Merge pull request #21572 from nextcloud/backport/21558/stable18

MorrisJobke · web-flow · commit f9cc07feef4d · 2020-07-02T23:50:50.000+02:00
[stable18] relax permissions mask check for detecting part file rename
diff --git a/lib/private/Files/Storage/Wrapper/PermissionsMask.php b/lib/private/Files/Storage/Wrapper/PermissionsMask.php
@@ -80,13 +80,9 @@ public function getPermissions($path) {
 	}
 
 	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 (dirname($path1) === dirname($path2) && strpos($path1, '.ocTransferId') > 0) {
+			return $this->checkMask(Constants::PERMISSION_CREATE) and parent::rename($path1, $path2);
 		}
 		return $this->checkMask(Constants::PERMISSION_UPDATE) and parent::rename($path1, $path2);
 	}

Original file line number	Diff line number	Diff line change
`@@ -80,13 +80,9 @@ public function getPermissions($path) {`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`public function rename($path1, $path2) {`
`83`		`- $p = strpos($path1, $path2);`
`84`		`- if ($p === 0) {`
`85`		`- $part = substr($path1, strlen($path2));`
`86`		`- //This is a rename of the transfer file to the original file`
`87`		`- if (strpos($part, '.ocTransferId') === 0) {`
`88`		`- return $this->checkMask(Constants::PERMISSION_CREATE) and parent::rename($path1, $path2);`
`89`		`- }`
	`83`	`+ //This is a rename of the transfer file to the original file`
	`84`	`+ if (dirname($path1) === dirname($path2) && strpos($path1, '.ocTransferId') > 0) {`
	`85`	`+ return $this->checkMask(Constants::PERMISSION_CREATE) and parent::rename($path1, $path2);`
`90`	`86`	`}`
`91`	`87`	`return $this->checkMask(Constants::PERMISSION_UPDATE) and parent::rename($path1, $path2);`
`92`	`88`	`}`