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

Merge pull request #7407 from nextcloud/12_7348 

[stable12] Check if owner of share exists
This commit is contained in:
Morris Jobke 2017-12-08 09:22:07 +01:00 committed by GitHub
parent 5dd15c4a7d aedc59c636
commit c9318ddd1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/dav/lib/Connector/Sabre/ObjectTree.php
View File

@ -29,6 +29,7 @@
namespace OCA\DAV\Connector\Sabre;
use OC\Files\Storage\FailedStorage;
use OCA\DAV\Connector\Sabre\Exception\Forbidden;
use OCA\DAV\Connector\Sabre\Exception\InvalidPath;
use OCA\DAV\Connector\Sabre\Exception\FileLocked;
@ -158,6 +159,10 @@ class ObjectTree extends \Sabre\DAV\Tree {
// read from cache
try {
$info = $this->fileView->getFileInfo($path);
if ($info instanceof \OCP\Files\FileInfo && $info->getStorage()->instanceOfStorage(FailedStorage::class)) {
throw new StorageNotAvailableException();
}
} catch (StorageNotAvailableException $e) {
throw new \Sabre\DAV\Exception\ServiceUnavailable('Storage is temporarily not available');
} catch (StorageInvalidException $e) {

2
apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php
View File

@ -174,6 +174,8 @@ class ObjectTreeTest extends \Test\TestCase {
$fileInfo->expects($this->once())
->method('getName')
->will($this->returnValue($outputFileName));
$fileInfo->method('getStorage')
->willReturn($this->createMock(\OC\Files\Storage\Common::class));
$view->expects($this->once())
->method('getFileInfo')