fix part file rename check

Signed-off-by: Robin Appelman <robin@icewind.nl>

apps/files_sharing/lib/SharedStorage.php

@@ -312,10 +312,12 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto
 
 		if ($targetExists || ($sameFodler && !$isPartFile)) {
 			if (!$this->isUpdatable('')) {
+				$this->logger->warning("Blocking rename, target not updatable");
 				return false;
 			}
 		} else {
 			if (!$this->isCreatable('')) {
+				$this->logger->warning("Blocking rename, target not creatable");
 				return false;
 			}
 		}

lib/private/Files/Storage/Local.php

@@ -337,7 +337,16 @@ class Local extends \OC\Files\Storage\Common {
 			}
 		}
 
-		return rename($this->getSourcePath($path1), $this->getSourcePath($path2));
+		$targetExists = file_exists($this->getSourcePath($path2));
+
+		$result = rename($this->getSourcePath($path1), $this->getSourcePath($path2));
+
+		if (!$result) {
+			$message = "Failed to rename file from " . $this->getSourcePath($path1) . " to " . $this->getSourcePath($path2) . ($targetExists ? " (target exists)" : "");
+			\OC::$server->getLogger()->logException(new \Exception($message));
+		}
+
+		return $result;
 	}
 
 	public function copy($path1, $path2) {

lib/private/Files/Storage/Wrapper/PermissionsMask.php

@@ -80,14 +80,19 @@ class PermissionsMask extends Wrapper {
 	}
 
 	public function rename($path1, $path2) {
-		$p = strpos($path1, $path2);
-		if ($p === 0) {
-			$part = substr($path1, strlen($path2));
-			//This is a rename of the transfer file to the original file
-			if (strpos($part, '.ocTransferId') === 0) {
-				return $this->checkMask(Constants::PERMISSION_CREATE) and parent::rename($path1, $path2);
+		//This is a rename of the transfer file to the original file
+		if (strpos($path1, '.ocTransferId') > 0) {
+			if (!$this->checkMask(Constants::PERMISSION_CREATE)) {
+				\OC::$server->getLogger()->warning("Blocking rename from $path1 to $path2, not enough permissions to create new file from part. mask: " . $this->mask);
 			}
+
+			return $this->checkMask(Constants::PERMISSION_CREATE) and parent::rename($path1, $path2);
 		}
+
+		if (!$this->checkMask(Constants::PERMISSION_UPDATE)) {
+			\OC::$server->getLogger()->warning("Blocking rename from $path1 to $path2, not enough permissions to update file. mask: " . $this->mask);
+		}
+
 		return $this->checkMask(Constants::PERMISSION_UPDATE) and parent::rename($path1, $path2);
 	}