From e73a11d1060320917343679b15c126f0076ac46b Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Sat, 22 Oct 2016 21:29:14 +0200 Subject: [PATCH] Fix permision mask If we move a file from the temp part file to the original file we don't need update permissions. Signed-off-by: Roeland Jago Douma --- apps/dav/lib/Files/Sharing/FilesDropPlugin.php | 0 lib/private/Files/Storage/Wrapper/PermissionsMask.php | 8 ++++++++ 2 files changed, 8 insertions(+) create mode 100644 apps/dav/lib/Files/Sharing/FilesDropPlugin.php diff --git a/apps/dav/lib/Files/Sharing/FilesDropPlugin.php b/apps/dav/lib/Files/Sharing/FilesDropPlugin.php new file mode 100644 index 00000000000..e69de29bb2d diff --git a/lib/private/Files/Storage/Wrapper/PermissionsMask.php b/lib/private/Files/Storage/Wrapper/PermissionsMask.php index 39375602c34..7bcb1087fef 100644 --- a/lib/private/Files/Storage/Wrapper/PermissionsMask.php +++ b/lib/private/Files/Storage/Wrapper/PermissionsMask.php @@ -78,6 +78,14 @@ 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); + } + } return $this->checkMask(Constants::PERMISSION_UPDATE) and parent::rename($path1, $path2); } -- 2.39.5