carpawell/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#675] cli/container: Support binary eACL format

Browse source 
Signed-off-by: Pavel Karpy <carpawell@nspcc.ru>
This commit is contained in:
Pavel Karpy 2021-07-08 20:16:14 +03:00 committed by Alex Vanin
parent d189d60925
commit cf8f640726
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
cmd/neofs-cli/modules/container.go
View file

@ -68,9 +68,10 @@ var (
) )
var ( var (
errDeleteTimeout = errors.New("timeout: container has not been removed from sidechain") errDeleteTimeout = errors.New("timeout: container has not been removed from sidechain")
errCreateTimeout = errors.New("timeout: container has not been persisted on sidechain") errCreateTimeout = errors.New("timeout: container has not been persisted on sidechain")
errSetEACLTimeout = errors.New("timeout: EACL has not been persisted on sidechain") errSetEACLTimeout = errors.New("timeout: EACL has not been persisted on sidechain")
errUnsupportedEACLFormat = errors.New("unsupported eACL format")
) )
// containerCmd represents the container command // containerCmd represents the container command
@ -715,17 +716,27 @@ func parseEACL(eaclPath string) (*eacl.Table, error) {
} }
table := eacl.NewTable() table := eacl.NewTable()
if err = table.UnmarshalJSON(data); err == nil {
v := table.Version()
if !version.IsValid(v) {
table.SetVersion(*pkg.SDKVersion())
}
if err = table.UnmarshalJSON(data); err == nil {
validateAndFixEACLVersion(table)
printVerbose("Parsed JSON encoded EACL table") printVerbose("Parsed JSON encoded EACL table")
return table, nil return table, nil
} }
return nil, fmt.Errorf("can't parse EACL table: %w", err) if err = table.Unmarshal(data); err == nil {
validateAndFixEACLVersion(table)
printVerbose("Parsed binary encoded EACL table")
return table, nil
}
return nil, errUnsupportedEACLFormat
}
func validateAndFixEACLVersion(table *eacl.Table) {
v := table.Version()
if !version.IsValid(v) {
table.SetVersion(*pkg.SDKVersion())
}
} }
func prettyPrintEACL(cmd *cobra.Command, table *eacl.Table) { func prettyPrintEACL(cmd *cobra.Command, table *eacl.Table) {