mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Write to session in batch at the end of the request

This commit is contained in:
Lukas Reschke 2015-09-08 22:05:36 +02:00
parent e579dd62fd
commit 0b91087489
3 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/private/session/cryptosessiondata.php
View File

@ -38,6 +38,8 @@ class CryptoSessionData implements \ArrayAccess, ISession {
protected $passphrase; protected $passphrase;
/** @var array */ /** @var array */
protected $sessionValues; protected $sessionValues;
/** @var bool */
protected $isModified = false;
CONST encryptedSessionName = 'encrypted_session_data'; CONST encryptedSessionName = 'encrypted_session_data';
/** /**
@ -54,6 +56,13 @@ class CryptoSessionData implements \ArrayAccess, ISession {
$this->initializeSession(); $this->initializeSession();
} }
/**
* Close session if class gets destructed
*/
public function __destruct() {
$this->close();
}
protected function initializeSession() { protected function initializeSession() {
$encryptedSessionData = $this->session->get(self::encryptedSessionName); $encryptedSessionData = $this->session->get(self::encryptedSessionName);
try { try {
@ -74,8 +83,7 @@ class CryptoSessionData implements \ArrayAccess, ISession {
*/ */
public function set($key, $value) { public function set($key, $value) {
$this->sessionValues[$key] = $value; $this->sessionValues[$key] = $value;
$encryptedValue = $this->crypto->encrypt(json_encode($this->sessionValues), $this->passphrase); $this->isModified = true;
$this->session->set(self::encryptedSessionName, $encryptedValue);
} }
/** /**
@ -85,7 +93,6 @@ class CryptoSessionData implements \ArrayAccess, ISession {
* @return string|null Either the value or null * @return string|null Either the value or null
*/ */
public function get($key) { public function get($key) {
if(isset($this->sessionValues[$key])) { if(isset($this->sessionValues[$key])) {
return $this->sessionValues[$key]; return $this->sessionValues[$key];
} }
@ -109,6 +116,7 @@ class CryptoSessionData implements \ArrayAccess, ISession {
* @param string $key * @param string $key
*/ */
public function remove($key) { public function remove($key) {
$this->isModified = true;
unset($this->sessionValues[$key]); unset($this->sessionValues[$key]);
$this->session->remove(self::encryptedSessionName); $this->session->remove(self::encryptedSessionName);
} }
@ -118,13 +126,19 @@ class CryptoSessionData implements \ArrayAccess, ISession {
*/ */
public function clear() { public function clear() {
$this->sessionValues = []; $this->sessionValues = [];
$this->isModified = true;
$this->session->clear(); $this->session->clear();
} }
/** /**
* Close the session and release the lock * Close the session and release the lock, also writes all changed data in batch
*/ */
public function close() { public function close() {
if($this->isModified) {
$encryptedValue = $this->crypto->encrypt(json_encode($this->sessionValues), $this->passphrase);
$this->session->set(self::encryptedSessionName, $encryptedValue);
$this->isModified = false;
}
$this->session->close(); $this->session->close();
} }

8
lib/private/session/internal.php
View File

@ -32,6 +32,10 @@ namespace OC\Session;
* @package OC\Session * @package OC\Session
*/ */
class Internal extends Session { class Internal extends Session {
/**
* @param string $name
* @throws \Exception
*/
public function __construct($name) { public function __construct($name) {
session_name($name); session_name($name);
set_error_handler(array($this, 'trapError')); set_error_handler(array($this, 'trapError'));
@ -42,10 +46,6 @@ class Internal extends Session {
} }
} }
public function __destruct() {
$this->close();
}
/** /**
* @param string $key * @param string $key
* @param integer $value * @param integer $value

9
tests/lib/session/cryptowrappingtest.php
View File

@ -57,15 +57,6 @@ class CryptoWrappingTest extends TestCase {
$this->instance = new CryptoSessionData($this->wrappedSession, $this->crypto, 'PASS'); $this->instance = new CryptoSessionData($this->wrappedSession, $this->crypto, 'PASS');
} }
public function testWrappingSet() {
$unencryptedValue = 'foobar';
$this->wrappedSession->expects($this->once())
->method('set')
->with('encrypted_session_data', $this->crypto->encrypt(json_encode(['encrypted_session_data' => $unencryptedValue])));
$this->instance->set('encrypted_session_data', $unencryptedValue);
}
public function testUnwrappingGet() { public function testUnwrappingGet() {
$unencryptedValue = 'foobar'; $unencryptedValue = 'foobar';
$encryptedValue = $this->crypto->encrypt($unencryptedValue); $encryptedValue = $this->crypto->encrypt($unencryptedValue);