From 62a35b3e77ca18544bbcf3f732fd862505f6ad86 Mon Sep 17 00:00:00 2001 From: Taran Pelkey Date: Mon, 24 Feb 2025 20:43:59 -0500 Subject: [PATCH] Update SRSvcAccCreate with new type (#20974) --- cmd/admin-handlers-idp-ldap.go | 2 +- cmd/admin-handlers-users.go | 8 ++++---- cmd/site-replication.go | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cmd/admin-handlers-idp-ldap.go b/cmd/admin-handlers-idp-ldap.go index 6c4e197b4..b818237f2 100644 --- a/cmd/admin-handlers-idp-ldap.go +++ b/cmd/admin-handlers-idp-ldap.go @@ -345,7 +345,7 @@ func (a adminAPIHandlers) AddServiceAccountLDAP(w http.ResponseWriter, r *http.R Name: newCred.Name, Description: newCred.Description, Claims: opts.claims, - SessionPolicy: createReq.Policy, + SessionPolicy: madmin.SRSessionPolicy(createReq.Policy), Status: auth.AccountOn, Expiration: createReq.Expiration, }, diff --git a/cmd/admin-handlers-users.go b/cmd/admin-handlers-users.go index 12a44ad76..4706ef59f 100644 --- a/cmd/admin-handlers-users.go +++ b/cmd/admin-handlers-users.go @@ -783,7 +783,7 @@ func (a adminAPIHandlers) AddServiceAccount(w http.ResponseWriter, r *http.Reque Name: newCred.Name, Description: newCred.Description, Claims: opts.claims, - SessionPolicy: createReq.Policy, + SessionPolicy: madmin.SRSessionPolicy(createReq.Policy), Status: auth.AccountOn, Expiration: createReq.Expiration, }, @@ -907,7 +907,7 @@ func (a adminAPIHandlers) UpdateServiceAccount(w http.ResponseWriter, r *http.Re Status: opts.status, Name: opts.name, Description: opts.description, - SessionPolicy: updateReq.NewPolicy, + SessionPolicy: madmin.SRSessionPolicy(updateReq.NewPolicy), Expiration: updateReq.NewExpiration, }, }, @@ -2169,7 +2169,7 @@ func (a adminAPIHandlers) ExportIAM(w http.ResponseWriter, r *http.Request) { SecretKey: acc.Credentials.SecretKey, Groups: acc.Credentials.Groups, Claims: claims, - SessionPolicy: json.RawMessage(policyJSON), + SessionPolicy: policyJSON, Status: acc.Credentials.Status, Name: sa.Name, Description: sa.Description, @@ -2441,7 +2441,7 @@ func (a adminAPIHandlers) importIAM(w http.ResponseWriter, r *http.Request, apiV } var sp *policy.Policy var err error - if len(svcAcctReq.SessionPolicy) > 0 && !bytes.Equal(svcAcctReq.SessionPolicy, []byte("null")) { + if len(svcAcctReq.SessionPolicy) > 0 { sp, err = policy.ParseConfig(bytes.NewReader(svcAcctReq.SessionPolicy)) if err != nil { writeErrorResponseJSON(ctx, w, importError(ctx, err, allSvcAcctsFile, user), r.URL) diff --git a/cmd/site-replication.go b/cmd/site-replication.go index 38ef4ad6c..f2005f012 100644 --- a/cmd/site-replication.go +++ b/cmd/site-replication.go @@ -2152,7 +2152,7 @@ func (c *SiteReplicationSys) syncToAllPeers(ctx context.Context, addOpts madmin. SecretKey: acc.Credentials.SecretKey, Groups: acc.Credentials.Groups, Claims: claims, - SessionPolicy: json.RawMessage(policyJSON), + SessionPolicy: policyJSON, Status: acc.Credentials.Status, Name: acc.Credentials.Name, Description: acc.Credentials.Description, @@ -5549,7 +5549,7 @@ func (c *SiteReplicationSys) healUsers(ctx context.Context, objAPI ObjectLayer, SecretKey: creds.SecretKey, Groups: creds.Groups, Claims: claims, - SessionPolicy: json.RawMessage(policyJSON), + SessionPolicy: policyJSON, Status: creds.Status, Name: creds.Name, Description: creds.Description, diff --git a/go.mod b/go.mod index 06c296564..85983af58 100644 --- a/go.mod +++ b/go.mod @@ -51,7 +51,7 @@ require ( github.com/minio/highwayhash v1.0.3 github.com/minio/kms-go/kes v0.3.1 github.com/minio/kms-go/kms v0.4.0 - github.com/minio/madmin-go/v3 v3.0.91 + github.com/minio/madmin-go/v3 v3.0.94 github.com/minio/minio-go/v7 v7.0.85 github.com/minio/mux v1.9.0 github.com/minio/pkg/v3 v3.0.29 diff --git a/go.sum b/go.sum index 9afd0fc32..b95dc0afa 100644 --- a/go.sum +++ b/go.sum @@ -448,8 +448,8 @@ github.com/minio/kms-go/kes v0.3.1 h1:K3sPFAvFbJx33XlCTUBnQo8JRmSZyDvT6T2/MQ2iC3 github.com/minio/kms-go/kes v0.3.1/go.mod h1:Q9Ct0KUAuN9dH0hSVa0eva45Jg99cahbZpPxeqR9rOQ= github.com/minio/kms-go/kms v0.4.0 h1:cLPZceEp+05xHotVBaeFJrgL7JcXM4lBy6PU0idkE7I= github.com/minio/kms-go/kms v0.4.0/go.mod h1:q12CehiIy2qgBnDKq6Q7wmPi2PHSyRVug5DKp0HAVeE= -github.com/minio/madmin-go/v3 v3.0.91 h1:ixa64WnPNeysO77Bk0OoYP8dl1jz4FVOfJ56+3CjoOc= -github.com/minio/madmin-go/v3 v3.0.91/go.mod h1:pMLdj9OtN0CANNs5tdm6opvOlDFfj0WhbztboZAjRWE= +github.com/minio/madmin-go/v3 v3.0.94 h1:n2S8zgm0eRJ09YC7qrDTFDQDQOEUzCTiKEPywCitO/s= +github.com/minio/madmin-go/v3 v3.0.94/go.mod h1:pMLdj9OtN0CANNs5tdm6opvOlDFfj0WhbztboZAjRWE= github.com/minio/mc v0.0.0-20250208210632-10c50368c526 h1:FzxZFUgTf21n+spBVhGAed8HCSUpAN+zfOChg49zZ64= github.com/minio/mc v0.0.0-20250208210632-10c50368c526/go.mod h1:AgzD1Axs0TauPrFSd7M3yC75TRg9zT919d9bbxhubJ4= github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=