Fix for #23066

owncloud · May 24, 2016 · 8666439 · 8666439
1 parent 4525427
commit 8666439
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/apps/files_sharing/lib/helper.php b/apps/files_sharing/lib/helper.php
@@ -126,7 +126,7 @@ public static function authenticate($linkItem, $password = null) {
 				$newHash = '';
 				if(\OC::$server->getHasher()->verify($password, $linkItem['share_with'], $newHash)) {
 					// Save item id in session for future requests
-					\OC::$server->getSession()->set('public_link_authenticated', $linkItem['id']);
+					\OC::$server->getSession()->set('public_link_authenticated', (string) $linkItem['id']);
 
 					/**
 					 * FIXME: Migrate old hashes to new hash format
@@ -156,7 +156,7 @@ public static function authenticate($linkItem, $password = null) {
 		else {
 			// not authenticated ?
 			if ( ! \OC::$server->getSession()->exists('public_link_authenticated')
-				|| \OC::$server->getSession()->get('public_link_authenticated') !== $linkItem['id']) {
+				|| \OC::$server->getSession()->get('public_link_authenticated') !== (string)$linkItem['id']) {
 				return false;
 			}
 		}

diff --git a/lib/private/Share/Share.php b/lib/private/Share/Share.php
@@ -2491,7 +2491,7 @@ public static function checkPasswordProtectedShare(array $linkItem) {
 		}
 
 		if ( \OC::$server->getSession()->exists('public_link_authenticated')
-			&& \OC::$server->getSession()->get('public_link_authenticated') === $linkItem['id'] ) {
+			&& \OC::$server->getSession()->get('public_link_authenticated') === (string)$linkItem['id'] ) {
 			return true;
 		}
 

diff --git a/tests/lib/Share/ShareTest.php b/tests/lib/Share/ShareTest.php
@@ -990,7 +990,7 @@ public function testUnshareAll() {
 	 * @param $item
 	 */
 	public function testCheckPasswordProtectedShare($expected, $item) {
-		\OC::$server->getSession()->set('public_link_authenticated', 100);
+		\OC::$server->getSession()->set('public_link_authenticated', '100');
 		$result = \OCP\Share::checkPasswordProtectedShare($item);
 		$this->assertEquals($expected, $result);
 	}
@@ -1002,8 +1002,12 @@ function checkPasswordProtectedShareDataProvider() {
 			array(true, array('share_with' => '')),
 			array(true, array('share_with' => '1234567890', 'share_type' => '1')),
 			array(true, array('share_with' => '1234567890', 'share_type' => 1)),
+			array(true, array('share_with' => '1234567890', 'share_type' => '3', 'id' => '100')),
+			array(true, array('share_with' => '1234567890', 'share_type' => 3, 'id' => '100')),
 			array(true, array('share_with' => '1234567890', 'share_type' => '3', 'id' => 100)),
 			array(true, array('share_with' => '1234567890', 'share_type' => 3, 'id' => 100)),
+			array(false, array('share_with' => '1234567890', 'share_type' => '3', 'id' => '101')),
+			array(false, array('share_with' => '1234567890', 'share_type' => 3, 'id' => '101')),
 			array(false, array('share_with' => '1234567890', 'share_type' => '3', 'id' => 101)),
 			array(false, array('share_with' => '1234567890', 'share_type' => 3, 'id' => 101)),
 		);