PenTest/sqlmap
1
0
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-12-09 22:21:30 +00:00
Code Issues Projects Releases Wiki Activity

Revert of previous commit (more care has to be done regarding headers dynamicity)

Browse Source
This commit is contained in:
Miroslav Stampar
2013-01-18 16:49:35 +01:00
parent 33094a118c
commit 8141d17985
3 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/request/comparison.py
View File

@@ -46,8 +46,8 @@ def _adjust(condition, getRatioValue):
def _comparison(page, headers, code, getRatioValue, pageLength):
threadData = getCurrentThreadData()
if kb.testMode or any((conf.string, conf.notString, conf.regexp)):
threadData.lastComparisonContent = "%s%s" % (listToStrValue(headers.headers if headers else ""), page or "")
if kb.testMode:
threadData.lastComparisonPage = page
if page is None and pageLength is None:
return None
@@ -55,17 +55,20 @@ def _comparison(page, headers, code, getRatioValue, pageLength):
seqMatcher = threadData.seqMatcher
seqMatcher.set_seq1(kb.pageTemplate)
# String to match in page when the query is True and/or valid
if conf.string:
return conf.string in threadData.lastComparisonContent
if any((conf.string, conf.notString, conf.regexp)):
rawResponse = "%s%s" % (listToStrValue(headers.headers if headers else ""), page)
# String to match in page when the query is False and/or invalid
if conf.notString:
return conf.notString not in threadData.lastComparisonContent
# String to match in page when the query is True and/or valid
if conf.string:
return conf.string in rawResponse
# Regular expression to match in page when the query is True and/or valid
if conf.regexp:
return re.search(conf.regexp, threadData.lastComparisonContent, re.I | re.M) is not None
# String to match in page when the query is False and/or invalid
if conf.notString:
return conf.notString not in rawResponse
# Regular expression to match in page when the query is True and/or valid
if conf.regexp:
return re.search(conf.regexp, rawResponse, re.I | re.M) is not None
# HTTP code to match when the query is valid
if conf.code: