diff --git a/lib/core/optiondict.py b/lib/core/optiondict.py index 156d2d0c8..3c8337717 100644 --- a/lib/core/optiondict.py +++ b/lib/core/optiondict.py @@ -38,10 +38,12 @@ optDict = { "authType": "string", "authCred": "string", "authFile": "string", + "ignore401": "boolean", + "ignoreProxy": "boolean", + "ignoreTimeouts": "boolean", "proxy": "string", "proxyCred": "string", "proxyFile": "string", - "ignoreProxy": "boolean", "tor": "boolean", "torPort": "integer", "torType": "string", @@ -234,7 +236,6 @@ optDict = { "disablePrecon": "boolean", "profile": "boolean", "forceDns": "boolean", - "ignore401": "boolean", "murphyRate": "integer", "smokeTest": "boolean", "liveTest": "boolean", diff --git a/lib/core/settings.py b/lib/core/settings.py index d9a5aa20b..4adc391b5 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -19,7 +19,7 @@ from lib.core.enums import DBMS_DIRECTORY_NAME from lib.core.enums import OS # sqlmap version (...) -VERSION = "1.0.10.31" +VERSION = "1.0.10.32" 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) diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py index 9bed96fea..e247df969 100644 --- a/lib/parse/cmdline.py +++ b/lib/parse/cmdline.py @@ -152,6 +152,12 @@ def cmdLineParser(argv=None): request.add_option("--ignore-401", dest="ignore401", action="store_true", help="Ignore HTTP Error 401 (Unauthorized)") + request.add_option("--ignore-proxy", dest="ignoreProxy", action="store_true", + help="Ignore system default proxy settings") + + request.add_option("--ignore-timeouts", dest="ignoreTimeouts", action="store_true", + help="Ignore connection timeouts") + request.add_option("--proxy", dest="proxy", help="Use a proxy to connect to the target URL") @@ -162,9 +168,6 @@ def cmdLineParser(argv=None): request.add_option("--proxy-file", dest="proxyFile", help="Load proxy list from a file") - request.add_option("--ignore-proxy", dest="ignoreProxy", action="store_true", - help="Ignore system default proxy settings") - request.add_option("--tor", dest="tor", action="store_true", help="Use Tor anonymity network") diff --git a/lib/request/connect.py b/lib/request/connect.py index 64788c9e6..a7c1e286b 100644 --- a/lib/request/connect.py +++ b/lib/request/connect.py @@ -251,7 +251,7 @@ class Connect(object): timeout = kwargs.get("timeout", None) or conf.timeout auxHeaders = kwargs.get("auxHeaders", None) response = kwargs.get("response", False) - ignoreTimeout = kwargs.get("ignoreTimeout", False) or kb.ignoreTimeout + ignoreTimeout = kwargs.get("ignoreTimeout", False) or kb.ignoreTimeout or conf.ignoreTimeouts refreshing = kwargs.get("refreshing", False) retrying = kwargs.get("retrying", False) crawling = kwargs.get("crawling", False) diff --git a/sqlmap.conf b/sqlmap.conf index 712f98dd7..bd6ce400e 100644 --- a/sqlmap.conf +++ b/sqlmap.conf @@ -98,6 +98,18 @@ authCred = # Syntax: key_file authFile = +# Ignore HTTP Error 401 (Unauthorized). +# Valid: True or False +ignore401 = False + +# Ignore system default proxy settings. +# Valid: True or False +ignoreProxy = False + +# Ignore connection timeouts. +# Valid: True or False +ignoreTimeouts = False + # Use a proxy to connect to the target URL. # Syntax: (http|https|socks4|socks5)://address:port proxy = @@ -110,10 +122,6 @@ proxyCred = # Load proxy list from a file proxyFile = -# Ignore system default proxy settings. -# Valid: True or False -ignoreProxy = False - # Use Tor anonymity network. # Valid: True or False tor = False diff --git a/txt/checksum.md5 b/txt/checksum.md5 index ec63229e7..c93b26dd2 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -38,14 +38,14 @@ e4ca0fd47f20cf7ba6a5f5cbf980073c lib/core/decorators.py e4aec2b11c1ad6039d0c3dbbfbc5eb1a lib/core/exception.py cc9c82cfffd8ee9b25ba3af6284f057e lib/core/__init__.py 91c514013daa796e2cdd940389354eac lib/core/log.py -5b079749c50240602ea92637e268ed31 lib/core/optiondict.py +468ca9a68a5a40a1cb8395602083ba32 lib/core/optiondict.py d63e7749935f8ab323baaf5b425977ef lib/core/option.py 7af487340c138f7b5dbd443161cbb428 lib/core/profiling.py e60456db5380840a586654344003d4e6 lib/core/readlineng.py 5ef56abb8671c2ca6ceecb208258e360 lib/core/replication.py 99a2b496b9d5b546b335653ca801153f lib/core/revision.py 7c15dd2777af4dac2c89cab6df17462e lib/core/session.py -2f3e42f732f34fc56d046f8753eca3a2 lib/core/settings.py +bb5bbbea41c5204fa605973dcae71a84 lib/core/settings.py 7af83e4f18cab6dff5e67840eb65be80 lib/core/shell.py 23657cd7d924e3c6d225719865855827 lib/core/subprocessng.py c3ace7874a536d801f308cf1fd03df99 lib/core/target.py @@ -56,7 +56,7 @@ d43f059747ffd48952922c94152e2a07 lib/core/testing.py 8485a3cd94c0a5af2718bad60c5f1ae5 lib/core/wordlist.py cc9c82cfffd8ee9b25ba3af6284f057e lib/__init__.py c1288bc4ce5651dbdd82d4a9435fdc03 lib/parse/banner.py -2debb66e5bd9cf9207b067189402e1e6 lib/parse/cmdline.py +cbca40e76a5a6e93c9fb523f69a99d88 lib/parse/cmdline.py 8ec4d4f02634834701f8258726f2e511 lib/parse/configfile.py fe4e2152292587928edb94c9a4d311ff lib/parse/handler.py 8e6bfb13e5a34b2610f3ff23467a34cf lib/parse/headers.py @@ -67,7 +67,7 @@ b40a4c5d91770d347df36d3065b63798 lib/parse/sitemap.py 9299f21804033f099681525bb9bf51c0 lib/request/basicauthhandler.py 083e7f446909b12009e72ae8e5e5737c lib/request/basic.py c48285682a61d49982cb508351013cb4 lib/request/comparison.py -ab1cc5a69002306db2fd24d71cd0e606 lib/request/connect.py +5d6906483ef57032e28dcc6a9fcfd545 lib/request/connect.py 49b4c583af68689de5f9acb162de2939 lib/request/direct.py 1a46f7bb26b23ec0c0d9d9c95828241b lib/request/dns.py 70ceefe39980611494d4f99afb96f652 lib/request/httpshandler.py