Patching --har (drei)

stamparm · stamparm · commit de95ff08a466 · 2019-05-08T13:15:42.000+02:00
diff --git a/lib/core/settings.py b/lib/core/settings.py
@@ -18,7 +18,7 @@
 from thirdparty import six
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.3.5.51"
+VERSION = "1.3.5.52"
 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)
diff --git a/lib/utils/har.py b/lib/utils/har.py
@@ -12,6 +12,8 @@
 import time
 
 from lib.core.bigarray import BigArray
+from lib.core.convert import getBytes
+from lib.core.convert import getText
 from lib.core.settings import VERSION
 from thirdparty.six.moves import BaseHTTPServer as _BaseHTTPServer
 from thirdparty.six.moves import http_client as _http_client
@@ -48,8 +50,8 @@ def obtain(self):
 
 class RawPair:
     def __init__(self, request, response, startTime=None, endTime=None, extendedArguments=None):
-        self.request = request
-        self.response = response
+        self.request = getBytes(request)
+        self.response = getBytes(response)
         self.startTime = startTime
         self.endTime = endTime
         self.extendedArguments = extendedArguments or {}
@@ -119,20 +121,20 @@ def toDict(self):
             "queryString": [],
             "headersSize": -1,
             "bodySize": -1,
-            "comment": self.comment,
+            "comment": getText(self.comment),
         }
 
         if self.postBody:
             contentType = self.headers.get("Content-Type")
             out["postData"] = {
                 "mimeType": contentType,
-                "text": self.postBody.rstrip("\r\n"),
+                "text": getText(self.postBody).rstrip("\r\n"),
             }
 
         return out
 
 class Response:
-    extract_status = re.compile(r'\((\d{3}) (.*)\)')
+    extract_status = re.compile(b'\\((\\d{3}) (.*)\\)')
 
     def __init__(self, httpVersion, status, statusText, headers, content, raw=None, comment=None):
         self.raw = raw
@@ -146,22 +148,22 @@ def __init__(self, httpVersion, status, statusText, headers, content, raw=None,
     @classmethod
     def parse(cls, raw):
         altered = raw
-        comment = ""
+        comment = b""
 
-        if altered.startswith("HTTP response [") or altered.startswith("HTTP redirect ["):
-            stream = io.StringIO(raw)
+        if altered.startswith(b"HTTP response [") or altered.startswith(b"HTTP redirect ["):
+            stream = io.BytesIO(raw)
             first_line = stream.readline()
             parts = cls.extract_status.search(first_line)
-            status_line = "HTTP/1.0 %s %s" % (parts.group(1), parts.group(2))
+            status_line = b"HTTP/1.0 %s %s" % (parts.group(1), parts.group(2))
             remain = stream.read()
-            altered = status_line + "\r\n" + remain
+            altered = status_line + b"\r\n" + remain
             comment = first_line
 
         response = _http_client.HTTPResponse(FakeSocket(altered))
         response.begin()
 
         try:
-            content = response.read(-1)
+            content = response.read()
         except _http_client.IncompleteRead:
             content = raw[raw.find("\r\n\r\n") + 4:].rstrip("\r\n")
 
@@ -180,10 +182,12 @@ def toDict(self):
             "size": len(self.content or "")
         }
 
-        binary = set(['\0', '\1'])
+        binary = set([b'\0', b'\1'])
         if any(c in binary for c in self.content):
             content["encoding"] = "base64"
-            content["text"] = base64.b64encode(self.content)
+            content["text"] = getText(base64.b64encode(self.content))
+        else:
+            content["text"] = getText(content["text"])
 
         return {
             "httpVersion": self.httpVersion,
@@ -195,15 +199,15 @@ def toDict(self):
             "headersSize": -1,
             "bodySize": -1,
             "redirectURL": "",
-            "comment": self.comment,
+            "comment": getText(self.comment),
         }
 
 class FakeSocket:
     # Original source:
     # https://stackoverflow.com/questions/24728088/python-parse-http-response-string
 
     def __init__(self, response_text):
-        self._file = io.StringIO(response_text)
+        self._file = io.BytesIO(response_text)
 
     def makefile(self, *args, **kwargs):
         return self._file
@@ -214,10 +218,10 @@ class HTTPRequest(_BaseHTTPServer.BaseHTTPRequestHandler):
 
     def __init__(self, request_text):
         self.comment = None
-        self.rfile = io.StringIO(request_text)
+        self.rfile = io.BytesIO(request_text)
         self.raw_requestline = self.rfile.readline()
 
-        if self.raw_requestline.startswith("HTTP request ["):
+        if self.raw_requestline.startswith(b"HTTP request ["):
             self.comment = self.raw_requestline
             self.raw_requestline = self.rfile.readline()
 
