Mikaela
/
Limnoria
mirror of https://github.com/Mikaela/Limnoria.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #562 from nyuszika7h/unix-patches 

Patches for Unix plugin
This commit is contained in:
Valentin Lorentz 2014-03-02 23:08:03 +01:00
parent b4ad8c228d fb8d929cc8
commit 6520dba7ad
1 changed files with 66 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
plugins/Unix/plugin.py
View File

@ -210,10 +210,11 @@ class Unix(callbacks.Plugin):
args.append('-a') args.append('-a')
args.extend(self.registryValue('fortune.files')) args.extend(self.registryValue('fortune.files'))
try: try:
inst = subprocess.Popen(args, close_fds=True, with open(os.devnull) as null:
stdout=subprocess.PIPE, inst = subprocess.Popen(args,
stderr=subprocess.PIPE, stdout=subprocess.PIPE,
stdin=open(os.devnull)) stderr=subprocess.PIPE,
stdin=null)
except OSError as e: except OSError as e:
irc.error(_('It seems the configured fortune command was ' irc.error(_('It seems the configured fortune command was '
'not available.'), Raise=True) 'not available.'), Raise=True)
@ -241,10 +242,11 @@ class Unix(callbacks.Plugin):
if wtfCmd: if wtfCmd:
something = something.rstrip('?') something = something.rstrip('?')
try: try:
inst = subprocess.Popen([wtfCmd, something], close_fds=True, with open(os.devnull, 'r+') as null:
stdout=subprocess.PIPE, inst = subprocess.Popen([wtfCmd, something],
stderr=open(os.devnull), stdout=subprocess.PIPE,
stdin=open(os.devnull)) stderr=null,
stdin=null)
except OSError: except OSError:
irc.error(_('It seems the configured wtf command was not ' irc.error(_('It seems the configured wtf command was not '
'available.'), Raise=True) 'available.'), Raise=True)
@ -291,9 +293,11 @@ class Unix(callbacks.Plugin):
args.append('5') args.append('5')
args.append(host) args.append(host)
try: try:
inst = subprocess.Popen(args, stdout=subprocess.PIPE, with open(os.devnull) as null:
stderr=subprocess.PIPE, inst = subprocess.Popen(args,
stdin=open(os.devnull)) stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
stdin=null)
except OSError as e: except OSError as e:
irc.error('It seems the configured ping command was ' irc.error('It seems the configured ping command was '
'not available (%s).' % e, Raise=True) 'not available (%s).' % e, Raise=True)
@ -311,7 +315,7 @@ class Unix(callbacks.Plugin):
_hostExpr = re.compile(r'^[a-z0-9][a-z0-9\.-]*[a-z0-9]$', re.I) _hostExpr = re.compile(r'^[a-z0-9][a-z0-9\.-]*[a-z0-9]$', re.I)
ping = thread(wrap(ping, [getopts({'c':'positiveInt','i':'float', ping = thread(wrap(ping, [getopts({'c':'positiveInt','i':'float',
't':'positiveInt','W':'positiveInt'}), 't':'positiveInt','W':'positiveInt'}),
first('ip', ('matches', _hostExpr, 'Invalid hostname'))])) first('ip', ('matches', _hostExpr, 'Invalid hostname'))]))
def sysuptime(self, irc, msg, args): def sysuptime(self, irc, msg, args):
@ -323,10 +327,11 @@ class Unix(callbacks.Plugin):
if uptimeCmd: if uptimeCmd:
args = [uptimeCmd] args = [uptimeCmd]
try: try:
inst = subprocess.Popen(args, close_fds=True, with open(os.devnull) as null:
stdout=subprocess.PIPE, inst = subprocess.Popen(args,
stderr=subprocess.PIPE, stdout=subprocess.PIPE,
stdin=open(os.devnull)) stderr=subprocess.PIPE,
stdin=null)
except OSError as e: except OSError as e:
irc.error('It seems the configured uptime command was ' irc.error('It seems the configured uptime command was '
'not available.', Raise=True) 'not available.', Raise=True)
@ -351,10 +356,11 @@ class Unix(callbacks.Plugin):
if unameCmd: if unameCmd:
args = [unameCmd, '-a'] args = [unameCmd, '-a']
try: try:
inst = subprocess.Popen(args, close_fds=True, with open(os.devnull) as null:
stdout=subprocess.PIPE, inst = subprocess.Popen(args,
stderr=subprocess.PIPE, stdout=subprocess.PIPE,
stdin=open(os.devnull)) stderr=subprocess.PIPE,
stdin=null)
except OSError as e: except OSError as e:
irc.error('It seems the configured uptime command was ' irc.error('It seems the configured uptime command was '
'not available.', Raise=True) 'not available.', Raise=True)
@ -371,19 +377,21 @@ class Unix(callbacks.Plugin):
'variable appropriately.') 'variable appropriately.')
def call(self, irc, msg, args, text): def call(self, irc, msg, args, text):
"""<command to call with any arguments> """<command to call with any arguments>
Calls any command available on the system, and returns its output. Calls any command available on the system, and returns its output.
Requires owner capability. Requires owner capability.
Note that being restricted to owner, this command does not do any Note that being restricted to owner, this command does not do any
sanity checking on input/output. So it is up to you to make sure sanity checking on input/output. So it is up to you to make sure
you don't run anything that will spamify your channel or that you don't run anything that will spamify your channel or that
will bring your machine to its knees. will bring your machine to its knees.
""" """
args = shlex.split(text) args = shlex.split(text)
try: try:
inst = subprocess.Popen(args, stdout=subprocess.PIPE, with open(os.devnull) as null:
stderr=subprocess.PIPE, inst = subprocess.Popen(args,
stdin=open(os.devnull)) stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
stdin=null)
except OSError as e: except OSError as e:
irc.error('It seems the requested command was ' irc.error('It seems the requested command was '
'not available (%s).' % e, Raise=True) 'not available (%s).' % e, Raise=True)
@ -391,10 +399,41 @@ class Unix(callbacks.Plugin):
if result[1]: # stderr if result[1]: # stderr
irc.error(' '.join(result[1].decode('utf8').split())) irc.error(' '.join(result[1].decode('utf8').split()))
if result[0]: # stdout if result[0]: # stdout
response = result[0].decode('utf8').split("\n"); response = result[0].decode('utf8').splitlines()
response = [l for l in response if l] response = [l for l in response if l]
irc.replies(response) irc.replies(response)
call = thread(wrap(call, ["owner", "text"])) call = thread(wrap(call, ["owner", "text"]))
def shell(self, irc, msg, args, text):
"""<command to call with any arguments>
Calls any command available on the system using the shell
specified by the SHELL environment variable, and returns its
output.
Requires owner capability.
Note that being restricted to owner, this command does not do any
sanity checking on input/output. So it is up to you to make sure
you don't run anything that will spamify your channel or that
will bring your machine to its knees.
"""
try:
with open(os.devnull) as null:
inst = subprocess.Popen(text,
shell=True,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
stdin=null)
except OSError as e:
irc.error('It seems the shell (%s) was not available (%s)' %
(os.getenv('SHELL'), e), Raise=True)
result = inst.communicate()
if result[1]: # stderr
irc.error(' '.join(result[1].decode('utf8').split()))
if result[0]: # stdout
response = result[0].decode('utf8').splitlines()
response = [l for l in response if l]
irc.replies(response)
shell = thread(wrap(shell, ["owner", "text"]))
Class = Unix Class = Unix
# vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79: # vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79: