Handle permission denied error on listing folders (#114)

cernbox · Apr 10, 2017 · 9a67a2e · 9a67a2e
1 parent ca43451
commit 9a67a2e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php
@@ -131,6 +131,14 @@
 			'message' => $l->t('Storage invalid')
 		)
 	));
+} catch (\OCP\Files\NotPermittedException $e) {
+	\OCP\Util::logException('files', $e);
+	OCP\JSON::error(array(
+		'data' => array(
+			'exception' => '\OCP\Files\NotPermittedException',
+			'message' => $l->t('Permission denied accessing the resource or temporary storage error')
+		)
+	));
 } catch (\Exception $e) {
 	\OCP\Util::logException('files', $e);
 	OCP\JSON::error(array(

diff --git a/lib/private/files/objectstore/eosutil.php b/lib/private/files/objectstore/eosutil.php
@@ -1058,7 +1058,8 @@ public static function getFolderContents($eosPath, $additionalParameterCallback
 		$files = array();
 		list($result, $errcode) = EosCmd::exec($getFolderContents);
 		if ($errcode !== 0) {
-			return $files;
+			// Safe bet: always throw permission denied if the call to eos fails.
+			throw new \OCP\Files\NotPermittedException("cannot list contents of eos folder");
 		}
 
 		// we need to obtain the tree size performing an 'ls' command and merging attributes