From 96ffb4b9115df187fb696a233bee38d5b30d5508 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Mon, 11 Sep 2017 10:38:19 +0200 Subject: [PATCH] Fixes #2693 --- lib/controller/checks.py | 6 +++--- lib/core/settings.py | 2 +- txt/checksum.md5 | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/controller/checks.py b/lib/controller/checks.py index 48b73be99..7d198ae2a 100644 --- a/lib/controller/checks.py +++ b/lib/controller/checks.py @@ -257,13 +257,13 @@ def checkSqlInjection(place, parameter, value): if payloadDbms is not None: # Skip DBMS-specific test if it does not match the user's # provided DBMS - if conf.dbms is not None and not intersect(payloadDbms, conf.dbms, True): + if conf.dbms and not intersect(payloadDbms, conf.dbms, True): debugMsg = "skipping test '%s' because " % title debugMsg += "it is different than provided" logger.debug(debugMsg) continue - if kb.dbmsFilter is not None and not intersect(payloadDbms, kb.dbmsFilter, True): + if kb.dbmsFilter and not intersect(payloadDbms, kb.dbmsFilter, True): debugMsg = "skipping test '%s' because " % title debugMsg += "it is different than provided" logger.debug(debugMsg) @@ -271,7 +271,7 @@ def checkSqlInjection(place, parameter, value): # Skip DBMS-specific test if it does not match the # previously identified DBMS (via DBMS-specific payload) - if injection.dbms is not None and not intersect(payloadDbms, injection.dbms, True): + if injection.dbms and not intersect(payloadDbms, injection.dbms, True): debugMsg = "skipping test '%s' because the identified " % title debugMsg += "back-end DBMS is %s" % injection.dbms logger.debug(debugMsg) diff --git a/lib/core/settings.py b/lib/core/settings.py index 54c247094..396190c9f 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.9.12" +VERSION = "1.1.9.13" 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 23a905a34..a86f93366 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -21,7 +21,7 @@ c55b400b72acc43e0e59c87dd8bb8d75 extra/shellcodeexec/windows/shellcodeexec.x32. 310efc965c862cfbd7b0da5150a5ad36 extra/sqlharvest/__init__.py 7713aa366c983cdf1f3dbaa7383ea9e1 extra/sqlharvest/sqlharvest.py 7afe836fd97271ccba67b4c0da2482ff lib/controller/action.py -20ec996d592a09f0b4607ddd231586f7 lib/controller/checks.py +5fd3320fc6e86e7864c5c87919d63488 lib/controller/checks.py a66093c734c7f94ecdf94d882c2d8b89 lib/controller/controller.py 926bdaf98d082a41fdd57bb41c1692d1 lib/controller/handler.py 310efc965c862cfbd7b0da5150a5ad36 lib/controller/__init__.py @@ -46,7 +46,7 @@ c5f09788ee8ff9c9d12a052986875bc6 lib/core/option.py d8e9250f3775119df07e9070eddccd16 lib/core/replication.py 785f86e3f963fa3798f84286a4e83ff2 lib/core/revision.py 40c80b28b3a5819b737a5a17d4565ae9 lib/core/session.py -0a387452776db9ef7f0648048f965561 lib/core/settings.py +979db28e78f1698e28d31d5287a17705 lib/core/settings.py d91291997d2bd2f6028aaf371bf1d3b6 lib/core/shell.py 2ad85c130cc5f2b3701ea85c2f6bbf20 lib/core/subprocessng.py effc153067a00bd43461bfc1cdec1122 lib/core/target.py