Catch session unavailable exception

owncloud · Feb 2, 2018 · b17d059 · b17d059
1 parent 1dbc499
commit b17d059
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/lib/private/Session/Memory.php b/lib/private/Session/Memory.php
@@ -116,7 +116,7 @@ public function reopen() {
 	 */
 	private function validateSession() {
 		if ($this->sessionClosed) {
-			throw new Exception('Session has been closed - no further changes to the session are allowed');
+			throw new SessionNotAvailableException('Session has been closed - no further changes to the session are allowed');
 		}
 	}
 }
diff --git a/tests/lib/Session/CryptoSessionDataTest.php b/tests/lib/Session/CryptoSessionDataTest.php
@@ -22,6 +22,7 @@
 namespace Test\Session;
 
 use OC\Session\CryptoSessionData;
+use OCP\Session\Exceptions\SessionNotAvailableException;
 
 class CryptoSessionDataTest extends Session {
 	/** @var \PHPUnit_Framework_MockObject_MockObject|\OCP\Security\ICrypto */
@@ -50,4 +51,14 @@ protected function setUp() {
 
 		$this->instance = new CryptoSessionData($this->wrappedSession, $this->crypto, 'PASS');
 	}
+
+	/**
+	 * Thrown exception during session destruct/close should be handled silently
+	 */
+	protected function testDestructExceptionCatching() {
+		$instance = new CryptoSessionData($this->wrappedSession, $this->crypto, 'PASS');
+		$e = new SessionNotAvailableException();
+		$this->wrappedSession->expects($this->once())->method('set')->willThrowException($e);
+		$instance->__destruct();
+	}
 }