aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorernolf <raphael.gradenwitz@googlemail.com>2024-08-20 12:33:28 +0200
committerJoas Schilling <coding@schilljs.com>2024-09-25 09:39:51 +0200
commit0551919bcedc4cd62fdeb011ffb2a291673ece8c (patch)
treec9f3ab9e7b3aa54503f1f15a28f8842a14b37bcc /lib
parentcfb8f1289eebb77784f4d29896083f30b0f337ae (diff)
downloadnextcloud-server-backport/47265/stable30.tar.gz
nextcloud-server-backport/47265/stable30.zip
fix(share): Ensure unique share tokensbackport/47265/stable30
- check for token collisions and retry up to three times. - throw after 3 attempts without finding a unique token. Signed-off-by: ernolf <raphael.gradenwitz@googlemail.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Share20/Manager.php22
1 files changed, 17 insertions, 5 deletions
diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
index 55e10602e72..ce0dbd9b17a 100644
--- a/lib/private/Share20/Manager.php
+++ b/lib/private/Share20/Manager.php
@@ -665,13 +665,25 @@ class Manager implements IManager {
$this->linkCreateChecks($share);
$this->setLinkParent($share);
- // For now ignore a set token.
- $share->setToken(
- $this->secureRandom->generate(
+ for ($i = 0; $i <= 3; $i++) {
+ $token = $this->secureRandom->generate(
\OC\Share\Constants::TOKEN_LENGTH,
\OCP\Security\ISecureRandom::CHAR_HUMAN_READABLE
- )
- );
+ );
+
+ try {
+ $this->getShareByToken($token);
+ } catch (\OCP\Share\Exceptions\ShareNotFound $e) {
+ // Set the unique token
+ $share->setToken($token);
+ break;
+ }
+
+ // Abort after 3 failed attempts
+ if ($i >= 3) {
+ throw new \Exception('Unable to generate a unique share token after 3 attempts.');
+ }
+ }
// Verify the expiration date
$share = $this->validateExpirationDateLink($share);