gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change s3_account.go package to avoid cycle dependency (#3813)

Browse Source
This commit is contained in:
LHHDZ
2022-10-10 21:44:29 +08:00
committed by GitHub
parent 0711870f43
commit 3550692afc
7 changed files with 41 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
weed/s3api/s3api_acp.go
View File

@@ -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