sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2024-11-22 17:46:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Minor refactoring

Browse Source
This commit is contained in:
Miroslav Stampar 2012-07-06 17:05:47 +02:00
parent fb7fe552b7
commit 1a8ebbfd43
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/techniques/blind/inference.py
View File

@ -81,7 +81,7 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
if partialValue: if partialValue:
firstChar = len(partialValue) firstChar = len(partialValue)
elif "LENGTH(" in expression or "LEN(" in expression: elif "LENGTH(" in expression.upper() or "LEN(" in expression.upper():
firstChar = 0 firstChar = 0
elif dump and conf.firstChar is not None and ( isinstance(conf.firstChar, int) or ( isinstance(conf.firstChar, basestring) and conf.firstChar.isdigit() ) ): elif dump and conf.firstChar is not None and ( isinstance(conf.firstChar, int) or ( isinstance(conf.firstChar, basestring) and conf.firstChar.isdigit() ) ):
firstChar = int(conf.firstChar) - 1 firstChar = int(conf.firstChar) - 1
@ -90,7 +90,7 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
elif ( isinstance(firstChar, basestring) and firstChar.isdigit() ) or isinstance(firstChar, int): elif ( isinstance(firstChar, basestring) and firstChar.isdigit() ) or isinstance(firstChar, int):
firstChar = int(firstChar) - 1 firstChar = int(firstChar) - 1
if "LENGTH(" in expression or "LEN(" in expression: if "LENGTH(" in expression.upper() or "LEN(" in expression.upper():
lastChar = 0 lastChar = 0
elif dump and conf.lastChar is not None and ( isinstance(conf.lastChar, int) or ( isinstance(conf.lastChar, basestring) and conf.lastChar.isdigit() ) ): elif dump and conf.lastChar is not None and ( isinstance(conf.lastChar, int) or ( isinstance(conf.lastChar, basestring) and conf.lastChar.isdigit() ) ):
lastChar = int(conf.lastChar) lastChar = int(conf.lastChar)
@ -342,7 +342,6 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
# Go multi-threading (--threads > 1) # Go multi-threading (--threads > 1)
if conf.threads > 1 and isinstance(length, int) and length > 1: if conf.threads > 1 and isinstance(length, int) and length > 1:
value = []
threadData = getCurrentThreadData() threadData = getCurrentThreadData()
threadData.shared.value = [ None ] * length threadData.shared.value = [ None ] * length
@ -560,30 +559,29 @@ def queryOutputLength(expression, payload):
selectDistinctExpr = re.search("\ASELECT\s+DISTINCT\((.+?)\)\s+FROM", expression, re.I) selectDistinctExpr = re.search("\ASELECT\s+DISTINCT\((.+?)\)\s+FROM", expression, re.I)
selectFromExpr = re.search("\ASELECT\s+(.+?)\s+FROM", expression, re.I) selectFromExpr = re.search("\ASELECT\s+(.+?)\s+FROM", expression, re.I)
selectExpr = re.search("\ASELECT\s+(.+)$", expression, re.I) selectExpr = re.search("\ASELECT\s+(.+)$", expression, re.I)
miscExpr = re.search("\A(.+)", expression, re.I)
if selectTopExpr or selectDistinctExpr or selectFromExpr or selectExpr: if any((selectTopExpr, selectDistinctExpr, selectFromExpr, selectExpr)):
if selectTopExpr: if selectTopExpr:
regExpr = selectTopExpr.groups()[0] query = selectTopExpr.group(1)
elif selectDistinctExpr: elif selectDistinctExpr:
regExpr = selectDistinctExpr.groups()[0] query = selectDistinctExpr.group(1)
elif selectFromExpr: elif selectFromExpr:
regExpr = selectFromExpr.groups()[0] query = selectFromExpr.group(1)
elif selectExpr: elif selectExpr:
regExpr = selectExpr.groups()[0] query = selectExpr.group(1)
elif miscExpr: else:
regExpr = miscExpr.groups()[0] query = expression
if ( select and re.search("\A(COUNT|LTRIM)\(", regExpr, re.I) ) or len(regExpr) <= 1: if ( select and re.search("\A(COUNT|LTRIM)\(", query, re.I) ) or len(query) <= 1:
return None, None, None return None, None, None
if selectDistinctExpr: if selectDistinctExpr:
lengthExpr = "SELECT %s FROM (%s)" % (lengthQuery % regExpr, expression) lengthExpr = "SELECT %s FROM (%s)" % (lengthQuery % query, expression)
if Backend.getIdentifiedDbms() in ( DBMS.MYSQL, DBMS.PGSQL ): if Backend.getIdentifiedDbms() in ( DBMS.MYSQL, DBMS.PGSQL ):
lengthExpr += " AS %s" % randomStr(lowercase=True) lengthExpr += " AS %s" % randomStr(lowercase=True)
elif select: elif select:
lengthExpr = expression.replace(regExpr, lengthQuery % regExpr, 1) lengthExpr = expression.replace(query, lengthQuery % query, 1)
else: else:
lengthExpr = lengthQuery % expression lengthExpr = lengthQuery % expression
@ -600,4 +598,4 @@ def queryOutputLength(expression, payload):
if length == " ": if length == " ":
length = 0 length = 0
return count, length, regExpr return count, length, query