diff options
| author | chrislu <chris.lu@gmail.com> | 2022-10-13 23:10:49 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2022-10-13 23:10:49 -0700 |
| commit | e05637c42cbb7519aa97c3b46a0305872fa6d11a (patch) | |
| tree | e2ade7d0cac8c386c84f1c8ec41375bd905ee429 /weed/s3api/s3acl/acl_helper.go | |
| parent | dcd0743a35912dfa559ae912e5208f15dd186386 (diff) | |
| parent | a5b867af69ff7be5e0f0944b2ee4275524d542e9 (diff) | |
| download | seaweedfs-e05637c42cbb7519aa97c3b46a0305872fa6d11a.tar.xz seaweedfs-e05637c42cbb7519aa97c3b46a0305872fa6d11a.zip | |
Merge branch 'master' of https://github.com/seaweedfs/seaweedfs
Diffstat (limited to 'weed/s3api/s3acl/acl_helper.go')
| -rw-r--r-- | weed/s3api/s3acl/acl_helper.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/weed/s3api/s3acl/acl_helper.go b/weed/s3api/s3acl/acl_helper.go index e54e67556..bb956368e 100644 --- a/weed/s3api/s3acl/acl_helper.go +++ b/weed/s3api/s3acl/acl_helper.go @@ -411,6 +411,8 @@ func AssembleEntryWithAcp(objectEntry *filer_pb.Entry, objectOwner string, grant if len(objectOwner) > 0 { objectEntry.Extended[s3_constants.ExtAmzOwnerKey] = []byte(objectOwner) + } else { + delete(objectEntry.Extended, s3_constants.ExtAmzOwnerKey) } if len(grants) > 0 { @@ -420,6 +422,8 @@ func AssembleEntryWithAcp(objectEntry *filer_pb.Entry, objectOwner string, grant return s3err.ErrInvalidRequest } objectEntry.Extended[s3_constants.ExtAmzAclKey] = grantsBytes + } else { + delete(objectEntry.Extended, s3_constants.ExtAmzAclKey) } return s3err.ErrNone |