diff options
| author | LHHDZ <changlin.shi@ly.com> | 2022-10-10 21:44:29 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-10 06:44:29 -0700 |
| commit | 3550692afc3cad1166522c2eada46efd3b3a617d (patch) | |
| tree | efaf3604efab5aa6dc72a31c95829de0badc5bae /weed/s3api/s3api_acp.go | |
| parent | 0711870f43e6c5eadd3df70f22478e6e9998e5a2 (diff) | |
| download | seaweedfs-3550692afc3cad1166522c2eada46efd3b3a617d.tar.xz seaweedfs-3550692afc3cad1166522c2eada46efd3b3a617d.zip | |
change s3_account.go package to avoid cycle dependency (#3813)
Diffstat (limited to 'weed/s3api/s3api_acp.go')
| -rw-r--r-- | weed/s3api/s3api_acp.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/weed/s3api/s3api_acp.go b/weed/s3api/s3api_acp.go index 0a79990f5..7a76c2a67 100644 --- a/weed/s3api/s3api_acp.go +++ b/weed/s3api/s3api_acp.go @@ -2,6 +2,7 @@ package s3api import ( "github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants" + "github.com/seaweedfs/seaweedfs/weed/s3api/s3account" "github.com/seaweedfs/seaweedfs/weed/s3api/s3err" "net/http" ) @@ -9,7 +10,7 @@ import ( func getAccountId(r *http.Request) string { id := r.Header.Get(s3_constants.AmzAccountId) if len(id) == 0 { - return AccountAnonymous.Id + return s3account.AccountAnonymous.Id } else { return id } @@ -21,7 +22,7 @@ func (s3a *S3ApiServer) checkAccessByOwnership(r *http.Request, bucket string) s return errCode } accountId := getAccountId(r) - if accountId == AccountAdmin.Id || accountId == *metadata.Owner.ID { + if accountId == s3account.AccountAdmin.Id || accountId == *metadata.Owner.ID { return s3err.ErrNone } return s3err.ErrAccessDenied |