Commit 92791bb8 authored by Morris Jobke's avatar Morris Jobke
Browse files

Merge pull request #15126 from owncloud/sabre-storagenotavailable

Soft fail in CustomPropertiesBackend whenever storage not available
parents 5e71d155 eb894e66
......@@ -30,6 +30,7 @@ use Sabre\DAV\PropFind;
use Sabre\DAV\PropPatch;
use Sabre\DAV\Tree;
use Sabre\DAV\Exception\NotFound;
use Sabre\DAV\Exception\ServiceUnavailable;
class CustomPropertiesBackend implements BackendInterface {
......@@ -100,6 +101,9 @@ class CustomPropertiesBackend implements BackendInterface {
if (!($node instanceof Node)) {
return;
}
} catch (ServiceUnavailable $e) {
// might happen for unavailable mount points, skip
return;
} catch (NotFound $e) {
// in some rare (buggy) cases the node might not be found,
// we catch the exception to prevent breaking the whole list with a 404
......
......@@ -105,11 +105,16 @@ class CustomPropertiesBackend extends \Test\TestCase {
* Test that propFind on a missing file soft fails
*/
public function testPropFindMissingFileSoftFail() {
$this->tree->expects($this->any())
$this->tree->expects($this->at(0))
->method('getNodeForPath')
->with('/dummypath')
->will($this->throwException(new \Sabre\DAV\Exception\NotFound()));
$this->tree->expects($this->at(1))
->method('getNodeForPath')
->with('/dummypath')
->will($this->throwException(new \Sabre\DAV\Exception\ServiceUnavailable()));
$propFind = new \Sabre\DAV\PropFind(
'/dummypath',
array(
......@@ -125,6 +130,11 @@ class CustomPropertiesBackend extends \Test\TestCase {
$propFind
);
$this->plugin->propFind(
'/dummypath',
$propFind
);
// no exception, soft fail
$this->assertTrue(true);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment