bugfixes with SSL and bytes decoding

Author: ickerwx

proxymodules/textdump.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 import os.path as path
+from codecs import decode
 
 
 class Module:
@@ -19,10 +20,10 @@ def __init__(self, incoming=False, verbose=False, options=None):
 
     def execute(self, data):
         if self.find is None:
-            print(data)
+            print(repr(decode(data, 'raw_unicode_escape')))
         else:
             pdata = data.replace(self.find, self.color + self.find + b'\033[0m')
-            print(pdata.decode('ascii'))
+            print(repr(decode(pdata, 'raw_unicode_escape')))
         return data
 
     def help(self):

tcpproxy.py

@@ -184,12 +184,12 @@ def handle_data(data, modules, dont_chain, incoming, verbose):
 def is_client_hello(sock):
     firstbytes = sock.recv(128, socket.MSG_PEEK)
     return (len(firstbytes) >= 3 and
-            firstbytes[0] == "\x16" and
-            firstbytes[1:3] in ["\x03\x00",
-                                "\x03\x01",
-                                "\x03\x02",
-                                "\x03\x03",
-                                "\x02\x00"]
+            firstbytes[0] == 0x16 and
+            firstbytes[1:3] in [b"\x03\x00",
+                                b"\x03\x01",
+                                b"\x03\x02",
+                                b"\x03\x03",
+                                b"\x02\x00"]
             )