Minor bug-fix regarding option --output-dir. Ref: #905

commixproject · May 3, 2024 · 1f99ecd · 1f99ecd
1 parent 8684693
commit 1f99ecd
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## Version 4.0 (TBA)
+* Fixed: Minor bug-fix regarding option `--output-dir`.
 * Revised: Improvement regarding option `--skip` for excluding certain parameter(s) from testing.
 * Revised: Improvement regarding specifying which parameter(s) to test (i.e. `-p` option).
 * Revised: Improvement regarding processing / ignoring custom injection marker (i.e. asterisk `*`).

diff --git a/src/utils/logs.py b/src/utils/logs.py
@@ -16,6 +16,7 @@
 import re
 import sys
 import time
+import tempfile
 import sqlite3
 from datetime import date
 from datetime import datetime
@@ -54,10 +55,13 @@ def logs_filename_creation(url):
     menu.options.output_dir = os.path.abspath(menu.options.output_dir)
     if os.path.isdir(menu.options.output_dir):
       output_dir = menu.options.output_dir
+      warn_msg = "Using '" + output_dir + "' as the output directory."
+      print(settings.print_warning_msg(warn_msg)) 
     else:
-      error_msg = "The '" + menu.options.output_dir + "' is not directory."
-      print(settings.print_critical_msg(error_msg))
-      raise SystemExit()
+      output_dir = tempfile.mkdtemp(prefix=settings.APPLICATION)
+      warn_msg = "Unable to create output directory '" + menu.options.output_dir + "'. "
+      warn_msg += "Using temporary directory '" + output_dir + "' instead."
+      print(settings.print_warning_msg(warn_msg))
   else:
     output_dir = settings.OUTPUT_DIR
     path_creation(os.path.dirname(settings.OUTPUT_DIR))
@@ -67,7 +71,6 @@ def logs_filename_creation(url):
 
   # The logs filename construction.
   filename = create_log_file(url, output_dir)
-
   return filename
 
 """
@@ -89,11 +92,9 @@ def create_log_file(url, output_dir):
     if os.path.exists(menu.options.session_file):
       settings.SESSION_FILE = menu.options.session_file
     else:
-       err_msg = "The provided session file ('" + \
-                    menu.options.session_file + \
-                    "') does not exist."
-       print(settings.print_critical_msg(err_msg))
-       raise SystemExit()
+      err_msg = "The provided session file ('" + menu.options.session_file + "') does not exist."
+      print(settings.print_critical_msg(err_msg))
+      raise SystemExit()
   else:
     settings.SESSION_FILE = logs_path + "session.db"
 
@@ -119,6 +120,10 @@ def create_log_file(url, output_dir):
       error_msg = str(err_msg.args[0]) + "."
     print(settings.print_critical_msg(error_msg))
     raise SystemExit()
+
+  if not menu.options.output_dir:
+    filename = os.path.abspath(filename)
+
   return filename
 
 """
@@ -180,7 +185,7 @@ def executed_command(filename, cmd, output):
 def logs_notification(filename):
   # Save command history.
   if not menu.options.no_logging:
-    info_msg = "Fetched data logged to text files under '" + os.getcwd() + "/" + filename + "'."
+    info_msg = "Fetched data logged to text files under '" + filename + "'."
     print(settings.print_info_msg(info_msg))
 
 """

diff --git a/src/utils/settings.py b/src/utils/settings.py
@@ -247,7 +247,7 @@ def sys_argv_errors():
 DESCRIPTION = "The command injection exploiter"
 AUTHOR  = "Anastasios Stasinopoulos"
 VERSION_NUM = "4.0"
-REVISION = "40"
+REVISION = "41"
 STABLE_RELEASE = False
 VERSION = "v"
 if STABLE_RELEASE: