django/daphne
1
1
Fork 0
mirror of https://github.com/django/daphne.git synced 2024-11-25 09:13:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Stop stomping on Twisted's header dict

Browse Source
This commit is contained in:
Andrew Godwin 2016-02-05 17:41:14 -08:00
parent b86c8a0164
commit 40ed9625c3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
daphne/http_protocol.py
View File

@ -41,12 +41,12 @@ class WebRequest(http.Request):
if b"?" in self.uri: if b"?" in self.uri:
self.query_string = self.uri.split(b"?", 1)[1] self.query_string = self.uri.split(b"?", 1)[1]
# Sanitize headers # Sanitize headers
self.headers = {} self.clean_headers = {}
for name, value in self.requestHeaders.getAllRawHeaders(): for name, value in self.requestHeaders.getAllRawHeaders():
# Prevent CVE-2015-0219 # Prevent CVE-2015-0219
if b"_" in name: if b"_" in name:
continue continue
self.headers[name.lower().decode("latin1")] = value[0] self.clean_headers[name.lower().decode("latin1")] = value[0]
# Is it WebSocket? IS IT?! # Is it WebSocket? IS IT?!
if upgrade_header == "websocket": if upgrade_header == "websocket":
# Make WebSocket protocol to hand off to # Make WebSocket protocol to hand off to
@ -88,7 +88,7 @@ class WebRequest(http.Request):
"path": self.path, "path": self.path,
"scheme": "http", "scheme": "http",
"query_string": self.query_string, "query_string": self.query_string,
"headers": self.headers, "headers": self.clean_headers,
"body": self.content.read(), "body": self.content.read(),
"client": [self.client.host, self.client.port], "client": [self.client.host, self.client.port],
"server": [self.host.host, self.host.port], "server": [self.host.host, self.host.port],

2
daphne/ws_protocol.py
View File

@ -21,7 +21,7 @@ class WebSocketProtocol(WebSocketServerProtocol):
def onConnect(self, request): def onConnect(self, request):
self.request_info = { self.request_info = {
"path": request.path, "path": request.path,
"headers": self.headers, "headers": self.clean_headers,
"query_string": request.query_string, "query_string": request.query_string,
"client": [request.client.host, request.client.port], "client": [request.client.host, request.client.port],
"server": [request.host.host, request.host.port], "server": [request.host.host, request.host.port],