From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Thu, 26 Sep 2013 09:50:46 +0000 (+0200)
Subject: catching NotPermittedException and throw it to the dav client as 403
X-Git-Tag: v6.0.0alpha2~77^2~6
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a86c10984a90ba51b8748cb789a93908118c5808;p=nextcloud-server.git

catching NotPermittedException and throw it to the dav client as 403
---

diff --git a/lib/connector/sabre/file.php b/lib/connector/sabre/file.php
index af9a36931ab..aa4b886429c 100644
--- a/lib/connector/sabre/file.php
+++ b/lib/connector/sabre/file.php
@@ -78,11 +78,16 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 		// mark file as partial while uploading (ignored by the scanner)
 		$partpath = $this->path . '.part';
 
-		$putOkay = $fs->file_put_contents($partpath, $data);
-		if ($putOkay === false) {
-			\OC_Log::write('webdav', '\OC\Files\Filesystem::file_put_contents() failed', \OC_Log::ERROR);
-			$fs->unlink($partpath);
-			throw new Sabre_DAV_Exception();
+		try {
+			$putOkay = $fs->file_put_contents($partpath, $data);
+			if ($putOkay === false) {
+				\OC_Log::write('webdav', '\OC\Files\Filesystem::file_put_contents() failed', \OC_Log::ERROR);
+				$fs->unlink($partpath);
+				// because we have no clue about the cause we can only throw back a 500/Internal Server Error
+				throw new Sabre_DAV_Exception();
+			}
+		} catch (\OCP\Files\NotPermittedException $e) {
+			throw new Sabre_DAV_Exception_Forbidden();
 		}
 
 		//detect aborted upload