TrueCloudLab/frostfs-sdk-go
33
0
Fork 21
Code Issues 34 Pull requests 1 Releases Activity Actions

[#106] Use BasicACL instead of uint32

Browse source 
Signed-off-by: Denis Kirillov <denis@nspcc.ru>
This commit is contained in:
Denis Kirillov 2021-12-29 15:36:01 +03:00 committed by Alex Vanin
parent b5235bdf34
commit 2d597c1be8
4 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
acl/types.go
View file

@ -6,36 +6,37 @@ import (
"strings" "strings"
) )
// BasicACL is Access Control List that defines who can interact with containers and what exactly they can do.
type BasicACL uint32 type BasicACL uint32
func (a BasicACL) String() string { func (a BasicACL) String() string {
return fmt.Sprintf("0x%x", uint32(a)) return fmt.Sprintf("0x%08x", uint32(a))
} }
const ( const (
// PublicBasicRule is a basic ACL value for final public-read-write container for which extended ACL CANNOT be set. // PublicBasicRule is a basic ACL value for final public-read-write container for which extended ACL CANNOT be set.
PublicBasicRule = 0x1FBFBFFF PublicBasicRule BasicACL = 0x1FBFBFFF
// PrivateBasicRule is a basic ACL value for final private container for which extended ACL CANNOT be set. // PrivateBasicRule is a basic ACL value for final private container for which extended ACL CANNOT be set.
PrivateBasicRule = 0x1C8C8CCC PrivateBasicRule BasicACL = 0x1C8C8CCC
// ReadOnlyBasicRule is a basic ACL value for final public-read container for which extended ACL CANNOT be set. // ReadOnlyBasicRule is a basic ACL value for final public-read container for which extended ACL CANNOT be set.
ReadOnlyBasicRule = 0x1FBF8CFF ReadOnlyBasicRule BasicACL = 0x1FBF8CFF
// PublicAppendRule is a basic ACL value for final public-append container for which extended ACL CANNOT be set. // PublicAppendRule is a basic ACL value for final public-append container for which extended ACL CANNOT be set.
PublicAppendRule = 0x1FBF9FFF PublicAppendRule BasicACL = 0x1FBF9FFF
// EACLPublicBasicRule is a basic ACL value for non-final public-read-write container for which extended ACL CAN be set. // EACLPublicBasicRule is a basic ACL value for non-final public-read-write container for which extended ACL CAN be set.
EACLPublicBasicRule = 0x0FBFBFFF EACLPublicBasicRule BasicACL = 0x0FBFBFFF
// EACLPrivateBasicRule is a basic ACL value for non-final private container for which extended ACL CAN be set. // EACLPrivateBasicRule is a basic ACL value for non-final private container for which extended ACL CAN be set.
EACLPrivateBasicRule = 0x0C8C8CCC EACLPrivateBasicRule BasicACL = 0x0C8C8CCC
// EACLReadOnlyBasicRule is a basic ACL value for non-final public-read container for which extended ACL CAN be set. // EACLReadOnlyBasicRule is a basic ACL value for non-final public-read container for which extended ACL CAN be set.
EACLReadOnlyBasicRule = 0x0FBF8CFF EACLReadOnlyBasicRule BasicACL = 0x0FBF8CFF
// EACLPublicAppendRule is a basic ACL value for non-final public-append container for which extended ACL CAN be set. // EACLPublicAppendRule is a basic ACL value for non-final public-append container for which extended ACL CAN be set.
EACLPublicAppendRule = 0x0FBF9FFF EACLPublicAppendRule BasicACL = 0x0FBF9FFF
) )
const ( const (
@ -65,7 +66,7 @@ const (
) )
// ParseBasicACL parse string ACL (well-known names or hex representation). // ParseBasicACL parse string ACL (well-known names or hex representation).
func ParseBasicACL(basicACL string) (uint32, error) { func ParseBasicACL(basicACL string) (BasicACL, error) {
switch basicACL { switch basicACL {
case PublicBasicName: case PublicBasicName:
return PublicBasicRule, nil return PublicBasicRule, nil
@ -84,13 +85,13 @@ func ParseBasicACL(basicACL string) (uint32, error) {
case EACLPublicAppendName: case EACLPublicAppendName:
return EACLPublicAppendRule, nil return EACLPublicAppendRule, nil
default: default:
basicACL = strings.Trim(strings.ToLower(basicACL), "0x") basicACL = strings.TrimPrefix(strings.ToLower(basicACL), "0x")
value, err := strconv.ParseUint(basicACL, 16, 32) value, err := strconv.ParseUint(basicACL, 16, 32)
if err != nil { if err != nil {
return 0, fmt.Errorf("can't parse basic ACL: %s", basicACL) return 0, fmt.Errorf("can't parse basic ACL: %s", basicACL)
} }
return uint32(value), nil return BasicACL(value), nil
} }
} }

4
acl/types_test.go
View file

@ -9,7 +9,7 @@ import (
func TestParser(t *testing.T) { func TestParser(t *testing.T) {
for _, tc := range []struct { for _, tc := range []struct {
acl string acl string
expected uint32 expected BasicACL
err bool err bool
}{ }{
{ {
@ -78,5 +78,5 @@ func TestString(t *testing.T) {
acl2, err := ParseBasicACL(PrivateBasicName) acl2, err := ParseBasicACL(PrivateBasicName)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, "0x1c8c8ccc", BasicACL(acl2).String()) require.Equal(t, "0x1c8c8ccc", acl2.String())
} }

5
container/container.go
View file

@ -5,6 +5,7 @@ import (
"github.com/google/uuid" "github.com/google/uuid"
"github.com/nspcc-dev/neofs-api-go/v2/container" "github.com/nspcc-dev/neofs-api-go/v2/container"
"github.com/nspcc-dev/neofs-sdk-go/acl"
cid "github.com/nspcc-dev/neofs-sdk-go/container/id" cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
"github.com/nspcc-dev/neofs-sdk-go/netmap" "github.com/nspcc-dev/neofs-sdk-go/netmap"
"github.com/nspcc-dev/neofs-sdk-go/owner" "github.com/nspcc-dev/neofs-sdk-go/owner"
@ -128,8 +129,8 @@ func (c *Container) BasicACL() uint32 {
return c.v2.GetBasicACL() return c.v2.GetBasicACL()
} }
func (c *Container) SetBasicACL(v uint32) { func (c *Container) SetBasicACL(v acl.BasicACL) {
c.v2.SetBasicACL(v) c.v2.SetBasicACL(uint32(v))
} }
func (c *Container) Attributes() Attributes { func (c *Container) Attributes() Attributes {

4
container/opts.go
View file

@ -11,7 +11,7 @@ type (
Option func(*containerOptions) Option func(*containerOptions)
containerOptions struct { containerOptions struct {
acl uint32 acl acl.BasicACL
policy *netmap.PlacementPolicy policy *netmap.PlacementPolicy
attributes Attributes attributes Attributes
owner *owner.ID owner *owner.ID
@ -43,7 +43,7 @@ func WithReadOnlyBasicACL() Option {
} }
} }
func WithCustomBasicACL(acl uint32) Option { func WithCustomBasicACL(acl acl.BasicACL) Option {
return func(option *containerOptions) { return func(option *containerOptions) {
option.acl = acl option.acl = acl
} }