Minor refactoring

lib/core/datatype.py

@@ -152,9 +152,10 @@ class LRUDict(object):
         return key in self.cache
 
     def __getitem__(self, key):
-        value = self.cache.pop(key)
-        self.cache[key] = value
-        return value
+        with self.__lock:
+            value = self.cache.pop(key)
+            self.cache[key] = value
+            return value
 
     def get(self, key):
         return self.__getitem__(key)

lib/core/decorators.py

@@ -15,7 +15,7 @@ from lib.core.settings import UNICODE_ENCODING
 from lib.core.threads import getCurrentThreadData
 
 _cache = {}
-_cache_lock = threading.Lock()
+_method_locks = {}
 
 def cachedmethod(f):
     """
@@ -37,22 +37,27 @@ def cachedmethod(f):
     """
 
     _cache[f] = LRUDict(capacity=MAX_CACHE_ITEMS)
+    _method_locks[f] = threading.RLock()
 
     @functools.wraps(f)
     def _f(*args, **kwargs):
+        parts = (
+            f.__module__ + "." + f.__name__,
+            "|".join(repr(a) for a in args),
+            "|".join("%s=%r" % (k, kwargs[k]) for k in sorted(kwargs))
+        )
         try:
-            key = int(hashlib.md5("|".join(str(_) for _ in (f, args, kwargs)).encode(UNICODE_ENCODING)).hexdigest(), 16) & 0x7fffffffffffffff
+            key = int(hashlib.md5("|".join(parts).encode(UNICODE_ENCODING)).hexdigest(), 16) & 0x7fffffffffffffff
         except ValueError:  # https://github.com/sqlmapproject/sqlmap/issues/4281 (NOTE: non-standard Python behavior where hexdigest returns binary value)
             result = f(*args, **kwargs)
         else:
-            try:
-                with _cache_lock:
-                    result = _cache[f][key]
-            except KeyError:
-                result = f(*args, **kwargs)
-
-                with _cache_lock:
-                    _cache[f][key] = result
+            lock, cache = _method_locks[f], _cache[f]
+            with lock:
+                try:
+                    result = cache[key]
+                except KeyError:
+                    result = f(*args, **kwargs)
+                    cache[key] = result
 
         return result
 

lib/core/settings.py

@@ -19,7 +19,7 @@ from lib.core.enums import OS
 from thirdparty import six
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.9.7.1"
+VERSION = "1.9.7.2"
 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)