From 09168e1274b0e33448811c39efa3fbdd2aeff756 Mon Sep 17 00:00:00 2001 From: "Michael J. Bazzinotti" Date: Tue, 29 Dec 2015 11:48:02 -0500 Subject: 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 --- libmproxy/proxy/config.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'libmproxy') 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: -- cgit v1.2.3