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

minor update

Browse Source
This commit is contained in:
Miroslav Stampar 2011-01-06 08:54:50 +00:00
parent 1297df66da
commit cc9ca802bf
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/controller/checks.py
View File

@ -19,7 +19,6 @@ from lib.core.common import getComparePageRatio
from lib.core.common import getCompiledRegex from lib.core.common import getCompiledRegex
from lib.core.common import getErrorParsedDBMSes from lib.core.common import getErrorParsedDBMSes
from lib.core.common import getErrorParsedDBMSesFormatted from lib.core.common import getErrorParsedDBMSesFormatted
from lib.core.common import getFilteredPageContent
from lib.core.common import getInjectionTests from lib.core.common import getInjectionTests
from lib.core.common import getUnicode from lib.core.common import getUnicode
from lib.core.common import popValue from lib.core.common import popValue
@ -586,8 +585,6 @@ def checkDynamicContent(firstPage, secondPage):
logger.warn(warnMsg) logger.warn(warnMsg)
conf.textOnly = True conf.textOnly = True
kb.originalPage = getFilteredPageContent(kb.originalPage)
kb.pageTemplates.clear()
setTextOnly() setTextOnly()
return return
@ -640,7 +637,7 @@ def checkStability():
warnMsg += "expression to match on" warnMsg += "expression to match on"
logger.warn(warnMsg) logger.warn(warnMsg)
message = "how do you want to proceed? [C(ontinue)/s(tring)/r(egex)/q(uit)] " message = "how do you want to proceed? [C(ontinue)/s(tring)/r(egex)/t(ext only)q(uit)] "
if not conf.realTest: if not conf.realTest:
test = readInput(message, default="C") test = readInput(message, default="C")
else: else:
@ -657,6 +654,7 @@ def checkStability():
if test: if test:
conf.string = test conf.string = test
setString()
if kb.nullConnection: if kb.nullConnection:
debugMsg = "turning off NULL connection " debugMsg = "turning off NULL connection "
@ -674,6 +672,7 @@ def checkStability():
if test: if test:
conf.regex = test conf.regex = test
setRegexp()
if kb.nullConnection: if kb.nullConnection:
debugMsg = "turning off NULL connection " debugMsg = "turning off NULL connection "
@ -684,6 +683,18 @@ def checkStability():
else: else:
errMsg = "Empty value supplied" errMsg = "Empty value supplied"
raise sqlmapNoneDataException, errMsg raise sqlmapNoneDataException, errMsg
elif test and test[0] in ("t", "T"):
conf.textOnly = True
setTextOnly()
if kb.nullConnection:
debugMsg = "turning off NULL connection "
debugMsg += "support because of regex checking"
logger.debug(debugMsg)
kb.nullConnection = None
else: else:
checkDynamicContent(firstPage, secondPage) checkDynamicContent(firstPage, secondPage)

4
lib/core/session.py
View File

@ -12,6 +12,7 @@ import re
from lib.core.common import aliasToDbmsEnum from lib.core.common import aliasToDbmsEnum
from lib.core.common import dataToSessionFile from lib.core.common import dataToSessionFile
from lib.core.common import formatFingerprintString from lib.core.common import formatFingerprintString
from lib.core.common import getFilteredPageContent
from lib.core.common import readInput from lib.core.common import readInput
from lib.core.convert import base64pickle from lib.core.convert import base64pickle
from lib.core.convert import base64unpickle from lib.core.convert import base64unpickle
@ -53,6 +54,9 @@ def setTextOnly():
if condition: if condition:
dataToSessionFile("[%s][None][None][Text only][True]\n" % conf.url) dataToSessionFile("[%s][None][None][Text only][True]\n" % conf.url)
kb.originalPage = getFilteredPageContent(kb.originalPage)
kb.pageTemplates.clear()
def setString(): def setString():
""" """
Save string to match in session file. Save string to match in session file.