Fixes #952

commixproject · Oct 10, 2024 · 9fc625e · 9fc625e
1 parent a319b99
commit 9fc625e
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 35 deletions.
diff --git a/src/core/tamper/base64encode.py b/src/core/tamper/base64encode.py
@@ -29,7 +29,7 @@
   settings.TAMPER_SCRIPTS[__tamper__] = True
 
 def tamper(payload):
-  if settings.WHITESPACES[0] == "+":
+  if len(settings.WHITESPACES) != 0 and settings.WHITESPACES[0] == _urllib.parse.quote_plus(settings.SINGLE_WHITESPACE):
     err_msg = "Tamper script '" +  __tamper__  + "' is unlikely to work combined with the tamper script 'space2plus'."
     if settings.VERBOSITY_LEVEL == 0:
       settings.print_data_to_stdout(settings.SINGLE_WHITESPACE)

diff --git a/src/core/tamper/hexencode.py b/src/core/tamper/hexencode.py
@@ -29,7 +29,7 @@
   settings.TAMPER_SCRIPTS[__tamper__] = True
 
 def tamper(payload):
-  if settings.WHITESPACES[0] == "+":
+  if len(settings.WHITESPACES) != 0 and settings.WHITESPACES[0] == _urllib.parse.quote_plus(settings.SINGLE_WHITESPACE):
     err_msg = "Tamper script '" +  __tamper__  + "' is unlikely to work combined with the tamper script 'space2plus'."
     if settings.VERBOSITY_LEVEL == 0:
       settings.print_data_to_stdout(settings.SINGLE_WHITESPACE)

diff --git a/src/core/tamper/space2htab.py b/src/core/tamper/space2htab.py
@@ -14,6 +14,7 @@
 """
 
 from src.utils import settings
+from src.thirdparty.six.moves import urllib as _urllib
 
 """
 About: Replaces space character ('%20') with horizontal tab ('%09')
@@ -28,10 +29,11 @@
 
 def tamper(payload):
   settings.TAMPER_SCRIPTS[__tamper__] = True
-  if settings.WHITESPACES[0] == "%20":
-    settings.WHITESPACES[0] = space2htab
-  elif space2htab not in settings.WHITESPACES:
-    settings.WHITESPACES.append(space2htab)
+  if len(settings.WHITESPACES) != 0:
+    if settings.WHITESPACES[0] == _urllib.parse.quote(settings.SINGLE_WHITESPACE):
+      settings.WHITESPACES[0] = space2htab
+    elif space2htab not in settings.WHITESPACES:
+      settings.WHITESPACES.append(space2htab)
   return payload
 
 # eof
diff --git a/src/core/tamper/space2ifs.py b/src/core/tamper/space2ifs.py
@@ -14,6 +14,7 @@
 """
 
 from src.utils import settings
+from src.thirdparty.six.moves import urllib as _urllib
 
 """
 About: Replaces space character ('%20') with the internal field separator ('$IFS').
@@ -29,18 +30,18 @@
   settings.TAMPER_SCRIPTS[__tamper__] = True
 
 def tamper(payload):
-  if space2ifs in settings.WHITESPACES[0] and \
-  settings.EVAL_BASED_STATE != False:
-    settings.WHITESPACES[0] = space2ifs
-  if settings.TARGET_OS != settings.OS.WINDOWS:
-    settings.TAMPER_SCRIPTS[__tamper__] = True
-    if settings.WHITESPACES[0] == "%20":
+  if len(settings.WHITESPACES) != 0:
+    if space2ifs in settings.WHITESPACES[0] and settings.EVAL_BASED_STATE != False:
       settings.WHITESPACES[0] = space2ifs
-    elif space2ifs not in settings.WHITESPACES:
-      settings.WHITESPACES.append(space2ifs)
-  else:
-    if space2ifs in settings.WHITESPACES:
-      settings.WHITESPACES.remove(space2ifs)
+    if settings.TARGET_OS != settings.OS.WINDOWS:
+      settings.TAMPER_SCRIPTS[__tamper__] = True
+      if settings.WHITESPACES[0] == _urllib.parse.quote(settings.SINGLE_WHITESPACE):
+        settings.WHITESPACES[0] = space2ifs
+      elif space2ifs not in settings.WHITESPACES:
+        settings.WHITESPACES.append(space2ifs)
+    else:
+      if space2ifs in settings.WHITESPACES:
+        settings.WHITESPACES.remove(space2ifs)
   return payload
 
 # eof
diff --git a/src/core/tamper/space2plus.py b/src/core/tamper/space2plus.py
@@ -14,24 +14,26 @@
 """
 
 from src.utils import settings
+from src.thirdparty.six.moves import urllib as _urllib
 
 """
 About: Replaces space character ('%20') with plus ('+').
 Notes: This tamper script works against all targets.
 """
 
 __tamper__ = "space2plus"
-space2plus = "+"
+space2plus = _urllib.parse.quote_plus(settings.SINGLE_WHITESPACE)
 
 if not settings.TAMPER_SCRIPTS[__tamper__]:
   settings.TAMPER_SCRIPTS[__tamper__] = True
 
 def tamper(payload):
   settings.TAMPER_SCRIPTS[__tamper__] = True
-  if settings.WHITESPACES[0] == "%20":
-    settings.WHITESPACES[0] = space2plus
-  elif space2plus not in settings.WHITESPACES:
-    settings.WHITESPACES.append(space2plus)
+  if len(settings.WHITESPACES) != 0:
+    if settings.WHITESPACES[0] == _urllib.parse.quote(settings.SINGLE_WHITESPACE):
+      settings.WHITESPACES[0] = space2plus
+    elif space2plus not in settings.WHITESPACES:
+      settings.WHITESPACES.append(space2plus)
   return payload
 
 # eof
diff --git a/src/core/tamper/space2vtab.py b/src/core/tamper/space2vtab.py
@@ -14,6 +14,7 @@
 """
 
 from src.utils import settings
+from src.thirdparty.six.moves import urllib as _urllib
 
 """
 About: Replaces space character ('%20') with vertical tab ('%0b').
@@ -27,15 +28,16 @@
   settings.TAMPER_SCRIPTS[__tamper__] = True
 
 def tamper(payload):
-  if settings.TARGET_OS == settings.OS.WINDOWS:
-    settings.TAMPER_SCRIPTS[__tamper__] = True
-    if settings.WHITESPACES[0] == "%20":
-      settings.WHITESPACES[0] = space2vtab
-    elif space2vtab not in settings.WHITESPACES:
-      settings.WHITESPACES.append(space2vtab)
-  else:
-    if space2vtab in settings.WHITESPACES:
-      settings.WHITESPACES.remove(space2vtab)
+  if len(settings.WHITESPACES) != 0:
+    if settings.TARGET_OS == settings.OS.WINDOWS:
+      settings.TAMPER_SCRIPTS[__tamper__] = True
+      if settings.WHITESPACES[0] == _urllib.parse.quote(settings.SINGLE_WHITESPACE):
+        settings.WHITESPACES[0] = space2vtab
+      elif space2vtab not in settings.WHITESPACES:
+        settings.WHITESPACES.append(space2vtab)
+    else:
+      if space2vtab in settings.WHITESPACES:
+        settings.WHITESPACES.remove(space2vtab)
   return payload
 
 # eof
diff --git a/src/utils/settings.py b/src/utils/settings.py
@@ -262,7 +262,7 @@ def sys_argv_errors():
 DESCRIPTION = "The command injection exploiter"
 AUTHOR  = "Anastasios Stasinopoulos"
 VERSION_NUM = "4.0"
-REVISION = "98"
+REVISION = "99"
 STABLE_RELEASE = False
 VERSION = "v"
 if STABLE_RELEASE:
@@ -549,11 +549,12 @@ class OS(object):
 # Raw payload (without tampering)
 RAW_PAYLOAD = ""
 
-# The default (url-ecoded) white-space.
-WHITESPACES = ["%20"]
-
+# Single whitespace
 SINGLE_WHITESPACE = " "
 
+# The default (url-ecoded) white-space.
+WHITESPACES = [_urllib.parse.quote(SINGLE_WHITESPACE)]
+
 # Reference: http://www.w3.org/Protocols/HTTP/Object_Headers.html#uri
 URI_HTTP_HEADER = "URI"