aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/proxy
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2019-10-06 14:41:46 +0200
committerGitHub <noreply@github.com>2019-10-06 14:41:46 +0200
commit902ef59d01f45613ce33520159e157697bcc6f9f (patch)
tree53d98b7e623ab1538b6bd53ff158d46e5f6977fc /mitmproxy/proxy
parentc88d3a943109132010a932aca82411a1527d934a (diff)
downloadmitmproxy-902ef59d01f45613ce33520159e157697bcc6f9f.tar.gz
mitmproxy-902ef59d01f45613ce33520159e157697bcc6f9f.tar.bz2
mitmproxy-902ef59d01f45613ce33520159e157697bcc6f9f.zip
Move onboardingapp from tornado to flask (#3661)
Diffstat (limited to 'mitmproxy/proxy')
-rw-r--r--mitmproxy/proxy/config.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/mitmproxy/proxy/config.py b/mitmproxy/proxy/config.py
index 881ed2fd..ae2ec68b 100644
--- a/mitmproxy/proxy/config.py
+++ b/mitmproxy/proxy/config.py
@@ -4,16 +4,13 @@ import typing
from OpenSSL import crypto
+from mitmproxy import certs
from mitmproxy import exceptions
from mitmproxy import options as moptions
-from mitmproxy import certs
from mitmproxy.net import server_spec
-CONF_BASENAME = "mitmproxy"
-
class HostMatcher:
-
def __init__(self, handle, patterns=tuple()):
self.handle = handle
self.patterns = list(patterns)
@@ -67,7 +64,7 @@ class ProxyConfig:
key_size = options.key_size
self.certstore = certs.CertStore.from_store(
certstore_path,
- CONF_BASENAME,
+ moptions.CONF_BASENAME,
key_size
)