diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-09-05 15:16:20 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-09-05 15:16:20 +0200 |
| commit | 2a6337343a14f7f72c28d8bf5f24220f6d9ca6d0 (patch) | |
| tree | 755d8cf7f6578c9346e9f3c68604615177cf9332 /libmproxy/proxy | |
| parent | f2570c773aa18e4ac236b1cf7f43acfb4ca080dd (diff) | |
| download | mitmproxy-2a6337343a14f7f72c28d8bf5f24220f6d9ca6d0.tar.gz mitmproxy-2a6337343a14f7f72c28d8bf5f24220f6d9ca6d0.tar.bz2 mitmproxy-2a6337343a14f7f72c28d8bf5f24220f6d9ca6d0.zip | |
update docs, mostly revert 2f44b26b4cd014e03dd62a125d79af9b81663a93
Diffstat (limited to 'libmproxy/proxy')
| -rw-r--r-- | libmproxy/proxy/__init__.py | 3 | ||||
| -rw-r--r-- | libmproxy/proxy/config.py | 6 | ||||
| -rw-r--r-- | libmproxy/proxy/server.py | 1 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libmproxy/proxy/__init__.py b/libmproxy/proxy/__init__.py index f5d6a2d0..e4c20030 100644 --- a/libmproxy/proxy/__init__.py +++ b/libmproxy/proxy/__init__.py @@ -1 +1,2 @@ -from .primitives import *
\ No newline at end of file +from .primitives import * +from .config import ProxyConfig diff --git a/libmproxy/proxy/config.py b/libmproxy/proxy/config.py index 6d4c078b..ea815c69 100644 --- a/libmproxy/proxy/config.py +++ b/libmproxy/proxy/config.py @@ -1,8 +1,8 @@ from __future__ import absolute_import import os -from .. import utils, platform import re from netlib import http_auth, certutils +from .. import utils, platform from .primitives import ConstUpstreamServerResolver, TransparentUpstreamServerResolver TRANSPARENT_SSL_PORTS = [443, 8443] @@ -11,7 +11,7 @@ CONF_DIR = "~/.mitmproxy" class ProxyConfig: - def __init__(self, confdir=CONF_DIR, clientcerts=None, + def __init__(self, confdir=CONF_DIR, ca_file=None, clientcerts=None, no_upstream_cert=False, body_size_limit=None, mode=None, upstream_server=None, http_form_in=None, http_form_out=None, authenticator=None, ignore=[], @@ -44,7 +44,7 @@ class ProxyConfig: self.ignore = [re.compile(i, re.IGNORECASE) for i in ignore] self.authenticator = authenticator self.confdir = os.path.expanduser(confdir) - self.ca_file = os.path.join(self.confdir, CONF_BASENAME + "-ca.pem") + self.ca_file = ca_file or os.path.join(self.confdir, CONF_BASENAME + "-ca.pem") self.certstore = certutils.CertStore.from_store(self.confdir, CONF_BASENAME) for spec, cert in certs: self.certstore.add_cert_file(spec, cert) diff --git a/libmproxy/proxy/server.py b/libmproxy/proxy/server.py index 58e386ab..aacc908e 100644 --- a/libmproxy/proxy/server.py +++ b/libmproxy/proxy/server.py @@ -1,5 +1,4 @@ from __future__ import absolute_import -import re import socket from OpenSSL import SSL |