Deduplicate user/password extraction from alternative HTTP headers.

diff --git a/lib/base.php b/lib/base.php
index 840d904471175b0d1f6f22d7b7fd677fd8a2804f..95e3a30cdeef5b95eb0de9a7eb4f270ff0fd6c7f 100644 (file)
--- a/lib/base.php
+++ b/lib/base.php
@@ -477,22 +477,20 @@ class OC {
                        $_SERVER['HTTP_AUTHORIZATION'] = $_SERVER['HTTP_XAUTHORIZATION'];
                }
 
-               //set http auth headers for apache+php-cgi work around
-               if (isset($_SERVER['HTTP_AUTHORIZATION'])
-                       && preg_match('/Basic\s+(.*)$/i', $_SERVER['HTTP_AUTHORIZATION'], $matches)
-               ) {
-                       list($name, $password) = explode(':', base64_decode($matches[1]), 2);
-                       $_SERVER['PHP_AUTH_USER'] = strip_tags($name);
-                       $_SERVER['PHP_AUTH_PW'] = strip_tags($password);
-               }
-
-               //set http auth headers for apache+php-cgi work around if variable gets renamed by apache
-               if (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION'])
-                       && preg_match('/Basic\s+(.*)$/i', $_SERVER['REDIRECT_HTTP_AUTHORIZATION'], $matches)
-               ) {
-                       list($name, $password) = explode(':', base64_decode($matches[1]), 2);
-                       $_SERVER['PHP_AUTH_USER'] = strip_tags($name);
-                       $_SERVER['PHP_AUTH_PW'] = strip_tags($password);
+               // Extract PHP_AUTH_USER/PHP_AUTH_PW from other headers if necessary.
+               $httpAuthHeaderServerVars = array(
+                       'HTTP_AUTHORIZATION', // apache+php-cgi work around
+                       'REDIRECT_HTTP_AUTHORIZATION', // apache+php-cgi alternative
+               );
+               foreach ($httpAuthHeaderServerVars as $httpAuthHeaderServerVar) {
+                       if (isset($_SERVER[$httpAuthHeaderServerVar])
+                               && preg_match('/Basic\s+(.*)$/i', $_SERVER[$httpAuthHeaderServerVar], $matches)
+                       ) {
+                               list($name, $password) = explode(':', base64_decode($matches[1]), 2);
+                               $_SERVER['PHP_AUTH_USER'] = strip_tags($name);
+                               $_SERVER['PHP_AUTH_PW'] = strip_tags($password);
+                               break;
+                       }
                }
 
                self::initPaths();