diff options
| author | Michael J. Bazzinotti <mbazzinotti@gmail.com> | 2015-12-29 11:48:02 -0500 |
|---|---|---|
| committer | Michael J. Bazzinotti <mbazzinotti@gmail.com> | 2015-12-29 11:48:02 -0500 |
| commit | 09168e1274b0e33448811c39efa3fbdd2aeff756 (patch) | |
| tree | 6cfb22f7f433b5b4af4079e2e6724f6730ebceb0 /libmproxy | |
| parent | 80690b79062c739fc8adfc725d39a68d4b65b43a (diff) | |
| download | mitmproxy-09168e1274b0e33448811c39efa3fbdd2aeff756.tar.gz mitmproxy-09168e1274b0e33448811c39efa3fbdd2aeff756.tar.bz2 mitmproxy-09168e1274b0e33448811c39efa3fbdd2aeff756.zip | |
client-cert: Simplify and cleanup
simplify the error message when cert path does not exist.
During tests, reset the clientcerts proxy config setting to None
Remove now-unused clientcerts code from class ProxTestBase
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/proxy/config.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libmproxy/proxy/config.py b/libmproxy/proxy/config.py index f06e55ca..b1478655 100644 --- a/libmproxy/proxy/config.py +++ b/libmproxy/proxy/config.py @@ -133,12 +133,9 @@ def process_proxy_options(parser, options): if options.clientcerts: options.clientcerts = os.path.expanduser(options.clientcerts) - if not (os.path.exists(options.clientcerts) or - os.path.isdir(options.clientcerts) or - os.path.isfile(options.clientcerts)): + if not os.path.exists(options.clientcerts): return parser.error( - "Client certificate argument is not a file or directory, " - "or does not exist: %s" % options.clientcerts + "Client certificate path does not exist: %s" % options.clientcerts ) if options.auth_nonanonymous or options.auth_singleuser or options.auth_htpasswd: |