Merge pull request #22057 from owncloud/share2_update_hash

Update old password hashed for link shares on access

2 files changed, 24 insertions, 1 deletions

diff --git a/lib/private/share20/manager.php b/lib/private/share20/manager.php
index 3c5bd197ae8..ac82fe05df4 100644
--- a/lib/private/share20/manager.php
+++ b/lib/private/share20/manager.php
@@ -815,7 +815,9 @@ class Manager implements IManager {
 		}
 
 		if (!empty($newHash)) {
-			//TODO update hash!
+			$share->setPassword($newHash);
+			$provider = $this->factory->getProviderForType($share->getShareType());
+			$provider->update($share);
 		}
 
 		return true;
diff --git a/tests/lib/share20/managertest.php b/tests/lib/share20/managertest.php
index b5559bb5172..cdcb71ed1e5 100644
--- a/tests/lib/share20/managertest.php
+++ b/tests/lib/share20/managertest.php
@@ -1645,6 +1645,27 @@ class ManagerTest extends \Test\TestCase {
 		$this->assertTrue($this->manager->checkPassword($share, 'password'));
 	}
 
+	public function testCheckPasswordUpdateShare() {
+		$share = $this->manager->newShare();
+		$share->setShareType(\OCP\Share::SHARE_TYPE_LINK)
+			->setPassword('passwordHash');
+
+		$this->hasher->method('verify')->with('password', 'passwordHash', '')
+			->will($this->returnCallback(function($pass, $hash, &$newHash) {
+				$newHash = 'newHash';
+
+				return true;
+			}));
+
+		$this->defaultProvider->expects($this->once())
+			->method('update')
+			->with($this->callback(function (\OCP\Share\IShare $share) {
+				return $share->getPassword() === 'newHash';
+			}));
+
+		$this->assertTrue($this->manager->checkPassword($share, 'password'));
+	}
+
 	/**
 	 * @expectedException Exception
 	 * @expectedExceptionMessage The Share API is disabled