aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/tools/web/master.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2017-07-05 16:25:38 +0200
committerGitHub <noreply@github.com>2017-07-05 16:25:38 +0200
commit062a58f848c80b3a5f499d407396998ba253202c (patch)
tree29af51e332bb8d103a786d2f85dcf31f25516ebf /mitmproxy/tools/web/master.py
parent55a20b819e1220024a66bd11275a5c3511f7d295 (diff)
parent37fea267c1d171fb661736b96db62943e7b49791 (diff)
downloadmitmproxy-062a58f848c80b3a5f499d407396998ba253202c.tar.gz
mitmproxy-062a58f848c80b3a5f499d407396998ba253202c.tar.bz2
mitmproxy-062a58f848c80b3a5f499d407396998ba253202c.zip
Merge pull request #2423 from MatthewShao/mitmweb-options
[web] [WIP] Mitmweb options editor content
Diffstat (limited to 'mitmproxy/tools/web/master.py')
-rw-r--r--mitmproxy/tools/web/master.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/mitmproxy/tools/web/master.py b/mitmproxy/tools/web/master.py
index c09fe0a2..8c2433ec 100644
--- a/mitmproxy/tools/web/master.py
+++ b/mitmproxy/tools/web/master.py
@@ -5,6 +5,7 @@ import tornado.ioloop
from mitmproxy import addons
from mitmproxy import log
from mitmproxy import master
+from mitmproxy import optmanager
from mitmproxy.addons import eventstore
from mitmproxy.addons import intercept
from mitmproxy.addons import readfile
@@ -29,6 +30,7 @@ class WebMaster(master.Master):
self.events.sig_refresh.connect(self._sig_events_refresh)
self.options.changed.connect(self._sig_options_update)
+ self.options.changed.connect(self._sig_settings_update)
self.addons.add(*addons.default_addons())
self.addons.add(
@@ -86,6 +88,14 @@ class WebMaster(master.Master):
)
def _sig_options_update(self, options, updated):
+ options_dict = optmanager.dump_dicts(options, updated)
+ app.ClientConnection.broadcast(
+ resource="options",
+ cmd="update",
+ data=options_dict
+ )
+
+ def _sig_settings_update(self, options, updated):
app.ClientConnection.broadcast(
resource="settings",
cmd="update",