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

Don't lose filecache entry on s3 overwrite error 

If the object store errors we should not always delete the filecache
entry. As this might lead to people losing access to their files.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2020-08-31 12:25:20 +02:00 committed by backportbot[bot]
parent 4ef423913d
commit 704f515175
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/private/Files/ObjectStore/ObjectStoreStorage.php
View File

@ -465,11 +465,22 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common {
$this->objectStore->writeObject($urn, $stream); $this->objectStore->writeObject($urn, $stream);
} }
} catch (\Exception $ex) { } catch (\Exception $ex) {
$this->getCache()->remove($uploadPath); if (!$exists) {
$this->logger->logException($ex, [ /*
'app' => 'objectstore', * Only remove the entry if we are dealing with a new file.
'message' => 'Could not create object ' . $urn . ' for ' . $path, * Else people lose access to existing files
]); */
$this->getCache()->remove($uploadPath);
$this->logger->logException($ex, [
'app' => 'objectstore',
'message' => 'Could not create object ' . $urn . ' for ' . $path,
]);
} else {
$this->logger->logException($ex, [
'app' => 'objectstore',
'message' => 'Could not update object ' . $urn . ' for ' . $path,
]);
}
throw $ex; // make this bubble up throw $ex; // make this bubble up
} }