From c8a0c525fc3ac80e279bcdb352ecf08228456f2f Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Wed, 19 Apr 2017 14:19:39 +0200 Subject: [PATCH] Fixes #2489 --- lib/controller/controller.py | 12 ++++++------ lib/core/settings.py | 2 +- txt/checksum.md5 | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/controller/controller.py b/lib/controller/controller.py index d487a9dba..716032719 100644 --- a/lib/controller/controller.py +++ b/lib/controller/controller.py @@ -334,8 +334,13 @@ def start(): continue message += "\ndo you want to test this form? [Y/n/q] " + choice = readInput(message, default='Y').strip().upper() - if readInput(message, default='Y', boolean=True): + if choice == 'N': + continue + elif choice == 'Q': + break + else: if conf.method != HTTPMETHOD.GET: message = "Edit %s data [default: %s]%s: " % (conf.method, urlencode(conf.data) if conf.data else "None", " (Warning: blank fields detected)" if conf.data and extractRegexResult(EMPTY_FORM_FIELDS_REGEX, conf.data) else "") conf.data = readInput(message, default=conf.data) @@ -353,11 +358,6 @@ def start(): parseTargetUrl() - elif test[0] in ("n", "N"): - continue - elif test[0] in ("q", "Q"): - break - else: message += "\ndo you want to test this URL? [Y/n/q]" choice = readInput(message, default='Y').strip().upper() diff --git a/lib/core/settings.py b/lib/core/settings.py index 7d30d529d..93c45b1f3 100755 --- 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.1.4.36" +VERSION = "1.1.4.37" 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/txt/checksum.md5 b/txt/checksum.md5 index 17d690e42..b88270ca6 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -22,7 +22,7 @@ c55b400b72acc43e0e59c87dd8bb8d75 extra/shellcodeexec/windows/shellcodeexec.x32. 7713aa366c983cdf1f3dbaa7383ea9e1 extra/sqlharvest/sqlharvest.py 7afe836fd97271ccba67b4c0da2482ff lib/controller/action.py 21c79cf1a79b61c6d90f9bd249f71584 lib/controller/checks.py -fc89abe14a48b8232feba692bde992be lib/controller/controller.py +adf62498f7f8c8f9af48350d3591e404 lib/controller/controller.py 52a3969f57170e935e3fc0156335bf2c lib/controller/handler.py 310efc965c862cfbd7b0da5150a5ad36 lib/controller/__init__.py d3b4e1139bf117fe4cf6451d43d8253c lib/core/agent.py @@ -46,7 +46,7 @@ ede9841e7cbbe841f41588f149e85789 lib/core/option.py d8e9250f3775119df07e9070eddccd16 lib/core/replication.py 785f86e3f963fa3798f84286a4e83ff2 lib/core/revision.py 40c80b28b3a5819b737a5a17d4565ae9 lib/core/session.py -6db254c2297d4b1d77e2a6d8f690f7d0 lib/core/settings.py +73759e4a4c8395f11e8323a1c6f8dd11 lib/core/settings.py d91291997d2bd2f6028aaf371bf1d3b6 lib/core/shell.py 2ad85c130cc5f2b3701ea85c2f6bbf20 lib/core/subprocessng.py 92e35ddfdf0e9676dd51565bcf4fa5cf lib/core/target.py