Minor patches

Author: stamparm

data/txt/sha256sums.txt

@@ -166,9 +166,9 @@ eed1db5da17eca4c65a8f999166e2246eef84397687ae820bbe4984ef65a09df  extra/vulnserv
 4608f21a4333c162ab3c266c903fda4793cc5834de30d06affe9b7566dd09811  lib/controller/__init__.py
 216c9399853b7454d36dcb552baf9f1169ec7942897ddc46504684325cb6ce00  lib/core/agent.py
 fbba89420acafcdb9ba1a95428cf2161b13cfa2d1a7ad7d5e70c14b0e04861f0  lib/core/bigarray.py
-e56ab9dafa97b1bff42a04bf50ec558ecbe0703cbdcc59d22ced05f82955024d  lib/core/common.py
+b7004d6b58ad638ac680d098aa96c07d0b403fb54f1938585fba3d61a262ff37  lib/core/common.py
 11c748cc96ea2bc507bc6c1930a17fe4bc6fdd2dd2a80430df971cb21428eb00  lib/core/compat.py
-2a65fe3ebf642f29a1e44b50c56f212430e323c1523b587ca7d6a76b8b5e5f3f  lib/core/convert.py
+34bcabad7602d6a5b79a517af8a71cc2bf21e34dfe695f9f8b9c41583a37aaef  lib/core/convert.py
 ae500647c4074681749735a4f3b17b7eca44868dd3f39f9cab0a575888ba04a1  lib/core/data.py
 ffae7cfe9f9afb92e887b9a8dbc1630d0063e865f35984ae417b04a4513e5024  lib/core/datatype.py
 38d30ecb10783f0ff58a255c801db8324ef2ac23516c7600a9e177b459d99750  lib/core/decorators.py
@@ -188,7 +188,7 @@ c4bfb493a03caf84dd362aec7c248097841de804b7413d0e1ecb8a90c8550bc0  lib/core/readl
 d1bd70c1a55858495c727fbec91e30af267459c8f64d50fabf9e4ee2c007e920  lib/core/replication.py
 1d0f80b0193ac5204527bfab4bde1a7aee0f693fd008e86b4b29f606d1ef94f3  lib/core/revision.py
 d2eb8e4b05ac93551272b3d4abfaf5b9f2d3ac92499a7704c16ed0b4f200db38  lib/core/session.py
-67c7c913fe2792bd303794a9537a50c538ab40bbcbe4be585ae176882891ffee  lib/core/settings.py
+a3da2c5bdbed5f80159db0bf6324f2c818aaa4a0a18f703ca3d7b9f7aef95891  lib/core/settings.py
 1c5eab9494eb969bc9ce118a2ea6954690c6851cbe54c18373c723b99734bf09  lib/core/shell.py
 4eea6dcf023e41e3c64b210cb5c2efc7ca893b727f5e49d9c924f076bb224053  lib/core/subprocessng.py
 cdd352e1331c6b535e780f6edea79465cb55af53aa2114dcea0e8bf382e56d1a  lib/core/target.py

lib/core/common.py

@@ -3339,14 +3339,14 @@ def filterNone(values):
     """
     Emulates filterNone([...]) functionality
 
-    >>> filterNone([1, 2, "", None, 3])
-    [1, 2, 3]
+    >>> filterNone([1, 2, "", None, 3, 0])
+    [1, 2, 3, 0]
     """
 
     retVal = values
 
     if isinstance(values, _collections.Iterable):
-        retVal = [_ for _ in values if _]
+        retVal = [_ for _ in values if _ or _ == 0]
 
     return retVal
 

lib/core/convert.py

@@ -58,7 +58,7 @@ def base64pickle(value):
         try:
             retVal = encodeBase64(pickle.dumps(value), binary=False)
         except:
-            retVal = encodeBase64(pickle.dumps(str(value), PICKLE_PROTOCOL), binary=False)
+            raise
 
     return retVal
 
@@ -146,13 +146,19 @@ def rot13(data):
     'sbbone jnf urer!!'
     >>> rot13('sbbone jnf urer!!')
     'foobar was here!!'
+    >>> rot13(b'foobar was here!!')
+    'sbbone jnf urer!!'
     """
 
-    # Reference: https://stackoverflow.com/a/62662878
     retVal = ""
     alphabit = "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ"
+
+    if isinstance(data, six.binary_type):
+        data = getText(data)
+
     for char in data:
         retVal += alphabit[alphabit.index(char) + 13] if char in alphabit else char
+
     return retVal
 
 def decodeHex(value, binary=True):

lib/core/settings.py

@@ -19,7 +19,7 @@
 from thirdparty import six
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.9.12.22"
+VERSION = "1.9.12.23"
 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)