qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-09-30 00:24:29 -06:00
Code Releases Activity

html/template: prevent aliasing of parse Trees via AddParseTree

Browse Source 
Check all associated templates in the set for an existing reference
to the given Tree in AddParseTree before assigning that reference
to a new or existing template. This prevents multiple html/template
Templates from referencing and modifying the same underlying Tree.

While there, fix a few existing unit tests so that they terminate
upon encountering unrecoverable failures.

Fixes #21844

Change-Id: I6b4f6996cf5467113ef94f7b91a6933dbbc21839
Reviewed-on: https://go-review.googlesource.com/64770
Run-TryBot: Rob Pike <r@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Rob Pike <r@golang.org>
This commit is contained in:
Samuel Tan 2017-09-19 11:54:47 -07:00 committed by Rob Pike
parent 3844e707f6
commit cd0a5f0829
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/html/template/escape_test.go
View File

@ -1840,7 +1840,7 @@ func TestErrorOnUndefined(t *testing.T) {
err := tmpl.Execute(nil, nil) err := tmpl.Execute(nil, nil)
if err == nil { if err == nil {
t.Error("expected error") t.Fatal("expected error")
} }
if !strings.Contains(err.Error(), "incomplete") { if !strings.Contains(err.Error(), "incomplete") {
t.Errorf("expected error about incomplete template; got %s", err) t.Errorf("expected error about incomplete template; got %s", err)
@ -1860,10 +1860,10 @@ func TestIdempotentExecute(t *testing.T) {
for i := 0; i < 2; i++ { for i := 0; i < 2; i++ {
err = tmpl.ExecuteTemplate(got, "hello", nil) err = tmpl.ExecuteTemplate(got, "hello", nil)
if err != nil { if err != nil {
t.Errorf("unexpected error: %s", err) t.Fatalf("unexpected error: %s", err)
} }
if got.String() != want { if got.String() != want {
t.Errorf("after executing template \"hello\", got:\n\t%q\nwant:\n\t%q\n", got.String(), want) t.Fatalf("after executing template \"hello\", got:\n\t%q\nwant:\n\t%q\n", got.String(), want)
} }
got.Reset() got.Reset()
} }
@ -1871,7 +1871,7 @@ func TestIdempotentExecute(t *testing.T) {
// "main" does not cause the output of "hello" to change. // "main" does not cause the output of "hello" to change.
err = tmpl.ExecuteTemplate(got, "main", nil) err = tmpl.ExecuteTemplate(got, "main", nil)
if err != nil { if err != nil {
t.Errorf("unexpected error: %s", err) t.Fatalf("unexpected error: %s", err)
} }
// If the HTML escaper is added again to the action {{"Ladies & Gentlemen!"}}, // If the HTML escaper is added again to the action {{"Ladies & Gentlemen!"}},
// we would expected to see the ampersand overescaped to "&amp;amp;". // we would expected to see the ampersand overescaped to "&amp;amp;".
@ -1881,6 +1881,19 @@ func TestIdempotentExecute(t *testing.T) {
} }
} }
// This covers issue #21844.
func TestAddExistingTreeError(t *testing.T) {
tmpl := Must(New("foo").Parse(`<p>{{.}}</p>`))
tmpl, err := tmpl.AddParseTree("bar", tmpl.Tree)
if err == nil {
t.Fatalf("expected error after AddParseTree")
}
const want = `html/template: cannot add parse tree that template "foo" already references`
if got := err.Error(); got != want {
t.Errorf("got error:\n\t%q\nwant:\n\t%q\n", got, want)
}
}
func BenchmarkEscapedExecute(b *testing.B) { func BenchmarkEscapedExecute(b *testing.B) {
tmpl := Must(New("t").Parse(`<a onclick="alert('{{.}}')">{{.}}</a>`)) tmpl := Must(New("t").Parse(`<a onclick="alert('{{.}}')">{{.}}</a>`))
var buf bytes.Buffer var buf bytes.Buffer

5
src/html/template/template.go
View File

@ -219,6 +219,11 @@ func (t *Template) AddParseTree(name string, tree *parse.Tree) (*Template, error
t.nameSpace.mu.Lock() t.nameSpace.mu.Lock()
defer t.nameSpace.mu.Unlock() defer t.nameSpace.mu.Unlock()
for _, tmpl := range t.set {
if tmpl.Tree == tree {
return nil, fmt.Errorf("html/template: cannot add parse tree that template %q already references", tmpl.Name())
}
}
text, err := t.text.AddParseTree(name, tree) text, err := t.text.AddParseTree(name, tree)
if err != nil { if err != nil {
return nil, err return nil, err