django/daphne
1
1
Fork 0
mirror of https://github.com/django/daphne.git synced 2024-11-21 23:46:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Modify Daphne to send WS headers as a tuple.

Browse Source
This commit is contained in:
Andrew Godwin 2016-05-18 09:58:07 -07:00
parent 61c501923c
commit 81d99a34d3
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
daphne/ws_protocol.py
View File

@ -28,12 +28,13 @@ class WebSocketProtocol(WebSocketServerProtocol):
self.last_data = time.time() self.last_data = time.time()
try: try:
# Sanitize and decode headers # Sanitize and decode headers
clean_headers = {} self.clean_headers = []
for name, value in request.headers.items(): for name, value in request.headers.items():
name = name.encode("ascii")
# Prevent CVE-2015-0219 # Prevent CVE-2015-0219
if "_" in name: if b"_" in name:
continue continue
clean_headers[name.lower()] = value.encode("latin1") self.clean_headers.append((name.lower(), value.encode("latin1")))
# Reconstruct query string # Reconstruct query string
# TODO: get autobahn to provide it raw # TODO: get autobahn to provide it raw
query_string = urlencode(request.params, doseq=True).encode("ascii") query_string = urlencode(request.params, doseq=True).encode("ascii")
@ -52,7 +53,7 @@ class WebSocketProtocol(WebSocketServerProtocol):
self.path = request.path.encode("ascii") self.path = request.path.encode("ascii")
self.request_info = { self.request_info = {
"path": self.unquote(self.path), "path": self.unquote(self.path),
"headers": clean_headers, "headers": self.clean_headers,
"query_string": self.unquote(query_string), "query_string": self.unquote(query_string),
"client": self.client_addr, "client": self.client_addr,
"server": self.server_addr, "server": self.server_addr,
@ -65,7 +66,10 @@ class WebSocketProtocol(WebSocketServerProtocol):
logger.error(traceback.format_exc()) logger.error(traceback.format_exc())
raise raise
ws_protocol = clean_headers.get('sec-websocket-protocol') ws_protocol = None
for header, value in self.clean_headers:
if header == 'sec-websocket-protocol':
ws_protocol = value
if ws_protocol and ws_protocol in self.factory.protocols: if ws_protocol and ws_protocol in self.factory.protocols:
return ws_protocol return ws_protocol