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

some refactoring

Browse Source
This commit is contained in:
Miroslav Stampar 2011-01-01 23:57:27 +00:00
parent 212035e64d
commit 428e817a32
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/controller/checks.py
View File

@ -16,6 +16,7 @@ from lib.core.common import beep
from lib.core.common import extractRegexResult from lib.core.common import extractRegexResult
from lib.core.common import findDynamicContent from lib.core.common import findDynamicContent
from lib.core.common import getCompiledRegex from lib.core.common import getCompiledRegex
from lib.core.common import getErrorParsedDBMS
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
@ -139,9 +140,9 @@ def checkSqlInjection(place, parameter, value):
continue continue
if kb.htmlFp and kb.htmlFp[-1] and kb.htmlFp[-1] != dbms\ if getErrorParsedDBMS() and getErrorParsedDBMS() != dbms\
and kb.skipTests is None: and kb.skipTests is None:
message = "heuristic test showed that the back-end DBMS could be '%s'." % kb.htmlFp[-1] message = "heuristic test showed that the back-end DBMS could be '%s'." % getErrorParsedDBMS()
message += " do you want to skip test payloads specific for other DBMSes? [Y/n]" message += " do you want to skip test payloads specific for other DBMSes? [Y/n]"
kb.skipTests = conf.realTest or readInput(message, default="Y") not in ("n", "N") kb.skipTests = conf.realTest or readInput(message, default="Y") not in ("n", "N")
@ -149,7 +150,7 @@ def checkSqlInjection(place, parameter, value):
debugMsg = "skipping test '%s' because " % title debugMsg = "skipping test '%s' because " % title
debugMsg += "the heuristic test showed that " debugMsg += "the heuristic test showed that "
debugMsg += "the back-end DBMS could be " debugMsg += "the back-end DBMS could be "
debugMsg += "%s" % kb.htmlFp[-1] debugMsg += "%s" % getErrorParsedDBMS()
logger.debug(debugMsg) logger.debug(debugMsg)
continue continue
@ -472,7 +473,7 @@ def heuristicCheckSqlInjection(place, parameter, value):
infoMsg += "parameter '%s' might " % parameter infoMsg += "parameter '%s' might " % parameter
if result: if result:
infoMsg += "be injectable (possible DBMS: %s)" % (kb.htmlFp[-1] if kb.htmlFp else 'Unknown') infoMsg += "be injectable (possible DBMS: %s)" % (getErrorParsedDBMS() or 'Unknown')
logger.info(infoMsg) logger.info(infoMsg)
else: else:
infoMsg += "not be injectable" infoMsg += "not be injectable"

3
lib/controller/handler.py
View File

@ -7,6 +7,7 @@ Copyright (c) 2006-2010 sqlmap developers (http://sqlmap.sourceforge.net/)
See the file 'doc/COPYING' for copying permission See the file 'doc/COPYING' for copying permission
""" """
from lib.core.common import getErrorParsedDBMS
from lib.core.common import popValue from lib.core.common import popValue
from lib.core.common import pushValue from lib.core.common import pushValue
from lib.core.data import conf from lib.core.data import conf
@ -62,7 +63,7 @@ def setHandler():
( SYBASE_ALIASES, SybaseMap, SybaseConn ), ( SYBASE_ALIASES, SybaseMap, SybaseConn ),
] ]
inferencedDbms = (kb.htmlFp[-1] if kb.htmlFp else None) or kb.dbms inferencedDbms = getErrorParsedDBMS() or kb.dbms
for injection in kb.injections: for injection in kb.injections:
if hasattr(injection, "dbms") and injection.dbms: if hasattr(injection, "dbms") and injection.dbms:

7
lib/core/common.py
View File

@ -1919,8 +1919,8 @@ def getInjectionTests():
detected DBMS from error messages detected DBMS from error messages
""" """
retVal = conf.tests retVal = conf.tests
if kb.htmlFp: if getErrorParsedDBMS():
dbms = kb.htmlFp[-1] dbms = getErrorParsedDBMS()
retVal = sorted(retVal, key=lambda test: False\ retVal = sorted(retVal, key=lambda test: False\
if 'details' in test and 'dbms' in test.details\ if 'details' in test and 'dbms' in test.details\
and test.details.dbms == dbms else True) and test.details.dbms == dbms else True)
@ -1953,3 +1953,6 @@ def unicodeToSafeHTMLValue(value):
if ord(char) > 127: if ord(char) > 127:
retVal = retVal.replace(char, "&#%d;" % ord(char)) retVal = retVal.replace(char, "&#%d;" % ord(char))
return retVal return retVal
def getErrorParsedDBMS():
return kb.htmlFp[0] if kb.htmlFp else None