Skip to content

Add HTTP/3 Host header support for ModSecurity #364

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
AMoo-Miki wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add HTTP/3 Host header support for ModSecurity #364

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
22 changes: 20 additions & 2 deletions src/ngx_http_modsecurity_rewrite.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,11 @@ ngx_http_modsecurity_rewrite_handler(ngx_http_request_t *r)
case NGX_HTTP_VERSION_20 :
http_version = "2.0";
break;
#endif
#if defined(nginx_version) && nginx_version >= 1025000
case NGX_HTTP_VERSION_30 :
http_version = "3.0";
break;
#endif
default :
http_version = ngx_str_to_char(r->http_protocol, r->pool);
Expand Down Expand Up @@ -212,9 +217,22 @@ ngx_http_modsecurity_rewrite_handler(ngx_http_request_t *r)
}

/**
* Since incoming request headers are already in place, lets send it to ModSecurity
*
* HTTP/3 uses :authority pseudo-header instead of Host header and nginx
* parses it into r->headers_in.server (see ngx_http_v3_request.c#L982)
* but doesn't add it to the headers list, so ModSecurity never sees it.
* We manually add Host header from r->headers_in.server for ModSecurity
* before processing the remaining headers.
*/
if (strcmp(http_version, "3.0") == 0 && r->headers_in.server.len > 0) {
dd("adding Host header from :authority: %.*s",
(int)r->headers_in.server.len, r->headers_in.server.data);

msc_add_n_request_header(ctx->modsec_transaction,
(const unsigned char *)"Host", 4,
(const unsigned char *)r->headers_in.server.data,
r->headers_in.server.len);
}

ngx_list_part_t *part = &r->headers_in.headers.part;
ngx_table_elt_t *data = part->elts;
ngx_uint_t i = 0;
Expand Down