mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2026-11-20 23:23:21 +00:00
Fixes #6168
This commit is contained in:
parent
9cd0619e2b
commit
c15f4bf055
4 changed files with 24 additions and 10 deletions
|
|
@ -3236,7 +3236,7 @@ def logHTTPTraffic(requestLogMsg, responseLogMsg, startTime=None, endTime=None):
|
|||
"""
|
||||
|
||||
if conf.harFile:
|
||||
conf.httpCollector.collectRequest(requestLogMsg, responseLogMsg, startTime, endTime)
|
||||
conf.httpCollector.collectRequest(requestLogMsg, responseLogMsg, startTime, endTime, scheme=conf.scheme)
|
||||
|
||||
if conf.trafficFile:
|
||||
with kb.locks.log:
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ from lib.core.enums import OS
|
|||
from thirdparty import six
|
||||
|
||||
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
|
||||
VERSION = "1.10.11.1"
|
||||
VERSION = "1.10.11.2"
|
||||
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
|
||||
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
|
||||
VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)
|
||||
|
|
|
|||
|
|
@ -36,10 +36,10 @@ class HTTPCollector(object):
|
|||
def setExtendedArguments(self, arguments):
|
||||
self.extendedArguments = arguments
|
||||
|
||||
def collectRequest(self, requestMessage, responseMessage, startTime=None, endTime=None):
|
||||
def collectRequest(self, requestMessage, responseMessage, startTime=None, endTime=None, scheme=None):
|
||||
self.messages.append(RawPair(requestMessage, responseMessage,
|
||||
startTime=startTime, endTime=endTime,
|
||||
extendedArguments=self.extendedArguments))
|
||||
extendedArguments=self.extendedArguments, scheme=scheme))
|
||||
|
||||
def obtain(self):
|
||||
return {"log": {
|
||||
|
|
@ -49,15 +49,16 @@ class HTTPCollector(object):
|
|||
}}
|
||||
|
||||
class RawPair(object):
|
||||
def __init__(self, request, response, startTime=None, endTime=None, extendedArguments=None):
|
||||
def __init__(self, request, response, startTime=None, endTime=None, extendedArguments=None, scheme=None):
|
||||
self.request = getBytes(request)
|
||||
self.response = getBytes(response)
|
||||
self.startTime = startTime
|
||||
self.endTime = endTime
|
||||
self.extendedArguments = extendedArguments or {}
|
||||
self.scheme = scheme # Note: of the target at the time of the request (as origin-form request lines don't carry one)
|
||||
|
||||
def toEntry(self):
|
||||
return Entry(request=Request.parse(self.request), response=Response.parse(self.response),
|
||||
return Entry(request=Request.parse(self.request, self.scheme), response=Response.parse(self.response),
|
||||
startTime=self.startTime, endTime=self.endTime,
|
||||
extendedArguments=self.extendedArguments)
|
||||
|
||||
|
|
@ -86,7 +87,7 @@ class Entry(object):
|
|||
return out
|
||||
|
||||
class Request(object):
|
||||
def __init__(self, method, path, httpVersion, headers, postBody=None, raw=None, comment=None):
|
||||
def __init__(self, method, path, httpVersion, headers, postBody=None, raw=None, comment=None, scheme=None):
|
||||
self.method = method
|
||||
self.path = path
|
||||
self.httpVersion = httpVersion
|
||||
|
|
@ -94,9 +95,10 @@ class Request(object):
|
|||
self.postBody = postBody
|
||||
self.comment = comment.strip() if comment else comment
|
||||
self.raw = raw
|
||||
self.scheme = scheme
|
||||
|
||||
@classmethod
|
||||
def parse(cls, raw):
|
||||
def parse(cls, raw, scheme=None):
|
||||
request = HTTPRequest(raw)
|
||||
return cls(method=request.command,
|
||||
path=request.path,
|
||||
|
|
@ -104,12 +106,16 @@ class Request(object):
|
|||
headers=request.headers,
|
||||
postBody=request.rfile.read(),
|
||||
comment=request.comment,
|
||||
raw=raw)
|
||||
raw=raw,
|
||||
scheme=scheme)
|
||||
|
||||
@property
|
||||
def url(self):
|
||||
if re.search(r"(?i)\Ahttps?://", self.path or ""): # Note: absolute-form request target (e.g. refreshing/crawling/checking requests)
|
||||
return self.path
|
||||
|
||||
host = self.headers.get("Host", "unknown")
|
||||
return "http://%s%s" % (host, self.path)
|
||||
return "%s://%s%s" % (self.scheme or "http", host, self.path)
|
||||
|
||||
def toDict(self):
|
||||
out = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue