diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-04-29 16:54:58 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-04-29 16:54:58 +0200 |
| commit | 4f1fe11549f47531f1c6d618fa20f6c1020653ed (patch) | |
| tree | 9a81a183ef21d755a612b5ca474f38fc7c2d3ca3 /libmproxy | |
| parent | e15b97372b57dfa33e5f7d4fb41503532520374e (diff) | |
| parent | 1f29b16fb7fa190755dfcc363e4d3b4a73964b97 (diff) | |
| download | mitmproxy-4f1fe11549f47531f1c6d618fa20f6c1020653ed.tar.gz mitmproxy-4f1fe11549f47531f1c6d618fa20f6c1020653ed.tar.bz2 mitmproxy-4f1fe11549f47531f1c6d618fa20f6c1020653ed.zip | |
Merge pull request #269 from shvar/master
init ProxyConfig.certstore with custom certs
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/proxy/config.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libmproxy/proxy/config.py b/libmproxy/proxy/config.py index 067c361d..0a1345fa 100644 --- a/libmproxy/proxy/config.py +++ b/libmproxy/proxy/config.py @@ -13,7 +13,7 @@ class ProxyConfig: def __init__(self, confdir=CONF_DIR, clientcerts=None, no_upstream_cert=False, body_size_limit=None, get_upstream_server=None, http_form_in="absolute", http_form_out="relative", authenticator=None, - ciphers=None, certs=None, certforward = False + ciphers=None, certs=[], certforward = False ): self.ciphers = ciphers self.clientcerts = clientcerts @@ -25,6 +25,8 @@ class ProxyConfig: self.authenticator = authenticator self.confdir = os.path.expanduser(confdir) self.certstore = certutils.CertStore.from_store(self.confdir, CONF_BASENAME) + for spec, cert in certs: + self.certstore.add_cert_file(spec, cert) self.certforward = certforward |