[Pkg-owncloud-commits] [php-sabredav] 24/42: Support REDIRECT_REMOTE_USER.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository php-sabredav.

commit 13b29ae16e93c2324713a88d0ffec351461123df
Author: Evert Pot <me at evertpot.com>
Date:   Wed Nov 19 16:17:40 2014 -0500

    Support REDIRECT_REMOTE_USER.
    
    Fixes #558.
---
 lib/DAV/Auth/Backend/Apache.php             |  3 +++
 tests/Sabre/DAV/Auth/Backend/ApacheTest.php | 21 +++++++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/lib/DAV/Auth/Backend/Apache.php b/lib/DAV/Auth/Backend/Apache.php
index 30d4ac0..bc6bb75 100644
--- a/lib/DAV/Auth/Backend/Apache.php
+++ b/lib/DAV/Auth/Backend/Apache.php
@@ -38,6 +38,9 @@ class Apache implements BackendInterface {
 
         $remoteUser = $server->httpRequest->getRawServerValue('REMOTE_USER');
         if (is_null($remoteUser)) {
+            $remoteUser = $server->httpRequest->getRawServerValue('REDIRECT_REMOTE_USER');
+        }
+        if (is_null($remoteUser)) {
             throw new DAV\Exception('We did not receive the $_SERVER[REMOTE_USER] property. This means that apache might have been misconfigured');
         }
 
diff --git a/tests/Sabre/DAV/Auth/Backend/ApacheTest.php b/tests/Sabre/DAV/Auth/Backend/ApacheTest.php
index 2ae44d7..4d04a2a 100644
--- a/tests/Sabre/DAV/Auth/Backend/ApacheTest.php
+++ b/tests/Sabre/DAV/Auth/Backend/ApacheTest.php
@@ -30,9 +30,9 @@ class ApacheTest extends \PHPUnit_Framework_TestCase {
         $backend = new Apache();
 
         $server = new DAV\Server();
-        $request = HTTP\Sapi::createFromServerArray(array(
+        $request = HTTP\Sapi::createFromServerArray([
             'REMOTE_USER' => 'username',
-        ));
+        ]);
         $server->httpRequest = $request;
 
         $this->assertTrue($backend->authenticate($server, 'Realm'));
@@ -43,4 +43,21 @@ class ApacheTest extends \PHPUnit_Framework_TestCase {
 
     }
 
+    function testRedirectRemoteUser() {
+
+        $backend = new Apache();
+
+        $server = new DAV\Server();
+        $request = HTTP\Sapi::createFromServerArray([
+            'REDIRECT_REMOTE_USER' => 'username',
+        ]);
+        $server->httpRequest = $request;
+
+        $this->assertTrue($backend->authenticate($server, 'Realm'));
+
+        $userInfo = 'username';
+
+        $this->assertEquals($userInfo, $backend->getCurrentUser());
+
+    }
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabredav.git