Add a basic built-in web app.

1 files changed, 19 insertions, 3 deletions

diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py
index ad7be354..3fac17b8 100644
--- a/libmproxy/proxy.py
+++ b/libmproxy/proxy.py
@@ -17,8 +17,11 @@ import shutil, tempfile, threading
 import SocketServer
 from OpenSSL import SSL
 from netlib import odict, tcp, http, wsgi, certutils, http_status, http_auth
-import utils, flow, version, platform, controller
+import utils, flow, version, platform, controller, app
 
+
+APP_DOMAIN = "mitm"
+APP_IP = "1.1.1.1"
 KILL = 0
 
 
@@ -36,8 +39,8 @@ class Log:
 
 
 class ProxyConfig:
-    def __init__(self, certfile = None, cacert = None, clientcerts = None, no_upstream_cert=False, body_size_limit = None, reverse_proxy=None, transparent_proxy=None, certdir = None, authenticator=None):
-        assert not (reverse_proxy and transparent_proxy)
+    def __init__(self, app=False, certfile = None, cacert = None, clientcerts = None, no_upstream_cert=False, body_size_limit = None, reverse_proxy=None, transparent_proxy=None, certdir = None, authenticator=None):
+        self.app = app
         self.certfile = certfile
         self.cacert = cacert
         self.clientcerts = clientcerts
@@ -85,6 +88,7 @@ class ServerConnection(tcp.TCPClient):
             pass
 
 
+
 class RequestReplayThread(threading.Thread):
     def __init__(self, config, flow, masterq):
         self.config, self.flow, self.channel = config, flow, controller.Channel(masterq)
@@ -497,6 +501,17 @@ class ProxyServer(tcp.TCPServer):
             raise ProxyServerError('Error starting proxy server: ' + v.strerror)
         self.channel = None
         self.apps = AppRegistry()
+        if config.app:
+            self.apps.add(
+                app.mapp,
+                APP_DOMAIN,
+                80
+            )
+            self.apps.add(
+                app.mapp,
+                APP_IP,
+                80
+            )
 
     def start_slave(self, klass, channel):
         slave = klass(channel, self)
@@ -629,6 +644,7 @@ def process_proxy_options(parser, options):
         authenticator = http_auth.NullProxyAuth(None)
 
     return ProxyConfig(
+        app = options.app,
         certfile = options.cert,
         cacert = cacert,
         clientcerts = options.clientcerts,