IntenseWebs/nginx
3
0 Fork 0
mirror of https://github.com/nginx/nginx.git synced 2026-10-25 15:10:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Upstream: limit header length for HTTP/2 and gRPC

Browse Source 
The change applies the HTTP/2 header length limits to avoid buffer
overflow.  See 58a7bc3406 for details.

Reported by Mufeed VH of Winfunc Research.
This commit is contained in:
Roman Arutyunyan authored and Roman Arutyunyan committed 2026-06-17 07:40:35 -07:00
1 parent 9e293766e7
commit 26d824ec3a
2 files changed
+88
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/http/modules/ngx_http_grpc_module.c
+44
View File
@@ -750,6 +750,12 @@ ngx_http_grpc_create_request(ngx_http_request_t *r)
tmp_len = 0;
} else {
if (r->method_name.len > NGX_HTTP_V2_MAX_FIELD) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"too long http2 method: \"%V\"", &r->method_name);
return NGX_ERROR;
}
len += 1 + NGX_HTTP_V2_INT_OCTETS + r->method_name.len;
tmp_len = r->method_name.len;
}
@@ -770,6 +776,12 @@ ngx_http_grpc_create_request(ngx_http_request_t *r)
uri_len = r->uri.len + escape + sizeof("?") - 1 + r->args.len;
}
if (uri_len > NGX_HTTP_V2_MAX_FIELD) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"too long http2 URI");
return NGX_ERROR;
}
len += 1 + NGX_HTTP_V2_INT_OCTETS + uri_len;
if (tmp_len < uri_len) {
@@ -779,6 +791,12 @@ ngx_http_grpc_create_request(ngx_http_request_t *r)
/* :authority header */
if (!glcf->host_set) {
if (ctx->host.len > NGX_HTTP_V2_MAX_FIELD) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"too long http2 host: \"%V\"", &ctx->host);
return NGX_ERROR;
}
len += 1 + NGX_HTTP_V2_INT_OCTETS + ctx->host.len;
if (tmp_len < ctx->host.len) {
@@ -809,6 +827,18 @@ ngx_http_grpc_create_request(ngx_http_request_t *r)
continue;
}
if (key_len > NGX_HTTP_V2_MAX_FIELD) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"too long http2 header name");
return NGX_ERROR;
}
if (val_len > NGX_HTTP_V2_MAX_FIELD) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"too long http2 header value");
return NGX_ERROR;
}
len += 1 + NGX_HTTP_V2_INT_OCTETS + key_len
+ NGX_HTTP_V2_INT_OCTETS + val_len;
@@ -843,6 +873,20 @@ ngx_http_grpc_create_request(ngx_http_request_t *r)
continue;
}
if (header[i].key.len > NGX_HTTP_V2_MAX_FIELD) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"too long http2 header name: \"%V\"",
&header[i].key);
return NGX_ERROR;
}
if (header[i].value.len > NGX_HTTP_V2_MAX_FIELD) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"too long http2 header value: \"%V: %V\"",
&header[i].key, &header[i].value);
return NGX_ERROR;
}
len += 1 + NGX_HTTP_V2_INT_OCTETS + header[i].key.len
+ NGX_HTTP_V2_INT_OCTETS + header[i].value.len;
src/http/modules/ngx_http_proxy_v2_module.c
+44
View File
@@ -379,6 +379,12 @@ ngx_http_proxy_v2_create_request(ngx_http_request_t *r)
tmp_len = 0;
} else {
if (method.len > NGX_HTTP_V2_MAX_FIELD) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"too long http2 method: \"%V\"", &method);
return NGX_ERROR;
}
len += 1 + NGX_HTTP_V2_INT_OCTETS + method.len;
tmp_len = method.len;
}
@@ -419,6 +425,12 @@ ngx_http_proxy_v2_create_request(ngx_http_request_t *r)
return NGX_ERROR;
}
if (uri_len > NGX_HTTP_V2_MAX_FIELD) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"too long http2 URI");
return NGX_ERROR;
}
len += 1 + NGX_HTTP_V2_INT_OCTETS + uri_len;
if (tmp_len < uri_len) {
@@ -430,6 +442,12 @@ ngx_http_proxy_v2_create_request(ngx_http_request_t *r)
host = &ctx->ctx.vars.host_header;
if (!plcf->host_set) {
if (host->len > NGX_HTTP_V2_MAX_FIELD) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"too long http2 host: \"%V\"", host);
return NGX_ERROR;
}
len += 1 + NGX_HTTP_V2_INT_OCTETS + host->len;
if (tmp_len < host->len) {
@@ -483,6 +501,18 @@ ngx_http_proxy_v2_create_request(ngx_http_request_t *r)
continue;
}
if (key_len > NGX_HTTP_V2_MAX_FIELD) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"too long http2 header name");
return NGX_ERROR;
}
if (val_len > NGX_HTTP_V2_MAX_FIELD) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"too long http2 header value");
return NGX_ERROR;
}
len += 1 + NGX_HTTP_V2_INT_OCTETS + key_len
+ NGX_HTTP_V2_INT_OCTETS + val_len;
@@ -517,6 +547,20 @@ ngx_http_proxy_v2_create_request(ngx_http_request_t *r)
continue;
}
if (header[i].key.len > NGX_HTTP_V2_MAX_FIELD) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"too long http2 header name: \"%V\"",
&header[i].key);
return NGX_ERROR;
}
if (header[i].value.len > NGX_HTTP_V2_MAX_FIELD) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"too long http2 header value: \"%V: %V\"",
&header[i].key, &header[i].value);
return NGX_ERROR;
}
len += 1 + NGX_HTTP_V2_INT_OCTETS + header[i].key.len
+ NGX_HTTP_V2_INT_OCTETS + header[i].value.len;