diff options
| author | ikoz <john@kozyrakis.gr> | 2016-03-16 22:45:27 +0000 |
|---|---|---|
| committer | ikoz <john@kozyrakis.gr> | 2016-03-16 22:45:27 +0000 |
| commit | 8ed491201a8ec56585b0e35d9c17e18231b174f8 (patch) | |
| tree | 95d587f1fd3c9c6b34b1899e661a7c5b55860ca9 | |
| parent | 9cc55f211fcc74990eb5fafc3945dec6599f94b7 (diff) | |
| download | mitmproxy-8ed491201a8ec56585b0e35d9c17e18231b174f8.tar.gz mitmproxy-8ed491201a8ec56585b0e35d9c17e18231b174f8.tar.bz2 mitmproxy-8ed491201a8ec56585b0e35d9c17e18231b174f8.zip | |
Revert "Create mutually exclusive group for add-server-certs-to-client-chain and verify-upstream-cert command line options. These are not meaningful together."
This reverts commit 02e378486b9daa7159503a4bdcd7bed9d85e119e.
| -rw-r--r-- | mitmproxy/cmdline.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mitmproxy/cmdline.py b/mitmproxy/cmdline.py index 7b9f2b82..d7de350f 100644 --- a/mitmproxy/cmdline.py +++ b/mitmproxy/cmdline.py @@ -434,14 +434,13 @@ def proxy_ssl_options(parser): action="store_true", dest="no_upstream_cert", help="Don't connect to upstream server to look up certificate details." ) - subgroup = group.add_mutually_exclusive_group() - subgroup.add_argument( + group.add_argument( "--add-upstream-certs-to-client-chain", default=False, action="store_true", dest="add_upstream_certs_to_client_chain", help="Add all certificates of the upstream server to the certificate chain " "that will be served to the proxy client, as extras." ) - subgroup.add_argument( + group.add_argument( "--verify-upstream-cert", default=False, action="store_true", dest="ssl_verify_upstream_cert", help="Verify upstream server SSL/TLS certificates and fail if invalid " |