Browse Source

s3api: use updateAuthenticationState helper and clarified log message

pull/8029/head
Chris Lu 1 day ago
parent
commit
df3f308740
  1. 14
      weed/s3api/auth_credentials.go

14
weed/s3api/auth_credentials.go

@ -477,11 +477,7 @@ func (iam *IdentityAccessManagement) replaceS3ApiConfiguration(config *iam_pb.S3
iam.nameToIdentity = nameToIdentity iam.nameToIdentity = nameToIdentity
// Update authentication state based on whether identities exist // Update authentication state based on whether identities exist
// Once enabled, keep it enabled (one-way toggle) // Once enabled, keep it enabled (one-way toggle)
authJustEnabled := false
if !iam.isAuthEnabled && len(identities) > 0 {
iam.isAuthEnabled = true
authJustEnabled = true
}
authJustEnabled := iam.updateAuthenticationState(len(identities))
iam.m.Unlock() iam.m.Unlock()
if authJustEnabled { if authJustEnabled {
@ -701,15 +697,11 @@ func (iam *IdentityAccessManagement) mergeS3ApiConfiguration(config *iam_pb.S3Ap
iam.nameToIdentity = nameToIdentity iam.nameToIdentity = nameToIdentity
// Update authentication state based on whether identities exist // Update authentication state based on whether identities exist
// Once enabled, keep it enabled (one-way toggle) // Once enabled, keep it enabled (one-way toggle)
authJustEnabled := false
if !iam.isAuthEnabled && len(identities) > 0 {
iam.isAuthEnabled = true
authJustEnabled = true
}
authJustEnabled := iam.updateAuthenticationState(len(identities))
iam.m.Unlock() iam.m.Unlock()
if authJustEnabled { if authJustEnabled {
glog.V(0).Infof("S3 authentication enabled - credentials were added dynamically")
glog.V(0).Infof("S3 authentication enabled because credentials were added dynamically")
} }
// Log configuration summary // Log configuration summary

Loading…
Cancel
Save