www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

mod_proxy: Fix selection of ProxyPassMatch workers with host/port substitution. PR 69233.

Browse Source 
With "ProxyPassMatch ^/([^/]+)/(.*)$ https://$1/$2", ap_proxy_get_worker_ex()
should not consider the length of scheme://host part of the given URL because
of the globbing match on the host part.

Fix it by setting worker->s>is_host_matchable when creating a worker with host
substitution and avoiding the min_match check in worker_matches() in this case.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919617 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2024-08-01 11:35:26 +00:00
parent 0838e04da4
commit 2f1f9c5df0
4 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
changes-entries/bz69233.txt Normal file
View File

@@ -0,0 +1,2 @@
*) mod_proxy: Fix selection of ProxyPassMatch workers with substitution
in the host name or port. PR 69233. [Yann Ylavic]

3
include/ap_mmn.h
View File

@@ -731,6 +731,7 @@
* and AP_REQUEST_TRUSTED_CT BNOTE. * and AP_REQUEST_TRUSTED_CT BNOTE.
* 20211221.24 (2.5.1-dev) Add ap_proxy_fixup_uds_filename() * 20211221.24 (2.5.1-dev) Add ap_proxy_fixup_uds_filename()
* 20211221.25 (2.5.1-dev) AP_SLASHES and AP_IS_SLASH * 20211221.25 (2.5.1-dev) AP_SLASHES and AP_IS_SLASH
* 20211221.26 (2.5.1-dev) Add is_host_matchable to proxy_worker_shared
*/ */
#define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */ #define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */
@@ -738,7 +739,7 @@
#ifndef MODULE_MAGIC_NUMBER_MAJOR #ifndef MODULE_MAGIC_NUMBER_MAJOR
#define MODULE_MAGIC_NUMBER_MAJOR 20211221 #define MODULE_MAGIC_NUMBER_MAJOR 20211221
#endif #endif
#define MODULE_MAGIC_NUMBER_MINOR 25 /* 0...n */ #define MODULE_MAGIC_NUMBER_MINOR 26 /* 0...n */
/** /**
* Determine if the server's current MODULE_MAGIC_NUMBER is at least a * Determine if the server's current MODULE_MAGIC_NUMBER is at least a

1
modules/proxy/mod_proxy.h
View File

@@ -492,6 +492,7 @@ typedef struct {
unsigned int disablereuse_set:1; unsigned int disablereuse_set:1;
unsigned int was_malloced:1; unsigned int was_malloced:1;
unsigned int is_name_matchable:1; unsigned int is_name_matchable:1;
unsigned int is_host_matchable:1;
unsigned int response_field_size_set:1; unsigned int response_field_size_set:1;
unsigned int address_ttl_set:1; unsigned int address_ttl_set:1;
apr_int32_t address_ttl; /* backend address' TTL (seconds) */ apr_int32_t address_ttl; /* backend address' TTL (seconds) */

30
modules/proxy/proxy_util.c
View File

@@ -1832,23 +1832,26 @@ static int ap_proxy_strcmp_ematch(const char *str, const char *expected)
return 0; return 0;
} }
static APR_INLINE static int worker_matches(proxy_worker *worker,
int worker_matches(proxy_worker *worker, const char *url, apr_size_t url_len,
const char *url, apr_size_t url_len, apr_size_t min_match, apr_size_t *max_match,
apr_size_t min_match, apr_size_t *max_match, unsigned int mask)
unsigned int mask)
{ {
apr_size_t name_len = strlen(worker->s->name); apr_size_t name_len = strlen(worker->s->name);
int name_match = worker->s->is_name_matchable;
if (name_len <= url_len if (name_len <= url_len
&& name_len >= min_match
&& name_len > *max_match && name_len > *max_match
&& ((name_match /* min_match is the length of the scheme://host part only of url,
&& (mask & AP_PROXY_WORKER_IS_MATCH) * so it's used as a fast path to avoid the match when url is too
&& !ap_proxy_strcmp_ematch(url, worker->s->name)) * small, but it's irrelevant when the worker host contains globs
|| (!name_match * (i.e. ->is_host_matchable).
&& (mask & AP_PROXY_WORKER_IS_PREFIX) */
&& !strncmp(url, worker->s->name, name_len)))) { && (worker->s->is_name_matchable
? ((mask & AP_PROXY_WORKER_IS_MATCH)
&& (worker->s->is_host_matchable || name_len >= min_match)
&& !ap_proxy_strcmp_ematch(url, worker->s->name))
: ((mask & AP_PROXY_WORKER_IS_PREFIX)
&& (name_len >= min_match)
&& !strncmp(url, worker->s->name, name_len)))) {
*max_match = name_len; *max_match = name_len;
return 1; return 1;
} }
@@ -2139,6 +2142,7 @@ PROXY_DECLARE(char *) ap_proxy_define_worker_ex(apr_pool_t *p,
wshared->was_malloced = (mask & AP_PROXY_WORKER_IS_MALLOCED) != 0; wshared->was_malloced = (mask & AP_PROXY_WORKER_IS_MALLOCED) != 0;
if (mask & AP_PROXY_WORKER_IS_MATCH) { if (mask & AP_PROXY_WORKER_IS_MATCH) {
wshared->is_name_matchable = 1; wshared->is_name_matchable = 1;
wshared->is_host_matchable = (address_not_reusable != 0);
/* Before AP_PROXY_WORKER_IS_MATCH (< 2.4.47), a regex worker with /* Before AP_PROXY_WORKER_IS_MATCH (< 2.4.47), a regex worker with
* dollar substitution was never matched against any actual URL, thus * dollar substitution was never matched against any actual URL, thus