django/daphne
1
1
Fork 0
mirror of https://github.com/django/daphne.git synced 2024-11-22 16:06:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

only encode header keys, not values; only decode value when instance of bytes

Browse Source
This commit is contained in:
Thomas Steen Rasmussen 2017-04-19 22:45:51 +02:00
parent ccaa7eda3e
commit cc870105f1
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
daphne/utils.py
View File

@ -5,7 +5,9 @@ def header_value(headers, header_name):
value = headers[header_name]
if isinstance(value, list):
value = value[0]
return value.decode("utf-8")
if isinstance(value, bytes):
value = value.decode("utf-8")
return value
def parse_x_forwarded_for(headers,
@ -24,15 +26,14 @@ def parse_x_forwarded_for(headers,
if not address_header_name:
return original
# Convert twisted-style headers into dicts
if isinstance(headers, Headers):
# Convert twisted-style headers into dicts
headers = dict(headers.getAllRawHeaders())
else:
# convert non twisted headers dict into utf-8
headers = {name.encode("utf-8"): values.encode("utf-8") for name, values in headers.items()}
# Lowercase all header names in the dict
# Lowercase header keys
headers = {name.lower(): values for name, values in headers.items()}
else:
# Lowercase and encode header keys
headers = {name.lower().encode("utf-8"): values for name, values in headers.items()}
address_header_name = address_header_name.lower().encode("utf-8")
result = original