Don't overwrite WWW-Authenticate. Fixes #38.

sabre-io · Dec 7, 2014 · 5b6653b · 5b6653b
1 parent 5bc28e4
commit 5b6653b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -5,7 +5,9 @@ ChangeLog
 ------------------
 
 * Hiding `Authorization` header value from `Request::__toString`.
-
+* #38: The Authentication helpers no longer overwrite any existing
+  `WWW-Authenticate` headers, but instead append new headers. This ensures
+  that multiple authentication systems can exist in the same environment.
 
 3.0.2 (2014-10-09)
 ------------------

diff --git a/lib/Auth/AWS.php b/lib/Auth/AWS.php
@@ -141,7 +141,7 @@ function validate($secretKey) {
      */
     function requireLogin() {
 
-        $this->response->setHeader('WWW-Authenticate','AWS');
+        $this->response->addHeader('WWW-Authenticate','AWS');
         $this->response->setStatus(401);
 
     }

diff --git a/lib/Auth/Basic.php b/lib/Auth/Basic.php
@@ -49,7 +49,7 @@ function getCredentials() {
      */
     function requireLogin() {
 
-        $this->response->setHeader('WWW-Authenticate','Basic realm="' . $this->realm . '"');
+        $this->response->addHeader('WWW-Authenticate','Basic realm="' . $this->realm . '"');
         $this->response->setStatus(401);
 
     }

diff --git a/lib/Auth/Digest.php b/lib/Auth/Digest.php
@@ -182,7 +182,7 @@ function requireLogin() {
                 break;
         }
 
-        $this->response->setHeader('WWW-Authenticate','Digest realm="' . $this->realm . '",qop="'.$qop.'",nonce="' . $this->nonce . '",opaque="' . $this->opaque . '"');
+        $this->response->addHeader('WWW-Authenticate','Digest realm="' . $this->realm . '",qop="'.$qop.'",nonce="' . $this->nonce . '",opaque="' . $this->opaque . '"');
         $this->response->setStatus(401);
 
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -182,7 +182,7 @@ function requireLogin() { @@
                     break;
             }
-            $this->response->setHeader('WWW-Authenticate','Digest realm="' . $this->realm . '",qop="'.$qop.'",nonce="' . $this->nonce . '",opaque="' . $this->opaque . '"');
+            $this->response->addHeader('WWW-Authenticate','Digest realm="' . $this->realm . '",qop="'.$qop.'",nonce="' . $this->nonce . '",opaque="' . $this->opaque . '"');
             $this->response->setStatus(401);
         }
@@ Expand Down @@