summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2018-09-26 10:43:40 +0200
committerArthur Schiwon <blizzz@arthur-schiwon.de>2018-09-26 10:48:37 +0200
commitc526cdf8ab1273489efdf7edd44f6df4e691e8de (patch)
tree3cb85c4d26ef5c4a89413453922bd4f2f5709899 /apps/files_sharing
parent2f45045c96b3d5cc552565e317263b41d04d356b (diff)
downloadnextcloud-server-c526cdf8ab1273489efdf7edd44f6df4e691e8de.tar.gz
nextcloud-server-c526cdf8ab1273489efdf7edd44f6df4e691e8de.zip
do not explode when getting permissions from a FailedStorage
for instance if a user of an external user backend is not available currently, the whole Files UI would be frozen. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to 'apps/files_sharing')
-rw-r--r--apps/files_sharing/lib/Cache.php10
1 files changed, 9 insertions, 1 deletions
diff --git a/apps/files_sharing/lib/Cache.php b/apps/files_sharing/lib/Cache.php
index f3712ead58b..bb1467ea827 100644
--- a/apps/files_sharing/lib/Cache.php
+++ b/apps/files_sharing/lib/Cache.php
@@ -32,6 +32,7 @@ use OC\Files\Cache\FailedCache;
use OC\Files\Cache\Wrapper\CacheJail;
use OC\Files\Storage\Wrapper\Jail;
use OCP\Files\Cache\ICacheEntry;
+use OCP\Files\StorageNotAvailableException;
/**
* Metadata cache for shared files
@@ -142,7 +143,14 @@ class Cache extends CacheJail {
} else {
$entry['path'] = $path;
}
- $sharePermissions = $this->storage->getPermissions($entry['path']);
+
+ try {
+ $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'])) {
$entry['permissions'] &= $sharePermissions;
} else {