use yaml for tests

Author: agilezebra

go.mod

@@ -7,6 +7,7 @@ require github.com/golang-jwt/jwt/v5 v5.0.0
 require (
 	github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964
 	github.com/go-jose/go-jose/v3 v3.0.0
+	gopkg.in/yaml.v3 v3.0.1
 )
 
 require golang.org/x/crypto v0.12.0 // indirect

go.sum

@@ -22,6 +22,8 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

jwt.go

@@ -313,18 +313,20 @@ func (plugin *JWTPlugin) fetchKeys(issuer string) error {
 func canonicalizeRequire(require map[string]interface{}) (map[string][]*template.Template, error) {
 	converted := make(map[string][]*template.Template, len(require))
 	for key, value := range require {
+		var templates []*template.Template
+		var err error
 		switch value := value.(type) {
 		case string:
-			converted[key], _ = createTemplates([]interface{}{value})
+			templates, err = createTemplates([]interface{}{value})
 		case []interface{}:
-			templates, err := createTemplates(value)
-			if err != nil {
-				return nil, err
-			}
-			converted[key] = templates
+			templates, err = createTemplates(value)
 		default:
 			return nil, fmt.Errorf("invalid type (%s) for required claim: %s", reflect.TypeOf(value), key)
 		}
+		if err != nil {
+			return nil, err
+		}
+		converted[key] = templates
 	}
 	return converted, nil
 }

jwt_test.go

@@ -20,6 +20,7 @@ import (
 
 	"github.com/go-jose/go-jose/v3"
 	"github.com/golang-jwt/jwt/v5"
+	"gopkg.in/yaml.v3"
 )
 
 type Test struct {
@@ -835,39 +836,54 @@ func TestCanonicalizeDomains(tester *testing.T) {
 }
 
 func TestCanonicalizeRequire(tester *testing.T) {
-	data := TemplateVariables{
+	var bad map[string]interface{}
+	variables := TemplateVariables{
 		URL: "test",
 	}
 
-	bad := map[string]interface{}{
-		"first":  "one {{.URL}}",
-		"second": []interface{}{"two {{.URL}}", "three {{.URL}}"},
-		"bad":    9,
-	}
-	_, err := canonicalizeRequire(bad)
-	if err == nil {
-		tester.Fatal("expected err")
+	texts := []string{
+		`
+first: "one {{.URL}}"
+second:
+  - "two {{.URL}}"
+  - "three {{.URL}}"
+bad: 9
+`,
+		`
+first: "one {{.URL}}"
+second:
+  - 9
+  - 10
+`,
+	}
+	for _, text := range texts {
+		err := yaml.Unmarshal([]byte(text), &bad)
+		if err != nil {
+			tester.Fatal(err)
+		}
+		_, err = canonicalizeRequire(bad)
+		if err == nil {
+			tester.Fatal("expected err")
+		}
 	}
 
-	bad2 := map[string]interface{}{
-		"first":  "one {{.URL}}",
-		"second": []interface{}{9, 10},
-	}
-	_, err = canonicalizeRequire(bad2)
-	if err == nil {
-		tester.Fatal("expected err")
-	}
+	text := `
+first: "one {{.URL}}"
+second:
+  - "two {{.URL}}"
+  - "three {{.URL}}"
+`
 
-	good := map[string]interface{}{
-		"first":  "one {{.URL}}",
-		"second": []interface{}{"two {{.URL}}", "three {{.URL}}"},
+	var good map[string]interface{}
+	err := yaml.Unmarshal([]byte(text), &good)
+	if err != nil {
+		tester.Fatal(err)
 	}
-
 	result, err := canonicalizeRequire(good)
 	if err != nil {
 		tester.Fatal(err)
 	}
-	value, err := expandTemplate(result["second"][0], &data)
+	value, err := expandTemplate(result["second"][0], &variables)
 	if err != nil {
 		tester.Fatal(err)
 	}

vendor/modules.txt

@@ -12,3 +12,6 @@ github.com/golang-jwt/jwt/v5
 # golang.org/x/crypto v0.12.0
 ## explicit; go 1.17
 golang.org/x/crypto/pbkdf2
+# gopkg.in/yaml.v3 v3.0.1
+## explicit
+gopkg.in/yaml.v3