upstream/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2026-07-11 02:01:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge b1341a04a1 into 18ccebb1a8

Browse source
This commit is contained in:
Demi Marie Obenour 2026-07-09 09:35:01 +01:00 committed by GitHub
commit 84fc813b1a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 55 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/core/ngx_string.h
View file

@ -236,4 +236,11 @@ void ngx_sort(void *base, size_t n, size_t size,
#define ngx_value(n) ngx_value_helper(n)
static ngx_inline ngx_int_t
ngx_str_is_hws(ngx_uint_t c)
{
return c == '\t' || c == ' ';
}
#endif /* _NGX_STRING_H_INCLUDED_ */

10
src/http/modules/ngx_http_grpc_module.c
View file

@ -3481,6 +3481,16 @@ ngx_http_grpc_validate_header_value(ngx_http_request_t *r, ngx_str_t *s)
u_char ch;
ngx_uint_t i;
if (s->len == 0) {
return NGX_OK;
}
if (ngx_str_is_hws(s->data[0])
|| ngx_str_is_hws(s->data[s->len - 1]))
{
return NGX_ERROR;
}
for (i = 0; i < s->len; i++) {
ch = s->data[i];

10
src/http/modules/ngx_http_proxy_v2_module.c
View file

@ -3319,6 +3319,16 @@ ngx_http_proxy_v2_validate_header_value(ngx_http_request_t *r, ngx_str_t *s)
u_char ch;
ngx_uint_t i;
if (s->len == 0) {
return NGX_OK;
}
if (ngx_str_is_hws(s->data[0])
|| ngx_str_is_hws(s->data[s->len - 1]))
{
return NGX_ERROR;
}
for (i = 0; i < s->len; i++) {
ch = s->data[i];

14
src/http/v2/ngx_http_v2.c
View file

@ -3277,6 +3277,20 @@ ngx_http_v2_validate_header(ngx_http_request_t *r, ngx_http_v2_header_t *header)
r->invalid_header = 1;
}
if (header->value.len == 0) {
return NGX_OK;
}
if (ngx_str_is_hws(header->value.data[0])
|| ngx_str_is_hws(header->value.data[header->value.len - 1]))
{
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
"client sent header \"%V\" with "
"leading or trailing space or HTAB in value",
&header->name);
return NGX_ERROR;
}
for (i = 0; i != header->value.len; i++) {
ch = header->value.data[i];

14
src/http/v3/ngx_http_v3_request.c
View file

@ -736,6 +736,20 @@ ngx_http_v3_validate_header(ngx_http_request_t *r, ngx_str_t *name,
r->invalid_header = 1;
}
if (value->len == 0) {
return NGX_OK;
}
if (ngx_str_is_hws(value->data[0])
|| ngx_str_is_hws(value->data[value->len - 1]))
{
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
"client sent header \"%V\" with "
"leading or trailing space or HTAB in value",
name);
return NGX_ERROR;
}
for (i = 0; i != value->len; i++) {
ch = value->data[i];