diff options
author | Maximilian Hils <git@maximilianhils.com> | 2015-09-11 00:00:00 +0200 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-11 00:00:00 +0200 |
commit | d1bc966e5b7e2ef822443f3ad28a5f3d40965e75 (patch) | |
tree | 3468125e5579adce3295b4055012c329ebc6d27a /libmproxy/proxy/config.py | |
parent | 33c0d3653077c9e6834034ec03a42beeba3ca7d7 (diff) | |
download | mitmproxy-d1bc966e5b7e2ef822443f3ad28a5f3d40965e75.tar.gz mitmproxy-d1bc966e5b7e2ef822443f3ad28a5f3d40965e75.tar.bz2 mitmproxy-d1bc966e5b7e2ef822443f3ad28a5f3d40965e75.zip |
polish for release: introduce http2 and rawtcp as command line switches
Diffstat (limited to 'libmproxy/proxy/config.py')
-rw-r--r-- | libmproxy/proxy/config.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libmproxy/proxy/config.py b/libmproxy/proxy/config.py index 2a1b84cb..cd9eda5a 100644 --- a/libmproxy/proxy/config.py +++ b/libmproxy/proxy/config.py @@ -54,6 +54,8 @@ class ProxyConfig: authenticator=None, ignore_hosts=tuple(), tcp_hosts=tuple(), + http2=False, + rawtcp=False, ciphers_client=None, ciphers_server=None, certs=tuple(), @@ -78,6 +80,8 @@ class ProxyConfig: self.check_ignore = HostMatcher(ignore_hosts) self.check_tcp = HostMatcher(tcp_hosts) + self.http2 = http2 + self.rawtcp = rawtcp self.authenticator = authenticator self.cadir = os.path.expanduser(cadir) self.certstore = certutils.CertStore.from_store( @@ -183,6 +187,8 @@ def process_proxy_options(parser, options): upstream_server=upstream_server, ignore_hosts=options.ignore_hosts, tcp_hosts=options.tcp_hosts, + http2=options.http2, + rawtcp=options.rawtcp, authenticator=authenticator, ciphers_client=options.ciphers_client, ciphers_server=options.ciphers_server, @@ -192,4 +198,4 @@ def process_proxy_options(parser, options): ssl_verify_upstream_cert=options.ssl_verify_upstream_cert, ssl_verify_upstream_trusted_cadir=options.ssl_verify_upstream_trusted_cadir, ssl_verify_upstream_trusted_ca=options.ssl_verify_upstream_trusted_ca - )
\ No newline at end of file + ) |