This commit is contained in:
Thomas Steen Rasmussen 2017-09-13 07:49:14 +00:00 committed by GitHub
commit ee87cd46e0

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,
@ -28,12 +30,14 @@ def parse_x_forwarded_for(headers,
if not address_header_name:
return (original_addr, original_scheme)
# Convert twisted-style headers into dicts
if isinstance(headers, Headers):
# Convert twisted-style headers into dicts
headers = dict(headers.getAllRawHeaders())
# 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() if isinstance(name, bytes) else name.lower().encode("utf-8"): values for name, values in headers.items()}
address_header_name = address_header_name.lower().encode("utf-8")
result_addr = original_addr