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

Regression in parsing empty headers #3218

Merged
merged 4 commits into from
Aug 28, 2018
Merged

Regression in parsing empty headers #3218

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3e12a2c
Add a empty header value parsing test (failing test)
popravich Aug 27, 2018
3bd5206
fix empty header value parsing
popravich Aug 27, 2018
0f1520b
add one more related issue to CHANGES
popravich Aug 27, 2018
3c98df8
drop duplicate news fragment
popravich Aug 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES/3218.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix empty header parsing regression.
1 change: 1 addition & 0 deletions CHANGES/3219.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix empty header parsing regression.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't need this duplication.

6 changes: 5 additions & 1 deletion aiohttp/_http_parser.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,7 @@ cdef class HttpParser:

bytearray _raw_name
bytearray _raw_value
bint _has_value

object _protocol
object _loop
Expand Down Expand Up @@ -327,6 +328,7 @@ cdef class HttpParser:

self._raw_name = bytearray()
self._raw_value = bytearray()
self._has_value = False

self._max_line_size = max_line_size
self._max_headers = max_headers
Expand Down Expand Up @@ -364,12 +366,13 @@ cdef class HttpParser:

PyByteArray_Resize(self._raw_name, 0)
PyByteArray_Resize(self._raw_value, 0)
self._has_value = False
self._raw_headers.append((raw_name, raw_value))

cdef _on_header_field(self, char* at, size_t length):
cdef Py_ssize_t size
cdef char *buf
if self._raw_value:
if self._has_value:
self._process_header()

size = PyByteArray_Size(self._raw_name)
Expand All @@ -385,6 +388,7 @@ cdef class HttpParser:
PyByteArray_Resize(self._raw_value, size + length)
buf = PyByteArray_AsString(self._raw_value)
memcpy(buf + size, at, length)
self._has_value = True

cdef _on_headers_complete(self):
self._process_header()
Expand Down
20 changes: 20 additions & 0 deletions tests/test_client_functional.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,26 @@ async def handler(request):
resp.close()


async def test_empty_header_values(aiohttp_client):
async def handler(request):
resp = web.Response()
resp.headers['X-Empty'] = ''
return resp

app = web.Application()
app.router.add_route('GET', '/', handler)
client = await aiohttp_client(app)
resp = await client.get('/')
assert resp.status == 200
raw_headers = tuple((bytes(h), bytes(v)) for h, v in resp.raw_headers)
assert raw_headers == ((b'X-Empty', b''),
(b'Content-Length', b'0'),
(b'Content-Type', b'application/octet-stream'),
(b'Date', mock.ANY),
(b'Server', mock.ANY))
resp.close()


async def test_204_with_gzipped_content_encoding(aiohttp_client):
async def handler(request):
resp = web.StreamResponse(status=204)
Expand Down