summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDylan William Hardison <dylan@hardison.net>2017-11-29 18:56:26 +0100
committerDylan William Hardison <dylan@hardison.net>2017-11-29 18:56:35 +0100
commit64ce7cb12deee5f394a869d9ec6b5e46cd2679f0 (patch)
tree1a9fee4fb73e7e948562f9c3396d83d36169c409
parent7d57b38aefe92683d8afe558fde7e1464837baba (diff)
downloadbugzilla-64ce7cb12deee5f394a869d9ec6b5e46cd2679f0.tar.gz
bugzilla-64ce7cb12deee5f394a869d9ec6b5e46cd2679f0.tar.xz
restore old env for unsafe auth
-rw-r--r--Bugzilla/Install/Filesystem.pm2
-rw-r--r--README.rst2
-rwxr-xr-xauth.cgi2
3 files changed, 3 insertions, 3 deletions
diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm
index 4e7ad2302..bb87e499e 100644
--- a/Bugzilla/Install/Filesystem.pm
+++ b/Bugzilla/Install/Filesystem.pm
@@ -106,7 +106,7 @@ sub HTTPD_ENV_CONF {
return join( "\n",
"PerlPassEnv LOCALCONFIG_ENV",
- "PerlPassEnv ALLOW_UNSAFE_AUTH_DELEGATION",
+ "PerlPassEnv BUGZILLA_UNSAFE_AUTH_DELEGATION",
map { "PerlPassEnv " . $_ } ENV_KEYS
) . "\n";
}
diff --git a/README.rst b/README.rst
index ed800b758..86e4dd414 100644
--- a/README.rst
+++ b/README.rst
@@ -173,7 +173,7 @@ PORT
plain-text HTTP connections.
Default: 8000
-ALLOW_UNSAFE_AUTH_DELEGATION
+BUGZILLA_UNSAFE_AUTH_DELEGATION
This should never be set in production. It allows auth delegation over http.
BMO_db_driver
diff --git a/auth.cgi b/auth.cgi
index 6549ed62d..adf5d3475 100755
--- a/auth.cgi
+++ b/auth.cgi
@@ -45,7 +45,7 @@ ThrowUserError("auth_delegation_invalid_description")
my $callback_uri = URI->new($callback);
my $legal_protocol
- = $ENV{ALLOW_UNSAFE_AUTH_DELEGATION}
+ = $ENV{BUGZILLA_UNSAFE_AUTH_DELEGATION}
? qr/^https?$/i # http or https
: qr/^https$/i; # https only