X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/fa93b93394adc45f4b3bd1694c960df127cfc4da..79519d5abd251267436256b6cc41f36872f39dbe:/modules/eval.py

diff --git a/modules/eval.py b/modules/eval.py
index aadd81b..e5e4399 100644
--- a/modules/eval.py
+++ b/modules/eval.py
@@ -1,5 +1,6 @@
 # Erebus IRC bot - Author: Erebus Team
-# !EVAL and !EXEC commands
+# vim: fileencoding=utf-8
+# !EVAL and !EXEC commands, dangerous! DO NOT USE without understanding the risks!
 # This file is released into the public domain; see http://unlicense.org/
 
 # module info
@@ -18,9 +19,12 @@ modstart = lib.modstart
 modstop = lib.modstop
 
 # module code
+import subprocess
 import sys
-import ctlmod
 
+# import these to make life easier using this module
+import os
+import ctlmod
 
 def module(name):
 	return lib.mod(name)
@@ -30,11 +34,11 @@ def module(name):
 @lib.argsGE(1)
 def cmd_eval(bot, user, chan, realtarget, *args):
 	if chan is not None: replyto = chan
-	else: replyto = user
+	else: replyto = user.bind_bot(bot)
 
 	try: ret = eval(' '.join(args))
-	except Exception: bot.msg(replyto, "Error: %s %s" % (sys.exc_info()[0], sys.exc_info()[1]))
-	else: bot.msg(replyto, "Done: %r" % (ret,))
+	except Exception: replyto.msg("Error: %s %s" % (sys.exc_info()[0], sys.exc_info()[1]))
+	else: replyto.msg("Done: %r" % (ret,))
 
 
 @lib.hook('exec', needchan=False, wantchan=True, glevel=lib.OWNER)
@@ -42,13 +46,44 @@ def cmd_eval(bot, user, chan, realtarget, *args):
 @lib.argsGE(1)
 def cmd_exec(bot, user, chan, realtarget, *args):
 	if chan is not None: replyto = chan
-	else: replyto = user
+	else: replyto = user.bind_bot(bot)
+
+	try: exec(' '.join(args))
+	except Exception: replyto.msg("Error: %s %s" % (sys.exc_info()[0], sys.exc_info()[1]))
+	else: replyto.msg("Done.")
+
+@lib.hook(needchan=False, wantchan=True, glevel=lib.OWNER)
+@lib.help('<command line>', 'think os.system')
+@lib.argsGE(1)
+def system(bot, user, chan, realtarget, *args):
+	if chan is not None: replyto = chan
+	else: replyto = user.bind_bot(bot)
 
-	try: exec ' '.join(args)
-	except Exception: bot.msg(replyto, "Error: %s %s" % (sys.exc_info()[0], sys.exc_info()[1]))
-	else: bot.msg(replyto, "Done.")
+	try:
+		proc = subprocess.Popen(' '.join(args), shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, close_fds=True)
+	except Exception:
+		replyto.msg("Error: %s %s" % (sys.exc_info()[0], sys.exc_info()[1]))
+	else:
+		for line in proc.stdout:
+			replyto.msg(line.decode('utf-8', 'surrogateescape'))
 
 @lib.hook('exception', needchan=False, glevel=lib.OWNER)
 @lib.help(None, "cause an exception")
 def cmd_exception(*args, **kwargs):
 	raise Exception()
+
+@lib.hook(needchan=False, wantchan=True, glevel=lib.ADMIN)
+@lib.help("<nick> <message>", "inject a line as though it came from <nick>", "note that this injects lines, not commands", "ex: INJECT DimeCadmium !WHOAMI")
+def inject(bot, user, chan, realtarget, *args):
+	targetuser = bot.parent.user(args[0], create=False)
+	if targetuser is None:
+		bot.msg(user, "User is unknown.")
+		return
+	if targetuser.glevel > user.glevel:
+		bot.msg(user, "That user has a higher access level than you.")
+		return
+
+	if chan is not None:
+		bot.parsemsg(bot.parent.user(args[0], create=False), str(chan), ' '.join(args[1:]))
+	else:
+		bot.parsemsg(bot.parent.user(args[0], create=False), str(bot), ' '.join(args[1:]))