Merge remote-tracking branch 'base/master'

1 files changed, 48 insertions, 117 deletions

diff --git a/libmproxy/main.py b/libmproxy/main.py
index 2d6a0119..e5b7f56b 100644
--- a/libmproxy/main.py
+++ b/libmproxy/main.py
@@ -1,5 +1,4 @@
 from __future__ import print_function, absolute_import
-import argparse
 import os
 import signal
 import sys
@@ -9,27 +8,43 @@ from .proxy import process_proxy_options, ProxyServerError
 from .proxy.server import DummyServer, ProxyServer
 
 
+# This file is not included in coverage analysis or tests - anything that can be
+# tested should live elsewhere.
+
 def check_versions():
     """
-    Having installed a wrong version of pyOpenSSL or netlib is unfortunately a very common source of error.
-    Check before every start that both versions are somewhat okay.
+    Having installed a wrong version of pyOpenSSL or netlib is unfortunately a
+    very common source of error. Check before every start that both versions are
+    somewhat okay.
     """
-    # We don't introduce backward-incompatible changes in patch versions. Only consider major and minor version.
+    # We don't introduce backward-incompatible changes in patch versions. Only
+    # consider major and minor version.
     if netlib.version.IVERSION[:2] != version.IVERSION[:2]:
         print(
             "Warning: You are using mitmdump %s with netlib %s. "
-            "Most likely, that doesn't work - please upgrade!" % (version.VERSION, netlib.version.VERSION),
-            file=sys.stderr)
-    import OpenSSL, inspect
-
+            "Most likely, that won't work - please upgrade!" % (
+                version.VERSION, netlib.version.VERSION
+            ),
+            file=sys.stderr
+        )
+    import OpenSSL
+    import inspect
     v = tuple([int(x) for x in OpenSSL.__version__.split(".")][:2])
     if v < (0, 14):
-        print("You are using an outdated version of pyOpenSSL: mitmproxy requires pyOpenSSL 0.14 or greater.",
-              file=sys.stderr)
-        # Some users apparently have multiple versions of pyOpenSSL installed. Report which one we got.
+        print(
+            "You are using an outdated version of pyOpenSSL:"
+            " mitmproxy requires pyOpenSSL 0.14 or greater.",
+            file=sys.stderr
+        )
+        # Some users apparently have multiple versions of pyOpenSSL installed.
+        # Report which one we got.
         pyopenssl_path = os.path.dirname(inspect.getfile(OpenSSL))
-        print("Your pyOpenSSL %s installation is located at %s" % (OpenSSL.__version__, pyopenssl_path),
-              file=sys.stderr)
+        print(
+            "Your pyOpenSSL %s installation is located at %s" % (
+                OpenSSL.__version__, pyopenssl_path
+            ),
+            file=sys.stderr
+        )
         sys.exit(1)
 
 
@@ -38,8 +53,14 @@ def assert_utf8_env():
     for i in ["LANG", "LC_CTYPE", "LC_ALL"]:
         spec += os.environ.get(i, "").lower()
     if "utf" not in spec:
-        print("Error: mitmproxy requires a UTF console environment.", file=sys.stderr)
-        print("Set your LANG enviroment variable to something like en_US.UTF-8", file=sys.stderr)
+        print(
+            "Error: mitmproxy requires a UTF console environment.",
+            file=sys.stderr
+        )
+        print(
+            "Set your LANG enviroment variable to something like en_US.UTF-8",
+            file=sys.stderr
+        )
         sys.exit(1)
 
 
@@ -54,34 +75,13 @@ def get_server(dummy_server, options):
             sys.exit(1)
 
 
-def mitmproxy_cmdline():
-    # Don't import libmproxy.console for mitmdump, urwid is not available on all platforms.
+def mitmproxy():  # pragma: nocover
     from . import console
-    from .console import palettes
-
-    parser = argparse.ArgumentParser(usage="%(prog)s [options]")
-    parser.add_argument('--version', action='version', version=version.NAMEVERSION)
-    cmdline.common_options(parser)
-    parser.add_argument(
-        "--palette", type=str, default="dark",
-        action="store", dest="palette",
-        help="Select color palette: " + ", ".join(palettes.palettes.keys())
-    )
-    parser.add_argument(
-        "-e",
-        action="store_true", dest="eventlog",
-        help="Show event log."
-    )
-    group = parser.add_argument_group(
-        "Filters",
-        "See help in mitmproxy for filter expression syntax."
-    )
-    group.add_argument(
-        "-i", "--intercept", action="store",
-        type=str, dest="intercept", default=None,
-        help="Intercept filter expression."
-    )
 
+    check_versions()
+    assert_utf8_env()
+
+    parser = cmdline.mitmproxy()
     options = parser.parse_args()
     if options.quiet:
         options.verbose = 0
@@ -92,15 +92,6 @@ def mitmproxy_cmdline():
     console_options.eventlog = options.eventlog
     console_options.intercept = options.intercept
 
-    return console_options, proxy_config
-
-
-def mitmproxy():  # pragma: nocover
-    from . import console
-
-    check_versions()
-    assert_utf8_env()
-    console_options, proxy_config = mitmproxy_cmdline()
     server = get_server(console_options.no_server, proxy_config)
 
     m = console.ConsoleMaster(server, console_options)
@@ -110,24 +101,12 @@ def mitmproxy():  # pragma: nocover
         pass
 
 
-def mitmdump_cmdline():
+def mitmdump():  # pragma: nocover
     from . import dump
 
-    parser = argparse.ArgumentParser(usage="%(prog)s [options] [filter]")
-    parser.add_argument('--version', action='version', version="mitmdump" + " " + version.VERSION)
-    cmdline.common_options(parser)
-    parser.add_argument(
-        "--keepserving",
-        action="store_true", dest="keepserving", default=False,
-        help="Continue serving after client playback or file read. We exit by default."
-    )
-    parser.add_argument(
-        "-d",
-        action="count", dest="flow_detail", default=1,
-        help="Increase flow detail display level. Can be passed multiple times."
-    )
-    parser.add_argument('args', nargs=argparse.REMAINDER)
+    check_versions()
 
+    parser = cmdline.mitmdump()
     options = parser.parse_args()
     if options.quiet:
         options.verbose = 0
@@ -139,14 +118,6 @@ def mitmdump_cmdline():
     dump_options.keepserving = options.keepserving
     dump_options.filtstr = " ".join(options.args) if options.args else None
 
-    return dump_options, proxy_config
-
-
-def mitmdump():  # pragma: nocover
-    from . import dump
-
-    check_versions()
-    dump_options, proxy_config = mitmdump_cmdline()
     server = get_server(dump_options.no_server, proxy_config)
 
     try:
@@ -164,44 +135,11 @@ def mitmdump():  # pragma: nocover
         pass
 
 
-def mitmweb_cmdline():
+def mitmweb():  # pragma: nocover
     from . import web
-    parser = argparse.ArgumentParser(usage="%(prog)s [options]")
-    parser.add_argument(
-        '--version',
-        action='version',
-        version="mitmweb" + " " + version.VERSION
-    )
-
-    group = parser.add_argument_group("Mitmweb")
-    group.add_argument(
-        "--wport",
-        action="store", type=int, dest="wport", default=8081,
-        metavar="PORT",
-        help="Mitmweb port."
-    )
-    group.add_argument(
-        "--wiface",
-        action="store", dest="wiface", default="127.0.0.1",
-        metavar="IFACE",
-        help="Mitmweb interface."
-    )
-    group.add_argument(
-        "--wdebug",
-        action="store_true", dest="wdebug",
-        help="Turn on mitmweb debugging"
-    )
-
-    cmdline.common_options(parser)
-    group = parser.add_argument_group(
-        "Filters",
-        "See help in mitmproxy for filter expression syntax."
-    )
-    group.add_argument(
-        "-i", "--intercept", action="store",
-        type=str, dest="intercept", default=None,
-        help="Intercept filter expression."
-    )
+
+    check_versions()
+    parser = cmdline.mitmweb()
 
     options = parser.parse_args()
     if options.quiet:
@@ -213,14 +151,7 @@ def mitmweb_cmdline():
     web_options.wdebug = options.wdebug
     web_options.wiface = options.wiface
     web_options.wport = options.wport
-    return web_options, proxy_config
-
 
-def mitmweb():  # pragma: nocover
-    from . import web
-
-    check_versions()
-    web_options, proxy_config = mitmweb_cmdline()
     server = get_server(web_options.no_server, proxy_config)
 
     m = web.WebMaster(server, web_options)