mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2024-11-22 17:46:37 +03:00
another minor improvement regarding logging of http traffic
This commit is contained in:
parent
3e569a1693
commit
3d25071d06
|
@ -90,6 +90,7 @@ class Connect:
|
||||||
responseMsg = "HTTP response "
|
responseMsg = "HTTP response "
|
||||||
requestHeaders = ""
|
requestHeaders = ""
|
||||||
responseHeaders = ""
|
responseHeaders = ""
|
||||||
|
logHeaders = ""
|
||||||
|
|
||||||
try:
|
try:
|
||||||
if silent:
|
if silent:
|
||||||
|
@ -224,8 +225,23 @@ class Connect:
|
||||||
code = e.code
|
code = e.code
|
||||||
status = e.msg
|
status = e.msg
|
||||||
|
|
||||||
responseMsg = "\n%s[#%d] (%d %s)\n" % (responseMsg, requestID, code, status)
|
try:
|
||||||
logHTTPTraffic(requestMsg, responseMsg)
|
page = e.read()
|
||||||
|
responseHeaders = e.info()
|
||||||
|
except socket.timeout:
|
||||||
|
warnMsg = "connection timed out while trying "
|
||||||
|
warnMsg += "to get error page information (%d)" % code
|
||||||
|
logger.warn(warnMsg)
|
||||||
|
return None, None
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
|
responseMsg = "\n%s[#%d] (%d %s):\n" % (responseMsg, requestID, code, status)
|
||||||
|
|
||||||
|
if responseHeaders:
|
||||||
|
logHeaders = "\n".join(["%s: %s" % (key.capitalize() if isinstance(key, basestring) else key, value) for (key, value) in responseHeaders.items()])
|
||||||
|
|
||||||
|
logHTTPTraffic(requestMsg, "%s%s\n\n%s" % (responseMsg, logHeaders, page))
|
||||||
|
|
||||||
if e.code == 401:
|
if e.code == 401:
|
||||||
errMsg = "not authorized, try to provide right HTTP "
|
errMsg = "not authorized, try to provide right HTTP "
|
||||||
|
@ -235,15 +251,6 @@ class Connect:
|
||||||
errMsg = "page not found (%d)" % code
|
errMsg = "page not found (%d)" % code
|
||||||
raise sqlmapConnectionException, errMsg
|
raise sqlmapConnectionException, errMsg
|
||||||
else:
|
else:
|
||||||
try:
|
|
||||||
page = e.read()
|
|
||||||
responseHeaders = e.info()
|
|
||||||
except socket.timeout:
|
|
||||||
warnMsg = "connection timed out while trying "
|
|
||||||
warnMsg += "to get error page information (%d)" % code
|
|
||||||
logger.warn(warnMsg)
|
|
||||||
return None, None
|
|
||||||
|
|
||||||
debugMsg = "got HTTP error code: %d (%s)" % (code, status)
|
debugMsg = "got HTTP error code: %d (%s)" % (code, status)
|
||||||
logger.debug(debugMsg)
|
logger.debug(debugMsg)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user