Public/minio
1
0
Fork 0
forked from Mirrors/minio
Code Pull Requests Actions 2 Activity

Fix SSE-C checksums (#19896)

Browse Source 
Compression will be disabled by default if SSE-C is specified. So we can still honor SSE-C.
This commit is contained in:
Klaus Post
2024-06-10 08:31:51 -07:00
committed by GitHub
parent 6c7a21df6b
commit a2cab02554
20 changed files with 113 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/object-api-datatypes.go
View File

@@ -233,7 +233,7 @@ func (o ObjectInfo) ExpiresStr() string {
// ArchiveInfo returns any saved zip archive meta information.
// It will be decrypted if needed.
func (o *ObjectInfo) ArchiveInfo() []byte {
func (o *ObjectInfo) ArchiveInfo(h http.Header) []byte {
if len(o.UserDefined) == 0 {
return nil
}
@@ -243,7 +243,7 @@ func (o *ObjectInfo) ArchiveInfo() []byte {
}
data := []byte(z)
if v, ok := o.UserDefined[archiveTypeMetadataKey]; ok && v == archiveTypeEnc {
decrypted, err := o.metadataDecrypter()(archiveTypeEnc, data)
decrypted, err := o.metadataDecrypter(h)(archiveTypeEnc, data)
if err != nil {
encLogIf(GlobalContext, err)
return nil
@@ -326,6 +326,7 @@ func (ri ReplicateObjectInfo) ToObjectInfo() ObjectInfo {
VersionPurgeStatusInternal: ri.VersionPurgeStatusInternal,
DeleteMarker: true,
UserDefined: map[string]string{},
Checksum: ri.Checksum,
}
}
@@ -357,6 +358,7 @@ type ReplicateObjectInfo struct {
TargetStatuses map[string]replication.StatusType
TargetPurgeStatuses map[string]VersionPurgeStatusType
ReplicationTimestamp time.Time
Checksum []byte
}
// MultipartInfo captures metadata information about the uploadId