Home Explore Help
Register Sign In
publics
/
net
0
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

html: add the RawNode NodeType

Fixes golang/go#36350

Change-Id: Ia11b65940949b7da996b194d48372bc6219d4baa
Reviewed-on: https://go-review.googlesource.com/c/net/+/216800
Reviewed-by: Kunpei Sakai <namusyaka@gmail.com>
Reviewed-by: Nigel Tao <nigeltao@golang.org>
Run-TryBot: Kunpei Sakai <namusyaka@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Nigel Tao 5 years ago
parent
6afb5195e5
commit
16171245cf
3 changed files with 19 additions and 1 deletions
Unified View Show Diff Stats
  1. 5 0
      html/node.go
  2. 3 0
      html/render.go
  3. 11 1
      html/render_test.go

+ 5 - 0
html/node.go
View File 

@@ -18,6 +18,11 @@ const (
 
 	ElementNode
 
 	ElementNode
 
 	CommentNode
 
 	CommentNode
 
 	DoctypeNode
 
 	DoctypeNode
 
+	// RawNode nodes are not returned by the parser, but can be part of the
 
+	// Node tree passed to func Render to insert raw HTML (without escaping).
 
+	// If so, this package makes no guarantee that the rendered HTML is secure
 
+	// (from e.g. Cross Site Scripting attacks) or well-formed.
 
+	RawNode
 
 	scopeMarkerNode
 
 	scopeMarkerNode
 
 )
 
 )

+ 3 - 0
html/render.go
View File 

@@ -134,6 +134,9 @@ func render1(w writer, n *Node) error {
 
 			}
 
 			}
 
 		}
 
 		}
 
 		return w.WriteByte('>')
 
 		return w.WriteByte('>')
 
+	case RawNode:
 
+		_, err := w.WriteString(n.Data)
 
+		return err
 
 	default:
 
 	default:
 
 		return errors.New("html: unknown node type")
 
 		return errors.New("html: unknown node type")
 
 	}
 
 	}

+ 11 - 1
html/render_test.go
View File 

@@ -89,6 +89,14 @@ func TestRenderer(t *testing.T) {
 
 			Type: TextNode,
 
 			Type: TextNode,
 
 			Data: "6",
 
 			Data: "6",
 
 		},
 
 		},
 
+		14: {
 
+			Type: CommentNode,
 
+			Data: "comm",
 
+		},
 
+		15: {
 
+			Type: RawNode,
 
+			Data: "7<pre>8</pre>9",
 
+		},
 
 	}
 
 	}
 
 
 
 	// Build a tree out of those nodes, based on a textual representation.
 
 	// Build a tree out of those nodes, based on a textual representation.
 
@@ -110,6 +118,8 @@ func TestRenderer(t *testing.T) {
 
 		11: `.	.	<blockquote>`,
 
 		11: `.	.	<blockquote>`,
 
 		12: `.	.	<br>`,
 
 		12: `.	.	<br>`,
 
 		13: `.	.	"6"`,
 
 		13: `.	.	"6"`,
 
+		14: `.	.	"<!--comm-->"`,
 
+		15: `.	.	"7<pre>8</pre>9"`,
 
 	}
 
 	}
 
 	if len(nodes) != len(treeAsText) {
 
 	if len(nodes) != len(treeAsText) {
 
 		t.Fatal("len(nodes) != len(treeAsText)")
 
 		t.Fatal("len(nodes) != len(treeAsText)")
 
@@ -145,7 +155,7 @@ func TestRenderer(t *testing.T) {
 
 
 
 	want := `<html><head></head><body>0&lt;1<p id="A" foo="abc&#34;def">` +
 
 	want := `<html><head></head><body>0&lt;1<p id="A" foo="abc&#34;def">` +
 
 		`2<b empty="">3</b><i backslash="\">&amp;4</i></p>` +
 
 		`2<b empty="">3</b><i backslash="\">&amp;4</i></p>` +
 
-		`5<blockquote></blockquote><br/>6</body></html>`
 
+		`5<blockquote></blockquote><br/>6<!--comm-->7<pre>8</pre>9</body></html>`
 
 	b := new(bytes.Buffer)
 
 	b := new(bytes.Buffer)
 
 	if err := Render(b, nodes[0]); err != nil {
 
 	if err := Render(b, nodes[0]); err != nil {
 
 		t.Fatal(err)
 
 		t.Fatal(err)