diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-08-30 02:27:38 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-08-30 02:27:38 +0200 |
| commit | 1dd09a5509219e7390abbb8c0b6818c7e792daa1 (patch) | |
| tree | ef1f433ebbcb05003b7648f8cabdfce7f2f00de5 /libmproxy/proxy | |
| parent | dd7f50d64bef38fa67b4cace91913d03691dde26 (diff) | |
| download | mitmproxy-1dd09a5509219e7390abbb8c0b6818c7e792daa1.tar.gz mitmproxy-1dd09a5509219e7390abbb8c0b6818c7e792daa1.tar.bz2 mitmproxy-1dd09a5509219e7390abbb8c0b6818c7e792daa1.zip | |
always insert tls layer for inline script upgrades
Diffstat (limited to 'libmproxy/proxy')
| -rw-r--r-- | libmproxy/proxy/config.py | 2 | ||||
| -rw-r--r-- | libmproxy/proxy/server.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libmproxy/proxy/config.py b/libmproxy/proxy/config.py index 415ee215..b360abbd 100644 --- a/libmproxy/proxy/config.py +++ b/libmproxy/proxy/config.py @@ -24,6 +24,8 @@ class HostMatcher(object): self.regexes = [re.compile(p, re.IGNORECASE) for p in self.patterns] def __call__(self, address): + if not address: + return False address = tcp.Address.wrap(address) host = "%s:%s" % (address.host, address.port) if any(rex.search(host) for rex in self.regexes): diff --git a/libmproxy/proxy/server.py b/libmproxy/proxy/server.py index 69784014..5abd0877 100644 --- a/libmproxy/proxy/server.py +++ b/libmproxy/proxy/server.py @@ -86,12 +86,10 @@ class ConnectionHandler(object): elif mode == "transparent": return protocol2.TransparentProxy(root_context) elif mode == "reverse": - client_tls = self.config.upstream_server.scheme.startswith("https") - server_tls = self.config.upstream_server.scheme.endswith("https") + server_tls = self.config.upstream_server.scheme == "https" return protocol2.ReverseProxy( root_context, self.config.upstream_server.address, - client_tls, server_tls ) elif mode == "socks5": |