diff options
| author | Robin Appelman <robin@icewind.nl> | 2020-06-11 14:22:59 +0200 |
|---|---|---|
| committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2020-06-24 19:11:18 +0000 |
| commit | 654f5a2109371ec5f8bb10a792ffa9a995c37e30 (patch) | |
| tree | 078ad3d48ead348946b7715572e2fc31e4b98024 /lib/private | |
| parent | d4343de3ebe9c71c2191990f01009ef82bfce93b (diff) | |
| download | nextcloud-server-654f5a2109371ec5f8bb10a792ffa9a995c37e30.tar.gz nextcloud-server-654f5a2109371ec5f8bb10a792ffa9a995c37e30.zip | |
relax permissions mask check for detecting part file rename
with files drop uploads the original file name isn't always used for the '.ocTransferId' source path
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/Files/Storage/Wrapper/PermissionsMask.php | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/private/Files/Storage/Wrapper/PermissionsMask.php b/lib/private/Files/Storage/Wrapper/PermissionsMask.php index 6b453b4380a..9c2d123b7bf 100644 --- a/lib/private/Files/Storage/Wrapper/PermissionsMask.php +++ b/lib/private/Files/Storage/Wrapper/PermissionsMask.php @@ -80,13 +80,9 @@ 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 (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); } |