Skip to content

Commit 9453cde

Browse files
authored
Comprehension nesting limit typo, allow nesting limit validator to accept doubles as limits (#1196)
* fix typo * Fix a bug for adapting textproto config to a native config
1 parent b023645 commit 9453cde

7 files changed

Lines changed: 22 additions & 8 deletions

File tree

‎cel/env_test.go‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -877,11 +877,17 @@ func TestEnvFromConfigErrors(t *testing.T) {
877877
want: errors.New("invalid validator"),
878878
},
879879
{
880-
name: "invalid validator config type",
880+
name: "invalid validator config type - unsupported type",
881881
conf: env.NewConfig("invalid validator config").
882-
AddValidators(env.NewValidator("cel.validator.comprehension_nesting_limit").SetConfig(map[string]any{"limit": 2.0})),
882+
AddValidators(env.NewValidator("cel.validator.comprehension_nesting_limit").SetConfig(map[string]any{"limit": "2"})),
883883
want: errors.New("invalid validator"),
884884
},
885+
{
886+
name: "invalid validator config type - fractional",
887+
conf: env.NewConfig("invalid validator config").
888+
AddValidators(env.NewValidator("cel.validator.comprehension_nesting_limit").SetConfig(map[string]any{"limit": 2.5})),
889+
want: errors.New("invalid validator: cel.validator.comprehension_nesting_limit, limit value is not a whole number: 2.5"),
890+
},
885891
}
886892
for _, tst := range tests {
887893
tc := tst

‎cel/validator.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,14 @@ var (
4545
astValidatorFactories = map[string]ASTValidatorFactory{
4646
nestingLimitValidatorName: func(val *env.Validator) (ASTValidator, error) {
4747
if limit, found := val.ConfigValue("limit"); found {
48+
// In case of protos, config value is of type by google.protobuf.Value, which numeric values are always a double.
49+
if val, isDouble := limit.(float64); isDouble {
50+
if val != float64(int64(val)) {
51+
return nil, fmt.Errorf("invalid validator: %s, limit value is not a whole number: %v", nestingLimitValidatorName, limit)
52+
}
53+
return ValidateComprehensionNestingLimit(int(val)), nil
54+
}
55+
4856
if val, isInt := limit.(int); isInt {
4957
return ValidateComprehensionNestingLimit(val), nil
5058
}

‎common/env/env_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ func TestConfig(t *testing.T) {
106106
NewValidator("cel.validator.duration"),
107107
NewValidator("cel.validator.matches"),
108108
NewValidator("cel.validator.timestamp"),
109-
NewValidator("cel.validator.nesting_comprehension_limit").
109+
NewValidator("cel.validator.comprehension_nesting_limit").
110110
SetConfig(map[string]any{"limit": 2}),
111111
),
112112
},

‎common/env/testdata/extended_env.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ validators:
5353
- name: cel.validator.duration
5454
- name: cel.validator.matches
5555
- name: cel.validator.timestamp
56-
- name: cel.validator.nesting_comprehension_limit
56+
- name: cel.validator.comprehension_nesting_limit
5757
config:
5858
limit: 2
5959
features:

‎tools/compiler/compiler.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ func envToValidators(pbEnv *configpb.Environment) ([]*env.Validator, error) {
323323
config := map[string]any{}
324324
for k, v := range pbValidator.GetConfig() {
325325
val := types.DefaultTypeAdapter.NativeToValue(v)
326-
config[k] = val
326+
config[k] = val.Value()
327327
}
328328
validator.SetConfig(config)
329329
validators = append(validators, validator)

‎tools/compiler/compiler_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,9 +321,9 @@ func testEnvProto() *configpb.Environment {
321321
Validators: []*configpb.Validator{
322322
{Name: "cel.validator.duration"},
323323
{
324-
Name: "cel.validator.nesting_comprehension_limit",
324+
Name: "cel.validator.comprehension_nesting_limit",
325325
Config: map[string]*structpb.Value{
326-
"limits": structpb.NewNumberValue(2),
326+
"limit": structpb.NewNumberValue(2),
327327
},
328328
},
329329
},

‎tools/compiler/testdata/config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ functions:
7474
type_name: "string"
7575
validators:
7676
- name: cel.validator.duration
77-
- name: cel.validator.nesting_comprehension_limit
77+
- name: cel.validator.comprehension_nesting_limit
7878
config:
7979
limit: 2
8080
features:

0 commit comments

Comments
 (0)