From 03f422153d70bc175bb6e68d27129deba6cb9875 Mon Sep 17 00:00:00 2001
From: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
Date: Thu, 10 Jul 2014 10:54:26 +0200
Subject: [PATCH] files: storage: rename should check parent directories of old
and new files
as described by POSIX.1-2008
(see http://pubs.opengroup.org/onlinepubs/9699919799/functions/rename.html)
Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
---
lib/private/files/storage/local.php | 13 +++++++++++--
lib/private/files/storage/mappedlocal.php | 13 +++++++++++--
2 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/lib/private/files/storage/local.php b/lib/private/files/storage/local.php
index e33747bbd5..63570d70cf 100644
--- a/lib/private/files/storage/local.php
+++ b/lib/private/files/storage/local.php
@@ -172,10 +172,19 @@ if (\OC_Util::runningOnWindows()) {
}
public function rename($path1, $path2) {
- if (!$this->isUpdatable($path1)) {
- \OC_Log::write('core', 'unable to rename, file is not writable : ' . $path1, \OC_Log::ERROR);
+ $srcParent = dirname($path1);
+ $dstParent = dirname($path2);
+
+ if (!$this->isUpdatable($srcParent)) {
+ \OC_Log::write('core', 'unable to rename, source directory is not writable : ' . $srcParent, \OC_Log::ERROR);
return false;
}
+
+ if (!$this->isUpdatable($dstParent)) {
+ \OC_Log::write('core', 'unable to rename, destination directory is not writable : ' . $dstParent, \OC_Log::ERROR);
+ return false;
+ }
+
if (!$this->file_exists($path1)) {
\OC_Log::write('core', 'unable to rename, file does not exists : ' . $path1, \OC_Log::ERROR);
return false;
diff --git a/lib/private/files/storage/mappedlocal.php b/lib/private/files/storage/mappedlocal.php
index ea4deaa66e..6910eef740 100644
--- a/lib/private/files/storage/mappedlocal.php
+++ b/lib/private/files/storage/mappedlocal.php
@@ -184,10 +184,19 @@ class MappedLocal extends \OC\Files\Storage\Common {
}
public function rename($path1, $path2) {
- if (!$this->isUpdatable($path1)) {
- \OC_Log::write('core', 'unable to rename, file is not writable : ' . $path1, \OC_Log::ERROR);
+ $srcParent = dirname($path1);
+ $dstParent = dirname($path2);
+
+ if (!$this->isUpdatable($srcParent)) {
+ \OC_Log::write('core', 'unable to rename, source directory is not writable : ' . $srcParent, \OC_Log::ERROR);
return false;
}
+
+ if (!$this->isUpdatable($dstParent)) {
+ \OC_Log::write('core', 'unable to rename, destination directory is not writable : ' . $dstParent, \OC_Log::ERROR);
+ return false;
+ }
+
if (!$this->file_exists($path1)) {
\OC_Log::write('core', 'unable to rename, file does not exists : ' . $path1, \OC_Log::ERROR);
return false;
--
GitLab