diff options
| author | provokateurin <kate@provokateurin.de> | 2024-09-16 16:00:46 +0200 |
|---|---|---|
| committer | provokateurin <kate@provokateurin.de> | 2024-09-17 10:10:50 +0200 |
| commit | dc13f9cc1e3d8dce1c18d2c7920afe99b7bfa475 (patch) | |
| tree | add5fe8603a640c5621655f9364c1291c53a9b18 /apps | |
| parent | 8ca6fcace7dc22230a7afe84936ca01470f50d00 (diff) | |
| download | nextcloud-server-dc13f9cc1e3d8dce1c18d2c7920afe99b7bfa475.tar.gz nextcloud-server-dc13f9cc1e3d8dce1c18d2c7920afe99b7bfa475.zip | |
fix(Files): Handle getOwner() returning falsefix/storage/get-owner-false
Signed-off-by: provokateurin <kate@provokateurin.de>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/dav/lib/Storage/PublicOwnerWrapper.php | 10 | ||||
| -rw-r--r-- | apps/files_versions/lib/Versions/LegacyVersionsBackend.php | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/apps/dav/lib/Storage/PublicOwnerWrapper.php b/apps/dav/lib/Storage/PublicOwnerWrapper.php index 40ef81ab06d..91c1916dc39 100644 --- a/apps/dav/lib/Storage/PublicOwnerWrapper.php +++ b/apps/dav/lib/Storage/PublicOwnerWrapper.php @@ -12,8 +12,7 @@ use OC\Files\Storage\Wrapper\Wrapper; class PublicOwnerWrapper extends Wrapper { - /** @var string */ - private $owner; + private string $owner; /** * @param array $arguments ['storage' => $storage, 'owner' => $owner] @@ -28,11 +27,10 @@ class PublicOwnerWrapper extends Wrapper { public function getOwner($path): string|false { $owner = parent::getOwner($path); - - if ($owner === null || $owner === false) { - return $this->owner; + if ($owner !== false) { + return $owner; } - return $owner; + return $this->owner; } } diff --git a/apps/files_versions/lib/Versions/LegacyVersionsBackend.php b/apps/files_versions/lib/Versions/LegacyVersionsBackend.php index fc37ecead95..bc46da85752 100644 --- a/apps/files_versions/lib/Versions/LegacyVersionsBackend.php +++ b/apps/files_versions/lib/Versions/LegacyVersionsBackend.php @@ -49,6 +49,10 @@ class LegacyVersionsBackend implements IVersionBackend, IDeletableVersionBackend if ($storage->instanceOfStorage(ISharedStorage::class)) { $owner = $storage->getOwner(''); + if ($owner === false) { + throw new NotFoundException('No owner for ' . $file->getPath()); + } + $user = $this->userManager->get($owner); $fileId = $file->getId(); |