Skip to content

Commit 61c8b78

Browse files
nielsdosbukka
authored andcommitted
Apache only generates REDIRECT_STATUS, so explicitly check for that if the server name is Apache, don't allow other variable names. Furthermore, redirect.so and Netscape no longer exist, so remove those entries as we can't check their server name anymore. We now also check for the configuration override *first* such that it always take precedence. This would allow for a mitigation path if something like this happens in the future.
1 parent 1c9f4d1 commit 61c8b78

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

sapi/cgi/cgi_main.c

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1885,18 +1885,17 @@ int main(int argc, char *argv[])
18851885

18861886
/* check force_cgi after startup, so we have proper output */
18871887
if (cgi && CGIG(force_redirect)) {
1888-
/* Apache will generate REDIRECT_STATUS,
1889-
* Netscape and redirect.so will generate HTTP_REDIRECT_STATUS.
1890-
* redirect.so and installation instructions available from
1891-
* http://www.koehntopp.de/php.
1892-
* -- kk@netuse.de
1893-
*/
1894-
if (!getenv("REDIRECT_STATUS") &&
1895-
!getenv ("HTTP_REDIRECT_STATUS") &&
1896-
/* this is to allow a different env var to be configured
1897-
* in case some server does something different than above */
1898-
(!CGIG(redirect_status_env) || !getenv(CGIG(redirect_status_env)))
1899-
) {
1888+
/* This is to allow a different environment variable to be configured
1889+
* in case the we cannot auto-detect which environment variable to use.
1890+
* Checking this first to allow user overrides in case the environment
1891+
* variable can be set by an untrusted party. */
1892+
const char *redirect_status_env = CGIG(redirect_status_env);
1893+
if (!redirect_status_env) {
1894+
/* Apache will generate REDIRECT_STATUS. */
1895+
redirect_status_env = "REDIRECT_STATUS";
1896+
}
1897+
1898+
if (!getenv(redirect_status_env)) {
19001899
zend_try {
19011900
SG(sapi_headers).http_response_code = 400;
19021901
PUTS("<b>Security Alert!</b> The PHP CGI cannot be accessed directly.\n\n\

0 commit comments

Comments
 (0)