burplog python2/3 compatible

The-Hunt3R · Apr 24, 2019 · 43553f7 · 43553f7
1 parent 83c9b9f
commit 43553f7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/wfuzz/externals/reqresp/Response.py b/src/wfuzz/externals/reqresp/Response.py
@@ -138,7 +138,6 @@ def parseResponse(self, rawheader, rawbody=None, type="curl"):
         self._headers = []
 
         tp = TextParser()
-        rawheader = python2_3_convert_from_unicode(rawheader.decode("utf-8", errors='replace'))
         tp.setSource("string", rawheader)
 
         tp.readUntil(r"(HTTP\S*) ([0-9]+)")

diff --git a/src/wfuzz/fuzzobjects.py b/src/wfuzz/fuzzobjects.py
@@ -22,7 +22,7 @@
 from .facade import Facade, ERROR_CODE
 from .mixins import FuzzRequestUrlMixing, FuzzRequestSoupMixing
 
-from .utils import python2_3_convert_to_unicode
+from .utils import python2_3_convert_to_unicode, python2_3_convert_from_unicode
 from .utils import MyCounter
 from .utils import rgetattr
 from .utils import DotDict
@@ -323,7 +323,8 @@ def to_http_object(self, c):
         return pycurl_c
 
     def from_http_object(self, c, bh, bb):
-        return self._request.response_from_conn_object(c, bh, bb)
+        raw_header = python2_3_convert_from_unicode(bh.decode("utf-8", errors='surrogateescape'))
+        return self._request.response_from_conn_object(c, raw_header, bb)
 
     def update_from_raw_http(self, raw, scheme, raw_response=None, raw_content=None):
         self._request.parseRequest(raw, scheme)
@@ -334,6 +335,7 @@ def update_from_raw_http(self, raw, scheme, raw_response=None, raw_content=None)
 
         if raw_response:
             rp = Response()
+            raw_response = python2_3_convert_from_unicode(raw_response.decode("utf-8", errors='surrogateescape'))
             rp.parseResponse(raw_response, raw_content)
             self._request.response = rp
 

diff --git a/src/wfuzz/plugins/payloads/burplog.py b/src/wfuzz/plugins/payloads/burplog.py
@@ -6,7 +6,11 @@
 
 import re
 
-CRLF = "\r\n"
+import sys
+if sys.version_info < (3, 0):
+    from io import open
+
+CRLF = "\n"
 DELIMITER = "%s%s" % ('=' * 54, CRLF)
 CRLF_DELIMITER = CRLF + DELIMITER
 HEADER = re.compile(r'(\d{1,2}:\d{2}:\d{2} (AM|PM|))[ \t]+(\S+)([ \t]+\[(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}|unknown host)\])?')
@@ -51,7 +55,7 @@ def parse_burp_log(self, burp_log):
         burp_file = None
 
         try:
-            burp_file = open(self.find_file(burp_log), 'rb')
+            burp_file = open(self.find_file(burp_log), 'r', encoding="utf-8", errors="surrogateescape")
 
             history = 'START'