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

Merge pull request #21558 from nextcloud/part-file-rename-mask 

relax permissions mask check for detecting part file rename
This commit is contained in:
Roeland Jago Douma 2020-06-24 21:05:07 +02:00 committed by GitHub
parent b4b7de5a95 35d75dbb38
commit b6ce75066d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/private/Files/Storage/Wrapper/PermissionsMask.php
View File

@ -80,13 +80,9 @@ class PermissionsMask extends Wrapper {
} }
public function rename($path1, $path2) { public function rename($path1, $path2) {
$p = strpos($path1, $path2); //This is a rename of the transfer file to the original file
if ($p === 0) { if (dirname($path1) === dirname($path2) && strpos($path1, '.ocTransferId') > 0) {
$part = substr($path1, strlen($path2)); 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($part, '.ocTransferId') === 0) {
return $this->checkMask(Constants::PERMISSION_CREATE) and parent::rename($path1, $path2);
}
} }
return $this->checkMask(Constants::PERMISSION_UPDATE) and parent::rename($path1, $path2); return $this->checkMask(Constants::PERMISSION_UPDATE) and parent::rename($path1, $path2);
} }