Fix cookie decryption when using psr7

cakephp · Aug 14, 2016 · c7704be · c7704be
1 parent 37b9149
commit c7704be
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/src/Http/ResponseTransformer.php b/src/Http/ResponseTransformer.php
@@ -101,7 +101,7 @@ protected static function parseCookies(array $cookieHeader)
             }
 
             list($name, $value) = explode('=', array_shift($parts), 2);
-            $parsed = compact('name', 'value');
+            $parsed = compact('name') + ['value' => urldecode($value)];
 
             foreach ($parts as $part) {
                 if (strpos($part, '=') !== false) {

diff --git a/tests/TestCase/TestSuite/CookieEncryptedUsingControllerTest.php b/tests/TestCase/TestSuite/CookieEncryptedUsingControllerTest.php
@@ -43,6 +43,17 @@ public function setUp()
         DispatcherFactory::add('ControllerFactory');
     }
 
+    /**
+     * tear down.
+     *
+     * @return void
+     */
+    public function tearDown()
+    {
+        parent::tearDown();
+        $this->_useHttpServer = false;
+    }
+
     /**
      * Can encrypt/decrypt the cookie value.
      */
@@ -140,4 +151,14 @@ public function testCanAssertCookieEncryptedWithAnotherEncryptionKey()
         $this->get('/cookie_component_test/set_cookie');
         $this->assertCookieEncrypted('abc', 'NameOfCookie', 'aes', $key);
     }
+
+    /**
+     * Can AssertCookie even if encrypted with the aes when using PSR7 server.
+     */
+    public function testCanAssertCookieEncryptedWithAesWhenUsingPsr7()
+    {
+        $this->_useHttpServer = true;
+        $this->get('/cookie_component_test/set_cookie');
+        $this->assertCookieEncrypted('abc', 'NameOfCookie', 'aes');
+    }
 }
diff --git a/tests/test_app/TestApp/Controller/CookieComponentTestController.php b/tests/test_app/TestApp/Controller/CookieComponentTestController.php
@@ -27,6 +27,8 @@ class CookieComponentTestController extends Controller
         'Cookie',
     ];
 
+    public $autoRender = false;
+
     /**
      * view
      *