sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-02-03 05:04:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

compatibility with partial union and error technique resumed data

Browse Source
This commit is contained in:
Miroslav Stampar 2011-12-22 12:20:21 +00:00
parent 58a4a02b7e
commit f622995a29
5 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/controller/checks.py
View File

@ -472,7 +472,6 @@ def checkSqlInjection(place, parameter, value):
injection.data[stype].comment = comment injection.data[stype].comment = comment
injection.data[stype].templatePayload = templatePayload injection.data[stype].templatePayload = templatePayload
injection.data[stype].matchRatio = kb.matchRatio injection.data[stype].matchRatio = kb.matchRatio
injection.data[stype].chars = kb.chars
injection.conf.textOnly = conf.textOnly injection.conf.textOnly = conf.textOnly
injection.conf.titles = conf.titles injection.conf.titles = conf.titles

8
lib/controller/controller.py
View File

@ -176,12 +176,16 @@ def __saveToSessionFile():
setInjection(inj) setInjection(inj)
def __saveAbsFilePaths(): def __saveToHashDB():
key = "kb.absFilePaths" key = "kb.absFilePaths"
value = unserializeObject(conf.hashDB.retrieve(key)) or set() value = unserializeObject(conf.hashDB.retrieve(key)) or set()
value.update(kb.absFilePaths) value.update(kb.absFilePaths)
conf.hashDB.write(key, serializeObject(value)) conf.hashDB.write(key, serializeObject(value))
key = "kb.chars"
if not conf.hashDB.retrieve(key):
conf.hashDB.write(key, serializeObject(kb.chars))
def __saveToResultsFile(): def __saveToResultsFile():
if not conf.resultsFP: if not conf.resultsFP:
return return
@ -568,7 +572,7 @@ def start():
__saveToSessionFile() __saveToSessionFile()
__saveToResultsFile() __saveToResultsFile()
__saveAbsFilePaths() __saveToHashDB()
__showInjections() __showInjections()
__selectInjection() __selectInjection()

1
lib/core/common.py
View File

@ -2505,7 +2505,6 @@ def initTechnique(technique=None):
if data: if data:
kb.pageTemplate, kb.errorIsNone = getPageTemplate(data.templatePayload, kb.injection.place) kb.pageTemplate, kb.errorIsNone = getPageTemplate(data.templatePayload, kb.injection.place)
kb.matchRatio = data.matchRatio kb.matchRatio = data.matchRatio
kb.chars = data.chars
# Restoring stored conf options # Restoring stored conf options
for key, value in kb.injection.conf.items(): for key, value in kb.injection.conf.items():

1
lib/core/target.py
View File

@ -210,6 +210,7 @@ def __resumeHashDBValues():
""" """
kb.absFilePaths = unserializeObject(conf.hashDB.retrieve("kb.absFilePaths")) or kb.absFilePaths kb.absFilePaths = unserializeObject(conf.hashDB.retrieve("kb.absFilePaths")) or kb.absFilePaths
kb.chars = unserializeObject(conf.hashDB.retrieve("kb.chars")) or kb.chars
def __setOutputResume(): def __setOutputResume():
""" """

4
lib/techniques/error/use.py
View File

@ -130,6 +130,10 @@ def __oneShotErrorUse(expression, field):
conf.hashDB.write(expression, retVal) conf.hashDB.write(expression, retVal)
else:
check = "%s(?P<result>.*?)%s" % (kb.chars.start, kb.chars.stop)
retVal = extractRegexResult(check, retVal, re.DOTALL | re.IGNORECASE) or retVal
return safecharencode(retVal) if kb.safeCharEncode else retVal return safecharencode(retVal) if kb.safeCharEncode else retVal
def __errorFields(expression, expressionFields, expressionFieldsList, expected=None, num=None, resumeValue=True): def __errorFields(expression, expressionFields, expressionFieldsList, expected=None, num=None, resumeValue=True):