wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix missing update of session, when it was already used.

Browse source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2016-10-28 11:29:02 +02:00 committed by Lukas Reschke
parent f7d681d038
commit 2cd92d0abb
No known key found for this signature in database
GPG key ID: B9F6980CF6E759B1
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/private/Security/CSRF/TokenStorage/SessionStorage.php
View file

@ -40,6 +40,13 @@ class SessionStorage {
$this->session = $session;
}
/**
* @param ISession $session
*/
public function setSession(ISession $session) {
$this->session = $session;
}
/**
* Returns the current token or throws an exception if none is found.
*

7
lib/private/Server.php
View file

@ -710,13 +710,15 @@ class Server extends ServerContainer implements IServerContainer {
});
$this->registerService('CsrfTokenManager', function (Server $c) {
$tokenGenerator = new CsrfTokenGenerator($c->getSecureRandom());
$sessionStorage = new SessionStorage($c->getSession());
return new CsrfTokenManager(
$tokenGenerator,
$sessionStorage
$c->query(SessionStorage::class)
);
});
$this->registerService(SessionStorage::class, function (Server $c) {
return new SessionStorage($c->getSession());
});
$this->registerService('ContentSecurityPolicyManager', function (Server $c) {
return new ContentSecurityPolicyManager();
});
@ -945,6 +947,7 @@ class Server extends ServerContainer implements IServerContainer {
* @param \OCP\ISession $session
*/
public function setSession(\OCP\ISession $session) {
$this->query(SessionStorage::class)->setSession($session);
return $this->query('UserSession')->setSession($session);
}