From 6141d5aa3f5cf8f1b89472e7fdb66578810d0ae3 Mon Sep 17 00:00:00 2001 From: Eric Covener Date: Wed, 21 Apr 2021 01:02:11 +0000 Subject: [PATCH] legacy default slash-matching behavior w/ 'MergeSlashes OFF' git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1889036 13f79535-47bb-0310-9956-ffa450edef68 Upstream-Status: Backport CVE: CVE-2021-30641 Reference to upstream patch: https://httpd.apache.org/security/vulnerabilities_24.html#CVE-2021-30641 https://github.com/apache/httpd/commit/6141d5aa3f5cf8f1b89472e7fdb66578810d0ae3 Signed-off-by: Li Wang --- server/request.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/server/request.c b/server/request.c index d5c558a..18625af 100644 --- a/server/request.c +++ b/server/request.c @@ -1419,7 +1419,20 @@ AP_DECLARE(int) ap_location_walk(request_rec *r) cache = prep_walk_cache(AP_NOTE_LOCATION_WALK, r); cached = (cache->cached != NULL); - entry_uri = r->uri; + + /* + * When merge_slashes is set to AP_CORE_CONFIG_OFF the slashes in r->uri + * have not been merged. But for Location walks we always go with merged + * slashes no matter what merge_slashes is set to. + */ + if (sconf->merge_slashes != AP_CORE_CONFIG_OFF) { + entry_uri = r->uri; + } + else { + char *uri = apr_pstrdup(r->pool, r->uri); + ap_no2slash(uri); + entry_uri = uri; + } /* If we have an cache->cached location that matches r->uri, * and the vhost's list of locations hasn't changed, we can skip @@ -1486,7 +1499,7 @@ AP_DECLARE(int) ap_location_walk(request_rec *r) pmatch = apr_palloc(rxpool, nmatch*sizeof(ap_regmatch_t)); } - if (ap_regexec(entry_core->r, entry_uri, nmatch, pmatch, 0)) { + if (ap_regexec(entry_core->r, r->uri, nmatch, pmatch, 0)) { continue; } @@ -1496,7 +1509,7 @@ AP_DECLARE(int) ap_location_walk(request_rec *r) apr_table_setn(r->subprocess_env, ((const char **)entry_core->refs->elts)[i], apr_pstrndup(r->pool, - entry_uri + pmatch[i].rm_so, + r->uri + pmatch[i].rm_so, pmatch[i].rm_eo - pmatch[i].rm_so)); } } -- 2.7.4