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

minor fix (credentials were only set for the first target)

Browse Source
This commit is contained in:
Miroslav Stampar 2012-06-04 22:30:12 +00:00
parent 738073105e
commit f94ebe3107
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/core/option.py
View File

@ -1017,17 +1017,16 @@ def __setHTTPAuthentication():
if not aCredRegExp: if not aCredRegExp:
raise sqlmapSyntaxException, errMsg raise sqlmapSyntaxException, errMsg
authUsername = aCredRegExp.group(1) conf.authUsername = aCredRegExp.group(1)
authPassword = aCredRegExp.group(2) conf.authPassword = aCredRegExp.group(2)
passwordMgr = urllib2.HTTPPasswordMgrWithDefaultRealm() kb.passwordMgr = urllib2.HTTPPasswordMgrWithDefaultRealm()
passwordMgr.add_password(None, "%s://%s" % (conf.scheme, conf.hostname), authUsername, authPassword)
if aTypeLower == "basic": if aTypeLower == "basic":
authHandler = SmartHTTPBasicAuthHandler(passwordMgr) authHandler = SmartHTTPBasicAuthHandler(kb.passwordMgr)
elif aTypeLower == "digest": elif aTypeLower == "digest":
authHandler = urllib2.HTTPDigestAuthHandler(passwordMgr) authHandler = urllib2.HTTPDigestAuthHandler(kb.passwordMgr)
elif aTypeLower == "ntlm": elif aTypeLower == "ntlm":
try: try:
@ -1038,7 +1037,7 @@ def __setHTTPAuthentication():
errMsg += "http://code.google.com/p/python-ntlm/" errMsg += "http://code.google.com/p/python-ntlm/"
raise sqlmapMissingDependence, errMsg raise sqlmapMissingDependence, errMsg
authHandler = HTTPNtlmAuthHandler.HTTPNtlmAuthHandler(passwordMgr) authHandler = HTTPNtlmAuthHandler.HTTPNtlmAuthHandler(kb.passwordMgr)
else: else:
debugMsg = "setting the HTTP(s) authentication certificate" debugMsg = "setting the HTTP(s) authentication certificate"
logger.debug(debugMsg) logger.debug(debugMsg)
@ -1374,6 +1373,8 @@ def __setConfAttributes():
debugMsg = "initializing the configuration" debugMsg = "initializing the configuration"
logger.debug(debugMsg) logger.debug(debugMsg)
conf.authUsername = None
conf.authPassword = None
conf.boundaries = [] conf.boundaries = []
conf.cj = None conf.cj = None
conf.dbmsConnector = None conf.dbmsConnector = None
@ -1522,6 +1523,7 @@ def __setKnowledgeBaseAttributes(flushAll=True):
if flushAll: if flushAll:
kb.headerPaths = {} kb.headerPaths = {}
kb.keywords = set(getFileItems(paths.SQL_KEYWORDS)) kb.keywords = set(getFileItems(paths.SQL_KEYWORDS))
kb.passwordMgr = None
kb.scanOnlyGoogleGETs = None kb.scanOnlyGoogleGETs = None
kb.tamperFunctions = [] kb.tamperFunctions = []
kb.targetUrls = oset() kb.targetUrls = oset()

10
lib/core/target.py
View File

@ -34,6 +34,7 @@ from lib.core.exception import sqlmapFilePathException
from lib.core.exception import sqlmapGenericException from lib.core.exception import sqlmapGenericException
from lib.core.exception import sqlmapSyntaxException from lib.core.exception import sqlmapSyntaxException
from lib.core.exception import sqlmapUserQuitException from lib.core.exception import sqlmapUserQuitException
from lib.core.option import authHandler
from lib.core.option import __setDBMS from lib.core.option import __setDBMS
from lib.core.option import __setKnowledgeBaseAttributes from lib.core.option import __setKnowledgeBaseAttributes
from lib.core.session import resumeConfKb from lib.core.session import resumeConfKb
@ -331,6 +332,14 @@ def __setResultsFile():
logger.info("using '%s' as results file" % conf.resultsFilename) logger.info("using '%s' as results file" % conf.resultsFilename)
def __setAuthCred():
"""
Adds authentication credentials (if any) for current target to the password manager (used by connection handler).
"""
if kb.passwordMgr:
kb.passwordMgr.add_password(None, "%s://%s" % (conf.scheme, conf.hostname), conf.authUsername, conf.authPassword)
def __createFilesDir(): def __createFilesDir():
""" """
Create the file directory. Create the file directory.
@ -440,3 +449,4 @@ def setupTargetEnv():
__setHashDB() __setHashDB()
__resumeHashDBValues() __resumeHashDBValues()
__setResultsFile() __setResultsFile()
__setAuthCred()