Magic-Mirror/mitmproxy
1
0
Fork 0
mirror of https://github.com/mitmproxy/mitmproxy.git synced 2024-12-03 19:11:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

revert ALPN-related changes to fix master

Browse Source 
In the future this should be added again to support HTTP/2.
This commit is contained in:
Thomas Kriechbaumer 2015-08-01 10:41:21 +02:00
parent c31b6c3c36
commit 8a05151170
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libmproxy/proxy/connection.py
View File

@ -71,15 +71,16 @@ class ClientConnection(tcp.BaseHandler, stateobject.StateObject):
return f
def convert_to_ssl(self, *args, **kwargs):
def alpn_select_callback(conn_, options):
if alpn_select in options:
return bytes(alpn_select)
else: # pragma no cover
return options[0]
# TODO: read ALPN from server and select same proto for client conn
# alpn_select = 'h2'
# def alpn_select_callback(conn_, options):
# if alpn_select in options:
# return bytes(alpn_select)
# else: # pragma no cover
# return options[0]
# tcp.BaseHandler.convert_to_ssl(self, alpn_select=alpn_select_callback, *args, **kwargs)
tcp.BaseHandler.convert_to_ssl(self, alpn_select=alpn_select_callback, *args, **kwargs)
tcp.BaseHandler.convert_to_ssl(self, *args, **kwargs)
self.timestamp_ssl_setup = utils.timestamp()
def finish(self):
@ -176,8 +177,9 @@ class ServerConnection(tcp.TCPClient, stateobject.StateObject):
clientcert = path
# TODO: read ALPN from client and use same list for server conn
# self.convert_to_ssl(cert=clientcert, sni=sni, alpn_protos=[netlib.http.http2.HTTP2Protocol.ALPN_PROTO_H2], **kwargs)
self.convert_to_ssl(cert=clientcert, sni=sni, alpn_protos=['h2'], **kwargs)
self.convert_to_ssl(cert=clientcert, sni=sni, **kwargs)
self.sni = sni
self.timestamp_ssl_setup = utils.timestamp()