walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Disallow content-length in 1xx, 204, or 200 to a CONNECT request

This commit is contained in:
Tatsuhiro Tsujikawa 2016-11-03 17:26:32 +09:00
parent e082b7be72
commit 6ad9ddcdea
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/nghttp2_http.c
View File

@ -250,6 +250,11 @@ static int http_response_on_header(nghttp2_stream *stream, nghttp2_hd_nv *nv,
break; break;
} }
case NGHTTP2_TOKEN_CONTENT_LENGTH: { case NGHTTP2_TOKEN_CONTENT_LENGTH: {
if (stream->status_code == 204 || stream->status_code / 100 == 1 ||
(stream->status_code == 200 &&
(stream->http_flags & NGHTTP2_HTTP_FLAG_METH_CONNECT))) {
return NGHTTP2_ERR_HTTP_HEADER;
}
if (stream->content_length != -1) { if (stream->content_length != -1) {
return NGHTTP2_ERR_HTTP_HEADER; return NGHTTP2_ERR_HTTP_HEADER;
} }

23
tests/nghttp2_session_test.c
View File

@ -10200,6 +10200,10 @@ void test_nghttp2_http_mandatory_headers(void) {
MAKE_NV("content-length", "0")}; MAKE_NV("content-length", "0")};
const nghttp2_nv badhd_resnv[] = {MAKE_NV(":status", "200"), const nghttp2_nv badhd_resnv[] = {MAKE_NV(":status", "200"),
MAKE_NV("connection", "close")}; MAKE_NV("connection", "close")};
const nghttp2_nv cl1xx_resnv[] = {MAKE_NV(":status", "100"),
MAKE_NV("content-length", "0")};
const nghttp2_nv cl204_resnv[] = {MAKE_NV(":status", "204"),
MAKE_NV("content-length", "0")};
/* test case for request */ /* test case for request */
const nghttp2_nv nopath_reqnv[] = {MAKE_NV(":scheme", "https"), const nghttp2_nv nopath_reqnv[] = {MAKE_NV(":scheme", "https"),
@ -10298,6 +10302,16 @@ void test_nghttp2_http_mandatory_headers(void) {
NGHTTP2_STREAM_OPENING, badhd_resnv, NGHTTP2_STREAM_OPENING, badhd_resnv,
ARRLEN(badhd_resnv)); ARRLEN(badhd_resnv));
/* response header has content-length with 100 status code */
check_nghttp2_http_recv_headers_fail(session, &deflater, 17,
NGHTTP2_STREAM_OPENING, cl1xx_resnv,
ARRLEN(cl1xx_resnv));
/* response header has content-length with 204 status code */
check_nghttp2_http_recv_headers_fail(session, &deflater, 19,
NGHTTP2_STREAM_OPENING, cl204_resnv,
ARRLEN(cl204_resnv));
nghttp2_hd_deflate_free(&deflater); nghttp2_hd_deflate_free(&deflater);
nghttp2_session_del(session); nghttp2_session_del(session);
@ -11001,6 +11015,7 @@ void test_nghttp2_http_record_request_method(void) {
nghttp2_bufs bufs; nghttp2_bufs bufs;
nghttp2_hd_deflater deflater; nghttp2_hd_deflater deflater;
nghttp2_mem *mem; nghttp2_mem *mem;
nghttp2_outbound_item *item;
mem = nghttp2_mem_default(); mem = nghttp2_mem_default();
frame_pack_bufs_init(&bufs); frame_pack_bufs_init(&bufs);
@ -11033,6 +11048,14 @@ void test_nghttp2_http_record_request_method(void) {
CU_ASSERT((NGHTTP2_HTTP_FLAG_METH_CONNECT & stream->http_flags) > 0); CU_ASSERT((NGHTTP2_HTTP_FLAG_METH_CONNECT & stream->http_flags) > 0);
CU_ASSERT(-1 == stream->content_length); CU_ASSERT(-1 == stream->content_length);
/* content-length is now allowed in 200 response to a CONNECT
request */
item = nghttp2_session_get_next_ob_item(session);
CU_ASSERT(NULL != item);
CU_ASSERT(NGHTTP2_RST_STREAM == item->frame.hd.type);
CU_ASSERT(NGHTTP2_PROTOCOL_ERROR == item->frame.rst_stream.error_code);
nghttp2_hd_deflate_free(&deflater); nghttp2_hd_deflate_free(&deflater);
nghttp2_session_del(session); nghttp2_session_del(session);
nghttp2_bufs_free(&bufs); nghttp2_bufs_free(&bufs);