diff options
author | Maximilian Hils <git@maximilianhils.com> | 2016-11-22 18:27:16 +0100 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2016-11-22 18:27:16 +0100 |
commit | 40f0193dda992960b9836482425cd45329f240af (patch) | |
tree | b3ee6096a09f2a0f18215880255b8ea9d58e7487 | |
parent | 21a03d56b5551fd9bf3d93b0de8a01b15027803f (diff) | |
download | mitmproxy-40f0193dda992960b9836482425cd45329f240af.tar.gz mitmproxy-40f0193dda992960b9836482425cd45329f240af.tar.bz2 mitmproxy-40f0193dda992960b9836482425cd45329f240af.zip |
remove mitmweb auth
9b08279c7c3384f716b66329fefbe97a368189a2 removed the actual functionality.
we should not have a command line switch that does nothing. :)
-rw-r--r-- | examples/complex/flowbasic.py | 2 | ||||
-rw-r--r-- | mitmproxy/tools/cmdline.py | 15 | ||||
-rw-r--r-- | mitmproxy/tools/main.py | 2 |
3 files changed, 1 insertions, 18 deletions
diff --git a/examples/complex/flowbasic.py b/examples/complex/flowbasic.py index 25b0b1a9..dafdd084 100644 --- a/examples/complex/flowbasic.py +++ b/examples/complex/flowbasic.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ This example shows how to build a proxy based on mitmproxy's Flow primitives. diff --git a/mitmproxy/tools/cmdline.py b/mitmproxy/tools/cmdline.py index 34f1c08f..1ad521b5 100644 --- a/mitmproxy/tools/cmdline.py +++ b/mitmproxy/tools/cmdline.py @@ -883,21 +883,6 @@ def mitmweb(): action="store_true", dest="wdebug", help="Turn on mitmweb debugging" ) - group.add_argument( - "--wsingleuser", - action="store", dest="wsingleuser", type=str, - metavar="USER", - help=""" - Allows access to a a single user, specified in the form - username:password. - """ - ) - group.add_argument( - "--whtpasswd", - action="store", dest="whtpasswd", type=str, - metavar="PATH", - help="Allow access to users specified in an Apache htpasswd file." - ) common_options(parser) group = parser.add_argument_group( diff --git a/mitmproxy/tools/main.py b/mitmproxy/tools/main.py index 08e5f2ca..69dd3791 100644 --- a/mitmproxy/tools/main.py +++ b/mitmproxy/tools/main.py @@ -135,8 +135,6 @@ def mitmweb(args=None): # pragma: no cover web_options.wdebug = args.wdebug web_options.wiface = args.wiface web_options.wport = args.wport - web_options.wsingleuser = args.wsingleuser - web_options.whtpasswd = args.whtpasswd web_options.process_web_options(parser) server = process_options(parser, web_options, args) |