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

Merge pull request #2530 from mhils/nicer-clienthello-alpns

Browse Source 
Improve ClientHello.alpn_protocols API
This commit is contained in:
Maximilian Hils 2017-08-16 19:10:27 +02:00 committed by GitHub
commit 7c650aa53b
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mitmproxy/proxy/protocol/tls.py
View File

@ -292,7 +292,7 @@ class TlsClientHello:
if self._client_hello.extensions: if self._client_hello.extensions:
for extension in self._client_hello.extensions.extensions: for extension in self._client_hello.extensions.extensions:
if extension.type == 0x10: if extension.type == 0x10:
return list(extension.body.alpn_protocols) return list(x.name for x in extension.body.alpn_protocols)
return [] return []
@classmethod @classmethod
@ -519,8 +519,8 @@ class TlsLayer(base.Layer):
# We only support http/1.1 and h2. # We only support http/1.1 and h2.
# If the server only supports spdy (next to http/1.1), it may select that # If the server only supports spdy (next to http/1.1), it may select that
# and mitmproxy would enter TCP passthrough mode, which we want to avoid. # and mitmproxy would enter TCP passthrough mode, which we want to avoid.
alpn = [x.name for x in self._client_hello.alpn_protocols if alpn = [x for x in self._client_hello.alpn_protocols if
not (x.name.startswith(b"h2-") or x.name.startswith(b"spdy"))] not (x.startswith(b"h2-") or x.startswith(b"spdy"))]
if alpn and b"h2" in alpn and not self.config.options.http2: if alpn and b"h2" in alpn and not self.config.options.http2:
alpn.remove(b"h2") alpn.remove(b"h2")

3
test/mitmproxy/proxy/protocol/test_tls.py
View File

@ -23,5 +23,4 @@ class TestClientHello:
) )
c = TlsClientHello(data) c = TlsClientHello(data)
assert c.sni == 'example.com' assert c.sni == 'example.com'
assert c.alpn_protocols[0].name == b'h2' assert c.alpn_protocols == [b'h2', b'http/1.1']
assert c.alpn_protocols[1].name == b'http/1.1'