Fixes #5364

stamparm · stamparm · commit 3117730d84b0 · 2023-03-15T23:00:16.000+01:00
diff --git a/lib/core/compat.py b/lib/core/compat.py
@@ -9,6 +9,7 @@
 
 import binascii
 import functools
+import inspect
 import math
 import os
 import random
@@ -312,3 +313,20 @@ def LooseVersion(version):
         result = float("NaN")
 
     return result
+
+# Reference: https://github.com/bottlepy/bottle/blob/df67999584a0e51ec5b691146c7fa4f3c87f5aac/bottle.py
+if not hasattr(inspect, "getargspec") and hasattr(inspect, "getfullargspec"):
+    from inspect import getfullargspec
+
+    def makelist(data):
+        if isinstance(data, (tuple, list, set, dict)):
+            return list(data)
+        elif data:
+            return [data]
+        else:
+            return []
+
+    def getargspec(func):
+        spec = getfullargspec(func)
+        kwargs = makelist(spec[0]) + makelist(spec.kwonlyargs)
+        return kwargs, spec[1], spec[2], spec[3]
diff --git a/lib/core/option.py b/lib/core/option.py
@@ -815,7 +815,7 @@ def _setTamperingFunctions():
             priority = PRIORITY.NORMAL if not hasattr(module, "__priority__") else module.__priority__
 
             for name, function in inspect.getmembers(module, inspect.isfunction):
-                if name == "tamper" and (hasattr(inspect, "signature") and all(_ in inspect.signature(function).parameters for _ in ("payload", "kwargs")) or hasattr(inspect, "getargspec") and inspect.getargspec(function).args and inspect.getargspec(function).keywords == "kwargs"):
+                if name == "tamper" and (hasattr(inspect, "signature") and all(_ in inspect.signature(function).parameters for _ in ("payload", "kwargs")) or inspect.getargspec(function).args and inspect.getargspec(function).keywords == "kwargs"):
                     found = True
                     kb.tamperFunctions.append(function)
                     function.__name__ = module.__name__
diff --git a/lib/core/settings.py b/lib/core/settings.py
@@ -20,7 +20,7 @@
 from thirdparty.six import unichr as _unichr
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.7.3.0"
+VERSION = "1.7.3.1"
 TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
 TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
 VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)
