diff options
| -rw-r--r-- | weed/iamapi/iamapi_management_handlers.go | 4 | ||||
| -rw-r--r-- | weed/util/compression.go | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/weed/iamapi/iamapi_management_handlers.go b/weed/iamapi/iamapi_management_handlers.go index b00ada234..89d283138 100644 --- a/weed/iamapi/iamapi_management_handlers.go +++ b/weed/iamapi/iamapi_management_handlers.go @@ -114,7 +114,11 @@ func (iama *IamApiServer) ListUsers(s3cfg *iam_pb.S3ApiConfiguration, values url func (iama *IamApiServer) ListAccessKeys(s3cfg *iam_pb.S3ApiConfiguration, values url.Values) (resp ListAccessKeysResponse) { status := iam.StatusTypeActive + userName := values.Get("UserName") for _, ident := range s3cfg.Identities { + if userName != "" && userName != ident.Name { + continue + } for _, cred := range ident.Credentials { resp.ListAccessKeysResult.AccessKeyMetadata = append(resp.ListAccessKeysResult.AccessKeyMetadata, &iam.AccessKeyMetadata{UserName: &ident.Name, AccessKeyId: &cred.AccessKey, Status: &status}, diff --git a/weed/util/compression.go b/weed/util/compression.go index 9d52810cb..5ba8c4930 100644 --- a/weed/util/compression.go +++ b/weed/util/compression.go @@ -126,7 +126,7 @@ func IsZstdContent(data []byte) bool { // by file name extension switch ext { - case ".zip", ".rar", ".gz", ".bz2", ".xz", ".zst": + case ".zip", ".rar", ".gz", ".bz2", ".xz", ".zst", ".br": return false, true case ".pdf", ".txt", ".html", ".htm", ".css", ".js", ".json": return true, true @@ -147,6 +147,9 @@ func IsZstdContent(data []byte) bool { if strings.HasSuffix(mtype, "script") { return true, true } + if strings.HasSuffix(mtype, "vnd.rar) { + return false, true + } } if strings.HasPrefix(mtype, "audio/") { |