pogpp/frostfs-s3-gw
1
0
Fork 0
forked from TrueCloudLab/frostfs-s3-gw
Code Pull requests Activity

[#422] authmate: Fix extended ACL rules reading

Browse source 
Signed-off-by: Alex Vanin <alexey@nspcc.ru>
This commit is contained in:
Alex Vanin 2022-04-28 18:12:57 +03:00 committed by Kira
parent c9126fc0a9
commit 406e4db30b
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
authmate/authmate.go
View file

@ -12,6 +12,7 @@ import (
"github.com/google/uuid" "github.com/google/uuid"
"github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/crypto/keys"
v2acl "github.com/nspcc-dev/neofs-api-go/v2/acl"
"github.com/nspcc-dev/neofs-s3-gw/api/cache" "github.com/nspcc-dev/neofs-s3-gw/api/cache"
"github.com/nspcc-dev/neofs-s3-gw/creds/accessbox" "github.com/nspcc-dev/neofs-s3-gw/creds/accessbox"
"github.com/nspcc-dev/neofs-s3-gw/creds/tokens" "github.com/nspcc-dev/neofs-s3-gw/creds/tokens"
@ -312,11 +313,20 @@ func (a *Agent) ObtainSecret(ctx context.Context, w io.Writer, options *ObtainSe
} }
func buildEACLTable(eaclTable []byte) (*eacl.Table, error) { func buildEACLTable(eaclTable []byte) (*eacl.Table, error) {
table := eacl.NewTable()
if len(eaclTable) != 0 { if len(eaclTable) != 0 {
return table, table.UnmarshalJSON(eaclTable) // fixme(neofs-sdk-go/#235)
// Can't parse SDK version of eACL table because it requires
// non-empty container ID. Possible solution: read json of bearer
// token instead of eACL table.
v2table := new(v2acl.Table)
err := v2table.UnmarshalJSON(eaclTable)
if err != nil {
return nil, err
}
return eacl.NewTableFromV2(v2table), nil
} }
table := eacl.NewTable()
record := eacl.NewRecord() record := eacl.NewRecord()
record.SetOperation(eacl.OperationGet) record.SetOperation(eacl.OperationGet)
record.SetAction(eacl.ActionAllow) record.SetAction(eacl.ActionAllow)