Merge pull request #7558 from danielchengibm/fix-template-recursion-check

fix recursion count in templates
pull/7571/head
Matt Farina 5 years ago committed by GitHub
commit 3129b5323c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -120,6 +120,7 @@ func (e Engine) initFunMap(t *template.Template, referenceTpls map[string]render
includedNames[name] = 1
}
err := t.ExecuteTemplate(&buf, name, data)
includedNames[name]--
return buf.String(), err
}

@ -643,3 +643,58 @@ func TestAlterFuncMap_tplinclude(t *testing.T) {
}
}
func TestRenderRecursionLimit(t *testing.T) {
// endless recursion should produce an error
c := &chart.Chart{
Metadata: &chart.Metadata{Name: "bad"},
Templates: []*chart.File{
{Name: "templates/base", Data: []byte(`{{include "recursion" . }}`)},
{Name: "templates/recursion", Data: []byte(`{{define "recursion"}}{{include "recursion" . }}{{end}}`)},
},
}
v := chartutil.Values{
"Values": "",
"Chart": c.Metadata,
"Release": chartutil.Values{
"Name": "TestRelease",
},
}
expectErr := "rendering template has a nested reference name: recursion: unable to execute template"
_, err := Render(c, v)
if err == nil || !strings.HasSuffix(err.Error(), expectErr) {
t.Errorf("Expected err with suffix: %s", expectErr)
}
// calling the same function many times is ok
times := 4000
phrase := "All work and no play makes Jack a dull boy"
printFunc := `{{define "overlook"}}{{printf "` + phrase + `\n"}}{{end}}`
var repeatedIncl string
for i := 0; i < times; i++ {
repeatedIncl += `{{include "overlook" . }}`
}
d := &chart.Chart{
Metadata: &chart.Metadata{Name: "overlook"},
Templates: []*chart.File{
{Name: "templates/quote", Data: []byte(repeatedIncl)},
{Name: "templates/_function", Data: []byte(printFunc)},
},
}
out, err := Render(d, v)
if err != nil {
t.Fatal(err)
}
var expect string
for i := 0; i < times; i++ {
expect += phrase + "\n"
}
if got := out["overlook/templates/quote"]; got != expect {
t.Errorf("Expected %q, got %q (%v)", expect, got, out)
}
}

Loading…
Cancel
Save