wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #24949 from owncloud/ee-1325-internal-server-error-in-sync-client-on-forbidden-directurl

Browse source 
Catch the ForbiddenException to make sure it gets handled
This commit is contained in:
Vincent Petry 2016-06-02 10:39:43 +02:00
commit f584d5f03e
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/dav/lib/Connector/Sabre/FilesPlugin.php
View file

@ -30,6 +30,7 @@ namespace OCA\DAV\Connector\Sabre;
use OC\Files\View; use OC\Files\View;
use OCA\DAV\Upload\FutureFile; use OCA\DAV\Upload\FutureFile;
use OCP\Files\ForbiddenException;
use Sabre\DAV\Exception\Forbidden; use Sabre\DAV\Exception\Forbidden;
use Sabre\DAV\Exception\NotFound; use Sabre\DAV\Exception\NotFound;
use Sabre\DAV\IFile; use Sabre\DAV\IFile;
@ -311,6 +312,8 @@ class FilesPlugin extends ServerPlugin {
} }
} catch (StorageNotAvailableException $e) { } catch (StorageNotAvailableException $e) {
return false; return false;
} catch (ForbiddenException $e) {
return false;
} }
return false; return false;
}); });