diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-08-15 20:20:46 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-08-15 20:20:46 +0200 |
| commit | 2a15479cdbda07a4a99f56f6090e479decbeb17c (patch) | |
| tree | 3374510203286e555b600d7950df860a70c005e6 /libmproxy/protocol2/root_context.py | |
| parent | 0dd243c5e42950de9c8b1193ba9dbdd2d0414a45 (diff) | |
| download | mitmproxy-2a15479cdbda07a4a99f56f6090e479decbeb17c.tar.gz mitmproxy-2a15479cdbda07a4a99f56f6090e479decbeb17c.tar.bz2 mitmproxy-2a15479cdbda07a4a99f56f6090e479decbeb17c.zip | |
fix bugs, make https work
Diffstat (limited to 'libmproxy/protocol2/root_context.py')
| -rw-r--r-- | libmproxy/protocol2/root_context.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libmproxy/protocol2/root_context.py b/libmproxy/protocol2/root_context.py index 3b341778..bda8b12b 100644 --- a/libmproxy/protocol2/root_context.py +++ b/libmproxy/protocol2/root_context.py @@ -2,7 +2,7 @@ from __future__ import (absolute_import, print_function, division) from .rawtcp import RawTcpLayer from .tls import TlsLayer - +from .http import HttpLayer class RootContext(object): """ @@ -38,10 +38,12 @@ class RootContext(object): return if is_tls_client_hello: - layer = TlsLayer(top_layer, True, True) + return TlsLayer(top_layer, True, True) + elif isinstance(top_layer, TlsLayer) and isinstance(top_layer.ctx, HttpLayer): + return HttpLayer(top_layer, "transparent") else: - layer = RawTcpLayer(top_layer) - return layer + return RawTcpLayer(top_layer) + @property def layers(self): |