aboutsummaryrefslogtreecommitdiff
path: root/weed/s3api
diff options
context:
space:
mode:
authoryourchanges <yourchanges@gmail.com>2020-07-17 19:49:16 +0800
committerGitHub <noreply@github.com>2020-07-17 19:49:16 +0800
commit64df5207db14ccf7e7915561b5c9b8f3dab53c6e (patch)
treedf4a05999d67abb7c4765d39eddc01318521169b /weed/s3api
parent8c318470dd95b3fc24d39dc3cf253cc17b03ab39 (diff)
parentf43146b237bc5bbfb7033f6e427b5299554c0824 (diff)
downloadseaweedfs-64df5207db14ccf7e7915561b5c9b8f3dab53c6e.tar.xz
seaweedfs-64df5207db14ccf7e7915561b5c9b8f3dab53c6e.zip
Merge pull request #2 from chrislusf/master
merge
Diffstat (limited to 'weed/s3api')
-rw-r--r--weed/s3api/auth_credentials.go8
1 files changed, 7 insertions, 1 deletions
diff --git a/weed/s3api/auth_credentials.go b/weed/s3api/auth_credentials.go
index c1e8dff1e..30052878b 100644
--- a/weed/s3api/auth_credentials.go
+++ b/weed/s3api/auth_credentials.go
@@ -91,7 +91,13 @@ func (iam *IdentityAccessManagement) loadS3ApiConfiguration(fileName string) err
return nil
}
+func (iam *IdentityAccessManagement) isEnabled() bool {
+
+ return len(iam.identities) > 0
+}
+
func (iam *IdentityAccessManagement) lookupByAccessKey(accessKey string) (identity *Identity, cred *Credential, found bool) {
+
for _, ident := range iam.identities {
for _, cred := range ident.Credentials {
if cred.AccessKey == accessKey {
@@ -104,7 +110,7 @@ func (iam *IdentityAccessManagement) lookupByAccessKey(accessKey string) (identi
func (iam *IdentityAccessManagement) Auth(f http.HandlerFunc, action Action) http.HandlerFunc {
- if len(iam.identities) == 0 {
+ if iam.isEnabled() {
return f
}