Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mw: fix transform middleware regression with XML #1166

Merged
merged 1 commit into from Sep 29, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 14 additions & 0 deletions mw_transform_test.go
Expand Up @@ -2,6 +2,7 @@ package main

import (
"io/ioutil"
"strings"
"testing"
"text/template"

Expand Down Expand Up @@ -31,3 +32,16 @@ func TestTransformNonAscii(t *testing.T) {
t.Fatalf("wanted body %q, got %q", want, got)
}
}

func TestTransformXMLCrash(t *testing.T) {
// mxj.NewMapXmlReader used to take forever and crash the
// process by eating up all the memory.
in := strings.NewReader("")
r := testReq(t, "GET", "/", in)
tmeta := &TransformSpec{}
tmeta.TemplateData.Input = apidef.RequestXML
tmeta.Template = template.Must(template.New("blob").Parse(""))
if err := transformBody(r, tmeta, false); err == nil {
t.Fatalf("wanted error, got nil")
}
}
16 changes: 12 additions & 4 deletions vendor/github.com/clbanning/mxj/doc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 0 additions & 12 deletions vendor/github.com/clbanning/mxj/files.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 9 additions & 6 deletions vendor/github.com/clbanning/mxj/keyvalues.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 29 additions & 4 deletions vendor/github.com/clbanning/mxj/leafnode.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/clbanning/mxj/newmap.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 13 additions & 4 deletions vendor/github.com/clbanning/mxj/readme.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions vendor/github.com/clbanning/mxj/rename.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions vendor/github.com/clbanning/mxj/setfieldsep.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 23 additions & 10 deletions vendor/github.com/clbanning/mxj/struct.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.