Merge pull request #17326 from owncloud/stable8-catch-notpermitted

[stable8] Properly handle NotPermittedException in SabreDAV

1 files changed, 11 insertions, 0 deletions

diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php
index e57d04f9a6e..f29e3620d4a 100644
--- a/lib/private/connector/sabre/file.php
+++ b/lib/private/connector/sabre/file.php
@@ -142,6 +142,11 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\
 						throw new \Sabre\DAV\Exception('Could not rename part file to final file');
 					}
 				}
+				catch (\OCP\Files\NotPermittedException $e) {
+					$this->fileView->unlink($partFilePath);
+					// a more general case - due to whatever reason the content could not be written
+					throw new \Sabre\DAV\Exception\Forbidden($e->getMessage(), $e->getCode(), $e);
+				}
 				catch (\OCP\Files\LockNotAcquiredException $e) {
 					// the file is currently being written to by another process
 					throw new OC_Connector_Sabre_Exception_FileLocked($e->getMessage(), $e->getCode(), $e);
@@ -328,6 +333,12 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\
 
 				$info = $this->fileView->getFileInfo($targetPath);
 				return $info->getEtag();
+			} catch (\OCP\Files\NotPermittedException $e) {
+				if ($needsPartFile) {
+					$this->fileView->unlink($partFile);
+				}
+				// a more general case - due to whatever reason the content could not be written
+				throw new \Sabre\DAV\Exception\Forbidden($e->getMessage(), $e->getCode(), $e);
 			} catch (\OCP\Files\StorageNotAvailableException $e) {
 				throw new \Sabre\DAV\Exception\ServiceUnavailable("Failed to put file: ".$e->getMessage());
 			}