Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

xml: add check of version in document declaration

Browse source 
Check that if a version is declared, for example
in '<?xml version="XX" ?>', version must be '1.0'.

Change-Id: I16ba9f78873a5f31977dcf75ac8e671fe6c08280
Reviewed-on: https://go-review.googlesource.com/8961
Reviewed-by: Russ Cox <rsc@golang.org>
This commit is contained in:
Giulio Iotti 2015-04-15 16:59:49 +03:00 • committed by Russ Cox
parent a13606e619
commit 9490fbf755
2 changed files with 24 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/encoding/xml/xml.go
View file

@ -576,7 +576,6 @@ func (d *Decoder) rawToken() (Token, error) {
case '?': case '?':
// <?: Processing instruction. // <?: Processing instruction.
// TODO(rsc): Should parse the <?xml declaration to make sure the version is 1.0.
var target string var target string
if target, ok = d.name(); !ok { if target, ok = d.name(); !ok {
if d.err == nil { if d.err == nil {
@ -601,7 +600,13 @@ func (d *Decoder) rawToken() (Token, error) {
data = data[0 : len(data)-2] // chop ?> data = data[0 : len(data)-2] // chop ?>
if target == "xml" { if target == "xml" {
enc := procInstEncoding(string(data)) content := string(data)
ver := procInst("version", content)
if ver != "" && ver != "1.0" {
d.err = fmt.Errorf("xml: unsupported version %q; only version 1.0 is supported", ver)
return nil, d.err
}
enc := procInst("encoding", content)
if enc != "" && enc != "utf-8" && enc != "UTF-8" { if enc != "" && enc != "utf-8" && enc != "UTF-8" {
if d.CharsetReader == nil { if d.CharsetReader == nil {
d.err = fmt.Errorf("xml: encoding %q declared but Decoder.CharsetReader is nil", enc) d.err = fmt.Errorf("xml: encoding %q declared but Decoder.CharsetReader is nil", enc)
@ -1962,16 +1967,17 @@ func Escape(w io.Writer, s []byte) {
EscapeText(w, s) EscapeText(w, s)
} }
// procInstEncoding parses the `encoding="..."` or `encoding='...'` // procInst parses the `param="..."` or `param='...'`
// value out of the provided string, returning "" if not found. // value out of the provided string, returning "" if not found.
func procInstEncoding(s string) string { func procInst(param, s string) string {
// TODO: this parsing is somewhat lame and not exact. // TODO: this parsing is somewhat lame and not exact.
// It works for all actual cases, though. // It works for all actual cases, though.
idx := strings.Index(s, "encoding=") param = param + "="
idx := strings.Index(s, param)
if idx == -1 { if idx == -1 {
return "" return ""
} }
v := s[idx+len("encoding="):] v := s[idx+len(param):]
if v == "" { if v == "" {
return "" return ""
} }

21
src/encoding/xml/xml_test.go
View file

@ -657,20 +657,23 @@ type procInstEncodingTest struct {
} }
var procInstTests = []struct { var procInstTests = []struct {
input, expect string input string
expect [2]string
}{ }{
{`version="1.0" encoding="utf-8"`, "utf-8"}, {`version="1.0" encoding="utf-8"`, [2]string{"1.0", "utf-8"}},
{`version="1.0" encoding='utf-8'`, "utf-8"}, {`version="1.0" encoding='utf-8'`, [2]string{"1.0", "utf-8"}},
{`version="1.0" encoding='utf-8' `, "utf-8"}, {`version="1.0" encoding='utf-8' `, [2]string{"1.0", "utf-8"}},
{`version="1.0" encoding=utf-8`, ""}, {`version="1.0" encoding=utf-8`, [2]string{"1.0", ""}},
{`encoding="FOO" `, "FOO"}, {`encoding="FOO" `, [2]string{"", "FOO"}},
} }
func TestProcInstEncoding(t *testing.T) { func TestProcInstEncoding(t *testing.T) {
for _, test := range procInstTests { for _, test := range procInstTests {
got := procInstEncoding(test.input) if got := procInst("version", test.input); got != test.expect[0] {
if got != test.expect { t.Errorf("procInst(version, %q) = %q; want %q", test.input, got, test.expect[0])
t.Errorf("procInstEncoding(%q) = %q; want %q", test.input, got, test.expect) }
if got := procInst("encoding", test.input); got != test.expect[1] {
t.Errorf("procInst(encoding, %q) = %q; want %q", test.input, got, test.expect[1])
} }
} }
} }