Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy

1 files changed, 8 insertions, 1 deletions

diff --git a/libmproxy/web/app.py b/libmproxy/web/app.py
index 27e9aefc..31cbf2e2 100644
--- a/libmproxy/web/app.py
+++ b/libmproxy/web/app.py
@@ -4,7 +4,7 @@ import tornado.web
 import tornado.websocket
 import logging
 import json
-from .. import version
+from .. import version, filt
 
 
 class APIError(tornado.web.HTTPError):
@@ -52,6 +52,12 @@ class IndexHandler(RequestHandler):
         self.render("index.html")
 
 
+class FiltHelp(RequestHandler):
+    def get(self):
+        self.write(dict(
+            commands=filt.help
+        ))
+
 class WebSocketEventBroadcaster(tornado.websocket.WebSocketHandler):
     connections = None  # raise an error if inherited class doesn't specify its own instance.
 
@@ -194,6 +200,7 @@ class Application(tornado.web.Application):
         self.master = master
         handlers = [
             (r"/", IndexHandler),
+            (r"/filter-help", FiltHelp),
             (r"/updates", ClientConnection),
             (r"/events", Events),
             (r"/flows", Flows),