status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-02-12 13:46:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11293 from bisakhmondal/service_filter

Browse Source 
expression validation of service-resolver subset filter
This commit is contained in:
Jared Kirschner 2021-10-20 08:57:37 -04:00 committed by GitHub
commit 14af8cb7a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/11293.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:improvement
connect: service-resolver subset filters are validated for valid go-bexpr syntax on write
```

8
agent/structs/config_entry_discoverychain.go
View File

@ -11,6 +11,7 @@ import (
"strings"
"time"
"github.com/hashicorp/go-bexpr"
"github.com/mitchellh/copystructure"
"github.com/mitchellh/hashstructure"
@ -901,13 +902,18 @@ func (e *ServiceResolverConfigEntry) Validate() error {
}
if len(e.Subsets) > 0 {
for name := range e.Subsets {
for name, subset := range e.Subsets {
if name == "" {
return fmt.Errorf("Subset defined with empty name")
}
if err := validateServiceSubset(name); err != nil {
return fmt.Errorf("Subset %q is invalid: %v", name, err)
}
if subset.Filter != "" {
if _, err := bexpr.CreateEvaluator(subset.Filter, nil); err != nil {
return fmt.Errorf("Filter for subset %q is not a valid expression: %v", name, err)
}
}
}
}

11
agent/structs/config_entry_discoverychain_test.go
View File

@ -552,6 +552,17 @@ func TestServiceResolverConfigEntry(t *testing.T) {
},
validateErr: "Subset defined with empty name",
},
{
name: "invalid boolean expression subset filter",
entry: &ServiceResolverConfigEntry{
Kind: ServiceResolver,
Name: "test",
Subsets: map[string]ServiceResolverSubset{
"v1": {Filter: "random string"},
},
},
validateErr: `Filter for subset "v1" is not a valid expression`,
},
{
name: "default subset does not exist",
entry: &ServiceResolverConfigEntry{