Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cmd/admin-handlers-idp-openid.go
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,8 @@ func (a adminAPIHandlers) ListAccessKeysOpenIDBulk(w http.ResponseWriter, r *htt
if _, ok := accessKey.Claims[iamPolicyClaimNameOpenID()]; !ok {
continue // skip if no roleArn and no policy claim
}
// claim-based provider is in the roleArnMap under dummy ARN
arn = dummyRoleARN
}
matchingCfgName, ok := roleArnMap[arn]
if !ok {
Expand Down
5 changes: 5 additions & 0 deletions cmd/erasure-object.go
Original file line number Diff line number Diff line change
Expand Up @@ -1277,6 +1277,11 @@ func (er erasureObjects) putObject(ctx context.Context, bucket string, object st
if err != nil && !isErrVersionNotFound(err) && !isErrObjectNotFound(err) && !isErrReadQuorum(err) {
return objInfo, err
}

// if object doesn't exist and not a replication request return error for conditional requests
if err != nil && !opts.ReplicationRequest {
return objInfo, err
}
}

// Validate input data size and it can never be less than -1.
Expand Down
8 changes: 6 additions & 2 deletions cmd/object-api-options.go
Original file line number Diff line number Diff line change
Expand Up @@ -414,12 +414,16 @@ func putOptsFromHeaders(ctx context.Context, hdr http.Header, metadata map[strin
if err != nil {
return ObjectOptions{}, err
}
return ObjectOptions{
op := ObjectOptions{
ServerSideEncryption: sseKms,
UserDefined: metadata,
MTime: mtime,
PreserveETag: etag,
}, nil
}
if _, ok := hdr[xhttp.MinIOSourceReplicationRequest]; ok {
op.ReplicationRequest = true
}
return op, nil
}
// default case of passing encryption headers and UserDefined metadata to backend
opts, err = getDefaultOpts(hdr, false, metadata)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ require (
github.com/lithammer/shortuuid/v4 v4.2.0
github.com/miekg/dns v1.1.65
github.com/minio/cli v1.24.2
github.com/minio/console v1.7.7-0.20250729174702-3d6c4cbf4869
github.com/minio/console v1.7.7-0.20250905210349-2017f33b26e1
github.com/minio/csvparser v1.0.0
github.com/minio/dnscache v0.1.1
github.com/minio/dperf v0.6.3
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -421,8 +421,8 @@ github.com/minio/cli v1.24.2 h1:J+fCUh9mhPLjN3Lj/YhklXvxj8mnyE/D6FpFduXJ2jg=
github.com/minio/cli v1.24.2/go.mod h1:bYxnK0uS629N3Bq+AOZZ+6lwF77Sodk4+UL9vNuXhOY=
github.com/minio/colorjson v1.0.8 h1:AS6gEQ1dTRYHmC4xuoodPDRILHP/9Wz5wYUGDQfPLpg=
github.com/minio/colorjson v1.0.8/go.mod h1:wrs39G/4kqNlGjwqHvPlAnXuc2tlPszo6JKdSBCLN8w=
github.com/minio/console v1.7.7-0.20250729174702-3d6c4cbf4869 h1:f8+TehcIhhDajRvSGb8NZhRqOhxChWcWWAzb52kjwIg=
github.com/minio/console v1.7.7-0.20250729174702-3d6c4cbf4869/go.mod h1:hKNkzdKBKU84w5wXqMnkH74QocJGHW2zjvFtuGETDsc=
github.com/minio/console v1.7.7-0.20250905210349-2017f33b26e1 h1:jOW1ggtITn8sreTzUjcdYE/ZffxeVmWstXNlBLOE6j4=
github.com/minio/console v1.7.7-0.20250905210349-2017f33b26e1/go.mod h1:hKNkzdKBKU84w5wXqMnkH74QocJGHW2zjvFtuGETDsc=
github.com/minio/crc64nvme v1.0.1 h1:DHQPrYPdqK7jQG/Ls5CTBZWeex/2FMS3G5XGkycuFrY=
github.com/minio/crc64nvme v1.0.1/go.mod h1:eVfm2fAzLlxMdUGc0EEBGSMmPwmXD5XiNRpnu9J3bvg=
github.com/minio/csvparser v1.0.0 h1:xJEHcYK8ZAjeW4hNV9Zu30u+/2o4UyPnYgyjWp8b7ZU=
Expand Down
11 changes: 7 additions & 4 deletions internal/config/compress/compress.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,12 @@ func LookupConfig(kvs config.KVS) (Config, error) {
return cfg, err
}

compress := env.Get(EnvCompressState, kvs.Get(config.Enable))
compress := env.Get(EnvCompressState, "")
if compress == "" {
compress = env.Get(EnvCompress, "")
compress = env.Get(EnvCompressEnableLegacy, "")
if compress == "" {
compress = env.Get(EnvCompress, kvs.Get(config.Enable))
}
}
cfg.Enabled, err = config.ParseBool(compress)
if err != nil {
Expand All @@ -109,9 +112,9 @@ func LookupConfig(kvs config.KVS) (Config, error) {
return cfg, nil
}

allowEnc := env.Get(EnvCompressAllowEncryption, kvs.Get(AllowEncrypted))
allowEnc := env.Get(EnvCompressAllowEncryption, "")
if allowEnc == "" {
allowEnc = env.Get(EnvCompressAllowEncryptionLegacy, "")
allowEnc = env.Get(EnvCompressAllowEncryptionLegacy, kvs.Get(AllowEncrypted))
}

cfg.AllowEncrypted, err = config.ParseBool(allowEnc)
Expand Down
1 change: 1 addition & 0 deletions internal/config/compress/legacy.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ const (

// These envs were wrong but we supported them for a long time
// so keep them here to support existing deployments.
EnvCompressEnableLegacy = "MINIO_COMPRESS_ENABLE"
EnvCompressAllowEncryptionLegacy = "MINIO_COMPRESS_ALLOW_ENCRYPTION"
EnvCompressExtensionsLegacy = "MINIO_COMPRESS_EXTENSIONS"
EnvCompressMimeTypesLegacy2 = "MINIO_COMPRESS_MIME_TYPES"
Expand Down
Loading