From 7a525f28d43c7006ef9a800db3fe670e12de5f05 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Tue, 21 Dec 2010 15:26:23 +0000 Subject: [PATCH] cosmetics --- lib/core/settings.py | 4 ++-- lib/request/inject.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/core/settings.py b/lib/core/settings.py index bfa6827d7..16177db67 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -52,8 +52,8 @@ CHAR_INFERENCE_MARK = "%c" # coefficient used for a time-based query delay checking (must be >= 7) TIME_STDEV_COEFF = 10 -# maximum number of techniques used in inject.py/getValue() before deciding 'None' value -MAX_TECHNIQUES_BEFORE_NONE = 2 +# maximum number of techniques used in inject.py/getValue() per one value +MAX_TECHNIQUES_PER_VALUE = 2 # suffix used for naming meta databases in DBMS(es) without explicit database name METADB_SUFFIX = "_masterdb" diff --git a/lib/request/inject.py b/lib/request/inject.py index 74c2ce2ed..d65b21366 100644 --- a/lib/request/inject.py +++ b/lib/request/inject.py @@ -35,7 +35,7 @@ from lib.core.enums import EXPECTED from lib.core.enums import PAYLOAD from lib.core.exception import sqlmapNotVulnerableException from lib.core.settings import MIN_TIME_RESPONSES -from lib.core.settings import MAX_TECHNIQUES_BEFORE_NONE +from lib.core.settings import MAX_TECHNIQUES_PER_VALUE from lib.core.unescaper import unescaper from lib.request.connect import Connect as Request from lib.request.direct import direct @@ -422,7 +422,7 @@ def getValue(expression, blind=True, inband=True, error=True, time=True, fromUse value = __goInband(query, expected, sort, resumeValue, unpack, dump) count += 1 - found = value or (value is None and expectingNone) or count >= MAX_TECHNIQUES_BEFORE_NONE + found = value or (value is None and expectingNone) or count >= MAX_TECHNIQUES_PER_VALUE oldUnionNegative = kb.unionNegative kb.unionNegative = False @@ -436,7 +436,7 @@ def getValue(expression, blind=True, inband=True, error=True, time=True, fromUse value = __goError(query, resumeValue) count += 1 - found = value or (value is None and expectingNone) or count >= MAX_TECHNIQUES_BEFORE_NONE + found = value or (value is None and expectingNone) or count >= MAX_TECHNIQUES_PER_VALUE if blind and isTechniqueAvailable(PAYLOAD.TECHNIQUE.BOOLEAN) and not found: kb.technique = PAYLOAD.TECHNIQUE.BOOLEAN @@ -447,7 +447,7 @@ def getValue(expression, blind=True, inband=True, error=True, time=True, fromUse value = __goInferenceProxy(query, fromUser, expected, batch, resumeValue, unpack, charsetType, firstChar, lastChar) count += 1 - found = value or (value is None and expectingNone) or count >= MAX_TECHNIQUES_BEFORE_NONE + found = value or (value is None and expectingNone) or count >= MAX_TECHNIQUES_PER_VALUE if time and (isTechniqueAvailable(PAYLOAD.TECHNIQUE.TIME) or isTechniqueAvailable(PAYLOAD.TECHNIQUE.STACKED)) and not found: if isTechniqueAvailable(PAYLOAD.TECHNIQUE.TIME):