fix(s3): Add config option to disable multipart copy for certain s3 providers

Signed-off-by: Julius Härtl <jus@bitgrid.net>

diff --git a/lib/private/Files/ObjectStore/S3ConnectionTrait.php b/lib/private/Files/ObjectStore/S3ConnectionTrait.php
index 1a682567e0c903242adb59b646f1fc82f7153078..a1edfa1eb99eb12d12d5d3f6b103577f7a7adeaa 100644 (file)
--- a/lib/private/Files/ObjectStore/S3ConnectionTrait.php
+++ b/lib/private/Files/ObjectStore/S3ConnectionTrait.php
@@ -74,6 +74,8 @@ trait S3ConnectionTrait {
        /** @var int */
        private $copySizeLimit;
 
+       private bool $useMultipartCopy = true;
+
        protected $test;
 
        protected function parseParams($params) {
@@ -91,6 +93,7 @@ trait S3ConnectionTrait {
                $this->uploadPartSize = $params['uploadPartSize'] ?? 524288000;
                $this->putSizeLimit = $params['putSizeLimit'] ?? 104857600;
                $this->copySizeLimit = $params['copySizeLimit'] ?? 5242880000;
+               $this->useMultipartCopy = (bool)($params['useMultipartCopy'] ?? true);
                $params['region'] = empty($params['region']) ? 'eu-west-1' : $params['region'];
                $params['hostname'] = empty($params['hostname']) ? 's3.' . $params['region'] . '.amazonaws.com' : $params['hostname'];
                if (!isset($params['port']) || $params['port'] === '') {

diff --git a/lib/private/Files/ObjectStore/S3ObjectTrait.php b/lib/private/Files/ObjectStore/S3ObjectTrait.php
index 65952a76a61323f0ef327444e78a01d118d6d2c0..2ef9614ac85c372ee159ef7a895fd5c49599b040 100644 (file)
--- a/lib/private/Files/ObjectStore/S3ObjectTrait.php
+++ b/lib/private/Files/ObjectStore/S3ObjectTrait.php
@@ -198,7 +198,7 @@ trait S3ObjectTrait {
 
                $size = (int)($sourceMetadata->get('Size') ?? $sourceMetadata->get('ContentLength'));
 
-               if ($size > $this->copySizeLimit) {
+               if ($this->useMultipartCopy && $size > $this->copySizeLimit) {
                        $copy = new MultipartCopy($this->getConnection(), [
                                "source_bucket" => $this->getBucket(),
                                "source_key" => $from