Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-26 10:16:27 +00:00
Code Issues Projects Releases Wiki Activity

fix support for chained certificates

Browse Source
This commit is contained in:
Maximilian Hils 2014-10-08 20:44:52 +02:00
parent 76bd554cd1
commit d5c318b070
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/flowbasic
View File

@ -36,7 +36,7 @@ class MyMaster(flow.FlowMaster):
config = proxy.ProxyConfig(
port=8080,
ca_file=os.path.expanduser("~/.mitmproxy/mitmproxy-ca.pem")
default_ca=os.path.expanduser("~/.mitmproxy/mitmproxy-ca.pem")
)
state = flow.State()
server = ProxyServer(config)

2
examples/stickycookies
View File

@ -38,7 +38,7 @@ class StickyMaster(controller.Master):
config = proxy.ProxyConfig(
port=8080,
ca_file=os.path.expanduser("~/.mitmproxy/mitmproxy-ca.pem")
default_ca=os.path.expanduser("~/.mitmproxy/mitmproxy-ca.pem")
)
server = ProxyServer(config)
m = StickyMaster(server)

4
libmproxy/proxy/config.py
View File

@ -16,7 +16,7 @@ def parse_host_pattern(patterns):
class ProxyConfig:
def __init__(self, host='', port=8080, server_version=version.NAMEVERSION,
confdir=CONF_DIR, ca_file=None, clientcerts=None,
confdir=CONF_DIR, default_ca=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=[],
@ -45,7 +45,7 @@ class ProxyConfig:
self.ignore = parse_host_pattern(ignore)
self.authenticator = authenticator
self.confdir = os.path.expanduser(confdir)
self.ca_file = ca_file or os.path.join(self.confdir, CONF_BASENAME + "-ca.pem")
self.default_ca = default_ca 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)

10
libmproxy/proxy/server.py
View File

@ -190,14 +190,14 @@ class ConnectionHandler:
if client:
if self.client_conn.ssl_established:
raise ProxyError(502, "SSL to Client already established.")
cert, key = self.find_cert()
cert, key, chain_file = self.find_cert()
try:
self.client_conn.convert_to_ssl(
cert, key,
handle_sni=self.handle_sni,
cipher_list=self.config.ciphers,
dhparams=self.config.certstore.dhparams,
ca_file=self.config.ca_file
chain_file=chain_file
)
except tcp.NetLibError as v:
raise ProxyError(400, repr(v))
@ -264,17 +264,17 @@ class ConnectionHandler:
self.log("SNI received: %s" % self.sni, "debug")
self.server_reconnect() # reconnect to upstream server with SNI
# Now, change client context to reflect changed certificate:
cert, key = self.find_cert()
cert, key, chain_file = self.find_cert()
new_context = self.client_conn._create_ssl_context(
cert, key,
method=SSL.TLSv1_METHOD,
cipher_list=self.config.ciphers,
dhparams=self.config.certstore.dhparams,
ca_file=self.config.ca_file
chain_file=chain_file
)
connection.set_context(new_context)
# An unhandled exception in this method will core dump PyOpenSSL, so
# make dang sure it doesn't happen.
except Exception: # pragma: no cover
except: # pragma: no cover
import traceback
self.log("Error in handle_sni:\r\n" + traceback.format_exc(), "error")