diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-08-28 01:51:13 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-08-28 01:51:13 +0200 |
| commit | 1cc48345e13917aadc1e0fd93d6011139e78e3d9 (patch) | |
| tree | 9758b20f95587104807fc74e545e35ec9a9cdef3 /libmproxy/protocol2/root_context.py | |
| parent | a86491eeed13c7889356e5102312f52bd86c3c66 (diff) | |
| download | mitmproxy-1cc48345e13917aadc1e0fd93d6011139e78e3d9.tar.gz mitmproxy-1cc48345e13917aadc1e0fd93d6011139e78e3d9.tar.bz2 mitmproxy-1cc48345e13917aadc1e0fd93d6011139e78e3d9.zip | |
clean up config/cmdline, fix bugs, remove cruft
Diffstat (limited to 'libmproxy/protocol2/root_context.py')
| -rw-r--r-- | libmproxy/protocol2/root_context.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/libmproxy/protocol2/root_context.py b/libmproxy/protocol2/root_context.py index 78d48453..af0e7a37 100644 --- a/libmproxy/protocol2/root_context.py +++ b/libmproxy/protocol2/root_context.py @@ -4,7 +4,7 @@ from netlib.http.http1 import HTTP1Protocol from netlib.http.http2 import HTTP2Protocol from .rawtcp import RawTcpLayer -from .tls import TlsLayer +from .tls import TlsLayer, is_tls_record_magic from .http import Http1Layer, Http2Layer @@ -38,13 +38,7 @@ class RootContext(object): # TLS ClientHello magic, works for SSLv3, TLSv1.0, TLSv1.1, TLSv1.2 # http://www.moserware.com/2009/06/first-few-milliseconds-of-https.html#client-hello d = top_layer.client_conn.rfile.peek(3) - is_tls_client_hello = ( - len(d) == 3 and - d[0] == '\x16' and - d[1] == '\x03' and - d[2] in ('\x00', '\x01', '\x02', '\x03') - ) - if is_tls_client_hello: + if is_tls_record_magic(d): return TlsLayer(top_layer, True, True) # 3. Check for --tcp |