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

Ignore content-length in 200 response to CONNECT request

This commit is contained in:
Tatsuhiro Tsujikawa 2019-05-17 22:47:54 +09:00
parent 4fca2502d8
commit afefbda518
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/nghttp2_http.c
View File

@ -263,11 +263,14 @@ static int http_response_on_header(nghttp2_stream *stream, nghttp2_hd_nv *nv,
stream->content_length = 0; stream->content_length = 0;
return NGHTTP2_ERR_REMOVE_HTTP_HEADER; return NGHTTP2_ERR_REMOVE_HTTP_HEADER;
} }
if (stream->status_code / 100 == 1 || if (stream->status_code / 100 == 1) {
(stream->status_code / 100 == 2 &&
(stream->http_flags & NGHTTP2_HTTP_FLAG_METH_CONNECT))) {
return NGHTTP2_ERR_HTTP_HEADER; return NGHTTP2_ERR_HTTP_HEADER;
} }
/* https://tools.ietf.org/html/rfc7230#section-3.3.3 */
if (stream->status_code / 100 == 2 &&
(stream->http_flags & NGHTTP2_HTTP_FLAG_METH_CONNECT)) {
return NGHTTP2_ERR_REMOVE_HTTP_HEADER;
}
if (stream->content_length != -1) { if (stream->content_length != -1) {
return NGHTTP2_ERR_HTTP_HEADER; return NGHTTP2_ERR_HTTP_HEADER;
} }

27
tests/nghttp2_session_test.c
View File

@ -11762,6 +11762,8 @@ void test_nghttp2_http_ignore_content_length(void) {
const nghttp2_nv conn_reqnv[] = {MAKE_NV(":authority", "localhost"), const nghttp2_nv conn_reqnv[] = {MAKE_NV(":authority", "localhost"),
MAKE_NV(":method", "CONNECT"), MAKE_NV(":method", "CONNECT"),
MAKE_NV("content-length", "999999")}; MAKE_NV("content-length", "999999")};
const nghttp2_nv conn_cl_resnv[] = {MAKE_NV(":status", "200"),
MAKE_NV("content-length", "0")};
nghttp2_stream *stream; nghttp2_stream *stream;
mem = nghttp2_mem_default(); mem = nghttp2_mem_default();
@ -11791,6 +11793,24 @@ void test_nghttp2_http_ignore_content_length(void) {
nghttp2_bufs_reset(&bufs); nghttp2_bufs_reset(&bufs);
/* Content-Length in 200 response to CONNECT is ignored */
stream = open_sent_stream2(session, 3, NGHTTP2_STREAM_OPENING);
stream->http_flags |= NGHTTP2_HTTP_FLAG_METH_CONNECT;
rv = pack_headers(&bufs, &deflater, 3, NGHTTP2_FLAG_END_HEADERS,
conn_cl_resnv, ARRLEN(conn_cl_resnv), mem);
CU_ASSERT(0 == rv);
rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
nghttp2_buf_len(&bufs.head->buf));
CU_ASSERT((ssize_t)nghttp2_buf_len(&bufs.head->buf) == rv);
CU_ASSERT(NULL == nghttp2_session_get_next_ob_item(session));
CU_ASSERT(-1 == stream->content_length);
nghttp2_bufs_reset(&bufs);
nghttp2_hd_deflate_free(&deflater); nghttp2_hd_deflate_free(&deflater);
nghttp2_session_del(session); nghttp2_session_del(session);
@ -11866,13 +11886,10 @@ 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 /* content-length is ignored in 200 response to a CONNECT request */
request */
item = nghttp2_session_get_next_ob_item(session); item = nghttp2_session_get_next_ob_item(session);
CU_ASSERT(NULL != item); 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);