Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Forwardport] Fix unstable session manager #17608

Merged
merged 7 commits into from
Sep 12, 2018
Merged

[Forwardport] Fix unstable session manager #17608

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
eee587b
Fix unstable session manager
elioermini May 3, 2018
3828ac5
removed empty line
elioermini May 4, 2018
ac42b70
amended variable naming
elioermini May 4, 2018
5b6e78e
Suppress code standard warning
elioermini May 9, 2018
e688b8a
Update from review
elioermini May 10, 2018
f53cfd7
Fixed minor issues
Aug 8, 2018
bc15e1a
Fixed static test failure
Aug 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 38 additions & 1 deletion lib/internal/Magento/Framework/Session/SessionManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,21 @@ public function start()
// Need to apply the config options so they can be ready by session_start
$this->initIniOptions();
$this->registerSaveHandler();
if (isset($_SESSION['new_session_id'])) {
// Not fully expired yet. Could be lost cookie by unstable network.
session_commit();
session_id($_SESSION['new_session_id']);
}
$sid = $this->sidResolver->getSid($this);
// potential custom logic for session id (ex. switching between hosts)
$this->setSessionId($sid);
session_start();
if (isset($_SESSION['destroyed'])
&& $_SESSION['destroyed'] < time() - $this->sessionConfig->getCookieLifetime()
) {
$this->destroy(['clear_storage' => true]);
}

$this->validator->validate($this);
$this->renewCookie($sid);

Expand Down Expand Up @@ -498,7 +509,33 @@ public function regenerateId()
return $this;
}

$this->isSessionExists() ? session_regenerate_id(true) : session_start();
if ($this->isSessionExists()) {
// Regenerate the session
session_regenerate_id();
$newSessionId = session_id();
$_SESSION['new_session_id'] = $newSessionId;

// Set destroy timestamp
$_SESSION['destroyed'] = time();

// Write and close current session;
session_commit();

// Called after destroy()
$oldSession = $_SESSION;

// Start session with new session ID
session_id($newSessionId);
session_start();
$_SESSION = $oldSession;

// New session does not need them
unset($_SESSION['destroyed']);
unset($_SESSION['new_session_id']);
} else {
session_start();
}

$this->storage->init(isset($_SESSION) ? $_SESSION : []);

if ($this->sessionConfig->getUseCookies()) {
Expand Down