diff options
| -rw-r--r-- | libmproxy/proxy.py | 189 | ||||
| -rwxr-xr-x | scripts/contributors | 2 | ||||
| -rw-r--r-- | test/test_proxy.py | 12 |
3 files changed, 112 insertions, 91 deletions
diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py index d2452e36..f14e4e3e 100644 --- a/libmproxy/proxy.py +++ b/libmproxy/proxy.py @@ -96,11 +96,8 @@ class ServerConnection(tcp.TCPClient): d = request._assemble() if not d: raise ProxyError(502, "Cannot transmit an incomplete request.") - try: - self.wfile.write(d) - self.wfile.flush() - except socket.error, err: - raise ProxyError(502, 'Error sending data to "%s": %s' % (request.host, err)) + self.wfile.write(d) + self.wfile.flush() def terminate(self): try: @@ -264,97 +261,119 @@ class ProxyHandler(tcp.BaseHandler): if sn: self.sni = sn.decode("utf8").encode("idna") - def read_request(self, client_conn): - self.rfile.reset_timestamps() - if self.config.transparent_proxy: - orig = self.config.transparent_proxy["resolver"].original_addr(self.connection) - if not orig: - raise ProxyError(502, "Transparent mode failure: could not resolve original destination.") - host, port = orig - if not self.ssl_established and (port in self.config.transparent_proxy["sslports"]): - scheme = "https" - certfile = self.find_cert(host, port, None) - try: - self.convert_to_ssl(certfile, self.config.certfile or self.config.cacert) - except tcp.NetLibError, v: - raise ProxyError(400, str(v)) - else: - scheme = "http" - host = self.sni or host - line = self.get_line(self.rfile) - if line == "": - return None + def read_request_transparent(self, client_conn): + orig = self.config.transparent_proxy["resolver"].original_addr(self.connection) + if not orig: + raise ProxyError(502, "Transparent mode failure: could not resolve original destination.") + host, port = orig + if not self.ssl_established and (port in self.config.transparent_proxy["sslports"]): + scheme = "https" + certfile = self.find_cert(host, port, None) + try: + self.convert_to_ssl(certfile, self.config.certfile or self.config.cacert) + except tcp.NetLibError, v: + raise ProxyError(400, str(v)) + else: + scheme = "http" + host = self.sni or host + line = self.get_line(self.rfile) + if line == "": + return None + r = http.parse_init_http(line) + if not r: + raise ProxyError(400, "Bad HTTP request line: %s"%repr(line)) + method, path, httpversion = r + headers = self.read_headers(authenticate=False) + content = http.read_http_body_request( + self.rfile, self.wfile, headers, httpversion, self.config.body_size_limit + ) + return flow.Request( + client_conn,httpversion, host, port, scheme, method, path, headers, content, + self.rfile.first_byte_timestamp, utils.timestamp() + ) + + def read_request_reverse(self, client_conn): + line = self.get_line(self.rfile) + if line == "": + return None + scheme, host, port = self.config.reverse_proxy + r = http.parse_init_http(line) + if not r: + raise ProxyError(400, "Bad HTTP request line: %s"%repr(line)) + method, path, httpversion = r + headers = self.read_headers(authenticate=False) + content = http.read_http_body_request( + self.rfile, self.wfile, headers, httpversion, self.config.body_size_limit + ) + return flow.Request( + client_conn, httpversion, host, port, "http", method, path, headers, content, + self.rfile.first_byte_timestamp, utils.timestamp() + ) + + + def read_request_proxy(self, client_conn): + line = self.get_line(self.rfile) + if line == "": + return None + if http.parse_init_connect(line): + r = http.parse_init_connect(line) + if not r: + raise ProxyError(400, "Bad HTTP request line: %s"%repr(line)) + host, port, httpversion = r + + headers = self.read_headers(authenticate=True) + + self.wfile.write( + 'HTTP/1.1 200 Connection established\r\n' + + ('Proxy-agent: %s\r\n'%self.server_version) + + '\r\n' + ) + self.wfile.flush() + certfile = self.find_cert(host, port, None) + try: + self.convert_to_ssl(certfile, self.config.certfile or self.config.cacert) + except tcp.NetLibError, v: + raise ProxyError(400, str(v)) + self.proxy_connect_state = (host, port, httpversion) + line = self.rfile.readline(line) + + if self.proxy_connect_state: r = http.parse_init_http(line) if not r: raise ProxyError(400, "Bad HTTP request line: %s"%repr(line)) method, path, httpversion = r headers = self.read_headers(authenticate=False) + + host, port, _ = self.proxy_connect_state content = http.read_http_body_request( - self.rfile, self.wfile, headers, httpversion, self.config.body_size_limit - ) - return flow.Request(client_conn, httpversion, host, port, scheme, method, path, headers, content, self.rfile.first_byte_timestamp, utils.timestamp()) - elif self.config.reverse_proxy: - line = self.get_line(self.rfile) - if line == "": - return None - scheme, host, port = self.config.reverse_proxy - r = http.parse_init_http(line) + self.rfile, self.wfile, headers, httpversion, self.config.body_size_limit + ) + return flow.Request( + client_conn, httpversion, host, port, "https", method, path, headers, content, + self.rfile.first_byte_timestamp, utils.timestamp() + ) + else: + r = http.parse_init_proxy(line) if not r: raise ProxyError(400, "Bad HTTP request line: %s"%repr(line)) - method, path, httpversion = r - headers = self.read_headers(authenticate=False) + method, scheme, host, port, path, httpversion = r + headers = self.read_headers(authenticate=True) content = http.read_http_body_request( - self.rfile, self.wfile, headers, httpversion, self.config.body_size_limit + self.rfile, self.wfile, headers, httpversion, self.config.body_size_limit + ) + return flow.Request( + client_conn, httpversion, host, port, scheme, method, path, headers, content, + self.rfile.first_byte_timestamp, utils.timestamp() ) - return flow.Request(client_conn, httpversion, host, port, "http", method, path, headers, content, self.rfile.first_byte_timestamp, utils.timestamp()) + + def read_request(self, client_conn): + self.rfile.reset_timestamps() + if self.config.transparent_proxy: + return self.read_request_transparent(client_conn) + elif self.config.reverse_proxy: + return self.read_request_reverse(client_conn) else: - line = self.get_line(self.rfile) - if line == "": - return None - if http.parse_init_connect(line): - r = http.parse_init_connect(line) - if not r: - raise ProxyError(400, "Bad HTTP request line: %s"%repr(line)) - host, port, httpversion = r - - headers = self.read_headers(authenticate=True) - - self.wfile.write( - 'HTTP/1.1 200 Connection established\r\n' + - ('Proxy-agent: %s\r\n'%self.server_version) + - '\r\n' - ) - self.wfile.flush() - certfile = self.find_cert(host, port, None) - try: - self.convert_to_ssl(certfile, self.config.certfile or self.config.cacert) - except tcp.NetLibError, v: - raise ProxyError(400, str(v)) - self.proxy_connect_state = (host, port, httpversion) - line = self.rfile.readline(line) - - if self.proxy_connect_state: - r = http.parse_init_http(line) - if not r: - raise ProxyError(400, "Bad HTTP request line: %s"%repr(line)) - method, path, httpversion = r - headers = self.read_headers(authenticate=False) - - host, port, _ = self.proxy_connect_state - content = http.read_http_body_request( - self.rfile, self.wfile, headers, httpversion, self.config.body_size_limit - ) - return flow.Request(client_conn, httpversion, host, port, "https", method, path, headers, content, self.rfile.first_byte_timestamp, utils.timestamp()) - else: - r = http.parse_init_proxy(line) - if not r: - raise ProxyError(400, "Bad HTTP request line: %s"%repr(line)) - method, scheme, host, port, path, httpversion = r - headers = self.read_headers(authenticate=True) - content = http.read_http_body_request( - self.rfile, self.wfile, headers, httpversion, self.config.body_size_limit - ) - return flow.Request(client_conn, httpversion, host, port, scheme, method, path, headers, content, self.rfile.first_byte_timestamp, utils.timestamp()) + return self.read_request_proxy(client_conn) def read_headers(self, authenticate=False): headers = http.read_headers(self.rfile) diff --git a/scripts/contributors b/scripts/contributors index 75b97c6c..a7518219 100755 --- a/scripts/contributors +++ b/scripts/contributors @@ -1,2 +1,2 @@ #!/bin/sh -git log | grep "^Author:" | sed 's/ <.*//; s/^Author: //' | sort | uniq -c | sort -nr +git shortlog -n -s diff --git a/test/test_proxy.py b/test/test_proxy.py index 89e5a825..c73f61d8 100644 --- a/test/test_proxy.py +++ b/test/test_proxy.py @@ -2,6 +2,7 @@ from libmproxy import proxy, flow import tutils from libpathod import test from netlib import http +import mock def test_proxy_error(): @@ -30,7 +31,6 @@ def test_app_registry(): assert ar.get(r) - class TestServerConnection: def setUp(self): self.d = test.Daemon() @@ -50,9 +50,11 @@ class TestServerConnection: r.content = flow.CONTENT_MISSING tutils.raises("incomplete request", sc.send, r) - def test_send_error(self): + sc.terminate() + + def test_terminate_error(self): sc = proxy.ServerConnection(proxy.ProxyConfig(), self.d.IFACE, self.d.port) sc.connect("http") - r = tutils.treq() - sc.send(r) - + sc.connection = mock.Mock() + sc.connection.close = mock.Mock(side_effect=IOError) + sc.terminate() |