mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11389 from nextcloud/backport/11383/stable14 

[stable14] do not explode when getting permissions from a FailedStorage
This commit is contained in:
blizzz 2018-09-27 10:51:43 +02:00 committed by GitHub
parent 1b493b783d 5a20ac9863
commit 6eab0d0ece
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/files_sharing/lib/Cache.php
View File

@ -32,6 +32,7 @@ use OC\Files\Cache\FailedCache;
use OC\Files\Cache\Wrapper\CacheJail; use OC\Files\Cache\Wrapper\CacheJail;
use OC\Files\Storage\Wrapper\Jail; use OC\Files\Storage\Wrapper\Jail;
use OCP\Files\Cache\ICacheEntry; use OCP\Files\Cache\ICacheEntry;
use OCP\Files\StorageNotAvailableException;
/** /**
* Metadata cache for shared files * Metadata cache for shared files
@ -142,7 +143,14 @@ class Cache extends CacheJail {
} else { } else {
$entry['path'] = $path; $entry['path'] = $path;
} }
try {
$sharePermissions = $this->storage->getPermissions($entry['path']); $sharePermissions = $this->storage->getPermissions($entry['path']);
} catch (StorageNotAvailableException $e) {
// thrown by FailedStorage e.g. when the sharer does not exist anymore
// (IDE may say the exception is never thrown – false negative)
$sharePermissions = 0;
}
if (isset($entry['permissions'])) { if (isset($entry['permissions'])) {
$entry['permissions'] &= $sharePermissions; $entry['permissions'] &= $sharePermissions;
} else { } else {