diff options
author | Lukas Reschke <lukas@owncloud.com> | 2015-06-15 14:10:10 +0200 |
---|---|---|
committer | Lukas Reschke <lukas@owncloud.com> | 2015-10-25 17:58:21 +0100 |
commit | 13e817e90166d85dbea98043583185778d192212 (patch) | |
tree | e6cf6a7ba301b838a2ded0d3e7b9d81e2c655cfc /lib/private/files/filesystem.php | |
parent | eb10e3abc2cf5d325bc0cd6fecaa64e7665d4b4a (diff) | |
download | nextcloud-server-13e817e90166d85dbea98043583185778d192212.tar.gz nextcloud-server-13e817e90166d85dbea98043583185778d192212.zip |
Throw exception on `getPath` if file does not exist
Currently the `getPath` methods returned `NULL` in case when a file with the specified ID does not exist. This however mandates that developers are checking for the `NULL` case and if they do not the door for bugs with all kind of impact is widely opened.
This is especially harmful if used in context with Views where the final result is limited based on the result of `getPath`, if `getPath` returns `NULL` PHP type juggles this to an empty string resulting in all possible kind of bugs.
While one could argue that this is a misusage of the API the fact is that it is very often misused and an exception will trigger an immediate stop of execution as well as log this behaviour and show a pretty error page.
I also adjusted some usages where I believe that we need to catch these errors, in most cases this is though simply an error that should hard-fail.
Diffstat (limited to 'lib/private/files/filesystem.php')
-rw-r--r-- | lib/private/files/filesystem.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php index babf1c7d4ea..0f7508b8f26 100644 --- a/lib/private/files/filesystem.php +++ b/lib/private/files/filesystem.php @@ -62,6 +62,7 @@ use OC\Cache\File; use OC\Files\Config\MountProviderCollection; use OC\Files\Storage\StorageFactory; use OCP\Files\Config\IMountProvider; +use OCP\Files\NotFoundException; use OCP\IUserManager; class Filesystem { @@ -855,7 +856,7 @@ class Filesystem { * @param string $path * @param boolean $includeMountPoints whether to add mountpoint sizes, * defaults to true - * @return \OC\Files\FileInfo + * @return \OC\Files\FileInfo|bool False if file does not exist */ public static function getFileInfo($path, $includeMountPoints = true) { return self::$defaultInstance->getFileInfo($path, $includeMountPoints); @@ -891,6 +892,7 @@ class Filesystem { * Note that the resulting path is not guaranteed to be unique for the id, multiple paths can point to the same file * * @param int $id + * @throws NotFoundException * @return string */ public static function getPath($id) { |