diff options
| author | Ruediger Pluem <rpluem@apache.org> | 2023-04-28 06:20:27 +0000 |
|---|---|---|
| committer | Ruediger Pluem <rpluem@apache.org> | 2023-04-28 06:20:27 +0000 |
| commit | 9b1964bf455910aac9aeea85710ed4d63f941812 (patch) | |
| tree | 90822d3c64b4d8edb2b621847aea5f11cf65f8b1 | |
| parent | 10b15a816da1f4d1ecc4b2c2644ce363214c03c6 (diff) | |
| download | httpd-9b1964bf455910aac9aeea85710ed4d63f941812.tar.gz | |
* In the reverse proxy case when we only want to keep encoded slashes untouched
we can have decoded '%''s in the URI that got sent to us in the original URL
as %25. Don't error out in this case but just fall through and have them
encoded to %25 when forwarding to the backend.
PR: 66580
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1909464 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | changes-entries/pr66580.txt | 3 | ||||
| -rw-r--r-- | modules/proxy/proxy_util.c | 48 |
2 files changed, 32 insertions, 19 deletions
diff --git a/changes-entries/pr66580.txt b/changes-entries/pr66580.txt new file mode 100644 index 0000000000..f011fe79d9 --- /dev/null +++ b/changes-entries/pr66580.txt @@ -0,0 +1,3 @@ + *) mod_proxy: In case that AllowEncodedSlashes is set to NoDecode do not + fail on literal '%' when doing the encoding of the backend URL. + PR 66580 [Ruediger Pluem] diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c index 439e419370..614cdabb35 100644 --- a/modules/proxy/proxy_util.c +++ b/modules/proxy/proxy_util.c @@ -260,26 +260,36 @@ PROXY_DECLARE(char *)ap_proxy_canonenc_ex(apr_pool_t *p, const char *x, int len, */ if ((forcedec || noencslashesenc || (proxyreq && proxyreq != PROXYREQ_REVERSE)) && ch == '%') { - if (!apr_isxdigit(x[i + 1]) || !apr_isxdigit(x[i + 2])) { - return NULL; - } - ch = ap_proxy_hex2c(&x[i + 1]); - if (ch != 0 && strchr(reserved, ch)) { /* keep it encoded */ - y[j++] = x[i++]; - y[j++] = x[i++]; - y[j] = x[i]; - continue; - } - if (noencslashesenc && !forcedec && (proxyreq == PROXYREQ_REVERSE)) { - /* - * In the reverse proxy case when we only want to keep encoded - * slashes untouched revert back to '%' which will cause - * '%' to be encoded in the following. - */ - ch = '%'; + if (apr_isxdigit(x[i + 1]) && apr_isxdigit(x[i + 2])) { + ch = ap_proxy_hex2c(&x[i + 1]); + if (ch != 0 && strchr(reserved, ch)) { /* keep it encoded */ + y[j++] = x[i++]; + y[j++] = x[i++]; + y[j] = x[i]; + continue; + } + if (noencslashesenc && !forcedec && (proxyreq == PROXYREQ_REVERSE)) { + /* + * In the reverse proxy case when we only want to keep encoded + * slashes untouched revert back to '%' which will cause + * '%' to be encoded in the following. + */ + ch = '%'; + } + else { + i += 2; + } } - else { - i += 2; + /* + * In the reverse proxy case when we only want to keep encoded + * slashes untouched we can have decoded '%''s in the URI that got + * sent to us in the original URL as %25. + * Don't error out in this case but just fall through and have them + * encoded to %25 when forwarding to the backend. + */ + else if (!noencslashesenc || forcedec + || (proxyreq && proxyreq != PROXYREQ_REVERSE)) { + return NULL; } } /* recode it, if necessary */ |