Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-23 00:01:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #269 from shvar/master

Browse Source 
init ProxyConfig.certstore with custom certs
This commit is contained in:
Maximilian Hils 2014-04-29 16:54:58 +02:00
commit 4f1fe11549
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libmproxy/proxy/config.py
View File

@ -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