MyFavMirrors
/
minio
mirror of https://github.com/minio/minio.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix replication checksum transfer (#19906) 

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 10:40:33 -07:00 committed by GitHub
parent 789cbc6fb2
commit d2eed44c78
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/bucket-replication.go
View File

@ -77,7 +77,7 @@ const (
ObjectLockLegalHoldTimestamp = "objectlock-legalhold-timestamp" ObjectLockLegalHoldTimestamp = "objectlock-legalhold-timestamp"
// ReplicationSsecChecksumHeader - the encrypted checksum of the SSE-C encrypted object. // ReplicationSsecChecksumHeader - the encrypted checksum of the SSE-C encrypted object.
ReplicationSsecChecksumHeader = ReservedMetadataPrefix + "Ssec-Crc" ReplicationSsecChecksumHeader = "X-Minio-Replication-Ssec-Crc"
) )
// gets replication config associated to a given bucket name. // gets replication config associated to a given bucket name.

2
go.mod
View File

@ -53,7 +53,7 @@ require (
github.com/minio/kms-go/kes v0.3.0 github.com/minio/kms-go/kes v0.3.0
github.com/minio/kms-go/kms v0.4.0 github.com/minio/kms-go/kms v0.4.0
github.com/minio/madmin-go/v3 v3.0.55-0.20240603092915-420a67132c32 github.com/minio/madmin-go/v3 v3.0.55-0.20240603092915-420a67132c32
github.com/minio/minio-go/v7 v7.0.70 github.com/minio/minio-go/v7 v7.0.72-0.20240610154810-fa174cbf14b0
github.com/minio/mux v1.9.0 github.com/minio/mux v1.9.0
github.com/minio/pkg/v3 v3.0.1 github.com/minio/pkg/v3 v3.0.1
github.com/minio/selfupdate v0.6.0 github.com/minio/selfupdate v0.6.0

4
go.sum
View File

@ -461,8 +461,8 @@ github.com/minio/mc v0.0.0-20240605181330-17adf0abbbca/go.mod h1:21/cb+wUd+lLRsd
github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
github.com/minio/minio-go/v6 v6.0.46/go.mod h1:qD0lajrGW49lKZLtXKtCB4X/qkMf0a5tBvN2PaZg7Gg= github.com/minio/minio-go/v6 v6.0.46/go.mod h1:qD0lajrGW49lKZLtXKtCB4X/qkMf0a5tBvN2PaZg7Gg=
github.com/minio/minio-go/v7 v7.0.70 h1:1u9NtMgfK1U42kUxcsl5v0yj6TEOPR497OAQxpJnn2g= github.com/minio/minio-go/v7 v7.0.72-0.20240610154810-fa174cbf14b0 h1:7e4w0tbj1NpxxyiGB7CutxpKBnXus/RU1CwN3Sm4gDY=
github.com/minio/minio-go/v7 v7.0.70/go.mod h1:4yBA8v80xGA30cfM3fz0DKYMXunWl/AV/6tWEs9ryzo= github.com/minio/minio-go/v7 v7.0.72-0.20240610154810-fa174cbf14b0/go.mod h1:4yBA8v80xGA30cfM3fz0DKYMXunWl/AV/6tWEs9ryzo=
github.com/minio/mux v1.9.0 h1:dWafQFyEfGhJvK6AwLOt83bIG5bxKxKJnKMCi0XAaoA= github.com/minio/mux v1.9.0 h1:dWafQFyEfGhJvK6AwLOt83bIG5bxKxKJnKMCi0XAaoA=
github.com/minio/mux v1.9.0/go.mod h1:1pAare17ZRL5GpmNL+9YmqHoWnLmMZF9C/ioUCfy0BQ= github.com/minio/mux v1.9.0/go.mod h1:1pAare17ZRL5GpmNL+9YmqHoWnLmMZF9C/ioUCfy0BQ=
github.com/minio/pkg/v2 v2.0.19 h1:r187/k/oVH9H0DDwvLY5WipkJaZ4CLd4KI3KgIUExR0= github.com/minio/pkg/v2 v2.0.19 h1:r187/k/oVH9H0DDwvLY5WipkJaZ4CLd4KI3KgIUExR0=

2
internal/crypto/metadata.go
View File

@ -49,7 +49,7 @@ const (
MetaDataEncryptionKey = "X-Minio-Internal-Server-Side-Encryption-S3-Kms-Sealed-Key" MetaDataEncryptionKey = "X-Minio-Internal-Server-Side-Encryption-S3-Kms-Sealed-Key"
// MetaSsecCRC is the encrypted checksum of the SSE-C encrypted object. // MetaSsecCRC is the encrypted checksum of the SSE-C encrypted object.
MetaSsecCRC = "X-Minio-Internal-Ssec-Crc" MetaSsecCRC = "X-Minio-Replication-Ssec-Crc"
// MetaContext is the KMS context provided by a client when encrypting an // MetaContext is the KMS context provided by a client when encrypting an
// object with SSE-KMS. A client may not send a context in which case the // object with SSE-KMS. A client may not send a context in which case the

2
internal/grid/manager.go
View File

@ -121,7 +121,7 @@ func NewManager(ctx context.Context, o ManagerOptions) (*Manager, error) {
}) })
} }
if !found { if !found {
return nil, fmt.Errorf("grid: local host not found") return nil, fmt.Errorf("grid: local host (%s) not found in cluster setup", o.Local)
} }
return m, nil return m, nil