Move app instantiation out of proxy.py.

1 files changed, 18 insertions, 0 deletions

diff --git a/libmproxy/cmdline.py b/libmproxy/cmdline.py
index 6b6c4241..9ed4ef7b 100644
--- a/libmproxy/cmdline.py
+++ b/libmproxy/cmdline.py
@@ -17,6 +17,9 @@ import proxy
 import re, filt
 import argparse
 
+APP_DOMAIN = "mitm"
+APP_IP = "1.1.1.1"
+
 class ParseException(Exception): pass
 class OptionException(Exception): pass
 
@@ -139,6 +142,10 @@ def get_common_options(options):
         setheaders.append(p)
 
     return dict(
+        app = options.app,
+        app_ip = options.app_ip,
+        app_domain = options.app_domain,
+
         anticache = options.anticache,
         anticomp = options.anticomp,
         client_replay = options.client_replay,
@@ -267,6 +274,17 @@ def common_options(parser):
         action="store_true", dest="app", default=False,
         help="Enable the mitmproxy web app."
     )
+    group.add_argument(
+        "--appdomain",
+        action="store", dest="app_domain", default=APP_DOMAIN, metavar="domain",
+        help="Domain to serve the app from."
+    )
+    group.add_argument(
+        "--appip",
+        action="store", dest="app_ip", default=APP_IP, metavar="ip",
+        help="""IP to serve the app from. Useful for transparent mode, when a DNS
+        entry for the app domain is not present."""
+    )
 
     group = parser.add_argument_group("Client Replay")
     group.add_argument(