Skip to content

Commit

Permalink
http: unset F_CHUNKED on new Transfer-Encoding
Browse files Browse the repository at this point in the history
Duplicate `Transfer-Encoding` header should be a treated as a single,
but with original header values concatenated with a comma separator. In
the light of this, even if the past `Transfer-Encoding` ended with
`chunked`, we should be not let the `F_CHUNKED` to leak into the next
header, because mere presence of another header indicates that `chunked`
is not the last transfer-encoding token.

CVE-ID: CVE-2020-8287
PR-URL: nodejs-private/node-private#236
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
  • Loading branch information
indutny authored and richardlau committed Dec 23, 2020
1 parent 5de5354 commit 92d4309
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 0 deletions.
7 changes: 7 additions & 0 deletions deps/http_parser/http_parser.c
Expand Up @@ -1344,6 +1344,13 @@ size_t http_parser_execute (http_parser *parser,
} else if (parser->index == sizeof(TRANSFER_ENCODING)-2) {
parser->header_state = h_transfer_encoding;
parser->uses_transfer_encoding = 1;

/* Multiple `Transfer-Encoding` headers should be treated as
* one, but with values separate by a comma.
*
* See: https://tools.ietf.org/html/rfc7230#section-3.2.2
*/
parser->flags &= ~F_CHUNKED;
}
break;

Expand Down
26 changes: 26 additions & 0 deletions deps/http_parser/test.c
Expand Up @@ -2154,6 +2154,32 @@ const struct message responses[] =
,.body= "2\r\nOK\r\n0\r\n\r\n"
,.num_chunks_complete= 0
}
#define HTTP_200_DUPLICATE_TE_NOT_LAST_CHUNKED 30
, {.name= "HTTP 200 response with `chunked` and duplicate Transfer-Encoding"
,.type= HTTP_RESPONSE
,.raw= "HTTP/1.1 200 OK\r\n"
"Transfer-Encoding: chunked\r\n"
"Transfer-Encoding: identity\r\n"
"\r\n"
"2\r\n"
"OK\r\n"
"0\r\n"
"\r\n"
,.should_keep_alive= FALSE
,.message_complete_on_eof= TRUE
,.http_major= 1
,.http_minor= 1
,.status_code= 200
,.response_status= "OK"
,.content_length= -1
,.num_headers= 2
,.headers=
{ { "Transfer-Encoding", "chunked" }
, { "Transfer-Encoding", "identity" }
}
,.body= "2\r\nOK\r\n0\r\n\r\n"
,.num_chunks_complete= 0
}
};

/* strnlen() is a POSIX.2008 addition. Can't rely on it being available so
Expand Down

0 comments on commit 92d4309

Please sign in to comment.