IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-23 15:40:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Disabled control characters and space in header names.

Browse Source 
Control characters (0x00-0x1f, 0x7f), space, and colon were never allowed in
header names.  The only somewhat valid use is header continuation which nginx
never supported and which is explicitly obsolete by RFC 7230.

Previously, such headers were considered invalid and were ignored by default
(as per ignore_invalid_headers directive).  With this change, such headers
are unconditionally rejected.

It is expected to make nginx more resilient to various attacks, in particular,
with ignore_invalid_headers switched off (which is inherently unsecure, though
nevertheless sometimes used in the wild).
This commit is contained in:
Maxim Dounin 2021-06-28 18:01:18 +03:00
parent 0b66bd4be7
commit 9ab4d368af
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/http/modules/ngx_http_grpc_module.c
View File

@ -3384,7 +3384,7 @@ ngx_http_grpc_validate_header_name(ngx_http_request_t *r, ngx_str_t *s)
return NGX_ERROR;
}
if (ch == '\0' || ch == CR || ch == LF) {
if (ch <= 0x20 || ch == 0x7f) {
return NGX_ERROR;
}
}

4
src/http/ngx_http_parse.c
View File

@ -893,7 +893,7 @@ ngx_http_parse_header_line(ngx_http_request_t *r, ngx_buf_t *b,
break;
}
if (ch == '\0') {
if (ch <= 0x20 || ch == 0x7f || ch == ':') {
return NGX_HTTP_PARSE_INVALID_HEADER;
}
@ -961,7 +961,7 @@ ngx_http_parse_header_line(ngx_http_request_t *r, ngx_buf_t *b,
break;
}
if (ch == '\0') {
if (ch <= 0x20 || ch == 0x7f) {
return NGX_HTTP_PARSE_INVALID_HEADER;
}

2
src/http/v2/ngx_http_v2.c
View File

@ -3457,7 +3457,7 @@ ngx_http_v2_validate_header(ngx_http_request_t *r, ngx_http_v2_header_t *header)
continue;
}
if (ch == '\0' || ch == LF || ch == CR || ch == ':'
if (ch <= 0x20 || ch == 0x7f || ch == ':'
|| (ch >= 'A' && ch <= 'Z'))
{
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,