minor update

stamparm · stamparm · commit 96190cf594f0 · 2011-06-24T17:15:15.000Z
diff --git a/lib/core/option.py b/lib/core/option.py
@@ -101,6 +101,7 @@
 from lib.core.settings import LOCALHOST
 from lib.core.settings import MAX_NUMBER_OF_THREADS
 from lib.core.settings import TIME_DELAY_CANDIDATES
+from lib.core.settings import RAW_IP_ADDR_INFO
 from lib.core.settings import UNKNOWN_DBMS_VERSION
 from lib.core.settings import WEBSCARAB_SPLITTER
 from lib.core.update import update
@@ -933,13 +934,18 @@ def __setHTTPProxy():
     else:
         proxyHandler = urllib2.ProxyHandler({"http": __proxyString})
 
-    # Patch for DNS leakage
+    # Just in case patch for eventual "DNS leakage"
     if conf.proxy:
-        try:
-            addrinfo = socket.getaddrinfo(__hostname, __port)
-        except:
-            errMsg = "proxy host '%s' does not exist" % __hostname
-            raise sqlmapConnectionException, errMsg
+        if re.match(GENERAL_IP_ADDRESS_REGEX, __hostname):
+            addrinfo = RAW_IP_ADDR_INFO
+            for item in addrinfo:
+                item[-1] = (__hostname, __port)
+        else:
+            try:
+                addrinfo = socket.getaddrinfo(__hostname, __port)
+            except:
+                errMsg = "proxy host '%s' does not exist" % __hostname
+                raise sqlmapConnectionException, errMsg
 
         conf.proxyDNSResponse = addrinfo
 
diff --git a/lib/core/settings.py b/lib/core/settings.py
@@ -357,3 +357,6 @@
 
 # Extensions skipped by crawler
 CRAWL_EXCLUDE_EXTENSIONS = ("gif","jpg","jar","tif","bmp","war","ear","mpg","wmv","mpeg","scm","iso","dmp","dll","cab","so","avi","bin","exe","iso","tar","png","pdf","ps","mp3","zip","rar","gz")
+
+# Standard getaddrinfo response for raw IP addresses ((None,) -> ('ip', port))
+RAW_IP_ADDR_INFO = [[2, 1, 6, '', (None,)], [2, 2, 17, '', (None,)], [2, 3, 0, '', (None,)]]
