diff options
Diffstat (limited to 'libmproxy/proxy')
| -rw-r--r-- | libmproxy/proxy/config.py | 18 | ||||
| -rw-r--r-- | libmproxy/proxy/server.py | 12 |
2 files changed, 17 insertions, 13 deletions
diff --git a/libmproxy/proxy/config.py b/libmproxy/proxy/config.py index c5306b4a..ec91a6e0 100644 --- a/libmproxy/proxy/config.py +++ b/libmproxy/proxy/config.py @@ -2,7 +2,11 @@ from __future__ import absolute_import import os import re from OpenSSL import SSL -from netlib import http_auth, certutils, tcp + +import netlib +from netlib import http, certutils, tcp +from netlib.http import authentication + from .. import utils, platform, version from .primitives import RegularProxyMode, SpoofMode, SSLSpoofMode, TransparentProxyMode, UpstreamProxyMode, ReverseProxyMode, Socks5ProxyMode @@ -103,7 +107,7 @@ class ProxyConfig: self.openssl_method_server = ssl_version_server else: self.openssl_method_server = tcp.SSL_VERSIONS[ssl_version_server] - + if ssl_verify_upstream_cert: self.openssl_verification_mode_server = SSL.VERIFY_PEER else: @@ -164,18 +168,18 @@ def process_proxy_options(parser, options): return parser.error( "Invalid single-user specification. Please use the format username:password") username, password = options.auth_singleuser.split(':') - password_manager = http_auth.PassManSingleUser(username, password) + password_manager = authentication.PassManSingleUser(username, password) elif options.auth_nonanonymous: - password_manager = http_auth.PassManNonAnon() + password_manager = authentication.PassManNonAnon() elif options.auth_htpasswd: try: - password_manager = http_auth.PassManHtpasswd( + password_manager = authentication.PassManHtpasswd( options.auth_htpasswd) except ValueError as v: return parser.error(v.message) - authenticator = http_auth.BasicProxyAuth(password_manager, "mitmproxy") + authenticator = authentication.BasicProxyAuth(password_manager, "mitmproxy") else: - authenticator = http_auth.NullProxyAuth(None) + authenticator = authentication.NullProxyAuth(None) certs = [] for i in options.certs: diff --git a/libmproxy/proxy/server.py b/libmproxy/proxy/server.py index 2711bd0e..e77439fb 100644 --- a/libmproxy/proxy/server.py +++ b/libmproxy/proxy/server.py @@ -167,12 +167,12 @@ class ConnectionHandler: self.channel.tell("serverdisconnect", self) self.server_conn = None - def set_server_address(self, address): + def set_server_address(self, addr): """ Sets a new server address with the given priority. Does not re-establish either connection or SSL handshake. """ - address = tcp.Address.wrap(address) + address = tcp.Address.wrap(addr) # Don't reconnect to the same destination. if self.server_conn and self.server_conn.address == address: @@ -309,15 +309,15 @@ class ConnectionHandler: self.client_conn.finish() def log(self, msg, level, subs=()): - msg = [ + full_msg = [ "%s:%s: %s" % (self.client_conn.address.host, self.client_conn.address.port, msg)] for i in subs: - msg.append(" -> " + i) - msg = "\n".join(msg) - self.channel.tell("log", Log(msg, level)) + full_msg.append(" -> " + i) + full_msg = "\n".join(full_msg) + self.channel.tell("log", Log(full_msg, level)) def find_cert(self): host = self.server_conn.address.host |