Fix functional exemptions for homogeneous literal checks (#832)

TristonianJones · web-flow · commit bfccebd90866 · 2023-08-31T16:11:16.000-07:00
diff --git a/cel/validator.go b/cel/validator.go
@@ -304,7 +304,8 @@ func (v homogeneousAggregateLiteralValidator) Validate(_ *Env, c ValidatorConfig
 }
 
 func inExemptFunction(e ast.NavigableExpr, exemptFunctions []string) bool {
-	if parent, found := e.Parent(); found {
+	parent, found := e.Parent()
+	for found {
 		if parent.Kind() == ast.CallKind {
 			fnName := parent.AsCall().FunctionName()
 			for _, exempt := range exemptFunctions {
@@ -313,9 +314,7 @@ func inExemptFunction(e ast.NavigableExpr, exemptFunctions []string) bool {
 				}
 			}
 		}
-		if parent.Kind() == ast.ListKind || parent.Kind() == ast.MapKind {
-			return inExemptFunction(parent, exemptFunctions)
-		}
+		parent, found = parent.Parent()
 	}
 	return false
 }
diff --git a/ext/strings_test.go b/ext/strings_test.go
@@ -1318,6 +1318,50 @@ func TestStringFormat(t *testing.T) {
 	}
 }
 
+func TestStringFormatHeterogeneousLiterals(t *testing.T) {
+	tests := []struct {
+		expr string
+		out  string
+	}{
+		{
+			expr: `"list: %s".format([[[1, 2, [3.0, 4]]]])`,
+			out:  `list: [[1, 2, [3.000000, 4]]]`,
+		},
+		{
+			expr: `"list size: %d".format([[[1, 2, [3.0, 4]]].size()])`,
+			out:  `list size: 1`,
+		},
+		{
+			expr: `"list element: %s".format([[[1, 2, [3.0, 4]]][0]])`,
+			out:  `list element: [1, 2, [3.000000, 4]]`,
+		},
+	}
+	env, err := cel.NewEnv(Strings(), cel.ASTValidators(cel.ValidateHomogeneousAggregateLiterals()))
+	if err != nil {
+		t.Fatalf("cel.NewEnv() failed: %v", err)
+	}
+	for _, tst := range tests {
+		tc := tst
+		t.Run(tc.expr, func(t *testing.T) {
+			ast, iss := env.Compile(tc.expr)
+			if iss.Err() != nil {
+				t.Fatalf("env.Compile(%q) failed: %v", tc.expr, iss.Err())
+			}
+			prg, err := env.Program(ast)
+			if err != nil {
+				t.Fatalf("env.Program() failed: %v", err)
+			}
+			out, _, err := prg.Eval(cel.NoVars())
+			if err != nil {
+				t.Fatalf("Eval() failed: %v", err)
+			}
+			if out.Value() != tc.out {
+				t.Errorf("Eval() got %v, wanted %v", out, tc.out)
+			}
+		})
+	}
+}
+
 func TestBadLocale(t *testing.T) {
 	_, err := cel.NewEnv(Strings(StringsLocale("bad-locale")))
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,8 @@ func (v homogeneousAggregateLiteralValidator) Validate(_ *Env, c ValidatorConfig`
`304`	`304`	`}`
`305`	`305`
`306`	`306`	`func inExemptFunction(e ast.NavigableExpr, exemptFunctions []string) bool {`
`307`		`- if parent, found := e.Parent(); found {`
	`307`	`+ parent, found := e.Parent()`
	`308`	`+ for found {`
`308`	`309`	`if parent.Kind() == ast.CallKind {`
`309`	`310`	`fnName := parent.AsCall().FunctionName()`
`310`	`311`	`for _, exempt := range exemptFunctions {`
`@@ -313,9 +314,7 @@ func inExemptFunction(e ast.NavigableExpr, exemptFunctions []string) bool {`
`313`	`314`	`}`
`314`	`315`	`}`
`315`	`316`	`}`
`316`		`- if parent.Kind() == ast.ListKind \|\| parent.Kind() == ast.MapKind {`
`317`		`- return inExemptFunction(parent, exemptFunctions)`
`318`		`- }`
	`317`	`+ parent, found = parent.Parent()`
`319`	`318`	`}`
`320`	`319`	`return false`
`321`	`320`	`}`