Skip to content

Validate gRPC HPACK request fields #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xintenseapple wants to merge 1 commit into
base: default
Choose a base branch
from
Open

Validate gRPC HPACK request fields #37

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 48 additions & 1 deletion src/http/modules/ngx_http_grpc_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,6 +742,13 @@ 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_CRIT, r->connection->log, 0,
"too long grpc request 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;
}
Expand All @@ -759,7 +766,14 @@ ngx_http_grpc_create_request(ngx_http_request_t *r)
} else {
escape = 2 * ngx_escape_uri(NULL, r->uri.data, r->uri.len,
NGX_ESCAPE_URI);
uri_len = r->uri.len + escape + sizeof("?") - 1 + r->args.len;
uri_len = r->uri.len + escape
+ (r->args.len ? sizeof("?") - 1 + r->args.len : 0);
}

if (uri_len > NGX_HTTP_V2_MAX_FIELD) {
ngx_log_error(NGX_LOG_CRIT, r->connection->log, 0,
"too long grpc request path");
return NGX_ERROR;
}

len += 1 + NGX_HTTP_V2_INT_OCTETS + uri_len;
Expand All @@ -771,6 +785,13 @@ 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_CRIT, r->connection->log, 0,
"too long grpc request authority: \"%V\"",
&ctx->host);
return NGX_ERROR;
}

len += 1 + NGX_HTTP_V2_INT_OCTETS + ctx->host.len;

if (tmp_len < ctx->host.len) {
Expand Down Expand Up @@ -801,6 +822,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_CRIT, r->connection->log, 0,
"too long grpc request header name");
return NGX_ERROR;
}

if (val_len > NGX_HTTP_V2_MAX_FIELD) {
ngx_log_error(NGX_LOG_CRIT, r->connection->log, 0,
"too long grpc request header value");
return NGX_ERROR;
}

len += 1 + NGX_HTTP_V2_INT_OCTETS + key_len
+ NGX_HTTP_V2_INT_OCTETS + val_len;

Expand Down Expand Up @@ -835,6 +868,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_CRIT, r->connection->log, 0,
"too long grpc request header name: \"%V\"",
&header[i].key);
return NGX_ERROR;
}

if (header[i].value.len > NGX_HTTP_V2_MAX_FIELD) {
ngx_log_error(NGX_LOG_CRIT, r->connection->log, 0,
"too long grpc request 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;

Expand Down