From 74de40b9c51685102efc4018df722dfb063889e2 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Fri, 16 Mar 2018 15:21:19 +0100 Subject: [PATCH] Minor patch of a previous commit --- lib/controller/checks.py | 29 +++++++++++++++-------------- lib/core/settings.py | 2 +- txt/checksum.md5 | 4 ++-- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/lib/controller/checks.py b/lib/controller/checks.py index e54f8461a..b8e54cfe9 100644 --- a/lib/controller/checks.py +++ b/lib/controller/checks.py @@ -329,21 +329,22 @@ def checkSqlInjection(place, parameter, value): logger.debug(debugMsg) continue - match = re.search(r"(\d+)-(\d+)", test.request.columns) - if match and not injection.data: - _ = test.request.columns.split('-')[-1] - if conf.uCols is None and _.isdigit() and int(_) > 10: - if kb.futileUnion is None: - msg = "it is not recommended to perform " - msg += "extended UNION tests if there is not " - msg += "at least one other (potential) " - msg += "technique found. Do you want to skip? [Y/n] " - kb.futileUnion = not readInput(msg, default='Y', boolean=True) + if stype == PAYLOAD.TECHNIQUE.UNION: + match = re.search(r"(\d+)-(\d+)", test.request.columns) + if match and not injection.data: + _ = test.request.columns.split('-')[-1] + if conf.uCols is None and _.isdigit() and int(_) > 10: + if kb.futileUnion is None: + msg = "it is not recommended to perform " + msg += "extended UNION tests if there is not " + msg += "at least one other (potential) " + msg += "technique found. Do you want to skip? [Y/n] " + kb.futileUnion = not readInput(msg, default='Y', boolean=True) - if kb.futileUnion is False: - debugMsg = "skipping test '%s'" % title - logger.debug(debugMsg) - continue + if kb.futileUnion is False: + debugMsg = "skipping test '%s'" % title + logger.debug(debugMsg) + continue infoMsg = "testing '%s'" % title logger.info(infoMsg) diff --git a/lib/core/settings.py b/lib/core/settings.py index c32490965..868961139 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.3.33" +VERSION = "1.2.3.34" 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 bd6de5e7a..cb5ffa03c 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -21,7 +21,7 @@ c88d66597f4aab719bde4542b0a1a6e0 extra/shutils/regressiontest.py 1e5532ede194ac9c083891c2f02bca93 extra/sqlharvest/__init__.py b3e60ea4e18a65c48515d04aab28ff68 extra/sqlharvest/sqlharvest.py 0f581182871148b0456a691ae85b04c0 lib/controller/action.py -a6751962ab23d450857c11f7466dd43c lib/controller/checks.py +e15cd43d7bd71d04990494d13897c490 lib/controller/checks.py 33689bb1b064d4eebc216934795a595f lib/controller/controller.py c7443613a0a2505b1faec931cee2a6ef lib/controller/handler.py 1e5532ede194ac9c083891c2f02bca93 lib/controller/__init__.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 -a719b1091a4864e59d43f003f8f0155b lib/core/settings.py +7c1b5473621cf472755e6a0a13e3cd0e lib/core/settings.py 0dfc2ed40adf72e302291f6ecd4406f6 lib/core/shell.py a7edc9250d13af36ac0108f259859c19 lib/core/subprocessng.py 12f8c42ed742581644f6476a7d80dcf8 lib/core/target.py