Skip to content

Fix REQUEST_URI in phase 1 #3512

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
JonathanBerrew wants to merge 4 commits into
base: v2/master
Choose a base branch
from
+31 −12
Open

Fix REQUEST_URI in phase 1 #3512

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c6bbc59
Fix REQUEST_URI in phase 1
JonathanBerrew Mar 18, 2026
ebd2b3e
fix decode query instead of decoding twice uri
JonathanBerrew Apr 16, 2026
d58311a
fix: separate variable declarations in var_request_uri_generate function
JonathanBerrew Apr 29, 2026
5a58c48
fix: separate variable declarations in var_query_string_generate and …
JonathanBerrew Apr 29, 2026
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
43 changes: 31 additions & 12 deletions apache2/re_variables.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,17 +542,19 @@ static int var_request_uri_generate(modsec_rec *msr, msre_var *var, msre_rule *r
{
assert(msr != NULL);
assert(msr->r != NULL);
char *value = NULL;

if (msr->r->parsed_uri.query == NULL) value = msr->r->parsed_uri.path;
else {
value = apr_pstrcat(mptmp, msr->r->parsed_uri.path, "?", msr->r->parsed_uri.query, NULL);
if (!value) {
msr_log(msr, 1, "REQUEST_URI: Memory allocation error");
return -1;
}
char* value = apr_pstrdup(mptmp, msr->r->parsed_uri.path);
int invalid_count;
int changed;
#ifdef REQUEST_EARLY
// Before (real) phase 2, URI value is raw, httpd decodes it in before phase 2
if (msr->phase == 1) urldecode_nonstrict_inplace_ex(value, strlen(value), &invalid_count, &changed);
#endif
// Query is never decoded, so always decode it
if (msr->r->parsed_uri.query != NULL) {
char* query = apr_pstrdup(mptmp, msr->r->parsed_uri.query);
urldecode_nonstrict_inplace_ex(query, strlen(query), &invalid_count, &changed);
value = apr_pstrcat(mptmp, value, "?", query, NULL);
}

return var_simple_generate(var, vartab, mptmp, value);
}

Expand Down Expand Up @@ -2457,7 +2459,15 @@ static int var_query_string_generate(modsec_rec *msr, msre_var *var, msre_rule *
apr_table_t *vartab, apr_pool_t *mptmp)
{
assert(msr != NULL);
return var_simple_generate(var, vartab, mptmp, msr->query_string);
int invalid_count;
int changed;
char* value = "";
// Query is never decoded, so always decode it
if (msr->query_string) {
value = apr_pstrdup(mptmp, msr->query_string);
urldecode_nonstrict_inplace_ex(value, strlen(value), &invalid_count, &changed);
}
return var_simple_generate(var, vartab, mptmp, value);
}

/* REQUEST_BASENAME */
Expand Down Expand Up @@ -2952,7 +2962,16 @@ static int var_request_filename_generate(modsec_rec *msr, msre_var *var, msre_ru
{
assert(msr != NULL);
assert(msr->r != NULL);
return var_simple_generate(var, vartab, mptmp, msr->r->parsed_uri.path);
char* value = apr_pstrdup(mptmp, msr->r->parsed_uri.path);
#ifdef REQUEST_EARLY
// Before (real) phase 2, URI value is raw, httpd decodes it in before phase 2
if (msr->phase == 1) {
int invalid_count;
int changed;
urldecode_nonstrict_inplace_ex(value, strlen(value), &invalid_count, &changed);
}
#endif
return var_simple_generate(var, vartab, mptmp, value);
}

/* REQUEST_LINE */
Expand Down