gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

don't skip empty value at AssembleEntryWithAcp (#3855)

Browse source 
* add acl helper functionalities

Signed-off-by: changlin.shi <changlin.shi@ly.com>

* add tests

Signed-off-by: changlin.shi <changlin.shi@ly.com>

* remove 0 when create map

Signed-off-by: changlin.shi <changlin.shi@ly.com>

* delete when empty at `AssembleEntryWithAcp`

`PutBucketAcl/PutObjectAcl` allow request with empty grants, `AssembleEntryWithAcp`  shouldn't skip empty value

Signed-off-by: changlin.shi <changlin.shi@ly.com>

Signed-off-by: changlin.shi <changlin.shi@ly.com>
This commit is contained in:
LHHDZ 2022-10-14 13:50:44 +08:00 committed by GitHub
parent 1f7e52c63e
commit a5b867af69
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
weed/s3api/s3acl/acl_helper.go
View file

@ -411,6 +411,8 @@ func AssembleEntryWithAcp(objectEntry *filer_pb.Entry, objectOwner string, grant
if len(objectOwner) > 0 { if len(objectOwner) > 0 {
objectEntry.Extended[s3_constants.ExtAmzOwnerKey] = []byte(objectOwner) objectEntry.Extended[s3_constants.ExtAmzOwnerKey] = []byte(objectOwner)
} else {
delete(objectEntry.Extended, s3_constants.ExtAmzOwnerKey)
} }
if len(grants) > 0 { if len(grants) > 0 {
@ -420,6 +422,8 @@ func AssembleEntryWithAcp(objectEntry *filer_pb.Entry, objectOwner string, grant
return s3err.ErrInvalidRequest return s3err.ErrInvalidRequest
} }
objectEntry.Extended[s3_constants.ExtAmzAclKey] = grantsBytes objectEntry.Extended[s3_constants.ExtAmzAclKey] = grantsBytes
} else {
delete(objectEntry.Extended, s3_constants.ExtAmzAclKey)
} }
return s3err.ErrNone return s3err.ErrNone

70
weed/s3api/s3acl/acl_helper_test.go
View file

@ -487,46 +487,44 @@ func TestDetermineReqGrants(t *testing.T) {
func TestAssembleEntryWithAcp(t *testing.T) { func TestAssembleEntryWithAcp(t *testing.T) {
defaultOwner := "admin" defaultOwner := "admin"
{
//case1 //case1
expectOwner := "accountS" //assemble with non-empty grants
expectGrants := []*s3.Grant{ expectOwner := "accountS"
{ expectGrants := []*s3.Grant{
Permission: &s3_constants.PermissionRead, {
Grantee: &s3.Grantee{ Permission: &s3_constants.PermissionRead,
Type: &s3_constants.GrantTypeGroup, Grantee: &s3.Grantee{
ID: &s3account.AccountAdmin.Id, Type: &s3_constants.GrantTypeGroup,
URI: &s3_constants.GranteeGroupAllUsers, ID: &s3account.AccountAdmin.Id,
}, URI: &s3_constants.GranteeGroupAllUsers,
}, },
} },
entry := &filer_pb.Entry{}
AssembleEntryWithAcp(entry, expectOwner, expectGrants)
resultOwner := GetAcpOwner(entry.Extended, defaultOwner)
if resultOwner != expectOwner {
t.Fatalf("owner not expect")
}
resultGrants := GetAcpGrants(entry.Extended)
if !grantsEquals(resultGrants, expectGrants) {
t.Fatal("grants not expect")
}
} }
{ entry := &filer_pb.Entry{}
//case2 AssembleEntryWithAcp(entry, expectOwner, expectGrants)
entry := &filer_pb.Entry{}
AssembleEntryWithAcp(entry, "", nil)
resultOwner := GetAcpOwner(entry.Extended, defaultOwner) resultOwner := GetAcpOwner(entry.Extended, defaultOwner)
if resultOwner != defaultOwner { if resultOwner != expectOwner {
t.Fatalf("owner not expect") t.Fatalf("owner not expect")
} }
resultGrants := GetAcpGrants(entry.Extended) resultGrants := GetAcpGrants(entry.Extended)
if len(resultGrants) != 0 { if !grantsEquals(resultGrants, expectGrants) {
t.Fatal("grants not expect") t.Fatal("grants not expect")
} }
//case2
//assemble with empty grants (override)
AssembleEntryWithAcp(entry, "", nil)
resultOwner = GetAcpOwner(entry.Extended, defaultOwner)
if resultOwner != defaultOwner {
t.Fatalf("owner not expect")
}
resultGrants = GetAcpGrants(entry.Extended)
if len(resultGrants) != 0 {
t.Fatal("grants not expect")
} }
} }