Skip to content

Commit 0d96313

Browse files
authored
Merge pull request #39499 from nextcloud/backport/38934/stable27
[stable27] fix(s3): Pass SSE-C parameters for multipart upload
2 parents 83d114b + e25db0e commit 0d96313

File tree

1 file changed

+5
-5
lines changed
  • lib/private/Files/ObjectStore

1 file changed

+5
-5
lines changed

lib/private/Files/ObjectStore/S3.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function initiateMultipartUpload(string $urn): string {
4949
$upload = $this->getConnection()->createMultipartUpload([
5050
'Bucket' => $this->bucket,
5151
'Key' => $urn,
52-
]);
52+
] + $this->getSSECParameters());
5353
$uploadId = $upload->get('UploadId');
5454
if ($uploadId === null) {
5555
throw new Exception('No upload id returned');
@@ -65,7 +65,7 @@ public function uploadMultipartPart(string $urn, string $uploadId, int $partId,
6565
'ContentLength' => $size,
6666
'PartNumber' => $partId,
6767
'UploadId' => $uploadId,
68-
]);
68+
] + $this->getSSECParameters());
6969
}
7070

7171
public function getMultipartUploads(string $urn, string $uploadId): array {
@@ -80,12 +80,12 @@ public function getMultipartUploads(string $urn, string $uploadId): array {
8080
'UploadId' => $uploadId,
8181
'MaxParts' => 1000,
8282
'PartNumberMarker' => $partNumberMarker
83-
]);
83+
] + $this->getSSECParameters());
8484
$parts = array_merge($parts, $result->get('Parts') ?? []);
8585
$isTruncated = $result->get('IsTruncated');
8686
$partNumberMarker = $result->get('NextPartNumberMarker');
8787
}
88-
88+
8989
return $parts;
9090
}
9191

@@ -95,7 +95,7 @@ public function completeMultipartUpload(string $urn, string $uploadId, array $re
9595
'Key' => $urn,
9696
'UploadId' => $uploadId,
9797
'MultipartUpload' => ['Parts' => $result],
98-
]);
98+
] + $this->getSSECParameters());
9999
$stat = $this->getConnection()->headObject([
100100
'Bucket' => $this->bucket,
101101
'Key' => $urn,

0 commit comments

Comments
 (0)