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

Minor adjustment to HTTP headers handling

Browse Source
This commit is contained in:
Bernardo Damele 2010-06-29 23:51:44 +00:00
parent fb9f669544
commit c33f3ef844
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/core/option.py
View File

@ -724,7 +724,7 @@ def __setHTTPExtraHeaders():
if header and value: if header and value:
conf.httpHeaders.append((header, value)) conf.httpHeaders.append((header, value))
elif not conf.httpHeaders: elif not conf.httpHeaders or len(conf.httpHeaders) == 1:
conf.httpHeaders.append(("Accept", "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5")) conf.httpHeaders.append(("Accept", "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5"))
conf.httpHeaders.append(("Accept-Language", "en-us,en;q=0.5")) conf.httpHeaders.append(("Accept-Language", "en-us,en;q=0.5"))
conf.httpHeaders.append(("Accept-Charset", "ISO-8859-15,utf-8;q=0.7,*;q=0.7")) conf.httpHeaders.append(("Accept-Charset", "ISO-8859-15,utf-8;q=0.7,*;q=0.7"))
@ -763,7 +763,16 @@ def __setHTTPUserAgent():
return return
if not conf.userAgentsFile: if not conf.userAgentsFile:
conf.httpHeaders.append(("User-Agent", __defaultHTTPUserAgent())) addDefaultUserAgent = True
for header, _ in conf.httpHeaders:
if header == "User-Agent":
addDefaultUserAgent = False
break
if addDefaultUserAgent:
conf.httpHeaders.append(("User-Agent", __defaultHTTPUserAgent()))
return return
debugMsg = "fetching random HTTP User-Agent header from " debugMsg = "fetching random HTTP User-Agent header from "
@ -826,7 +835,7 @@ def __setHTTPCookies():
if conf.cookie: if conf.cookie:
debugMsg = "setting the HTTP Cookie header" debugMsg = "setting the HTTP Cookie header"
logger.debug(debugMsg) logger.debug(debugMsg)
conf.httpHeaders.append(("Connection", "Keep-Alive")) conf.httpHeaders.append(("Connection", "Keep-Alive"))
conf.httpHeaders.append(("Cookie", conf.cookie)) conf.httpHeaders.append(("Cookie", conf.cookie))
@ -1128,23 +1137,23 @@ def init(inputOptions=advancedDict()):
__cleanupOptions() __cleanupOptions()
__basicOptionValidation() __basicOptionValidation()
__setRequestFromFile() __setRequestFromFile()
__setMultipleTargets()
parseTargetUrl() parseTargetUrl()
parseTargetDirect() parseTargetDirect()
if conf.url or conf.list or conf.requestFile or conf.googleDork: if conf.url or conf.list or conf.requestFile or conf.googleDork:
__setHTTPTimeout() __setHTTPTimeout()
__setHTTPExtraHeaders()
__setHTTPCookies() __setHTTPCookies()
__setHTTPReferer() __setHTTPReferer()
__setHTTPUserAgent() __setHTTPUserAgent()
__setHTTPExtraHeaders()
__setHTTPMethod() __setHTTPMethod()
__setHTTPAuthentication() __setHTTPAuthentication()
__setHTTPProxy() __setHTTPProxy()
__setSafeUrl() __setSafeUrl()
__setUnionTech() __setUnionTech()
__setGoogleDorking() __setGoogleDorking()
__setMultipleTargets()
__urllib2Opener() __urllib2Opener()
__setDBMS() __setDBMS()