EliChin/frostfs-s3-gw
1
0
Fork 0
forked from TrueCloudLab/frostfs-s3-gw
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#583] Fix error when policy file cannot be read

Browse source 
Signed-off-by: Angira Kekteeva <kira@nspcc.ru>
This commit is contained in:
Angira Kekteeva 2022-07-07 01:28:16 +04:00 committed by Kira
parent a57b8d34d3
commit 5d52f056eb
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cmd/s3-authmate/main.go
View file

@ -440,9 +440,16 @@ func parsePolicies(val string) (authmate.ContainerPolicies, error) {
if val == "" { if val == "" {
return nil, nil return nil, nil
} }
data, err := os.ReadFile(val)
if err != nil { var (
data = []byte(val) data = []byte(val)
err error
)
if !json.Valid(data) {
if data, err = os.ReadFile(val); err != nil {
return nil, fmt.Errorf("coudln't read json file or its content is invalid")
}
} }
var policies authmate.ContainerPolicies var policies authmate.ContainerPolicies