From 1b5f5021dcb7cec45269a20fe9e8fdbea00600ed Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Fri, 2 Jan 2015 13:26:22 +1300 Subject: Consolidate reading flows from file, use in mitmweb. --- libmproxy/web/__init__.py | 9 +++++++++ libmproxy/web/app.py | 9 ++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) (limited to 'libmproxy/web') diff --git a/libmproxy/web/__init__.py b/libmproxy/web/__init__.py index d981ab30..4d4d6c7c 100644 --- a/libmproxy/web/__init__.py +++ b/libmproxy/web/__init__.py @@ -2,6 +2,7 @@ from __future__ import absolute_import, print_function import collections import tornado.ioloop import tornado.httpserver +import os from .. import controller, flow from . import app @@ -124,6 +125,14 @@ class WebMaster(flow.FlowMaster): self.options = options super(WebMaster, self).__init__(server, WebState()) self.app = app.Application(self, self.options.wdebug) + if options.rfile: + try: + print(self.load_flows_file(options.rfile)) + except flow.FlowReadError, v: + self.add_event( + "Could not read flow file: %s"%v, + "error" + ) def tick(self): flow.FlowMaster.tick(self, self.masterq, timeout=0) diff --git a/libmproxy/web/app.py b/libmproxy/web/app.py index 31cbf2e2..8598acf5 100644 --- a/libmproxy/web/app.py +++ b/libmproxy/web/app.py @@ -18,9 +18,12 @@ class RequestHandler(tornado.web.RequestHandler): self.set_header("X-Frame-Options", "DENY") self.add_header("X-XSS-Protection", "1; mode=block") self.add_header("X-Content-Type-Options", "nosniff") - self.add_header("Content-Security-Policy", "default-src 'self'; " - "connect-src 'self' ws://* ; " - "style-src 'self' 'unsafe-inline'") + self.add_header( + "Content-Security-Policy", + "default-src 'self'; " + "connect-src 'self' ws://* ; " + "style-src 'self' 'unsafe-inline'" + ) @property def state(self): -- cgit v1.2.3