Do not strip script tags with type=text/plain and template=amp-mustache

honeybadgerdontcare · twifkak · commit fd02f1a6f94a · 2019-11-15T17:45:38.000-08:00
PiperOrigin-RevId: 280769508
diff --git a/transformer/transformers/stripjs.go b/transformer/transformers/stripjs.go
@@ -69,10 +69,13 @@ func StripJS(e *Context) error {
 						htmlnode.RemoveNode(&n)
 					}
 				case "text/plain":
-					// ok to keep only for children of template (amp-mustache)
-					if !htmlnode.IsDescendantOf(n, atom.Template) {
-						htmlnode.RemoveNode(&n)
+					// ok to keep only when attribute template=amp-mustache is present
+					if t, ok := htmlnode.GetAttributeVal(n, "", "template"); ok {
+						if t == "amp-mustache" {
+							continue
+						}
 					}
+					htmlnode.RemoveNode(&n)
 				default:
 					htmlnode.RemoveNode(&n)
 				}
diff --git a/transformer/transformers/stripjs_test.go b/transformer/transformers/stripjs_test.go
@@ -62,12 +62,12 @@ func TestStripJS(t *testing.T) {
 			Expected: "<head><script type=application/json>foo</script></head><body></body>",
 		},
 		{
-			Desc:     "keep type=text/plain when child of template (amp-mustache)",
-			Input:    "<body><template type=amp-mustache><script type=text/plain></script></template></body>",
-			Expected: "<body><template type=amp-mustache><script type=text/plain></script></template></body>",
+			Desc:     "keep type=text/plain when attribute template=amp-mustache",
+			Input:    "<body><script template=amp-mustache type=text/plain></script></template></body>",
+			Expected: "<body><script template=amp-mustache type=text/plain></script></template></body>",
 		},
 		{
-			Desc:     "strips type=text/plain when not child of template (amp-mustache)",
+			Desc:     "strips type=text/plain when attribute template=amp-mustache is not present",
 			Input:    "<body><script type=text/plain></script></body>",
 			Expected: "<body></body>",
 		},

Original file line number	Diff line number	Diff line change
`@@ -69,10 +69,13 @@ func StripJS(e *Context) error {`
`69`	`69`	`htmlnode.RemoveNode(&n)`
`70`	`70`	`}`
`71`	`71`	`case "text/plain":`
`72`		`- // ok to keep only for children of template (amp-mustache)`
`73`		`- if !htmlnode.IsDescendantOf(n, atom.Template) {`
`74`		`- htmlnode.RemoveNode(&n)`
	`72`	`+ // ok to keep only when attribute template=amp-mustache is present`
	`73`	`+ if t, ok := htmlnode.GetAttributeVal(n, "", "template"); ok {`
	`74`	`+ if t == "amp-mustache" {`
	`75`	`+ continue`
	`76`	`+ }`
`75`	`77`	`}`
	`78`	`+ htmlnode.RemoveNode(&n)`
`76`	`79`	`default:`
`77`	`80`	`htmlnode.RemoveNode(&n)`
`78`	`81`	`}`