Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Disallow invalid header characters #725

Merged
merged 3 commits into from Jul 28, 2020
Merged

Disallow invalid header characters #725

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
051b18f
Disallow invalid header characters
tomchristie Jul 28, 2020
8802fdb
Linting
tomchristie Jul 28, 2020
731076a
Fix escape sequence
tomchristie Jul 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions uvicorn/protocols/http/httptools_impl.py
View file
Open in desktop
@@ -1,6 +1,7 @@
import asyncio
import http
import logging
import re
import urllib

import httptools
Expand All @@ -13,6 +14,9 @@
is_ssl,
)

HEADER_RE = re.compile(b'[\x00-\x1F\x7F()<>@,;:[]={} \t\\"]')
HEADER_VALUE_RE = re.compile(b"[\x00-\x1F\x7F]")


def _get_status_line(status_code):
try:
Expand Down Expand Up @@ -459,6 +463,11 @@ async def send(self, message):
content = [STATUS_LINE[status_code]]

for name, value in headers:
if HEADER_RE.search(name):
raise RuntimeError("Invalid HTTP header name.")
if HEADER_VALUE_RE.search(value):
raise RuntimeError("Invalid HTTP header value.")

name = name.lower()
if name == b"content-length" and self.chunked_encoding is None:
self.expected_content_length = int(value.decode())
Expand Down