From 9bf9c94b957acf2e105797b3f408c698d5c30e41 Mon Sep 17 00:00:00 2001 From: Tigran Mkrtchyan Date: Thu, 31 Mar 2022 10:38:25 +0200 Subject: [PATCH] config: add a switch to control truncate before update To avoid extra truncate on non WORM file systems, add a new config option `localstorage.unlink_on_truncate`, which defaults to false. The OC\Files\Storage\Local is update to respect that option. --- config/config.sample.php | 8 ++++++++ lib/private/Files/Storage/Local.php | 18 ++++++++++++------ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/config/config.sample.php b/config/config.sample.php index 05fba5777ebaa..bcd46381ebd01 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -1887,6 +1887,14 @@ */ 'localstorage.umask' => 0022, +/** + * This options allows storage systems that don't allow to modify existing files + * to overcome this limitation by removing the files before overwriting. + * + * Defaults to ``false`` + */ +'localstorage.unlink_on_truncate' => false, + /** * EXPERIMENTAL: option whether to include external storage in quota * calculation, defaults to false. diff --git a/lib/private/Files/Storage/Local.php b/lib/private/Files/Storage/Local.php index b9dcb7d0537e3..9b2a6f9b555c3 100644 --- a/lib/private/Files/Storage/Local.php +++ b/lib/private/Files/Storage/Local.php @@ -69,6 +69,8 @@ class Local extends \OC\Files\Storage\Common { private $defUMask; + protected $unlinkOnTruncate; + public function __construct($arguments) { if (!isset($arguments['datadir']) || !is_string($arguments['datadir'])) { throw new \InvalidArgumentException('No data directory set for local storage'); @@ -88,6 +90,9 @@ public function __construct($arguments) { $this->config = \OC::$server->get(IConfig::class); $this->mimeTypeDetector = \OC::$server->get(IMimeTypeDetector::class); $this->defUMask = $this->config->getSystemValue('localstorage.umask', 0022); + + // support Write-Once-Read-Many file systems + $this->unlinkOnTruncate = $this->config->getSystemValue('localstorage.unlink_on_truncate', false); } public function __destruct() { @@ -297,8 +302,9 @@ public function file_get_contents($path) { public function file_put_contents($path, $data) { $oldMask = umask($this->defUMask); - // support Write-Once-Read-Many filesystems - $this->unlink($path); + if ($this->unlinkOnTruncate) { + $this->unlink($path); + } $result = file_put_contents($this->getSourcePath($path), $data); umask($oldMask); return $result; @@ -372,8 +378,9 @@ public function copy($path1, $path2) { return parent::copy($path1, $path2); } else { $oldMask = umask($this->defUMask); - // support Write-Once-Read-Many filesystems - $this->unlink($path2); + if ($this->unlinkOnTruncate) { + $this->unlink($path2); + } $result = copy($this->getSourcePath($path1), $this->getSourcePath($path2)); umask($oldMask); return $result; @@ -382,8 +389,7 @@ public function copy($path1, $path2) { public function fopen($path, $mode) { $oldMask = umask($this->defUMask); - if ($mode === 'w') { - // support Write-Once-Read-Many filesystems + if (($mode === 'w' || $mode === 'w+') && $this->unlinkOnTruncate) { $this->unlink($path); } $result = fopen($this->getSourcePath($path), $mode);