diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2012-06-10 16:49:59 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2012-06-10 16:49:59 +1200 |
| commit | d60fa9918bf9a074c420a4fb3b8fa26b86710d9b (patch) | |
| tree | cc1b8d088b575ade659f58cb04bfb9c8a8e463ad /libmproxy | |
| parent | 1f659948cddab77d9203d4d3b979b10d8fa12b98 (diff) | |
| download | mitmproxy-d60fa9918bf9a074c420a4fb3b8fa26b86710d9b.tar.gz mitmproxy-d60fa9918bf9a074c420a4fb3b8fa26b86710d9b.tar.bz2 mitmproxy-d60fa9918bf9a074c420a4fb3b8fa26b86710d9b.zip | |
Localise client connection object manipulation.
This simplifies the call signature for a bunch of functions.
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/proxy.py | 51 |
1 files changed, 36 insertions, 15 deletions
diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py index dbe91e7e..8b2f6aab 100644 --- a/libmproxy/proxy.py +++ b/libmproxy/proxy.py @@ -104,10 +104,16 @@ def read_chunked(fp, limit): return content -def read_http_body(rfile, client_conn, headers, all, limit): - if 'transfer-encoding' in headers: - if not ",".join(headers["transfer-encoding"]).lower() == "chunked": - raise IOError('Invalid transfer-encoding') +def has_chunked_encoding(headers): + for i in headers["transfer-encoding"]: + for j in i.split(","): + if j.lower() == "chunked": + return True + return False + + +def read_http_body(rfile, headers, all, limit): + if has_chunked_encoding(headers): content = read_chunked(rfile, limit) elif "content-length" in headers: try: @@ -121,7 +127,6 @@ def read_http_body(rfile, client_conn, headers, all, limit): content = rfile.read(l) elif all: content = rfile.read(limit if limit else None) - client_conn.close = True else: content = "" return content @@ -185,10 +190,9 @@ def parse_init_http(line): return method, url, httpversion -def should_connection_close(httpversion, headers): +def request_connection_close(httpversion, headers): """ - Checks the HTTP version and headers to see if this connection should be - closed. + Checks the request to see if the client connection should be closed. """ if "connection" in headers: for value in ",".join(headers['connection']).split(","): @@ -203,7 +207,18 @@ def should_connection_close(httpversion, headers): return True -def read_http_body_request(rfile, wfile, client_conn, headers, httpversion, limit): +def response_connection_close(httpversion, headers): + """ + Checks the response to see if the client connection should be closed. + """ + if request_connection_close(httpversion, headers): + return True + elif not has_chunked_encoding(headers) and "content-length" in headers: + return True + return False + + +def read_http_body_request(rfile, wfile, headers, httpversion, limit): if "expect" in headers: # FIXME: Should be forwarded upstream expect = ",".join(headers['expect']) @@ -212,7 +227,7 @@ def read_http_body_request(rfile, wfile, client_conn, headers, httpversion, limi wfile.write('Proxy-agent: %s\r\n'%version.NAMEVERSION) wfile.write('\r\n') del headers['expect'] - return read_http_body(rfile, client_conn, headers, False, limit) + return read_http_body(rfile, headers, False, limit) class FileLike: @@ -335,7 +350,7 @@ class ServerConnection: if request.method == "HEAD" or code == 204 or code == 304: content = "" else: - content = read_http_body(self.rfile, self, headers, True, self.config.body_size_limit) + content = read_http_body(self.rfile, headers, True, self.config.body_size_limit) return flow.Response(request, httpversion, code, msg, headers, content, self.cert) def terminate(self): @@ -413,7 +428,13 @@ class ProxyHandler(SocketServer.StreamRequestHandler): if response is None: return self.send_response(response) - if should_connection_close(request.httpversion, request.headers): + if request_connection_close(request.httpversion, request.headers): + return + # We could keep the client connection when the server + # connection needs to go away. However, we want to mimic + # behaviour as closely as possible to the client, so we + # disconnect. + if response_connection_close(response.httpversion, response.headers): return except IOError, v: cc.connection_error = v @@ -467,7 +488,7 @@ class ProxyHandler(SocketServer.StreamRequestHandler): method, path, httpversion = parse_init_http(line) headers = read_headers(self.rfile) content = read_http_body_request( - self.rfile, self.wfile, client_conn, 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, "http", method, path, headers, content) else: @@ -495,14 +516,14 @@ class ProxyHandler(SocketServer.StreamRequestHandler): method, path, httpversion = parse_init_http(line) headers = read_headers(self.rfile) content = read_http_body_request( - self.rfile, self.wfile, client_conn, 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, "https", method, path, headers, content) else: method, scheme, host, port, path, httpversion = parse_init_proxy(line) headers = read_headers(self.rfile) content = read_http_body_request( - self.rfile, self.wfile, client_conn, 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) |