Merge branch 'sprain-master'

Author: dbu

doc/symfony-cache-configuration.rst

@@ -118,9 +118,10 @@ User Context
 ~~~~~~~~~~~~
 
 To support :doc:`user context hashing <user-context>` you need to register the
-``UserContextSubscriber``. If the default settings are right for you, you don't
-need to do anything more. You can customize a number of options through the
-constructor:
+``UserContextSubscriber``. The user context is then automatically recognized
+based on session cookies or authorization headers. If the default settings are
+right for you, you don't need to do anything more. You can customize a number of
+options through the constructor:
 
 * **anonymous_hash**: Hash used for anonymous user. This is a performance
   optimization to not do a backend request for users that are not logged in.
@@ -160,6 +161,16 @@ constructor:
     user context hash for every users, or not having it cached at all, which
     hurts performance.
 
+.. note::
+
+    To use authorization headers for user context, you might have to add some server
+    configuration to make these headers available to PHP.
+
+    With Apache, you can do this for example in a ``.htaccess`` file:
+
+        RewriteEngine On
+        RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+
 Cleaning the Cookie Header
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 

src/SymfonyCache/UserContextSubscriber.php

@@ -130,7 +130,10 @@ protected function cleanupHashLookupRequest(Request $hashLookupRequest, Request
                 $hashLookupRequest->cookies->set($name, $value);
             }
         }
-        $hashLookupRequest->headers->set('Cookie', http_build_query($sessionIds, '', '; '));
+
+        if (count($sessionIds) > 0) {
+            $hashLookupRequest->headers->set('Cookie', http_build_query($sessionIds, '', '; '));
+        }
     }
 
     /**
@@ -180,6 +183,16 @@ private function getUserHash(HttpKernelInterface $kernel, Request $request)
      */
     private function isAnonymous(Request $request)
     {
+        // You might have to enable rewriting of the Authorization header in your server config or .htaccess:
+        // RewriteEngine On
+        // RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+        if ($request->server->has('AUTHORIZATION') ||
+            $request->server->has('HTTP_AUTHORIZATION') ||
+            $request->server->has('PHP_AUTH_USER')
+        ) {
+            return false;
+        }
+
         foreach ($request->cookies as $name => $value) {
             if ($this->isSessionName($name)) {
                 return false;

tests/Unit/SymfonyCache/UserContextSubscriberTest.php

@@ -160,6 +160,7 @@ public function testUserHashUserWithSession($arg, $options)
                     $request->getMethod();
                     $request->getPathInfo();
                     $that->assertEquals($hashRequest, $request);
+                    $that->assertCount(2, $request->cookies->all());
 
                     return true;
                 }),
@@ -177,6 +178,54 @@ public function testUserHashUserWithSession($arg, $options)
         $this->assertSame($expectedContextHash, $request->headers->get($options['user_hash_header']));
     }
 
+    /**
+     * @dataProvider provideConfigOptions
+     */
+    public function testUserHashUserWithAuthorizationHeader($arg, $options)
+    {
+        $userContextSubscriber = new UserContextSubscriber($arg);
+
+        // The foo cookie should not be available in the eventual hash request anymore
+        $request = Request::create('/foo', 'GET', array(), array('foo' => 'bar'), array(), array('HTTP_AUTHORIZATION' => 'foo'));
+
+        $hashRequest = Request::create($options['user_hash_uri'], $options['user_hash_method'], array(), array(), array(), $request->server->all());
+        $hashRequest->attributes->set('internalRequest', true);
+        $hashRequest->headers->set('Accept', $options['user_hash_accept_header']);
+
+        // Ensure request properties have been filled up.
+        $hashRequest->getPathInfo();
+        $hashRequest->getMethod();
+
+        $expectedContextHash = 'my_generated_hash';
+        $hashResponse = new Response();
+        $hashResponse->headers->set($options['user_hash_header'], $expectedContextHash );
+
+        $that = $this;
+        $this->kernel
+            ->expects($this->once())
+            ->method('handle')
+            ->with(
+                $this->callback(function (Request $request) use ($that, $hashRequest) {
+                    // we need to call some methods to get the internal fields initialized
+                    $request->getMethod();
+                    $request->getPathInfo();
+                    $that->assertEquals($hashRequest, $request);
+                    $that->assertCount(0, $request->cookies->all());
+
+                    return true;
+                })
+            )
+            ->will($this->returnValue($hashResponse));
+
+        $event = new CacheEvent($this->kernel, $request);
+
+        $userContextSubscriber->preHandle($event);
+        $response = $event->getResponse();
+
+        $this->assertNull($response);
+        $this->assertTrue($request->headers->has($options['user_hash_header']));
+        $this->assertSame($expectedContextHash, $request->headers->get($options['user_hash_header']));
+    }
 
     /**
      * @expectedException \InvalidArgumentException