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

Fix proxy-fcgi-pathinfo=full #489

Open
wants to merge 2 commits into
base: 2.4.x
Choose a base branch
from
Open

Fix proxy-fcgi-pathinfo=full #489

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
628711b
mod_proxy_fcgi: Use r->uri rather than r->filename for directory walk.
ylavic Jul 27, 2024
b5e7cf3
mod_proxy_fggi: Follow up to r1919547: Accurate dirwalk for proxy-fcg…
ylavic Oct 10, 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
64 changes: 50 additions & 14 deletions modules/proxy/mod_proxy_fcgi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ typedef struct {
} sei_entry;

typedef struct {
int need_dirwalk;
char *dirwalk_uri_path;
} fcgi_req_config_t;

/* We will assume FPM, but still differentiate */
Expand Down Expand Up @@ -128,12 +128,13 @@ static int proxy_fcgi_canon(request_rec *r, char *url)
rconf = apr_pcalloc(r->pool, sizeof(fcgi_req_config_t));
ap_set_module_config(r->request_config, &proxy_fcgi_module, rconf);
}
rconf->dirwalk_uri_path = NULL;

if (NULL != (pathinfo_type = apr_table_get(r->subprocess_env, "proxy-fcgi-pathinfo"))) {
pathinfo_type = apr_table_get(r->subprocess_env, "proxy-fcgi-pathinfo");
if (pathinfo_type) {
/* It has to be on disk for this to work */
if (!strcasecmp(pathinfo_type, "full")) {
rconf->need_dirwalk = 1;
ap_unescape_url_keep2f(path, 0);
rconf->dirwalk_uri_path = apr_pstrcat(r->pool, "/", url, NULL);
}
else if (!strcasecmp(pathinfo_type, "first-dot")) {
char *split = ap_strchr(path, '.');
Expand Down Expand Up @@ -347,15 +348,45 @@ static apr_status_t send_environment(proxy_conn_rec *conn, request_rec *r,
int next_elem, starting_elem;
fcgi_req_config_t *rconf = ap_get_module_config(r->request_config, &proxy_fcgi_module);
fcgi_dirconf_t *dconf = ap_get_module_config(r->per_dir_config, &proxy_fcgi_module);
char *proxy_filename = r->filename;

/* Resolve SCRIPT_NAME/FILENAME from the filesystem? */
if (rconf && rconf->dirwalk_uri_path) {
char *saved_uri = r->uri;
char *saved_path_info = r->path_info;
char *saved_canonical_filename = r->canonical_filename;
int saved_filetype = r->finfo.filetype;
int i = 0;

r->proxyreq = PROXYREQ_NONE;
do {
r->path_info = NULL;
r->finfo.filetype = APR_NOFILE;
r->uri = r->filename = r->canonical_filename = rconf->dirwalk_uri_path;
/* Try without than with DocumentRoot prefix */
if (i && ap_core_translate(r) != OK) {
continue;
}
ap_directory_walk(r);
} while (r->finfo.filetype != APR_REG && ++i < 2);
r->proxyreq = PROXYREQ_REVERSE;

/* If no actual script was found, fall back to the "proxy:"
* SCRIPT_FILENAME dealt with below or by FPM directly.
*/
if (r->finfo.filetype != APR_REG) {
r->filename = proxy_filename;
r->canonical_filename = saved_canonical_filename;
r->finfo.filetype = saved_filetype;
r->path_info = saved_path_info;
}

if (rconf) {
if (rconf->need_dirwalk) {
ap_directory_walk(r);
}
/* Restore REQUEST_URI in any case */
r->uri = saved_uri;
}

/* Strip proxy: prefixes */
if (r->filename) {
/* Strip "proxy:" prefixes? */
if (r->filename == proxy_filename) {
char *newfname = NULL;

if (!strncmp(r->filename, "proxy:balancer://", 17)) {
Expand All @@ -370,24 +401,29 @@ static apr_status_t send_environment(proxy_conn_rec *conn, request_rec *r,
*/
newfname = apr_pstrdup(r->pool, r->filename+13);
}
/* Query string in environment only */

/* Strip potential query string (nocanon) from SCRIPT_FILENAME
* if it's the same as QUERY_STRING.
*/
if (newfname && r->args && *r->args) {
char *qs = strrchr(newfname, '?');
char *qs = strchr(newfname, '?');
if (qs && !strcmp(qs+1, r->args)) {
*qs = '\0';
}
}
}

if (newfname) {
newfname = ap_strchr(newfname, '/');
r->filename = newfname;
r->filename = ap_strchr(newfname, '/');
}
}

ap_add_common_vars(r);
ap_add_cgi_vars(r);

/* SCRIPT_NAME/FILENAME set, restore original */
r->filename = proxy_filename;

/* XXX are there any FastCGI specific env vars we need to send? */

/* Give admins final option to fine-tune env vars */
Expand Down
Loading