qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-10-04 10:31:22 -06:00
Code Releases Activity

exp/html: implement escaping and double-escaping in scripts

Browse Source 
The text inside <script> tags is not ordinary raw text; there are all sorts
of other complications. This CL implements those complications.

Pass 76 additional tests.

R=nigeltao
CC=golang-dev
https://golang.org/cl/6443070
This commit is contained in:
Andrew Balholm 2012-08-01 14:45:35 +10:00 committed by Nigel Tao
parent 8dbeb0ad07
commit dbbfbcc4a1
4 changed files with 336 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/pkg/exp/html/parse_test.go
View File

@ -389,6 +389,23 @@ var renderTestBlacklist = map[string]bool{
// A <plaintext> element is reparented, putting it before a table. // A <plaintext> element is reparented, putting it before a table.
// A <plaintext> element can't have anything after it in HTML. // A <plaintext> element can't have anything after it in HTML.
`<table><plaintext><td>`: true, `<table><plaintext><td>`: true,
// A script that ends at EOF may escape its own closing tag when rendered.
`<!doctype html><script><!--<script `: true,
`<!doctype html><script><!--<script <a`: true,
`<!doctype html><script><!--<script </script`: true,
`<!doctype html><script><!--<script </scripta`: true,
`<!doctype html><script><!--<script -`: true,
`<!doctype html><script><!--<script -a`: true,
`<!doctype html><script><!--<script --`: true,
`<!doctype html><script><!--<script --a`: true,
`<script><!--<script `: true,
`<script><!--<script <a`: true,
`<script><!--<script </script`: true,
`<script><!--<script </scripta`: true,
`<script><!--<script -`: true,
`<script><!--<script -a`: true,
`<script><!--<script --`: true,
`<script><!--<script --a`: true,
} }
func TestNodeConsistency(t *testing.T) { func TestNodeConsistency(t *testing.T) {

16
src/pkg/exp/html/testlogs/scriptdata01.dat.log
View File

@ -14,13 +14,13 @@ PASS "FOO<script>'<!-->'</script>BAR"
PASS "FOO<script>'<!-->'</script>BAR" PASS "FOO<script>'<!-->'</script>BAR"
PASS "FOO<script>'<!-- potato'</script>BAR" PASS "FOO<script>'<!-- potato'</script>BAR"
PASS "FOO<script>'<!-- <sCrIpt'</script>BAR" PASS "FOO<script>'<!-- <sCrIpt'</script>BAR"
FAIL "FOO<script type=\"text/plain\">'<!-- <sCrIpt>'</script>BAR" PASS "FOO<script type=\"text/plain\">'<!-- <sCrIpt>'</script>BAR"
FAIL "FOO<script type=\"text/plain\">'<!-- <sCrIpt> -'</script>BAR" PASS "FOO<script type=\"text/plain\">'<!-- <sCrIpt> -'</script>BAR"
FAIL "FOO<script type=\"text/plain\">'<!-- <sCrIpt> --'</script>BAR" PASS "FOO<script type=\"text/plain\">'<!-- <sCrIpt> --'</script>BAR"
PASS "FOO<script>'<!-- <sCrIpt> -->'</script>BAR" PASS "FOO<script>'<!-- <sCrIpt> -->'</script>BAR"
FAIL "FOO<script type=\"text/plain\">'<!-- <sCrIpt> --!>'</script>BAR" PASS "FOO<script type=\"text/plain\">'<!-- <sCrIpt> --!>'</script>BAR"
FAIL "FOO<script type=\"text/plain\">'<!-- <sCrIpt> -- >'</script>BAR" PASS "FOO<script type=\"text/plain\">'<!-- <sCrIpt> -- >'</script>BAR"
FAIL "FOO<script type=\"text/plain\">'<!-- <sCrIpt '</script>BAR" PASS "FOO<script type=\"text/plain\">'<!-- <sCrIpt '</script>BAR"
FAIL "FOO<script type=\"text/plain\">'<!-- <sCrIpt/'</script>BAR" PASS "FOO<script type=\"text/plain\">'<!-- <sCrIpt/'</script>BAR"
PASS "FOO<script type=\"text/plain\">'<!-- <sCrIpt\\'</script>BAR" PASS "FOO<script type=\"text/plain\">'<!-- <sCrIpt\\'</script>BAR"
FAIL "FOO<script type=\"text/plain\">'<!-- <sCrIpt/'</script>BAR</script>QUX" PASS "FOO<script type=\"text/plain\">'<!-- <sCrIpt/'</script>BAR</script>QUX"

136
src/pkg/exp/html/testlogs/tests16.dat.log
View File

@ -1,19 +1,19 @@
PASS "<!doctype html><script>" PASS "<!doctype html><script>"
PASS "<!doctype html><script>a" PASS "<!doctype html><script>a"
PARSE "<!doctype html><script><" PASS "<!doctype html><script><"
PARSE "<!doctype html><script></" PASS "<!doctype html><script></"
PARSE "<!doctype html><script></S" PASS "<!doctype html><script></S"
PARSE "<!doctype html><script></SC" PASS "<!doctype html><script></SC"
PARSE "<!doctype html><script></SCR" PASS "<!doctype html><script></SCR"
PARSE "<!doctype html><script></SCRI" PASS "<!doctype html><script></SCRI"
PARSE "<!doctype html><script></SCRIP" PASS "<!doctype html><script></SCRIP"
PASS "<!doctype html><script></SCRIPT" PASS "<!doctype html><script></SCRIPT"
PASS "<!doctype html><script></SCRIPT " PASS "<!doctype html><script></SCRIPT "
PARSE "<!doctype html><script></s" PASS "<!doctype html><script></s"
PARSE "<!doctype html><script></sc" PASS "<!doctype html><script></sc"
PARSE "<!doctype html><script></scr" PASS "<!doctype html><script></scr"
PARSE "<!doctype html><script></scri" PASS "<!doctype html><script></scri"
PARSE "<!doctype html><script></scrip" PASS "<!doctype html><script></scrip"
PASS "<!doctype html><script></script" PASS "<!doctype html><script></script"
PASS "<!doctype html><script></script " PASS "<!doctype html><script></script "
PASS "<!doctype html><script><!" PASS "<!doctype html><script><!"
@ -22,9 +22,9 @@ PASS "<!doctype html><script><!-"
PASS "<!doctype html><script><!-a" PASS "<!doctype html><script><!-a"
PASS "<!doctype html><script><!--" PASS "<!doctype html><script><!--"
PASS "<!doctype html><script><!--a" PASS "<!doctype html><script><!--a"
PARSE "<!doctype html><script><!--<" PASS "<!doctype html><script><!--<"
PASS "<!doctype html><script><!--<a" PASS "<!doctype html><script><!--<a"
PARSE "<!doctype html><script><!--</" PASS "<!doctype html><script><!--</"
PASS "<!doctype html><script><!--</script" PASS "<!doctype html><script><!--</script"
PASS "<!doctype html><script><!--</script " PASS "<!doctype html><script><!--</script "
PASS "<!doctype html><script><!--<s" PASS "<!doctype html><script><!--<s"
@ -36,16 +36,16 @@ PARSE "<!doctype html><script><!--<script </"
PARSE "<!doctype html><script><!--<script </s" PARSE "<!doctype html><script><!--<script </s"
PASS "<!doctype html><script><!--<script </script" PASS "<!doctype html><script><!--<script </script"
PASS "<!doctype html><script><!--<script </scripta" PASS "<!doctype html><script><!--<script </scripta"
FAIL "<!doctype html><script><!--<script </script " PASS "<!doctype html><script><!--<script </script "
FAIL "<!doctype html><script><!--<script </script>" PASS "<!doctype html><script><!--<script </script>"
FAIL "<!doctype html><script><!--<script </script/" PASS "<!doctype html><script><!--<script </script/"
FAIL "<!doctype html><script><!--<script </script <" PASS "<!doctype html><script><!--<script </script <"
FAIL "<!doctype html><script><!--<script </script <a" PASS "<!doctype html><script><!--<script </script <a"
FAIL "<!doctype html><script><!--<script </script </" PASS "<!doctype html><script><!--<script </script </"
FAIL "<!doctype html><script><!--<script </script </script" PASS "<!doctype html><script><!--<script </script </script"
FAIL "<!doctype html><script><!--<script </script </script " PASS "<!doctype html><script><!--<script </script </script "
FAIL "<!doctype html><script><!--<script </script </script/" PASS "<!doctype html><script><!--<script </script </script/"
FAIL "<!doctype html><script><!--<script </script </script>" PASS "<!doctype html><script><!--<script </script </script>"
PASS "<!doctype html><script><!--<script -" PASS "<!doctype html><script><!--<script -"
PASS "<!doctype html><script><!--<script -a" PASS "<!doctype html><script><!--<script -a"
PARSE "<!doctype html><script><!--<script -<" PARSE "<!doctype html><script><!--<script -<"
@ -53,23 +53,23 @@ PASS "<!doctype html><script><!--<script --"
PASS "<!doctype html><script><!--<script --a" PASS "<!doctype html><script><!--<script --a"
PARSE "<!doctype html><script><!--<script --<" PARSE "<!doctype html><script><!--<script --<"
PASS "<!doctype html><script><!--<script -->" PASS "<!doctype html><script><!--<script -->"
PARSE "<!doctype html><script><!--<script --><" PASS "<!doctype html><script><!--<script --><"
PARSE "<!doctype html><script><!--<script --></" PASS "<!doctype html><script><!--<script --></"
PASS "<!doctype html><script><!--<script --></script" PASS "<!doctype html><script><!--<script --></script"
PASS "<!doctype html><script><!--<script --></script " PASS "<!doctype html><script><!--<script --></script "
PASS "<!doctype html><script><!--<script --></script/" PASS "<!doctype html><script><!--<script --></script/"
PASS "<!doctype html><script><!--<script --></script>" PASS "<!doctype html><script><!--<script --></script>"
PASS "<!doctype html><script><!--<script><\\/script>--></script>" PASS "<!doctype html><script><!--<script><\\/script>--></script>"
PASS "<!doctype html><script><!--<script></scr'+'ipt>--></script>" PASS "<!doctype html><script><!--<script></scr'+'ipt>--></script>"
FAIL "<!doctype html><script><!--<script></script><script></script></script>" PASS "<!doctype html><script><!--<script></script><script></script></script>"
FAIL "<!doctype html><script><!--<script></script><script></script>--><!--</script>" PASS "<!doctype html><script><!--<script></script><script></script>--><!--</script>"
FAIL "<!doctype html><script><!--<script></script><script></script>-- ></script>" PASS "<!doctype html><script><!--<script></script><script></script>-- ></script>"
FAIL "<!doctype html><script><!--<script></script><script></script>- -></script>" PASS "<!doctype html><script><!--<script></script><script></script>- -></script>"
FAIL "<!doctype html><script><!--<script></script><script></script>- - ></script>" PASS "<!doctype html><script><!--<script></script><script></script>- - ></script>"
FAIL "<!doctype html><script><!--<script></script><script></script>-></script>" PASS "<!doctype html><script><!--<script></script><script></script>-></script>"
FAIL "<!doctype html><script><!--<script>--!></script>X" PASS "<!doctype html><script><!--<script>--!></script>X"
PASS "<!doctype html><script><!--<scr'+'ipt></script>--></script>" PASS "<!doctype html><script><!--<scr'+'ipt></script>--></script>"
FAIL "<!doctype html><script><!--<script></scr'+'ipt></script>X" PASS "<!doctype html><script><!--<script></scr'+'ipt></script>X"
PASS "<!doctype html><style><!--<style></style>--></style>" PASS "<!doctype html><style><!--<style></style>--></style>"
PASS "<!doctype html><style><!--</style>X" PASS "<!doctype html><style><!--</style>X"
PASS "<!doctype html><style><!--...</style>...--></style>" PASS "<!doctype html><style><!--...</style>...--></style>"
@ -96,20 +96,20 @@ PASS "<!doctype html><xmp><!--<xmp></xmp>--></xmp>"
PASS "<!doctype html><noembed><!--<noembed></noembed>--></noembed>" PASS "<!doctype html><noembed><!--<noembed></noembed>--></noembed>"
PASS "<script>" PASS "<script>"
PASS "<script>a" PASS "<script>a"
PARSE "<script><" PASS "<script><"
PARSE "<script></" PASS "<script></"
PARSE "<script></S" PASS "<script></S"
PARSE "<script></SC" PASS "<script></SC"
PARSE "<script></SCR" PASS "<script></SCR"
PARSE "<script></SCRI" PASS "<script></SCRI"
PARSE "<script></SCRIP" PASS "<script></SCRIP"
PASS "<script></SCRIPT" PASS "<script></SCRIPT"
PASS "<script></SCRIPT " PASS "<script></SCRIPT "
PARSE "<script></s" PASS "<script></s"
PARSE "<script></sc" PASS "<script></sc"
PARSE "<script></scr" PASS "<script></scr"
PARSE "<script></scri" PASS "<script></scri"
PARSE "<script></scrip" PASS "<script></scrip"
PASS "<script></script" PASS "<script></script"
PASS "<script></script " PASS "<script></script "
PASS "<script><!" PASS "<script><!"
@ -118,9 +118,9 @@ PASS "<script><!-"
PASS "<script><!-a" PASS "<script><!-a"
PASS "<script><!--" PASS "<script><!--"
PASS "<script><!--a" PASS "<script><!--a"
PARSE "<script><!--<" PASS "<script><!--<"
PASS "<script><!--<a" PASS "<script><!--<a"
PARSE "<script><!--</" PASS "<script><!--</"
PASS "<script><!--</script" PASS "<script><!--</script"
PASS "<script><!--</script " PASS "<script><!--</script "
PASS "<script><!--<s" PASS "<script><!--<s"
@ -132,38 +132,38 @@ PARSE "<script><!--<script </"
PARSE "<script><!--<script </s" PARSE "<script><!--<script </s"
PASS "<script><!--<script </script" PASS "<script><!--<script </script"
PASS "<script><!--<script </scripta" PASS "<script><!--<script </scripta"
FAIL "<script><!--<script </script " PASS "<script><!--<script </script "
FAIL "<script><!--<script </script>" PASS "<script><!--<script </script>"
FAIL "<script><!--<script </script/" PASS "<script><!--<script </script/"
FAIL "<script><!--<script </script <" PASS "<script><!--<script </script <"
FAIL "<script><!--<script </script <a" PASS "<script><!--<script </script <a"
FAIL "<script><!--<script </script </" PASS "<script><!--<script </script </"
FAIL "<script><!--<script </script </script" PASS "<script><!--<script </script </script"
FAIL "<script><!--<script </script </script " PASS "<script><!--<script </script </script "
FAIL "<script><!--<script </script </script/" PASS "<script><!--<script </script </script/"
FAIL "<script><!--<script </script </script>" PASS "<script><!--<script </script </script>"
PASS "<script><!--<script -" PASS "<script><!--<script -"
PASS "<script><!--<script -a" PASS "<script><!--<script -a"
PASS "<script><!--<script --" PASS "<script><!--<script --"
PASS "<script><!--<script --a" PASS "<script><!--<script --a"
PASS "<script><!--<script -->" PASS "<script><!--<script -->"
PARSE "<script><!--<script --><" PASS "<script><!--<script --><"
PARSE "<script><!--<script --></" PASS "<script><!--<script --></"
PASS "<script><!--<script --></script" PASS "<script><!--<script --></script"
PASS "<script><!--<script --></script " PASS "<script><!--<script --></script "
PASS "<script><!--<script --></script/" PASS "<script><!--<script --></script/"
PASS "<script><!--<script --></script>" PASS "<script><!--<script --></script>"
PASS "<script><!--<script><\\/script>--></script>" PASS "<script><!--<script><\\/script>--></script>"
PASS "<script><!--<script></scr'+'ipt>--></script>" PASS "<script><!--<script></scr'+'ipt>--></script>"
FAIL "<script><!--<script></script><script></script></script>" PASS "<script><!--<script></script><script></script></script>"
FAIL "<script><!--<script></script><script></script>--><!--</script>" PASS "<script><!--<script></script><script></script>--><!--</script>"
FAIL "<script><!--<script></script><script></script>-- ></script>" PASS "<script><!--<script></script><script></script>-- ></script>"
FAIL "<script><!--<script></script><script></script>- -></script>" PASS "<script><!--<script></script><script></script>- -></script>"
FAIL "<script><!--<script></script><script></script>- - ></script>" PASS "<script><!--<script></script><script></script>- - ></script>"
FAIL "<script><!--<script></script><script></script>-></script>" PASS "<script><!--<script></script><script></script>-></script>"
FAIL "<script><!--<script>--!></script>X" PASS "<script><!--<script>--!></script>X"
PASS "<script><!--<scr'+'ipt></script>--></script>" PASS "<script><!--<scr'+'ipt></script>--></script>"
FAIL "<script><!--<script></scr'+'ipt></script>X" PASS "<script><!--<script></scr'+'ipt></script>X"
PASS "<style><!--<style></style>--></style>" PASS "<style><!--<style></style>--></style>"
PASS "<style><!--</style>X" PASS "<style><!--</style>X"
PASS "<style><!--...</style>...--></style>" PASS "<style><!--...</style>...--></style>"

263
src/pkg/exp/html/token.go
View File

@ -241,6 +241,12 @@ func (z *Tokenizer) skipWhiteSpace() {
// readRawOrRCDATA reads until the next "</foo>", where "foo" is z.rawTag and // readRawOrRCDATA reads until the next "</foo>", where "foo" is z.rawTag and
// is typically something like "script" or "textarea". // is typically something like "script" or "textarea".
func (z *Tokenizer) readRawOrRCDATA() { func (z *Tokenizer) readRawOrRCDATA() {
if z.rawTag == "script" {
z.readScript()
z.textIsRaw = true
z.rawTag = ""
return
}
loop: loop:
for { for {
c := z.readByte() c := z.readByte()
@ -257,28 +263,9 @@ loop:
if c != '/' { if c != '/' {
continue loop continue loop
} }
for i := 0; i < len(z.rawTag); i++ { if z.readRawEndTag() || z.err != nil {
c = z.readByte()
if z.err != nil {
break loop break loop
} }
if c != z.rawTag[i] && c != z.rawTag[i]-('a'-'A') {
continue loop
}
}
c = z.readByte()
if z.err != nil {
break loop
}
switch c {
case ' ', '\n', '\r', '\t', '\f', '/', '>':
// The 3 is 2 for the leading "</" plus 1 for the trailing character c.
z.raw.end -= 3 + len(z.rawTag)
break loop
case '<':
// Step back one, to catch "</foo</foo>".
z.raw.end--
}
} }
z.data.end = z.raw.end z.data.end = z.raw.end
// A textarea's or title's RCDATA can contain escaped entities. // A textarea's or title's RCDATA can contain escaped entities.
@ -286,6 +273,242 @@ loop:
z.rawTag = "" z.rawTag = ""
} }
// readRawEndTag attempts to read a tag like "</foo>", where "foo" is z.rawTag.
// If it succeeds, it backs up the input position to reconsume the tag and
// returns true. Otherwise it returns false. The opening "</" has already been
// consumed.
func (z *Tokenizer) readRawEndTag() bool {
for i := 0; i < len(z.rawTag); i++ {
c := z.readByte()
if z.err != nil {
return false
}
if c != z.rawTag[i] && c != z.rawTag[i]-('a'-'A') {
z.raw.end--
return false
}
}
c := z.readByte()
if z.err != nil {
return false
}
switch c {
case ' ', '\n', '\r', '\t', '\f', '/', '>':
// The 3 is 2 for the leading "</" plus 1 for the trailing character c.
z.raw.end -= 3 + len(z.rawTag)
return true
}
z.raw.end--
return false
}
// readScript reads until the next </script> tag, following the byzantine
// rules for escaping/hiding the closing tag.
func (z *Tokenizer) readScript() {
defer func() {
z.data.end = z.raw.end
}()
var c byte
scriptData:
c = z.readByte()
if z.err != nil {
return
}
if c == '<' {
goto scriptDataLessThanSign
}
goto scriptData
scriptDataLessThanSign:
c = z.readByte()
if z.err != nil {
return
}
switch c {
case '/':
goto scriptDataEndTagOpen
case '!':
goto scriptDataEscapeStart
}
z.raw.end--
goto scriptData
scriptDataEndTagOpen:
if z.readRawEndTag() || z.err != nil {
return
}
goto scriptData
scriptDataEscapeStart:
c = z.readByte()
if z.err != nil {
return
}
if c == '-' {
goto scriptDataEscapeStartDash
}
z.raw.end--
goto scriptData
scriptDataEscapeStartDash:
c = z.readByte()
if z.err != nil {
return
}
if c == '-' {
goto scriptDataEscapedDashDash
}
z.raw.end--
goto scriptData
scriptDataEscaped:
c = z.readByte()
if z.err != nil {
return
}
switch c {
case '-':
goto scriptDataEscapedDash
case '<':
goto scriptDataEscapedLessThanSign
}
goto scriptDataEscaped
scriptDataEscapedDash:
c = z.readByte()
if z.err != nil {
return
}
switch c {
case '-':
goto scriptDataEscapedDashDash
case '<':
goto scriptDataEscapedLessThanSign
}
goto scriptDataEscaped
scriptDataEscapedDashDash:
c = z.readByte()
if z.err != nil {
return
}
switch c {
case '-':
goto scriptDataEscapedDashDash
case '<':
goto scriptDataEscapedLessThanSign
case '>':
goto scriptData
}
goto scriptDataEscaped
scriptDataEscapedLessThanSign:
c = z.readByte()
if z.err != nil {
return
}
if c == '/' {
goto scriptDataEscapedEndTagOpen
}
if 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' {
goto scriptDataDoubleEscapeStart
}
z.raw.end--
goto scriptData
scriptDataEscapedEndTagOpen:
if z.readRawEndTag() || z.err != nil {
return
}
goto scriptDataEscaped
scriptDataDoubleEscapeStart:
z.raw.end--
for i := 0; i < len("script"); i++ {
c = z.readByte()
if z.err != nil {
return
}
if c != "script"[i] && c != "SCRIPT"[i] {
z.raw.end--
goto scriptDataEscaped
}
}
c = z.readByte()
if z.err != nil {
return
}
switch c {
case ' ', '\n', '\r', '\t', '\f', '/', '>':
goto scriptDataDoubleEscaped
}
z.raw.end--
goto scriptDataEscaped
scriptDataDoubleEscaped:
c = z.readByte()
if z.err != nil {
return
}
switch c {
case '-':
goto scriptDataDoubleEscapedDash
case '<':
goto scriptDataDoubleEscapedLessThanSign
}
goto scriptDataDoubleEscaped
scriptDataDoubleEscapedDash:
c = z.readByte()
if z.err != nil {
return
}
switch c {
case '-':
goto scriptDataDoubleEscapedDashDash
case '<':
goto scriptDataDoubleEscapedLessThanSign
}
goto scriptDataDoubleEscaped
scriptDataDoubleEscapedDashDash:
c = z.readByte()
if z.err != nil {
return
}
switch c {
case '-':
goto scriptDataDoubleEscapedDashDash
case '<':
goto scriptDataDoubleEscapedLessThanSign
case '>':
goto scriptData
}
goto scriptDataDoubleEscaped
scriptDataDoubleEscapedLessThanSign:
c = z.readByte()
if z.err != nil {
return
}
if c == '/' {
goto scriptDataDoubleEscapeEnd
}
z.raw.end--
goto scriptDataDoubleEscaped
scriptDataDoubleEscapeEnd:
if z.readRawEndTag() {
z.raw.end += len("</script>")
goto scriptDataEscaped
}
if z.err != nil {
return
}
goto scriptDataDoubleEscaped
}
// readComment reads the next comment token starting with "<!--". The opening // readComment reads the next comment token starting with "<!--". The opening
// "<!--" has already been consumed. // "<!--" has already been consumed.
func (z *Tokenizer) readComment() { func (z *Tokenizer) readComment() {