Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-23 16:17:49 +00:00
Code Issues Projects Releases Wiki Activity

Make it possible to pass custom environment variables into wsgi apps.

Browse Source
This commit is contained in:
Aldo Cortesi 2014-01-05 10:57:50 +13:00
parent c7606ffdf9
commit 5717e7300c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
netlib/wsgi.py
View File

@ -33,7 +33,7 @@ class WSGIAdaptor:
def __init__(self, app, domain, port, sversion): def __init__(self, app, domain, port, sversion):
self.app, self.domain, self.port, self.sversion = app, domain, port, sversion self.app, self.domain, self.port, self.sversion = app, domain, port, sversion
def make_environ(self, request, errsoc): def make_environ(self, request, errsoc, **extra):
if '?' in request.path: if '?' in request.path:
path_info, query = request.path.split('?', 1) path_info, query = request.path.split('?', 1)
else: else:
@ -59,6 +59,7 @@ class WSGIAdaptor:
# FIXME: We need to pick up the protocol read from the request. # FIXME: We need to pick up the protocol read from the request.
'SERVER_PROTOCOL': "HTTP/1.1", 'SERVER_PROTOCOL': "HTTP/1.1",
} }
environ.update(extra)
if request.client_conn.address: if request.client_conn.address:
environ["REMOTE_ADDR"], environ["REMOTE_PORT"] = request.client_conn.address environ["REMOTE_ADDR"], environ["REMOTE_PORT"] = request.client_conn.address
@ -86,7 +87,7 @@ class WSGIAdaptor:
soc.write("\r\n") soc.write("\r\n")
soc.write(c) soc.write(c)
def serve(self, request, soc): def serve(self, request, soc, **env):
state = dict( state = dict(
response_started = False, response_started = False,
headers_sent = False, headers_sent = False,
@ -123,7 +124,7 @@ class WSGIAdaptor:
errs = cStringIO.StringIO() errs = cStringIO.StringIO()
try: try:
dataiter = self.app(self.make_environ(request, errs), start_response) dataiter = self.app(self.make_environ(request, errs, **env), start_response)
for i in dataiter: for i in dataiter:
write(i) write(i)
if not state["headers_sent"]: if not state["headers_sent"]: