Merge remote-tracking branch 'origin/main'

unjs · Sep 9, 2023 · e0500d2 · e0500d2
2 parents 6c04c23 + 0ad87cc
commit e0500d2
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 4 deletions.
diff --git a/packages/ssr/src/util/tagToString.ts b/packages/ssr/src/util/tagToString.ts
@@ -43,13 +43,14 @@ export function tagToString<T extends HeadTag>(tag: T) {
   if (!TagsWithInnerContent.includes(tag.tag))
     return SelfClosingTags.includes(tag.tag) ? openTag : `${openTag}</${tag.tag}>`
 
+  if (tag.innerHTML && ['application/ld+json', 'application/json'].includes(tag.props.type))
+    // ensure </script> tags get encoded
+    tag.innerHTML = escapeJson(tag.innerHTML)
+
   // dangerously using innerHTML, we don't encode this
   let content = String(tag.innerHTML || '')
   if (tag.textContent)
     // content needs to be encoded to avoid XSS, only for title
     content = escapeHtml(String(tag.textContent))
-  if (tag.innerHTML && ['application/ld+json', 'application/json'].includes(tag.props.type))
-    // ensure </script> tags get encoded
-    tag.innerHTML = escapeJson(tag.innerHTML)
   return SelfClosingTags.includes(tag.tag) ? openTag : `${openTag}${content}</${tag.tag}>`
 }
diff --git a/test/unhead/ssr/innerHTML.test.ts b/test/unhead/ssr/innerHTML.test.ts
@@ -29,6 +29,30 @@ describe('ssr innerHTML', () => {
     `)
   })
 
+  it('json escaping', async () => {
+    const head = createHead()
+    head.push({
+      script: [
+        {
+          type: 'application/json',
+          innerHTML: {
+            escape: '</script>',
+          },
+        },
+      ],
+    })
+    const ctx = await renderSSRHead(head)
+    expect(ctx).toMatchInlineSnapshot(`
+      {
+        "bodyAttrs": "",
+        "bodyTags": "",
+        "bodyTagsOpen": "",
+        "headTags": "<script type=\\"application/json\\">{\\"escape\\":\\"\\\\u003C/script>\\"}</script>",
+        "htmlAttrs": "",
+      }
+    `)
+  });
+
   it('noscript', async () => {
     const head = createHead()
     head.push({

diff --git a/test/unhead/ssr/templateParams.test.ts b/test/unhead/ssr/templateParams.test.ts
@@ -80,7 +80,7 @@ describe('ssr templateParams', () => {
 
     expect(headTags).toMatchInlineSnapshot(`
       "<title>Home &amp; &#x2F;&#x2F;&lt;&quot;With Encoding&quot;&gt;\\\\</title>
-      <script type=\\"application/json\\">{\\"title\\":\\"Home & //<\\\\\\"With Encoding\\\\\\">\\\\\\"}</script>"
+      <script type=\\"application/json\\">{\\"title\\":\\"Home & //\\\\u003C\\\\\\"With Encoding\\\\\\">\\\\\\"}</script>"
     `)
   })