From 56ef7d238b9c51aae096391e26d19fdcbc43ac5b Mon Sep 17 00:00:00 2001 From: David Weinstein Date: Mon, 25 Jan 2016 17:49:31 -0500 Subject: Don't store client_tls state in root context --- libmproxy/proxy/root_context.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'libmproxy') diff --git a/libmproxy/proxy/root_context.py b/libmproxy/proxy/root_context.py index ab10c47d..80e2047e 100644 --- a/libmproxy/proxy/root_context.py +++ b/libmproxy/proxy/root_context.py @@ -59,7 +59,6 @@ class RootContext(object): self.client_conn = client_conn self.channel = channel self.config = config - self._client_tls = False def next_layer(self, top_layer): """ @@ -84,15 +83,15 @@ class RootContext(object): d = top_layer.client_conn.rfile.peek(3) except TcpException as e: six.reraise(ProtocolException, ProtocolException(str(e)), sys.exc_info()[2]) - self._client_tls = is_tls_record_magic(d) + client_tls = is_tls_record_magic(d) # 2. Always insert a TLS layer, even if there's neither client nor server tls. # An inline script may upgrade from http to https, # in which case we need some form of TLS layer. if isinstance(top_layer, ReverseProxy): - return TlsLayer(top_layer, self._client_tls, top_layer.server_tls) + return TlsLayer(top_layer, client_tls, top_layer.server_tls) if isinstance(top_layer, ServerConnectionMixin) or isinstance(top_layer, UpstreamConnectLayer): - return TlsLayer(top_layer, self._client_tls, self._client_tls) + return TlsLayer(top_layer, client_tls, client_tls) # 3. In Http Proxy mode and Upstream Proxy mode, the next layer is fixed. if isinstance(top_layer, TlsLayer): @@ -102,7 +101,7 @@ class RootContext(object): return Http1Layer(top_layer, "upstream") # 4. Check for other TLS cases (e.g. after CONNECT). - if self._client_tls: + if client_tls: return TlsLayer(top_layer, True, True) # 4. Check for --tcp -- cgit v1.2.3