Skip to content

Commit c1c14c8

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 4b9cd27 commit c1c14c8

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
@@ -1910,18 +1910,17 @@ int main(int argc, char *argv[])
19101910

19111911
/* check force_cgi after startup, so we have proper output */
19121912
if (cgi && CGIG(force_redirect)) {
1913-
/* Apache will generate REDIRECT_STATUS,
1914-
* Netscape and redirect.so will generate HTTP_REDIRECT_STATUS.
1915-
* redirect.so and installation instructions available from
1916-
* http://www.koehntopp.de/php.
1917-
1918-
*/
1919-
if (!getenv("REDIRECT_STATUS") &&
1920-
!getenv ("HTTP_REDIRECT_STATUS") &&
1921-
/* this is to allow a different env var to be configured
1922-
* in case some server does something different than above */
1923-
(!CGIG(redirect_status_env) || !getenv(CGIG(redirect_status_env)))
1924-
) {
1913+
/* This is to allow a different environment variable to be configured
1914+
* in case the we cannot auto-detect which environment variable to use.
1915+
* Checking this first to allow user overrides in case the environment
1916+
* variable can be set by an untrusted party. */
1917+
const char *redirect_status_env = CGIG(redirect_status_env);
1918+
if (!redirect_status_env) {
1919+
/* Apache will generate REDIRECT_STATUS. */
1920+
redirect_status_env = "REDIRECT_STATUS";
1921+
}
1922+
1923+
if (!getenv(redirect_status_env)) {
19251924
zend_try {
19261925
SG(sapi_headers).http_response_code = 400;
19271926
PUTS("<b>Security Alert!</b> The PHP CGI cannot be accessed directly.\n\n\

0 commit comments

Comments
 (0)