Skip to content
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

Do not allocate new strings, add support for HTTP3 #332

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Do not allocate new strings, add support for HTTP3 #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34f84f9
Do not allocate new string when processing HTTP3 request
JakubOnderka Oct 22, 2024
3aa6dca
Do not allocate new string for common HTTP methods
JakubOnderka Oct 22, 2024
037f3e7
Add support for HTTP 3.0 as response protocol
JakubOnderka Oct 22, 2024
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
24 changes: 17 additions & 7 deletions src/ngx_http_modsecurity_header_filter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ ngx_http_modsecurity_header_filter(ngx_http_request_t *r)
*/
for (i = 0; ngx_http_modsecurity_headers_out[i].name.len; i++)
{
dd(" Sending header to ModSecurity - header: `%.*s'.",
dd("Sending header to ModSecurity - header: `%.*s'",
(int) ngx_http_modsecurity_headers_out[i].name.len,
ngx_http_modsecurity_headers_out[i].name.data);

Expand Down Expand Up @@ -516,14 +516,24 @@ ngx_http_modsecurity_header_filter(ngx_http_request_t *r)

/*
* NGINX always sends HTTP response with HTTP/1.1, except cases when
* HTTP V2 module is enabled, and request has been posted with HTTP/2.0.
* HTTP V2 module is enabled, and request has been posted with HTTP/2.0
* or when using HTTP V3
*/
http_response_ver = "HTTP 1.1";
#if (NGX_HTTP_V2)
if (r->stream) {
http_response_ver = "HTTP 2.0";
}
switch (r->http_version) {
#ifdef NGX_HTTP_VERSION_30
case NGX_HTTP_VERSION_30 :
http_response_ver = "HTTP 3.0";
break;
#endif
#ifdef NGX_HTTP_VERSION_20
case NGX_HTTP_VERSION_20 :
http_response_ver = "HTTP 2.0";
break;
#endif
default:
http_response_ver = "HTTP 1.1";
break;
}

old_pool = ngx_http_modsecurity_pcre_malloc_init(r->pool);
msc_process_response_headers(ctx->modsec_transaction, status, http_response_ver);
Expand Down
37 changes: 34 additions & 3 deletions src/ngx_http_modsecurity_rewrite.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,15 @@ ngx_http_modsecurity_rewrite_handler(ngx_http_request_t *r)
case NGX_HTTP_VERSION_11 :
http_version = "1.1";
break;
#if defined(nginx_version) && nginx_version >= 1009005
#ifdef NGX_HTTP_VERSION_20
case NGX_HTTP_VERSION_20 :
http_version = "2.0";
break;
#endif
#ifdef NGX_HTTP_VERSION_30
case NGX_HTTP_VERSION_30 :
http_version = "3.0";
break;
#endif
default :
http_version = ngx_str_to_char(r->http_protocol, r->pool);
Expand All @@ -152,15 +157,41 @@ ngx_http_modsecurity_rewrite_handler(ngx_http_request_t *r)
break;
}

// Do not allocate new string for common methods
const char *n_method;
switch (r->method) {
case NGX_HTTP_GET:
n_method = "GET";
break;
case NGX_HTTP_HEAD:
n_method = "HEAD";
break;
case NGX_HTTP_POST:
n_method = "POST";
break;
case NGX_HTTP_OPTIONS:
n_method = "OPTIONS";
break;
case NGX_HTTP_CONNECT:
n_method = "CONNECT";
break;
default:
n_method = ngx_str_to_char(r->method_name, r->pool);
if (n_method == (char*)-1) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
break;
}

const char *n_uri = ngx_str_to_char(r->unparsed_uri, r->pool);
const char *n_method = ngx_str_to_char(r->method_name, r->pool);
if (n_uri == (char*)-1 || n_method == (char*)-1) {
if (n_uri == (char*)-1) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
if (n_uri == NULL) {
dd("uri is of length zero");
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}

old_pool = ngx_http_modsecurity_pcre_malloc_init(r->pool);
msc_process_uri(ctx->modsec_transaction, n_uri, n_method, http_version);
ngx_http_modsecurity_pcre_malloc_done(old_pool);
Expand Down