diff options
| -rwxr-xr-x | examples/proxapp | 41 | ||||
| -rw-r--r-- | libmproxy/flow.py | 6 | ||||
| -rw-r--r-- | libmproxy/proxy.py | 72 | ||||
| -rw-r--r-- | libmproxy/version.py | 2 | ||||
| -rw-r--r-- | libmproxy/wsgi.py | 120 | ||||
| -rw-r--r-- | test/test_flow.py | 9 | ||||
| -rw-r--r-- | test/test_wsgi.py | 61 |
7 files changed, 276 insertions, 35 deletions
diff --git a/examples/proxapp b/examples/proxapp new file mode 100755 index 00000000..cb1fd881 --- /dev/null +++ b/examples/proxapp @@ -0,0 +1,41 @@ +#!/usr/bin/env python +import bottle +import os +from libmproxy import proxy, flow + + +@bottle.route('/') +def index(): + return 'Hi!' + + +class MyMaster(flow.FlowMaster): + def run(self): + try: + flow.FlowMaster.run(self) + except KeyboardInterrupt: + self.shutdown() + + def handle_request(self, r): + f = flow.FlowMaster.handle_request(self, r) + if f: + r._ack() + return f + + def handle_response(self, r): + f = flow.FlowMaster.handle_response(self, r) + if f: + r._ack() + print f + return f + + +config = proxy.ProxyConfig( + cacert = os.path.expanduser("~/.mitmproxy/mitmproxy-ca.pem") +) +state = flow.State() +server = proxy.ProxyServer(config, 8080) +server.apps.add(bottle.app(), "proxapp", 80) +m = MyMaster(server, state) +m.run() + diff --git a/libmproxy/flow.py b/libmproxy/flow.py index 4942d263..732718d3 100644 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -160,7 +160,6 @@ class ODict: """ if isinstance(valuelist, basestring): raise ValueError("ODict valuelist should be lists.") - k = self._kconv(k) new = self._filter_lst(k, self.lst) for i in valuelist: new.append((k, i)) @@ -174,7 +173,7 @@ class ODict: def __contains__(self, k): for i in self.lst: - if self._kconv(i[0]) == k: + if self._kconv(i[0]) == self._kconv(k): return True return False @@ -187,6 +186,9 @@ class ODict: else: return d + def items(self): + return self.lst[:] + def _get_state(self): return [tuple(i) for i in self.lst] diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py index a6db44c2..02ee8047 100644 --- a/libmproxy/proxy.py +++ b/libmproxy/proxy.py @@ -21,9 +21,7 @@ import sys, os, string, socket, time import shutil, tempfile, threading import optparse, SocketServer, ssl -import utils, flow, certutils - -NAME = "mitmproxy" +import utils, flow, certutils, version, wsgi class ProxyError(Exception): @@ -128,6 +126,8 @@ def read_http_body(rfile, connection, headers, all, limit): return content +#FIXME: Return full HTTP version specification from here. Allow non-HTTP +#protocol specs, and make it all editable. def parse_request_line(request): """ Parse a proxy request line. Return (method, scheme, host, port, path, minor). @@ -230,7 +230,7 @@ class ServerConnection: self.scheme = request.scheme self.close = False self.cert = None - self.server, self.rfile, self.wfile = None, None, None + self.sock, self.rfile, self.wfile = None, None, None self.connect() def connect(self): @@ -244,7 +244,7 @@ class ServerConnection: self.cert = server.getpeercert(True) except socket.error, err: raise ProxyError(502, 'Error connecting to "%s": %s' % (self.host, err)) - self.server = server + self.sock = server self.rfile, self.wfile = server.makefile('rb'), server.makefile('wb') def send(self): @@ -284,7 +284,7 @@ class ServerConnection: try: if not self.wfile.closed: self.wfile.flush() - self.server.close() + self.sock.close() except IOError: pass @@ -305,7 +305,7 @@ class ProxyHandler(SocketServer.StreamRequestHandler): self.finish() def handle_request(self, cc): - server, request, err = None, None, None + server_conn, request, err = None, None, None try: try: request = self.read_request(cc) @@ -315,29 +315,34 @@ class ProxyHandler(SocketServer.StreamRequestHandler): cc.close = True return cc.requestcount += 1 - request = request._send(self.mqueue) - if request is None: - cc.close = True - return - if isinstance(request, flow.Response): - response = request - request = False - response = response._send(self.mqueue) + app = self.server.apps.get(request) + if app: + app.serve(request, self.wfile) else: - server = ServerConnection(self.config, request) - server.send() - try: - response = server.read_response() - except IOError, v: - raise IOError, "Reading response: %s"%v - response = response._send(self.mqueue) + request = request._send(self.mqueue) + if request is None: + cc.close = True + return + + if isinstance(request, flow.Response): + response = request + request = False + response = response._send(self.mqueue) + else: + server_conn = ServerConnection(self.config, request) + server_conn.send() + try: + response = server_conn.read_response() + except IOError, v: + raise IOError, "Reading response: %s"%v + response = response._send(self.mqueue) + if response is None: + server_conn.terminate() if response is None: - server.terminate() - if response is None: - cc.close = True - return - self.send_response(response) + cc.close = True + return + self.send_response(response) except IOError, v: cc.connection_error = v cc.close = True @@ -348,8 +353,8 @@ class ProxyHandler(SocketServer.StreamRequestHandler): err = flow.Error(request, e.msg) err._send(self.mqueue) self.send_error(e.code, e.msg) - if server: - server.terminate() + if server_conn: + server_conn.terminate() def find_cert(self, host, port): if self.config.certfile: @@ -374,7 +379,7 @@ class ProxyHandler(SocketServer.StreamRequestHandler): return None method, scheme, host, port, path, httpminor = parse_request_line(line) if method == "CONNECT": - # Discard additional headers sent to the proxy. Should I expose + # FIXME: Discard additional headers sent to the proxy. Should I expose # these to users? while 1: d = self.rfile.readline() @@ -382,7 +387,7 @@ class ProxyHandler(SocketServer.StreamRequestHandler): break self.wfile.write( 'HTTP/1.1 200 Connection established\r\n' + - ('Proxy-agent: %s\r\n'%NAME) + + ('Proxy-agent: %s\r\n'%version.NAMEVERSION) + '\r\n' ) self.wfile.flush() @@ -425,7 +430,7 @@ class ProxyHandler(SocketServer.StreamRequestHandler): expect = ",".join(headers['expect']) if expect == "100-continue" and httpminor >= 1: self.wfile.write('HTTP/1.1 100 Continue\r\n') - self.wfile.write('Proxy-agent: %s\r\n'%NAME) + self.wfile.write('Proxy-agent: %s\r\n'%version.NAMEVERSION) self.wfile.write('\r\n') del headers['expect'] else: @@ -463,7 +468,7 @@ class ProxyHandler(SocketServer.StreamRequestHandler): import BaseHTTPServer response = BaseHTTPServer.BaseHTTPRequestHandler.responses[code][0] self.wfile.write("HTTP/1.1 %s %s\r\n" % (code, response)) - self.wfile.write("Server: %s\r\n"%NAME) + self.wfile.write("Server: %s\r\n"%version.NAMEVERSION) self.wfile.write("Connection: close\r\n") self.wfile.write("Content-type: text/html\r\n") self.wfile.write("\r\n") @@ -494,6 +499,7 @@ class ProxyServer(ServerBase): self.masterq = None self.certdir = tempfile.mkdtemp(prefix="mitmproxy") config.certdir = self.certdir + self.apps = wsgi.AppRegistry() def start_slave(self, klass, masterq): slave = klass(masterq, self) diff --git a/libmproxy/version.py b/libmproxy/version.py index 970a7181..3c39ed25 100644 --- a/libmproxy/version.py +++ b/libmproxy/version.py @@ -1,2 +1,4 @@ IVERSION = (0, 8) VERSION = ".".join(str(i) for i in IVERSION) +NAME = "mitmproxy" +NAMEVERSION = NAME + " " + VERSION diff --git a/libmproxy/wsgi.py b/libmproxy/wsgi.py new file mode 100644 index 00000000..8844ea3e --- /dev/null +++ b/libmproxy/wsgi.py @@ -0,0 +1,120 @@ +import cStringIO, urllib, time, sys +import version, flow + +def date_time_string(): + """Return the current date and time formatted for a message header.""" + WEEKS = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'] + MONTHS = [None, + 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', + 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'] + now = time.time() + year, month, day, hh, mm, ss, wd, y, z = time.gmtime(now) + s = "%s, %02d %3s %4d %02d:%02d:%02d GMT" % ( + WEEKS[wd], + day, MONTHS[month], year, + hh, mm, ss) + return s + + +class WSGIAdaptor: + def __init__(self, app, domain, port): + self.app, self.domain, self.port = app, domain, port + + def make_environ(self, request, errsoc): + if '?' in request.path: + path_info, query = request.path.split('?', 1) + else: + path_info = request.path + query = '' + environ = { + 'wsgi.version': (1, 0), + 'wsgi.url_scheme': request.scheme, + 'wsgi.input': cStringIO.StringIO(request.content), + 'wsgi.errors': errsoc, + 'wsgi.multithread': True, + 'wsgi.multiprocess': False, + 'wsgi.run_once': False, + 'SERVER_SOFTWARE': version.NAMEVERSION, + 'REQUEST_METHOD': request.method, + 'SCRIPT_NAME': '', + 'PATH_INFO': urllib.unquote(path_info), + 'QUERY_STRING': query, + 'CONTENT_TYPE': request.headers.get('Content-Type', [''])[0], + 'CONTENT_LENGTH': request.headers.get('Content-Length', [''])[0], + 'SERVER_NAME': self.domain, + 'SERVER_PORT': self.port, + # FIXME: We need to pick up the protocol read from the request. + 'SERVER_PROTOCOL': "HTTP/1.1", + } + if request.client_conn.address: + environ["REMOTE_ADDR"], environ["REMOTE_PORT"] = request.client_conn.address + + for key, value in request.headers.items(): + key = 'HTTP_' + key.upper().replace('-', '_') + if key not in ('HTTP_CONTENT_TYPE', 'HTTP_CONTENT_LENGTH'): + environ[key] = value + return environ + + def serve(self, request, soc): + state = dict( + response_started = False, + headers_sent = False, + status = None, + headers = None + ) + def write(data): + if not state["headers_sent"]: + soc.write("HTTP/1.1 %s\r\n"%state["status"]) + h = state["headers"] + if 'server' not in h: + h["Server"] = [version.NAMEVERSION] + if 'date' not in h: + h["Date"] = [date_time_string()] + soc.write(str(h)) + soc.write("\r\n") + state["headers_sent"] = True + soc.write(data) + soc.flush() + + def start_response(status, headers, exc_info=None): + if exc_info: + try: + if state["headers_sent"]: + raise exc_info[0], exc_info[1], exc_info[2] + finally: + exc_info = None + elif state["status"]: + raise AssertionError('Response already started') + state["status"] = status + state["headers"] = flow.ODictCaseless(headers) + return write + + errs = cStringIO.StringIO() + try: + dataiter = self.app(self.make_environ(request, errs), start_response) + for i in dataiter: + write(i) + if not state["headers_sent"]: + write("") + except Exception, v: + print v + try: + # Serve internal server error page + pass + except Exception, v: + pass + return errs.getvalue() + + +class AppRegistry: + def __init__(self): + self.apps = {} + + def add(self, app, domain, port): + self.apps[(domain, port)] = WSGIAdaptor(app, domain, port) + + def get(self, request): + """ + Returns an WSGIAdaptor instance if request matches an app, or None. + """ + return self.apps.get((request.host, request.port), None) diff --git a/test/test_flow.py b/test/test_flow.py index 74cf79f8..c91c456b 100644 --- a/test/test_flow.py +++ b/test/test_flow.py @@ -1030,6 +1030,15 @@ class uODictCaseless(libpry.AutoTree): def setUp(self): self.od = flow.ODictCaseless() + def test_case_preservation(self): + self.od["Foo"] = ["1"] + assert "foo" in self.od + assert self.od.items()[0][0] == "Foo" + assert self.od.get("foo") == ["1"] + assert self.od.get("foo", [""]) == ["1"] + assert self.od.get("Foo", [""]) == ["1"] + assert self.od.get("xx", "yy") == "yy" + def test_del(self): self.od.add("foo", 1) self.od.add("Foo", 2) diff --git a/test/test_wsgi.py b/test/test_wsgi.py new file mode 100644 index 00000000..f5f79f87 --- /dev/null +++ b/test/test_wsgi.py @@ -0,0 +1,61 @@ +import cStringIO +import libpry +from libmproxy import wsgi +import tutils + + +class TestApp: + def __init__(self): + self.called = False + + def __call__(self, environ, start_response): + self.called = True + status = '200 OK' + response_headers = [('Content-type', 'text/plain')] + start_response(status, response_headers) + return ['Hello', ' world!\n'] + + +class uWSGIAdaptor(libpry.AutoTree): + def test_make_environ(self): + w = wsgi.WSGIAdaptor(None, "foo", 80) + assert w.make_environ( + tutils.treq(), + None + ) + + def test_serve(self): + ta = TestApp() + w = wsgi.WSGIAdaptor(ta, "foo", 80) + r = tutils.treq() + r.host = "foo" + r.port = 80 + + wfile = cStringIO.StringIO() + err = w.serve(r, wfile) + assert ta.called + assert not err + + val = wfile.getvalue() + assert "Hello world" in val + assert "Server:" in val + + +class uAppRegistry(libpry.AutoTree): + def test_add_get(self): + ar = wsgi.AppRegistry() + ar.add("foo", "domain", 80) + + r = tutils.treq() + r.host = "domain" + r.port = 80 + assert ar.get(r) + + r.port = 81 + assert not ar.get(r) + + +tests = [ + uWSGIAdaptor(), + uAppRegistry() +] |