fix(s3): Pass SSE-C parameters for multipart upload

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

diff --git a/lib/private/Files/ObjectStore/S3.php b/lib/private/Files/ObjectStore/S3.php
index 76eee2bc96241245a82e6c0ae92f9497e12ab5bc..2d9119b5fc692445f76fa2389985a97eab8c5eb1 100644 (file)
--- a/lib/private/Files/ObjectStore/S3.php
+++ b/lib/private/Files/ObjectStore/S3.php
@@ -49,7 +49,7 @@ class S3 implements IObjectStore, IObjectStoreMultiPartUpload {
                $upload = $this->getConnection()->createMultipartUpload([
                        'Bucket' => $this->bucket,
                        'Key' => $urn,
-               ]);
+               ] + $this->getSSECParameters());
                $uploadId = $upload->get('UploadId');
                if ($uploadId === null) {
                        throw new Exception('No upload id returned');
@@ -65,7 +65,7 @@ class S3 implements IObjectStore, IObjectStoreMultiPartUpload {
                        'ContentLength' => $size,
                        'PartNumber' => $partId,
                        'UploadId' => $uploadId,
-               ]);
+               ] + $this->getSSECParameters());
        }
 
        public function getMultipartUploads(string $urn, string $uploadId): array {
@@ -80,12 +80,12 @@ class S3 implements IObjectStore, IObjectStoreMultiPartUpload {
                                'UploadId' => $uploadId,
                                'MaxParts' => 1000,
                                'PartNumberMarker' => $partNumberMarker
-                       ]);
+                       ] + $this->getSSECParameters());
                        $parts = array_merge($parts, $result->get('Parts') ?? []);
                        $isTruncated = $result->get('IsTruncated');
                        $partNumberMarker = $result->get('NextPartNumberMarker');
                }
-               
+
                return $parts;
        }
 
@@ -95,7 +95,7 @@ class S3 implements IObjectStore, IObjectStoreMultiPartUpload {
                        'Key' => $urn,
                        'UploadId' => $uploadId,
                        'MultipartUpload' => ['Parts' => $result],
-               ]);
+               ] + $this->getSSECParameters());
                $stat = $this->getConnection()->headObject([
                        'Bucket' => $this->bucket,
                        'Key' => $urn,