aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/tools
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-11-09 13:01:25 +0100
committerMaximilian Hils <git@maximilianhils.com>2016-11-09 13:01:25 +0100
commit77f05178ad23a8bb1f2cc43e1cdcf0593acd43d2 (patch)
tree8a13e6257146dc6a535dca220f7cb374cbd91a73 /mitmproxy/tools
parenta0ddedff6f2e6420ab44a7763132e80a8b8075d5 (diff)
downloadmitmproxy-77f05178ad23a8bb1f2cc43e1cdcf0593acd43d2.tar.gz
mitmproxy-77f05178ad23a8bb1f2cc43e1cdcf0593acd43d2.tar.bz2
mitmproxy-77f05178ad23a8bb1f2cc43e1cdcf0593acd43d2.zip
mitmweb: minor fixes
Diffstat (limited to 'mitmproxy/tools')
-rw-r--r--mitmproxy/tools/web/app.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/mitmproxy/tools/web/app.py b/mitmproxy/tools/web/app.py
index d04af430..4449a13c 100644
--- a/mitmproxy/tools/web/app.py
+++ b/mitmproxy/tools/web/app.py
@@ -8,6 +8,7 @@ from io import BytesIO
import tornado.web
import tornado.websocket
+import tornado.escape
from mitmproxy import contentviews
from mitmproxy import flow
from mitmproxy import flowfilter
@@ -95,6 +96,8 @@ class BasicAuth:
class RequestHandler(BasicAuth, tornado.web.RequestHandler):
def write(self, chunk):
+ # Writing arrays on the top level is ok nowadays.
+ # http://flask.pocoo.org/docs/0.11/security/#json-security
if isinstance(chunk, list):
chunk = tornado.escape.json_encode(chunk)
self.set_header("Content-Type", "application/json; charset=UTF-8")