Merge pull request #34955 from nextcloud/backport/34934/stable25

blizzz · web-flow · commit 1a1a810cf2a4 · 2022-11-23T20:42:30.000+01:00
[stable25] Read encrypted session data again on reopen
diff --git a/lib/private/Session/CryptoSessionData.php b/lib/private/Session/CryptoSessionData.php
@@ -143,7 +143,6 @@ public function remove(string $key) {
 		$reopened = $this->reopen();
 		$this->isModified = true;
 		unset($this->sessionValues[$key]);
-		$this->session->remove(self::encryptedSessionName);
 		if ($reopened) {
 			$this->close();
 		}
@@ -163,7 +162,11 @@ public function clear() {
 	}
 
 	public function reopen(): bool {
-		return $this->session->reopen();
+		$reopened = $this->session->reopen();
+		if ($reopened) {
+			$this->initializeSession();
+		}
+		return $reopened;
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,6 @@ public function remove(string $key) {`
`143`	`143`	`$reopened = $this->reopen();`
`144`	`144`	`$this->isModified = true;`
`145`	`145`	`unset($this->sessionValues[$key]);`
`146`		`- $this->session->remove(self::encryptedSessionName);`
`147`	`146`	`if ($reopened) {`
`148`	`147`	`$this->close();`
`149`	`148`	`}`
`@@ -163,7 +162,11 @@ public function clear() {`
`163`	`162`	`}`
`164`	`163`
`165`	`164`	`public function reopen(): bool {`
`166`		`- return $this->session->reopen();`
	`165`	`+ $reopened = $this->session->reopen();`
	`166`	`+ if ($reopened) {`
	`167`	`+ $this->initializeSession();`
	`168`	`+ }`
	`169`	`+ return $reopened;`
`167`	`170`	`}`
`168`	`171`
`169`	`172`	`/**`