Skip to content

Commit ac74f4b

Browse files
committed
fix: remove special proxy handling for bucket acls in posix backend
1 parent a29a736 commit ac74f4b

File tree

1 file changed

+0
-23
lines changed

1 file changed

+0
-23
lines changed

backend/posix/posix.go

-23
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ const (
6060
contentEncHdr = "content-encoding"
6161
emptyMD5 = "d41d8cd98f00b204e9800998ecf8427e"
6262
aclkey = "user.acl"
63-
proxyAclKey = "versitygwAcl"
64-
proxyBucketAclKey = "user.proxy.acl"
6563
etagkey = "user.etag"
6664
)
6765

@@ -1731,17 +1729,6 @@ func (p *Posix) PutBucketTagging(_ context.Context, bucket string, tags map[stri
17311729
return fmt.Errorf("stat bucket: %w", err)
17321730
}
17331731

1734-
acl, ok := tags[proxyAclKey]
1735-
if ok {
1736-
// set proxy acl in a separate xattr key
1737-
err = xattr.Set(bucket, proxyBucketAclKey, []byte(acl))
1738-
if err != nil {
1739-
return fmt.Errorf("set proxy acl: %w", err)
1740-
}
1741-
1742-
return nil
1743-
}
1744-
17451732
if tags == nil {
17461733
err = xattr.Remove(bucket, "user."+tagHdr)
17471734
if err != nil {
@@ -1777,16 +1764,6 @@ func (p *Posix) GetBucketTagging(_ context.Context, bucket string) (map[string]s
17771764
return nil, err
17781765
}
17791766

1780-
acl, err := xattr.Get(bucket, proxyBucketAclKey)
1781-
if isNoAttr(err) {
1782-
return tags, nil
1783-
}
1784-
if err != nil {
1785-
return nil, fmt.Errorf("get tags: %w", err)
1786-
}
1787-
1788-
tags[proxyAclKey] = string(acl)
1789-
17901767
return tags, nil
17911768
}
17921769

0 commit comments

Comments
 (0)