diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2017-03-07 14:46:28 +1300 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2017-03-07 14:46:28 +1300 |
commit | 10db254791480a35028554bc2821b9c8002e26ca (patch) | |
tree | 46eee6c996c7769c620c195319f0fa4495db61f8 /mitmproxy | |
parent | ac3b0d69cc29b5469f6b4cc55af528f6266d42cf (diff) | |
download | mitmproxy-10db254791480a35028554bc2821b9c8002e26ca.tar.gz mitmproxy-10db254791480a35028554bc2821b9c8002e26ca.tar.bz2 mitmproxy-10db254791480a35028554bc2821b9c8002e26ca.zip |
Remove less commonly used command-line options
We now have --set, so only options that really deserve it get a dedicated flag.
I'm inclined to strip this back even more. Feel free to argue that YOUR
favourite option deserves special treatment here.
Diffstat (limited to 'mitmproxy')
-rw-r--r-- | mitmproxy/optmanager.py | 9 | ||||
-rw-r--r-- | mitmproxy/tools/cmdline.py | 46 |
2 files changed, 5 insertions, 50 deletions
diff --git a/mitmproxy/optmanager.py b/mitmproxy/optmanager.py index eb56ef2d..e5277371 100644 --- a/mitmproxy/optmanager.py +++ b/mitmproxy/optmanager.py @@ -368,14 +368,13 @@ class OptManager: if o.typespec == bool: g = parser.add_mutually_exclusive_group(required=False) g.add_argument( - "--%s" % f, - action="store_true", + "--no-%s" % f, + action="store_false", dest=optname, - help=o.help ) g.add_argument( - "--no-%s" % f, - action="store_false", + "--%s" % f, + action="store_true", dest=optname, help=o.help ) diff --git a/mitmproxy/tools/cmdline.py b/mitmproxy/tools/cmdline.py index ea77acfd..d4f3aa69 100644 --- a/mitmproxy/tools/cmdline.py +++ b/mitmproxy/tools/cmdline.py @@ -57,7 +57,6 @@ def common_options(parser, opts): # Basic options opts.make_parser(parser, "mode") opts.make_parser(parser, "anticache") - opts.make_parser(parser, "cadir") opts.make_parser(parser, "showhost") opts.make_parser(parser, "rfile") opts.make_parser(parser, "scripts", metavar="SCRIPT") @@ -65,49 +64,21 @@ def common_options(parser, opts): opts.make_parser(parser, "stickyauth", metavar="FILTER") opts.make_parser(parser, "streamfile") opts.make_parser(parser, "anticomp") - opts.make_parser(parser, "body_size_limit", metavar="SIZE") - opts.make_parser(parser, "stream_large_bodies") # Proxy options group = parser.add_argument_group("Proxy Options") - opts.make_parser(group, "listen_host") + opts.make_parser(group, "listen_host", metavar="HOST") opts.make_parser(group, "ignore_hosts", metavar="HOST") opts.make_parser(group, "tcp_hosts", metavar="HOST") opts.make_parser(group, "no_server") opts.make_parser(group, "listen_port", metavar="PORT") - - http2 = group.add_mutually_exclusive_group() - opts.make_parser(http2, "http2") - opts.make_parser(http2, "http2_priority") - - websocket = group.add_mutually_exclusive_group() - opts.make_parser(websocket, "websocket") - opts.make_parser(group, "upstream_auth", metavar="USER:PASS") opts.make_parser(group, "rawtcp") - opts.make_parser(group, "spoof_source_address") - opts.make_parser(group, "upstream_bind_address", metavar="ADDR") - opts.make_parser(group, "keep_host_header") # Proxy SSL options group = parser.add_argument_group("SSL") opts.make_parser(group, "certs", metavar="SPEC") - opts.make_parser(group, "ciphers_server", metavar="CIPHERS") - opts.make_parser(group, "ciphers_client", metavar="CIPHERS") - opts.make_parser(group, "client_certs") - opts.make_parser(group, "upstream_cert") - opts.make_parser(group, "add_upstream_certs_to_client_chain") opts.make_parser(group, "ssl_insecure") - opts.make_parser(group, "ssl_verify_upstream_trusted_cadir", metavar="PATH") - opts.make_parser(group, "ssl_verify_upstream_trusted_ca", metavar="PATH") - opts.make_parser(group, "ssl_version_client", metavar="VERSION") - opts.make_parser(group, "ssl_version_server", metavar="VERSION") - - # Onboarding app - group = parser.add_argument_group("Onboarding App") - opts.make_parser(group, "onboarding") - opts.make_parser(group, "onboarding_host", metavar="HOST") - opts.make_parser(group, "onboarding_port", metavar="PORT") # Client replay group = parser.add_argument_group("Client Replay") @@ -117,16 +88,8 @@ def common_options(parser, opts): group = parser.add_argument_group("Server Replay") opts.make_parser(group, "server_replay", metavar="PATH") opts.make_parser(group, "replay_kill_extra") - opts.make_parser(group, "server_replay_use_headers", metavar="HEADER") - opts.make_parser(group, "refresh_server_playback") opts.make_parser(group, "server_replay_nopop") - payload = group.add_mutually_exclusive_group() - opts.make_parser(payload, "server_replay_ignore_content") - opts.make_parser(payload, "server_replay_ignore_payload_params") - opts.make_parser(payload, "server_replay_ignore_params") - opts.make_parser(payload, "server_replay_ignore_host") - # Replacements group = parser.add_argument_group( "Replacements", @@ -167,12 +130,7 @@ def mitmproxy(opts): parser = argparse.ArgumentParser(usage="%(prog)s [options]") common_options(parser, opts) - opts.make_parser(parser, "console_palette") - opts.make_parser(parser, "console_palette_transparent") opts.make_parser(parser, "console_eventlog") - opts.make_parser(parser, "console_focus_follow") - opts.make_parser(parser, "console_order") - opts.make_parser(parser, "console_mouse") group = parser.add_argument_group( "Filters", "See help in mitmproxy for filter expression syntax." @@ -186,7 +144,6 @@ def mitmdump(opts): parser = argparse.ArgumentParser(usage="%(prog)s [options] [filter]") common_options(parser, opts) - opts.make_parser(parser, "keepserving") opts.make_parser(parser, "flow_detail", metavar = "LEVEL") parser.add_argument( 'filter_args', @@ -206,7 +163,6 @@ def mitmweb(opts): opts.make_parser(group, "web_open_browser") opts.make_parser(group, "web_port", metavar="PORT") opts.make_parser(group, "web_iface", metavar="INTERFACE") - opts.make_parser(group, "web_debug") common_options(parser, opts) group = parser.add_argument_group( |