From 42d25902e855d3c06d5ead071bf55604f495c205 Mon Sep 17 00:00:00 2001
From: Harttle <harttle@harttle.com>
Date: Thu, 2 Mar 2023 22:39:30 +0800
Subject: [PATCH] fix: strip_html for multi line <script>/<style>/comments, #70

---
 src/filters/html.ts              |  2 +-
 test/e2e/issues.ts               | 10 ++++++++++
 test/integration/filters/html.ts | 16 ++++++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/filters/html.ts b/src/filters/html.ts
index 36b57b2a40..73be53cb64 100644
--- a/src/filters/html.ts
+++ b/src/filters/html.ts
@@ -32,5 +32,5 @@ export function newline_to_br (v: string) {
 }
 
 export function strip_html (v: string) {
-  return stringify(v).replace(/<script.*?<\/script>|<!--.*?-->|<style.*?<\/style>|<.*?>/g, '')
+  return stringify(v).replace(/<script[\s\S]*?<\/script>|<style[\s\S]*?<\/style>|<.*?>|<!--[\s\S]*?-->/g, '')
 }
diff --git a/test/e2e/issues.ts b/test/e2e/issues.ts
index 4cb7dd3883..d5d23455cc 100644
--- a/test/e2e/issues.ts
+++ b/test/e2e/issues.ts
@@ -390,4 +390,14 @@ describe('Issues', function () {
     const html = await liquid.parseAndRender(tpl, ctx)
     expect(html.trim()).to.equal('<a href="https://example.com">Lot more code here</a>')
   })
+  it('#70 strip multiline content of <style>', async() => {
+    const str = `
+    <style type="text/css">
+      .test-one-line {display: none;}
+    </style>`
+    const engine = new Liquid()
+    const template = '{{ str | strip_html }}'
+    const html = await engine.parseAndRender(template, { str })
+    expect(html).to.match(/^\s*$/)
+  })
 })
diff --git a/test/integration/filters/html.ts b/test/integration/filters/html.ts
index afe45b980f..0ba5cc124b 100644
--- a/test/integration/filters/html.ts
+++ b/test/integration/filters/html.ts
@@ -1,6 +1,10 @@
 import { test } from '../../stub/render'
+import { expect } from 'chai'
+import { Liquid } from '../../../src/liquid'
 
 describe('filters/html', function () {
+  let liquid: Liquid
+  beforeEach(() => liquid = new Liquid())
   describe('escape', function () {
     it('should escape \' and &', function () {
       return test('{{ "Have you read \'James & the Giant Peach\'?" | escape }}',
@@ -43,14 +47,26 @@ describe('filters/html', function () {
       return test('{{ "<!--Have you read-->Ulysses?" | strip_html }}',
         'Ulysses?')
     })
+    it('should strip multiline comments', function () {
+      expect(liquid.parseAndRenderSync('{{"<!--foo\r\nbar \ncoo\t  \r\n  -->"|strip_html}}')).to.equal('')
+    })
     it('should strip all style tags and their contents', function () {
       return test('{{ "<style>cite { font-style: italic; }</style><cite>Ulysses<cite>?" | strip_html }}',
         'Ulysses?')
     })
+    it('should strip multiline styles', function () {
+      expect(liquid.parseAndRenderSync('{{"<style> \n.header {\r\n  color: black;\r\n}\n</style>" | strip_html}}')).to.equal('')
+    })
     it('should strip all scripts tags and their contents', function () {
       return test('{{ "<script async>console.log(\'hello world\')</script><cite>Ulysses<cite>?" | strip_html }}',
         'Ulysses?')
     })
+    it('should strip multiline scripts', function () {
+      expect(liquid.parseAndRenderSync('{{ "<script> \nfoo\r\nbar\n</script>" | strip_html }}')).to.equal('')
+    })
+    it('should not strip non-matched <script>', function () {
+      expect(liquid.parseAndRenderSync('{{ "<script></script>text<script></script>" | strip_html }}')).to.equal('text')
+    })
     it('should strip until empty', function () {
       return test('{{"<br/><br />< p ></p></ p >" | strip_html }}', '')
     })