mirror of
https://github.com/status-im/consul.git
synced 2025-02-23 02:48:19 +00:00
32ce33825d
* upgrade hcl package and account for possiblity of duplicates existing already in the cache * upgrade to new tag * add defensive line to prevent potential forever loop * o mod tidy and changelog * Update acl/policy.go * fix raft reversion * go mod tidy * fix test * remove duplicate key in test * remove duplicates from test cases * clean up * go mod tidy * go mod tidy * pull in new hcl tag
59 lines
1.4 KiB
Go
59 lines
1.4 KiB
Go
// Copyright (c) HashiCorp, Inc.
|
|
// SPDX-License-Identifier: BUSL-1.1
|
|
|
|
//go:build !consulent
|
|
|
|
package acl
|
|
|
|
import (
|
|
"fmt"
|
|
"github.com/hashicorp/go-hclog"
|
|
"github.com/hashicorp/hcl"
|
|
"strings"
|
|
)
|
|
|
|
// EnterprisePolicyMeta stub
|
|
type EnterprisePolicyMeta struct{}
|
|
|
|
// EnterpriseRule stub
|
|
type EnterpriseRule struct{}
|
|
|
|
func (r *EnterpriseRule) Validate(string, *Config) error {
|
|
// nothing to validate
|
|
return nil
|
|
}
|
|
|
|
// EnterprisePolicyRules stub
|
|
type EnterprisePolicyRules struct{}
|
|
|
|
func (r *EnterprisePolicyRules) Validate(*Config) error {
|
|
// nothing to validate
|
|
return nil
|
|
}
|
|
|
|
func decodeRules(rules string, warnOnDuplicateKey bool, _ *Config, _ *EnterprisePolicyMeta) (*Policy, error) {
|
|
p := &Policy{}
|
|
|
|
err := hcl.DecodeErrorOnDuplicates(p, rules)
|
|
|
|
if errIsDuplicateKey(err) && warnOnDuplicateKey {
|
|
//because the snapshot saves the unparsed rules we have to assume some snapshots exist that shouldn't fail, but
|
|
// have duplicates
|
|
if err := hcl.Decode(p, rules); err != nil {
|
|
hclog.Default().Warn("Warning- Duplicate key in ACL Policy ignored", "errorMessage", err.Error())
|
|
return nil, fmt.Errorf("Failed to parse ACL rules: %v", err)
|
|
}
|
|
} else if err != nil {
|
|
return nil, fmt.Errorf("Failed to parse ACL rules: %v", err)
|
|
}
|
|
|
|
return p, nil
|
|
}
|
|
|
|
func errIsDuplicateKey(err error) bool {
|
|
if err == nil {
|
|
return false
|
|
}
|
|
return strings.Contains(err.Error(), "was already set. Each argument can only be defined once")
|
|
}
|