diff --git a/readme/CHANGELOG b/readme/CHANGELOG index d3659ea995..e542a0270c 100644 --- a/readme/CHANGELOG +++ b/readme/CHANGELOG @@ -10,7 +10,7 @@ version 8.0.2 * fix an issue on harvester file not defined (python 3 compat) * add a simple install for setoolkit (setup.py) -* teensy remove old path generation location /usr/share/set to /usr/share/setoolkit +* teensy remove old path generation location /usr/local/share/set to /usr/local/share/setoolkit * fixed raw_input issue for python3 * changed env variable to python3 * remove patched socket no longer needed @@ -670,7 +670,7 @@ version 6.3 * added additional wording about when specifying a custom payload that you will need to create your own listener * added flag replacement variable for param name 8 which will indicate a randomized four alphanumeric for custom payload delivery - this will allow custom payloads to function properly without triggering powershell or other exploitation methods * added the ability for powershell to execute first and if successful then not drop binary stager as last resort -* added a workaround for a metasploit bug that would cause bundle install issues when launching directly within the /opt/metasploit/apps/pro/msf3 directory or within the /usr/share/ framework directory. I first check for /usr/bin/msfconsole first and if there I do not append to the path variable in order to launch from anywhere +* added a workaround for a metasploit bug that would cause bundle install issues when launching directly within the /opt/metasploit/apps/pro/msf3 directory or within the /usr/local/share/ framework directory. I first check for /usr/bin/msfconsole first and if there I do not append to the path variable in order to launch from anywhere * added ability to use default msfconsole launcher if applicable from any path instead of from home directory - fixed in psexec, powershell injection, java applet, custom payloads, etc. * randomized custom parameter name when deploying custom binaries to throw off static signatures @@ -887,7 +887,7 @@ version 5.4 * added obfuscation to the multipyinjection binary * added proper permissions for manifest files within SET and Java Applet - removes warning message in applets * officially removed se-toolkit - use setoolkit from now on to launch SET -* fixed a bug that would cause SET to not function properly if running from a different directory and /usr/share/setoolkit was present +* fixed a bug that would cause SET to not function properly if running from a different directory and /usr/local/share/setoolkit was present * fixed SET to no longer use se-toolkit in the launcher * fixed an issue that would cause STAGE_ENCODING to report None type instead of on/off * added STAGE_ENCODING to update_config.py options for dynamic importing @@ -1111,7 +1111,7 @@ version 5.0.8 version 5.0.7 ~~~~~~~~~~~~~~~~ -* added /usr/share/set for standard kali installations of se-toolkit launch +* added /usr/local/share/set for standard kali installations of se-toolkit launch ~~~~~~~~~~~~~~~~ version 5.0.6 diff --git a/seautomate b/seautomate index f6cad246a4..d8884e8a7f 100755 --- a/seautomate +++ b/seautomate @@ -22,10 +22,10 @@ except NameError: from importlib import reload # check where we are and load default directory -if os.path.isdir("/usr/share/setoolkit"): +if os.path.isdir("/usr/local/share/setoolkit"): if not os.path.isfile("setoolkit"): - os.chdir("/usr/share/setoolkit") - sys.path.append("/usr/share/setoolkit") + os.chdir("/usr/local/share/setoolkit") + sys.path.append("/usr/local/share/setoolkit") import src.core.setcore as core diff --git a/setoolkit b/setoolkit index 16f52423b4..b7ef223d0f 100755 --- a/setoolkit +++ b/setoolkit @@ -35,16 +35,16 @@ if os.path.isfile("setoolkit"): pass # check where we are and load default directory -elif os.path.isdir("/usr/share/setoolkit"): +elif os.path.isdir("/usr/local/share/setoolkit"): if not os.path.isfile("setoolkit"): - os.chdir("/usr/share/setoolkit") - sys.path.append("/usr/share/setoolkit") + os.chdir("/usr/local/share/setoolkit") + sys.path.append("/usr/local/share/setoolkit") # check where we are and load default directory -elif os.path.isdir("/usr/share/set"): +elif os.path.isdir("/usr/local/share/set"): if not os.path.isfile("setoolkit"): - os.chdir("/usr/share/set") - sys.path.append("/usr/share/set") + os.chdir("/usr/local/share/set") + sys.path.append("/usr/local/share/set") # make sure the config file is located in /etc/setoolkit if not os.path.isdir("/etc/setoolkit/"): diff --git a/setup.py b/setup.py index a9cca40294..ce67b1433e 100755 --- a/setup.py +++ b/setup.py @@ -8,12 +8,12 @@ import os print("[*] Installing requirements.txt...") subprocess.Popen("pip3 install -r requirements.txt", shell=True).wait() -print("[*] Installing setoolkit to /usr/share/setoolkit..") +print("[*] Installing setoolkit to /usr/local/share/setoolkit") print(os.getcwd()) -subprocess.Popen("mkdir /usr/share/setoolkit/;mkdir /etc/setoolkit/;cp -rf * /usr/share/setoolkit/;cp src/core/config.baseline /etc/setoolkit/set.config", shell=True).wait() +subprocess.Popen("mkdir /usr/local/share/setoolkit/;mkdir /etc/setoolkit/;cp -rf * /usr/local/share/setoolkit/;cp src/core/config.baseline /etc/setoolkit/set.config", shell=True).wait() print("[*] Creating launcher for setoolkit...") filewrite = open("/usr/local/bin/setoolkit", "w") -filewrite.write("#!/bin/sh\ncd /usr/share/setoolkit\n./setoolkit") +filewrite.write("#!/bin/sh\ncd /usr/local/share/setoolkit\n./setoolkit") filewrite.close() print("[*] Done. Chmoding +x.... ") subprocess.Popen("chmod +x /usr/local/bin/setoolkit", shell=True).wait() diff --git a/seupdate b/seupdate index 10718d32cb..779907f5d1 100755 --- a/seupdate +++ b/seupdate @@ -9,10 +9,10 @@ import sys # check where we are and load default directory -if os.path.isdir("/usr/share/setoolkit"): +if os.path.isdir("/usr/local/share/setoolkit"): if not os.path.isfile("se-toolkit"): - os.chdir("/usr/share/setoolkit") - sys.path.append("/usr/share/setoolkit") + os.chdir("/usr/local/share/setoolkit") + sys.path.append("/usr/local/share/setoolkit") import src.core.setcore as core diff --git a/src/core/config.baseline b/src/core/config.baseline index 92ee54f5c5..7f7fb8f9df 100644 --- a/src/core/config.baseline +++ b/src/core/config.baseline @@ -66,7 +66,7 @@ METASPLOIT_IFRAME_PORT=8080 ETTERCAP=OFF # ### Ettercap home directory (needed for DNS_spoof). -ETTERCAP_PATH=/usr/share/ettercap +ETTERCAP_PATH=/usr/local/share/ettercap # ### Specify what interface you want Ettercap or dsniff to listen on. ETTERCAP_INTERFACE=eth0 diff --git a/src/core/setcore.py b/src/core/setcore.py index 785d48a988..74c09ca255 100644 --- a/src/core/setcore.py +++ b/src/core/setcore.py @@ -61,7 +61,7 @@ def definepath(): if os.path.isfile("setoolkit"): return os.getcwd() else: - return "/usr/share/setoolkit/" + return "/usr/local/share/setoolkit/" else: return os.getcwd() @@ -397,9 +397,9 @@ def meta_path(): trigger = 1 # Kali linux bleeding edge should return this in order to work - if os.path.isfile("/usr/share/metasploit-framework/msfconsole"): + if os.path.isfile("/usr/local/share/metasploit-framework/msfconsole"): if trigger == 0: - msf_path = "/usr/share/metasploit-framework/" + msf_path = "/usr/local/share/metasploit-framework/" trigger = 1 # if we didn't find anything diff --git a/src/teensy/ino_gen.py b/src/teensy/ino_gen.py index 192b018555..157512bae8 100644 --- a/src/teensy/ino_gen.py +++ b/src/teensy/ino_gen.py @@ -15,7 +15,7 @@ # Mike Judge April 2017 # Declare required variables for shellcode generation -meta_path = '/usr/share/metasploit-framework/' # File path to metasploit - std SET msf_path = meta_path(). +meta_path = '/usr/local/share/metasploit-framework/' # File path to metasploit - std SET msf_path = meta_path(). lhost_ipaddr = '192.168.50.5' # Local host LHOST ip address. --Make user selectable-- shell_arch = 'x86' # Shellcode architecture. --Make user selectable-- shell_plat = 'Windows' # Shellcode platform. --Make user selectable-- @@ -34,10 +34,10 @@ build_path = 'C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319\\msbuild.exe' # Path to msbuild.exe - needs to have \ escaped with \\ to prevent issues. --Make user selectable-- # Variables for external files -ino_output_filename = '/usr/share/setoolkit/src/teensy/ino_file_gen.ino' # Filename of the final ino file containing the generated arduino code and xml build config for msbuild. -ino_header_filename = '/usr/share/setoolkit/src/teensy/ino_header.txt' # File containg the header arduino code to be incorporated into the ino file before the xml build config. -ino_tail_filename = '/usr/share/setoolkit/src/teensy/ino_tail.txt' # File containg the header arduino code to be incorporated into the ino file after the xml build config. -xml_input_filename = '/usr/share/setoolkit/src/teensy/ino_build_file.xml' # File containing the xml build structure to be incorporated into the ino file. +ino_output_filename = '/usr/local/share/setoolkit/src/teensy/ino_file_gen.ino' # Filename of the final ino file containing the generated arduino code and xml build config for msbuild. +ino_header_filename = '/usr/local/share/setoolkit/src/teensy/ino_header.txt' # File containg the header arduino code to be incorporated into the ino file before the xml build config. +ino_tail_filename = '/usr/local/share/setoolkit/src/teensy/ino_tail.txt' # File containg the header arduino code to be incorporated into the ino file after the xml build config. +xml_input_filename = '/usr/local/share/setoolkit/src/teensy/ino_build_file.xml' # File containing the xml build structure to be incorporated into the ino file. # User selection - default values print('\n-----default settings for shellcode generation-----\n')