mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2025-02-03 05:04:11 +03:00
minor update
This commit is contained in:
parent
7e925bcfe8
commit
f36e093fa7
|
@ -1249,6 +1249,7 @@ def goGoodSamaritan(part, prevValue, originalCharset):
|
||||||
predictionSet = set()
|
predictionSet = set()
|
||||||
wildIndexes = []
|
wildIndexes = []
|
||||||
singleValue = None
|
singleValue = None
|
||||||
|
reObj = getCompiledRegex('\A%s' % prevValue)
|
||||||
|
|
||||||
if prevValue[-1] != '.':
|
if prevValue[-1] != '.':
|
||||||
prevValue += '.'
|
prevValue += '.'
|
||||||
|
@ -1265,7 +1266,7 @@ def goGoodSamaritan(part, prevValue, originalCharset):
|
||||||
if part in kb.commonOutputs:
|
if part in kb.commonOutputs:
|
||||||
for item in kb.commonOutputs[part]:
|
for item in kb.commonOutputs[part]:
|
||||||
# Check if the common output (item) starts with prevValue
|
# Check if the common output (item) starts with prevValue
|
||||||
if re.search('\A%s' % prevValue, item):
|
if reObj.search(item):
|
||||||
singleValue = item
|
singleValue = item
|
||||||
|
|
||||||
for index in wildIndexes:
|
for index in wildIndexes:
|
||||||
|
@ -1331,3 +1332,30 @@ def getPartRun():
|
||||||
break
|
break
|
||||||
|
|
||||||
return commonPartsDict[retVal][1] if retVal in commonPartsDict else retVal
|
return commonPartsDict[retVal][1] if retVal in commonPartsDict else retVal
|
||||||
|
|
||||||
|
def getCommonStart(strings=[]):
|
||||||
|
"""
|
||||||
|
Returns common start of given strings
|
||||||
|
"""
|
||||||
|
if not strings or not isinstance(strings, list):
|
||||||
|
return None
|
||||||
|
|
||||||
|
if len(strings) == 1:
|
||||||
|
return strings[0]
|
||||||
|
|
||||||
|
retVal = str()
|
||||||
|
maxCount = min(len(string) for string in strings)
|
||||||
|
|
||||||
|
count = 0
|
||||||
|
while count < maxCount:
|
||||||
|
char = strings[0][count]
|
||||||
|
for i in xrange(1, len(strings)):
|
||||||
|
if char != strings[i][count]:
|
||||||
|
char = None
|
||||||
|
break
|
||||||
|
if char is None:
|
||||||
|
break
|
||||||
|
retVal += char
|
||||||
|
count += 1
|
||||||
|
|
||||||
|
return retVal
|
||||||
|
|
|
@ -1077,6 +1077,11 @@ def __basicOptionValidation():
|
||||||
conf.limitStop is not None and isinstance(conf.limitStop, int) and conf.limitStop > 0 and conf.limitStop <= conf.limitStart:
|
conf.limitStop is not None and isinstance(conf.limitStop, int) and conf.limitStop > 0 and conf.limitStop <= conf.limitStart:
|
||||||
errMsg = "value for --start (limitStart) option must be smaller than value for --stop (limitStop) option"
|
errMsg = "value for --start (limitStart) option must be smaller than value for --stop (limitStop) option"
|
||||||
raise sqlmapSyntaxException, errMsg
|
raise sqlmapSyntaxException, errMsg
|
||||||
|
|
||||||
|
if conf.cpuThrottle is not None and isinstance(conf.cpuThrottle, int) and (conf.cpuThrottle > 100 or\
|
||||||
|
conf.cpuThrottle < 0):
|
||||||
|
errMsg = "value for --cpu-throttle (cpuThrottle) option must be in range [0,100]"
|
||||||
|
raise sqlmapSyntaxException, errMsg
|
||||||
|
|
||||||
def init(inputOptions=advancedDict()):
|
def init(inputOptions=advancedDict()):
|
||||||
"""
|
"""
|
||||||
|
|
Loading…
Reference in New Issue
Block a user