diff --git a/lib/controller/controller.py b/lib/controller/controller.py index b491f3bd4..298fca106 100644 --- a/lib/controller/controller.py +++ b/lib/controller/controller.py @@ -368,9 +368,8 @@ def start(): conf.data = urldecode(conf.data) if conf.data and urlencode(DEFAULT_GET_POST_DELIMITER, None) not in conf.data else conf.data else: - if targetUrl.find("?") > -1: - firstPart = targetUrl[:targetUrl.find("?")] - secondPart = targetUrl[targetUrl.find("?") + 1:] + if '?' in targetUrl: + firstPart, secondPart = targetUrl.split('?', 1) message = "Edit GET data [default: %s]: " % secondPart test = readInput(message, default=secondPart) test = _randomFillBlankFields(test) diff --git a/lib/core/settings.py b/lib/core/settings.py index d943db53c..7de454f7f 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.2.2.2" +VERSION = "1.2.2.3" 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/request/connect.py b/lib/request/connect.py index c7001371b..1c62fa3b0 100644 --- a/lib/request/connect.py +++ b/lib/request/connect.py @@ -479,8 +479,7 @@ class Connect(object): # Get HTTP response if hasattr(conn, "redurl"): - page = (threadData.lastRedirectMsg[1] if kb.redirectChoice == REDIRECTION.NO\ - else Connect._connReadProxy(conn)) if not skipRead else None + page = (threadData.lastRedirectMsg[1] if kb.redirectChoice == REDIRECTION.NO else Connect._connReadProxy(conn)) if not skipRead else None skipLogTraffic = kb.redirectChoice == REDIRECTION.NO code = conn.redcode else: diff --git a/txt/checksum.md5 b/txt/checksum.md5 index d9bf2cb80..2e4cd3df5 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -22,7 +22,7 @@ c88d66597f4aab719bde4542b0a1a6e0 extra/shutils/regressiontest.py b3e60ea4e18a65c48515d04aab28ff68 extra/sqlharvest/sqlharvest.py 0f581182871148b0456a691ae85b04c0 lib/controller/action.py a4605691d340fd05d4bfe7dde922da92 lib/controller/checks.py -ccd66880fc677a3c83db2a3a70d196d7 lib/controller/controller.py +f0e3f93f6a5275812e4d0c3e3a2a3701 lib/controller/controller.py a7b0c8e5a18a3abe8803999dcfc4664f lib/controller/handler.py 1e5532ede194ac9c083891c2f02bca93 lib/controller/__init__.py e3a3f5218b2e52dd0afafdfc9fed2002 lib/core/agent.py @@ -46,7 +46,7 @@ ffa5f01f39b17c8d73423acca6cfe86a lib/core/readlineng.py 0c3eef46bdbf87e29a3f95f90240d192 lib/core/replication.py a7db43859b61569b601b97f187dd31c5 lib/core/revision.py fcb74fcc9577523524659ec49e2e964b lib/core/session.py -e4a29b441ac8137ce22d7113dd2b72c5 lib/core/settings.py +a2aed50a1a6605d67d688b524bda5f56 lib/core/settings.py d0adc28a38e43a787df4471f7f027413 lib/core/shell.py 63491be462c515a1a3880c27c2acc4a2 lib/core/subprocessng.py 505aaa61e1bba3c3d4567c3e667699e3 lib/core/target.py @@ -68,7 +68,7 @@ fb2e2f05dde98caeac6ccf3e67192177 lib/parse/configfile.py 4e60fe7c94bbfa631087ed3426df8ef0 lib/request/basicauthhandler.py eb39d5cbd69a2238e2f4ea2fde183cdb lib/request/basic.py c0cabedead14b8a23353b606672cff42 lib/request/comparison.py -a38e09038468387b20e978ce1b885018 lib/request/connect.py +b3c3b71e9d4aeaa2ece681cabefc953d lib/request/connect.py dd4598675027fae99f2e2475b05986da lib/request/direct.py 2044fce3f4ffa268fcfaaf63241b1e64 lib/request/dns.py a1436e4e4f9b636cb8332f00b686bfd5 lib/request/httpshandler.py