Skip to content

Check if the owner of a share exists #7348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 2 commits into from
Dec 6, 2017
Merged

Check if the owner of a share exists #7348

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8a29ec
A failed storage is a not available storage
rullzer Nov 30, 2017
d2fe30d
Fix tests
rullzer Dec 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
A failed storage is a not available storage 
We have to double check. Since getting the info of the root returns a
generic entry. But actually the stroage is not available. Else we get
very weird sync and web behavior.

Signed-off-by: Roeland Jago Douma <[email protected]>
  • Loading branch information
@rullzer
rullzer committed Dec 4, 2017
commit c8a29ec94287855bcd02aad6e315a9656ba0183d
5 changes: 5 additions & 0 deletions apps/dav/lib/Connector/Sabre/ObjectTree.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -154,6 +155,10 @@ public function getNodeForPath($path) {
// read from cache
try {
$info = $this->fileView->getFileInfo($path);

if ($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) {
Expand Down