Merge pull request #682 from owncloud/butonic-patch-1v9.1.0v9.0.6RC1v9.0.5RC2v9.0.5RC1v9.0.5v9.0.4RC1v9.0.4

[stable9] Fix of issue #23066

2 files changed, 6 insertions, 6 deletions

diff --git a/middleware/envcheckmiddleware.php b/middleware/envcheckmiddleware.php
index 7d09661f..0e6862e5 100644
--- a/middleware/envcheckmiddleware.php
+++ b/middleware/envcheckmiddleware.php
@@ -290,7 +290,7 @@ class EnvCheckMiddleware extends CheckMiddleware {
 		$newHash = '';
 		if ($this->hasher->verify($password, $linkItem['share_with'], $newHash)) {
 			// Save item id in session for future requests
-			$this->session->set('public_link_authenticated', $linkItem['id']);
+			$this->session->set('public_link_authenticated', (string)$linkItem['id']);
 			// @codeCoverageIgnoreStart
 			if (!empty($newHash)) {
 				// For future use
@@ -312,7 +312,7 @@ class EnvCheckMiddleware extends CheckMiddleware {
 	private function checkSession($linkItem) {
 		// Not authenticated ?
 		if (!$this->session->exists('public_link_authenticated')
-			|| $this->session->get('public_link_authenticated') !== $linkItem['id']
+			|| $this->session->get('public_link_authenticated') !== (string)$linkItem['id']
 		) {
 			throw new CheckException("Missing password", Http::STATUS_UNAUTHORIZED);
 		}
diff --git a/tests/unit/middleware/EnvCheckMiddlewareTest.php b/tests/unit/middleware/EnvCheckMiddlewareTest.php
index a589b5e0..6ff24b71 100644
--- a/tests/unit/middleware/EnvCheckMiddlewareTest.php
+++ b/tests/unit/middleware/EnvCheckMiddlewareTest.php
@@ -247,8 +247,8 @@ class EnvCheckMiddlewareTest extends \Codeception\TestCase\Test {
 
 	public function testCheckSessionAfterPasswordEntry() {
 		$linkItem['id'] = 12345;
-		$this->mockSessionExists($linkItem['id']);
-		$this->mockSessionWithLinkItemId($linkItem['id']);
+		$this->mockSessionExists((string)$linkItem['id']);
+		$this->mockSessionWithLinkItemId((string)$linkItem['id']);
 
 		self::invokePrivate($this->middleware, 'checkSession', [$linkItem]);
 	}
@@ -387,8 +387,8 @@ class EnvCheckMiddlewareTest extends \Codeception\TestCase\Test {
 			'id'         => 12345,
 			'share_with' => 'Empyrion Galactic Survival'
 		];
-		$this->mockSessionExists($linkItem['id']);
-		$this->mockSessionWithLinkItemId($linkItem['id']);
+		$this->mockSessionExists((string)$linkItem['id']);
+		$this->mockSessionWithLinkItemId((string)$linkItem['id']);
 
 		self::invokePrivate($this->middleware, 'checkAuthorisation', [$linkItem, $password]);
 	}