fixes issue #224 and issue #221, deperecates some code that has to do with macOS which is no longer needed, removes the error_file after it has been used (if it has been used)

Author: Ekultek

autosploit/main.py

@@ -69,9 +69,7 @@ def main():
                     )
                     if choice.lower().startswith("y"):
                         try:
-                            if "darwin" in platform_running.lower():
-                                cmdline("{} darwin".format(START_SERVICES_PATH))
-                            elif "linux" in platform_running.lower():
+                            if "linux" in platform_running.lower():
                                 cmdline("{} linux".format(START_SERVICES_PATH))
                             else:
                                 close("your platform is not supported by AutoSploit at this time", status=2)

etc/scripts/start_services.sh

@@ -11,21 +11,10 @@ function startPostgreSQLLinux () {
   sudo systemctl start postgresql > /dev/null 2>&1
 }
 
-function startApacheOSX () {
-  sudo apachectl start > /dev/null 2>&1
-}
-
-function startPostgreSQLOSX () {
-  brew services restart postgresql > /dev/null 2>&1
-}
-
 function main () {
   if [ $1 == "linux" ]; then
     startApacheLinux;
     startPostgreSQLLinux;
-  elif [ $1 == "darwin" ]; then
-    startApacheOSX;
-    startPostgreSQLOSX;
   else
     echo "[*] invalid operating system";
   fi

lib/creation/issue_creator.py

@@ -1,4 +1,5 @@
 import re
+import os
 import sys
 import json
 import platform
@@ -165,5 +166,9 @@ def request_issue_creation(path, arguments, error_message):
             lib.output.error(
                 "someone has already created this issue here: {}".format(find_url(identifier))
             )
+        try:
+            os.remove(path)
+        except:
+            pass
     else:
         lib.output.info("the issue has been logged to a file in path: '{}'".format(path))

lib/exploitation/exploiter.py

@@ -78,7 +78,11 @@ def start_exploit(self, sep="*" * 10):
 
         today_printable = datetime.datetime.today().strftime("%Y-%m-%d_%Hh%Mm%Ss")
         current_run_path = path.join(lib.settings.RC_SCRIPTS_PATH, today_printable)
-        makedirs(current_run_path)
+        try:
+            makedirs(current_run_path)
+        except OSError:
+            current_run_path = path.join(lib.settings.RC_SCRIPTS_PATH, today_printable + "(1)")
+            makedirs(current_run_path)
 
         report_path = path.join(current_run_path, "report.csv")
         with open(report_path, 'w') as f:

lib/term/terminal.py

@@ -274,7 +274,12 @@ def custom_host_list(self, mods):
         option 3 must be provided
         """
         provided_host_file = lib.output.prompt("enter the full path to your host file", lowercase=False)
-        self.exploit_gathered_hosts(mods, hosts=provided_host_file)
+        if provided_host_file == "":
+            lib.output.error("you provided a blank hosts file, did you mean to?")
+            lib.output.info("defaulting to default hosts file (press CNTRL-C to go back and try again)")
+            self.exploit_gathered_hosts(mods, hosts=self.host_path)
+        else:
+            self.exploit_gathered_hosts(mods, hosts=provided_host_file)
 
     def terminal_main_display(self, loaded_mods):
         """