Changeset 78

Timestamp:

06/02/15 13:33:02 (9 years ago)

Author:

tim

Message:

hack to handle binary data in responses for probe_bytes

File:

• trunk/lib/bletchley/chosenct.py (modified) (2 diffs)

trunk/lib/bletchley/chosenct.py

@@ -24 +24 @@
 import queue
 import hashlib
+import codecs
+
+
+def escape_handler(error):
+    ret_val = ''
+    for b in error.object[error.start:error.end]:
+        ret_val += "\\x%.2X" % b
+
+    return (ret_val,error.end)
+
+codecs.register_error('decode_escape',escape_handler)
+
 
 # Wish Python had a better function for this that escaped more characters
 _html_escape_table = {
-    "&": "&",
-    '"': """,
-    "'": "'",
-    ">": ">",
-    "<": "&lt;",
-    "\n": "&#x0a",
-    "\r": "&#x0d",
+    "&":  "&amp;",
+    '"':  "&quot;",
+    "'":  "&apos;",
+    ">":  "&gt;",
+    "<":  "&lt;",
+    "\n": "&#x0a;",
+    "\r": "&#x0d;",
     }
 
@@ -99 +111 @@
                 bg,fg = self._generate_colors(message)
                 if not isinstance(message, str):
-                    message = message.decode('utf-8')
+                    message = message.decode('utf-8', 'decode_escape')
 
                 truncated = message[0:maxlen]