[HttpFoundation] Fixed session migration with custom cookie lifetime

Guite · nicolas-grekas · commit 3e824de38556 · 2020-04-05T11:49:47.000+02:00
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
@@ -152,7 +152,7 @@ public function start()
 
         // ok to try and start the session
         if (!session_start()) {
-            throw new \RuntimeException('Failed to start the session');
+            throw new \RuntimeException('Failed to start the session.');
         }
 
         if (null !== $this->emulateSameSite) {
@@ -213,8 +213,10 @@ public function regenerate($destroy = false, $lifetime = null)
             return false;
         }
 
-        if (null !== $lifetime) {
+        if (null !== $lifetime && $lifetime != ini_get('session.cookie_lifetime')) {
+            $this->save();
             ini_set('session.cookie_lifetime', $lifetime);
+            $this->start();
         }
 
         if ($destroy) {
@@ -314,7 +316,7 @@ public function registerBag(SessionBagInterface $bag)
     public function getBag($name)
     {
         if (!isset($this->bags[$name])) {
-            throw new \InvalidArgumentException(sprintf('The SessionBagInterface %s is not registered.', $name));
+            throw new \InvalidArgumentException(sprintf('The SessionBagInterface "%s" is not registered.', $name));
         }
 
         if (!$this->started && $this->saveHandler->isActive()) {
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
@@ -123,6 +123,19 @@ public function testRegenerateDestroy()
         $this->assertEquals(11, $storage->getBag('attributes')->get('legs'));
     }
 
+    public function testRegenerateWithCustomLifetime()
+    {
+        $storage = $this->getStorage();
+        $storage->start();
+        $id = $storage->getId();
+        $lifetime = 999999;
+        $storage->getBag('attributes')->set('legs', 11);
+        $storage->regenerate(false, $lifetime);
+        $this->assertNotEquals($id, $storage->getId());
+        $this->assertEquals(11, $storage->getBag('attributes')->get('legs'));
+        $this->assertEquals($lifetime, ini_get('session.cookie_lifetime'));
+    }
+
     public function testSessionGlobalIsUpToDateAfterIdRegeneration()
     {
         $storage = $this->getStorage();

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ public function start()`
`152`	`152`
`153`	`153`	`// ok to try and start the session`
`154`	`154`	`if (!session_start()) {`
`155`		`- throw new \RuntimeException('Failed to start the session');`
	`155`	`+ throw new \RuntimeException('Failed to start the session.');`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`if (null !== $this->emulateSameSite) {`
`@@ -213,8 +213,10 @@ public function regenerate($destroy = false, $lifetime = null)`
`213`	`213`	`return false;`
`214`	`214`	`}`
`215`	`215`
`216`		`- if (null !== $lifetime) {`
	`216`	`+ if (null !== $lifetime && $lifetime != ini_get('session.cookie_lifetime')) {`
	`217`	`+ $this->save();`
`217`	`218`	`ini_set('session.cookie_lifetime', $lifetime);`
	`219`	`+ $this->start();`
`218`	`220`	`}`
`219`	`221`
`220`	`222`	`if ($destroy) {`
`@@ -314,7 +316,7 @@ public function registerBag(SessionBagInterface $bag)`
`314`	`316`	`public function getBag($name)`
`315`	`317`	`{`
`316`	`318`	`if (!isset($this->bags[$name])) {`
`317`		`- throw new \InvalidArgumentException(sprintf('The SessionBagInterface %s is not registered.', $name));`
	`319`	`+ throw new \InvalidArgumentException(sprintf('The SessionBagInterface "%s" is not registered.', $name));`
`318`	`320`	`}`
`319`	`321`
`320`	`322`	`if (!$this->started && $this->saveHandler->isActive()) {`