forked from TrueCloudLab/frostfs-s3-gw
Revert "[#422] authmate: Fix extended ACL rules reading"
This reverts commit 406e4db30b
.
Signed-off-by: Alex Vanin <alexey@nspcc.ru>
This commit is contained in:
parent
5485adc477
commit
0e27fea8f2
1 changed files with 2 additions and 12 deletions
|
@ -12,7 +12,6 @@ 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"
|
||||||
|
@ -318,20 +317,11 @@ 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 {
|
||||||
// fixme(neofs-sdk-go/#235)
|
return table, table.UnmarshalJSON(eaclTable)
|
||||||
// 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)
|
||||||
|
|
Loading…
Reference in a new issue