From 7a3096ce25d6ca8e60c0a15e1820d10fc0ec6e44 Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Fri, 21 Oct 2011 21:12:48 +0000
Subject: [PATCH] some refactoring
---
lib/core/common.py | 6 ++++++
lib/techniques/union/test.py | 7 ++++---
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/lib/core/common.py b/lib/core/common.py
index 97c15ad14..3850f1663 100644
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -2830,6 +2830,12 @@ def isNoneValue(value):
else:
return value is None
+def isNullValue(value):
+ """
+ Returns whether the value contains explicit 'NULL' value
+ """
+ return isinstance(value,basestring) and value.upper() == "NULL"
+
def expandMnemonics(mnemonics, parser, args):
"""
Expand mnemonic options
diff --git a/lib/techniques/union/test.py b/lib/techniques/union/test.py
index 54781e0f0..c7e2078cd 100644
--- a/lib/techniques/union/test.py
+++ b/lib/techniques/union/test.py
@@ -18,6 +18,7 @@ from lib.core.common import clearConsoleLine
from lib.core.common import dataToStdout
from lib.core.common import extractRegexResult
from lib.core.common import getUnicode
+from lib.core.common import isNullValue
from lib.core.common import listToStrValue
from lib.core.common import popValue
from lib.core.common import pushValue
@@ -110,14 +111,14 @@ def __findUnionCharCount(comment, place, parameter, value, prefix, suffix, where
query = agent.forgeInbandQuery('', -1, count, comment, prefix, suffix, kb.uChar)
payload = agent.payload(place=place, parameter=parameter, newValue=query, where=where)
page, headers = Request.queryPage(payload, place=place, content=True, raise404=False)
- if kb.uChar:
+ if not isNullValue(kb.uChar):
pages[count] = page
ratio = comparison(page, headers, getRatioValue=True) or MIN_RATIO
ratios.append(ratio)
min_, max_ = min(min_, ratio), max(max_, ratio)
items.append((count, ratio))
- if kb.uChar and kb.uChar.upper() != 'NULL':
+ if not isNullValue(kb.uChar):
for regex in (kb.uChar, r'>\s*%s\s*<' % kb.uChar):
contains = [(count, re.search(regex, page or "", re.IGNORECASE) is not None) for count, page in pages.items()]
if len(filter(lambda x: x[1], contains)) == 1:
@@ -255,7 +256,7 @@ def __unionTestByCharBruteforce(comment, place, parameter, value, prefix, suffix
if conf.uColsStop == conf.uColsStart:
count = conf.uColsStart
else:
- count = __findUnionCharCount(comment, place, parameter, value, prefix, suffix, PAYLOAD.WHERE.ORIGINAL if kb.uChar.upper() == "NULL" else PAYLOAD.WHERE.NEGATIVE)
+ count = __findUnionCharCount(comment, place, parameter, value, prefix, suffix, PAYLOAD.WHERE.ORIGINAL if isNullValue(kb.uChar) else PAYLOAD.WHERE.NEGATIVE)
if count:
if Backend.getIdentifiedDbms() in FROM_TABLE and query.endswith(FROM_TABLE[Backend.getIdentifiedDbms()]):