Fixes #6006

data/txt/sha256sums.txt

@@ -189,7 +189,7 @@ e18c0c2c5a57924a623792a48bfd36e98d9bc085f6db61a95fc0dc8a3bcedc0c  lib/core/decor
 48797d6c34dd9bb8a53f7f3794c85f4288d82a9a1d6be7fcf317d388cb20d4b3  lib/core/replication.py
 3574639db4942d16a2dc0a2f04bb7c0913c40c3862b54d34c44075a760e0c194  lib/core/revision.py
 888daba83fd4a34e9503fe21f01fef4cc730e5cde871b1d40e15d4cbc847d56c  lib/core/session.py
-c0f848d501c33ae35d0372c7d70ce9bde176691b6962ae94e2d753c2fff17543  lib/core/settings.py
+6cae0d283ebb2e5860f2ea19b2c224b8e22f53b8bcf046809767572638bdcdc5  lib/core/settings.py
 cd5a66deee8963ba8e7e9af3dd36eb5e8127d4d68698811c29e789655f507f82  lib/core/shell.py
 bcb5d8090d5e3e0ef2a586ba09ba80eef0c6d51feb0f611ed25299fbb254f725  lib/core/subprocessng.py
 d35650179816193164a5f177102f18379dfbe6bb6d40fbb67b78d907b41c8038  lib/core/target.py
@@ -634,7 +634,7 @@ ef70b88cc969a3e259868f163ad822832f846196e3f7d7eccb84958c80b7f696  thirdparty/odi
 c51c91f703d3d4b3696c923cb5fec213e05e75d9215393befac7f2fa6a3904df  thirdparty/six/__init__.py
 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  thirdparty/socks/__init__.py
 7027e214e014eb78b7adcc1ceda5aca713a79fc4f6a0c52c9da5b3e707e6ffe9  thirdparty/socks/LICENSE
-57dba7460c09b7922df68b981e824135f1a6306180ba4c107b626e3232513eff  thirdparty/socks/socks.py
+56ae8fb03a5cf34cc5babb59f8c2c3bb20388a04f94491f6847989428ce49b82  thirdparty/socks/socks.py
 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  thirdparty/termcolor/__init__.py
 b14474d467c70f5fe6cb8ed624f79d881c04fe6aeb7d406455da624fe8b3c0df  thirdparty/termcolor/termcolor.py
 4db695470f664b0d7cd5e6b9f3c94c8d811c4c550f37f17ed7bdab61bc3bdefc  thirdparty/wininetpton/__init__.py

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.10.1.41"
+VERSION = "1.10.1.42"
 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)

thirdparty/socks/socks.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 """SocksiPy - Python SOCKS module.
-Version 1.00
+Version 1.01
 
 Copyright 2006 Dan-Haim. All rights reserved.
 
@@ -44,6 +44,7 @@ mainly to merge bug fixes found in Sourceforge
 
 """
 
+import functools
 import socket
 import struct
 
@@ -107,8 +108,29 @@ def wrapmodule(module):
     This will only work on modules that import socket directly into the namespace;
     most of the Python Standard Library falls into this category.
     """
-    if _defaultproxy != None:
-        module.socket.socket = socksocket
+    if _defaultproxy is not None:
+        _orig_socket_ctor = _orgsocket
+
+        @functools.wraps(_orig_socket_ctor)
+        def guarded_socket(*args, **kwargs):
+            # socket.socket([family[, type[, proto]]])
+            family = args[0] if len(args) > 0 else kwargs.get("family", socket.AF_INET)
+            stype  = args[1] if len(args) > 1 else kwargs.get("type", socket.SOCK_STREAM)
+
+            # Normalize socket type by stripping flags (Py3.3+ may OR these in)
+            flags = 0
+            flags |= getattr(socket, "SOCK_CLOEXEC", 0)
+            flags |= getattr(socket, "SOCK_NONBLOCK", 0)
+            base_type = stype & ~flags
+
+            if family in (socket.AF_INET, getattr(socket, "AF_INET6", socket.AF_INET)) and base_type == socket.SOCK_STREAM:
+                return socksocket(*args, **kwargs)
+
+            # Fallback: don't proxy AF_UNIX / raw / etc.
+            return _orig_socket_ctor(*args, **kwargs)
+
+        module.socket.socket = guarded_socket
+
         if _defaultproxy[0] == PROXY_TYPE_SOCKS4:
             # Note: unable to prevent DNS leakage in SOCKS4 (Reference: https://security.stackexchange.com/a/171280)
             pass