Commit a5a92f29 authored by xjm's avatar xjm

SA-CORE-2019-005 by samuel.mortenson, alexpott, MichaelCu, larowlan, mlhess, xjm

parent 471af00d
......@@ -1483,16 +1483,16 @@
},
{
"name": "symfony/dependency-injection",
"version": "v3.4.14",
"version": "v3.4.26",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
"reference": "1c0e679e522591fd744fdf242fec41a43d62b2b1"
"reference": "dee85a9148399cdb2731603802842bcfd8afe5ab"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/1c0e679e522591fd744fdf242fec41a43d62b2b1",
"reference": "1c0e679e522591fd744fdf242fec41a43d62b2b1",
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/dee85a9148399cdb2731603802842bcfd8afe5ab",
"reference": "dee85a9148399cdb2731603802842bcfd8afe5ab",
"shasum": ""
},
"require": {
......@@ -1550,7 +1550,7 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com",
"time": "2018-07-29T15:19:31+00:00"
"time": "2019-04-16T11:13:42+00:00"
},
{
"name": "symfony/event-dispatcher",
......@@ -1617,16 +1617,16 @@
},
{
"name": "symfony/http-foundation",
"version": "v3.4.14",
"version": "v3.4.26",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
"reference": "19a3267828046a2a4a05e3dc2954bbd2e0ad9fa6"
"reference": "90454ad44c95d75faf3507d56388056001b74baf"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/19a3267828046a2a4a05e3dc2954bbd2e0ad9fa6",
"reference": "19a3267828046a2a4a05e3dc2954bbd2e0ad9fa6",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/90454ad44c95d75faf3507d56388056001b74baf",
"reference": "90454ad44c95d75faf3507d56388056001b74baf",
"shasum": ""
},
"require": {
......@@ -1667,7 +1667,7 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
"time": "2018-08-01T14:04:26+00:00"
"time": "2019-04-17T14:51:18+00:00"
},
{
"name": "symfony/http-kernel",
......@@ -3411,12 +3411,12 @@
"version": "v1.6.5",
"source": {
"type": "git",
"url": "https://github.com/mikey179/vfsStream.git",
"url": "https://github.com/bovigo/vfsStream.git",
"reference": "d5fec95f541d4d71c4823bb5e30cf9b9e5b96145"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mikey179/vfsStream/zipball/d5fec95f541d4d71c4823bb5e30cf9b9e5b96145",
"url": "https://api.github.com/repos/bovigo/vfsStream/zipball/d5fec95f541d4d71c4823bb5e30cf9b9e5b96145",
"reference": "d5fec95f541d4d71c4823bb5e30cf9b9e5b96145",
"shasum": ""
},
......
......@@ -20,9 +20,9 @@
"php": "^5.5.9|>=7.0.8",
"symfony/class-loader": "~3.4.0",
"symfony/console": "~3.4.0",
"symfony/dependency-injection": "~3.4.0",
"symfony/dependency-injection": "~3.4.26",
"symfony/event-dispatcher": "~3.4.0",
"symfony/http-foundation": "~3.4.14",
"symfony/http-foundation": "~3.4.26",
"symfony/http-kernel": "~3.4.14",
"symfony/routing": "~3.4.0",
"symfony/serializer": "~3.4.0",
......
......@@ -216,7 +216,7 @@ public function regenerate($destroy = FALSE, $lifetime = NULL) {
throw new \InvalidArgumentException('The optional parameters $destroy and $lifetime of SessionManager::regenerate() are not supported currently');
}
if ($this->isStarted()) {
if ($this->started) {
$old_session_id = $this->getId();
}
session_id(Crypt::randomBytesBase64());
......@@ -230,7 +230,7 @@ public function regenerate($destroy = FALSE, $lifetime = NULL) {
$this->migrateStoredSession($old_session_id);
}
if (!$this->isStarted()) {
if (!$this->started) {
// Start the session when it doesn't exist yet.
$this->startNow();
}
......@@ -338,4 +338,19 @@ protected function migrateStoredSession($old_session_id) {
->execute();
}
/**
* Checks if the session is started.
*
* Beginning with symfony/http-foundation 3.4.24, the session will no longer
* save unless this method returns true. The parent method returns true if
* $this->started is true, but we need the session to also save if we lazy
* started, so we override isStarted() here.
*
* @return bool
* True if started, false otherwise
*/
public function isStarted() {
return parent::isStarted() || $this->startedLazy;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment