mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2025-03-03 19:55:47 +03:00
improvement toward proper implementation of OR-based injection by usage of "negative logic" mechanism
This commit is contained in:
parent
ce4c697bbd
commit
637a8d8273
|
@ -327,6 +327,7 @@ def checkSqlInjection(place, parameter, value):
|
|||
# Useful to set kb.matchRatio at first based on
|
||||
# the False response content
|
||||
kb.matchRatio = None
|
||||
kb.negativeLogic = (where == PAYLOAD.WHERE.NEGATIVE)
|
||||
Request.queryPage(genCmpPayload(), place, raise404=False)
|
||||
|
||||
# Perform the test's True request
|
||||
|
|
|
@ -2386,6 +2386,7 @@ def initTechnique(technique=None):
|
|||
if data:
|
||||
kb.pageTemplate, kb.errorIsNone = getPageTemplate(data.templatePayload, kb.injection.place)
|
||||
kb.matchRatio = data.matchRatio
|
||||
kb.negativeLogic = (technique == PAYLOAD.TECHNIQUE.BOOLEAN) and (data.where == PAYLOAD.WHERE.NEGATIVE)
|
||||
|
||||
# Restoring stored conf options
|
||||
for key, value in kb.injection.conf.items():
|
||||
|
|
|
@ -29,12 +29,19 @@ from lib.core.settings import UPPER_RATIO_BOUND
|
|||
from lib.core.threads import getCurrentThreadData
|
||||
|
||||
def comparison(page, headers, code=None, getRatioValue=False, pageLength=None):
|
||||
#return _checkNegativeLogic(_comparison(page, headers, code, getRatioValue, pageLength), getRatioValue)
|
||||
return _comparison(page, headers, code, getRatioValue, pageLength)
|
||||
return _adjust(_comparison(page, headers, code, getRatioValue, pageLength), getRatioValue)
|
||||
|
||||
def _checkNegativeLogic(condition, getRatioValue):
|
||||
condition = not (condition or False) if kb.negativeLogic else condition
|
||||
return condition if not getRatioValue else (MAX_RATIO if condition else MIN_RATIO)
|
||||
def _adjust(condition, getRatioValue):
|
||||
# Negative logic approach is used in raw page comparison scheme as that what is "different" than original
|
||||
# PAYLOAD.WHERE.NEGATIVE response is considered as True; in switch based approach negative logic is not
|
||||
# applied as that is by the user considered as True is that what is returned by the comparison mechanism
|
||||
# itself
|
||||
if not any([conf.string, conf.regexp, conf.code]):
|
||||
retVal = not (condition or False) if kb.negativeLogic else condition
|
||||
else:
|
||||
retVal = condition if not getRatioValue else (MAX_RATIO if condition else MIN_RATIO)
|
||||
|
||||
return retVal
|
||||
|
||||
def _comparison(page, headers, code, getRatioValue, pageLength):
|
||||
if page is None and pageLength is None:
|
||||
|
|
|
@ -502,8 +502,6 @@ class Connect:
|
|||
string match check ('--string' command line parameter)
|
||||
"""
|
||||
|
||||
kb.negativeLogic = "OR NOT" in (value or "")
|
||||
|
||||
if conf.direct:
|
||||
return direct(value, content)
|
||||
|
||||
|
|
|
@ -615,12 +615,12 @@ Formats:
|
|||
<risk>3</risk>
|
||||
<clause>1</clause>
|
||||
<where>2</where>
|
||||
<vector>OR NOT ([INFERENCE])</vector>
|
||||
<vector>OR ([INFERENCE])</vector>
|
||||
<request>
|
||||
<payload>OR NOT ([RANDNUM]=[RANDNUM])</payload>
|
||||
<payload>OR ([RANDNUM]=[RANDNUM])</payload>
|
||||
</request>
|
||||
<response>
|
||||
<comparison>OR NOT ([RANDNUM]=[RANDNUM1])</comparison>
|
||||
<comparison>OR ([RANDNUM]=[RANDNUM1])</comparison>
|
||||
</response>
|
||||
</test>
|
||||
|
||||
|
@ -631,13 +631,13 @@ Formats:
|
|||
<risk>3</risk>
|
||||
<clause>1</clause>
|
||||
<where>2</where>
|
||||
<vector>OR NOT ([INFERENCE])</vector>
|
||||
<vector>OR ([INFERENCE])</vector>
|
||||
<request>
|
||||
<payload>OR NOT ([RANDNUM]=[RANDNUM])</payload>
|
||||
<payload>OR ([RANDNUM]=[RANDNUM])</payload>
|
||||
<comment>#</comment>
|
||||
</request>
|
||||
<response>
|
||||
<comparison>OR NOT ([RANDNUM]=[RANDNUM1])</comparison>
|
||||
<comparison>OR ([RANDNUM]=[RANDNUM1])</comparison>
|
||||
</response>
|
||||
<details>
|
||||
<dbms>MySQL</dbms>
|
||||
|
@ -651,13 +651,13 @@ Formats:
|
|||
<risk>3</risk>
|
||||
<clause>1</clause>
|
||||
<where>2</where>
|
||||
<vector>OR NOT ([INFERENCE])</vector>
|
||||
<vector>OR ([INFERENCE])</vector>
|
||||
<request>
|
||||
<payload>OR NOT ([RANDNUM]=[RANDNUM])</payload>
|
||||
<payload>OR ([RANDNUM]=[RANDNUM])</payload>
|
||||
<comment>-- </comment>
|
||||
</request>
|
||||
<response>
|
||||
<comparison>OR NOT ([RANDNUM]=[RANDNUM1])</comparison>
|
||||
<comparison>OR ([RANDNUM]=[RANDNUM1])</comparison>
|
||||
</response>
|
||||
</test>
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user