Open platform to collect and prioritize feedback
fix: sanitize input before parsing markdown (#727)
Guilherme Oenning0b187f70e06a
diff --git a/app/pkg/markdown/markdown.go b/app/pkg/markdown/markdown.goindex ed0fc1e14..a091281e6 100644--- a/app/pkg/markdown/markdown.go+++ b/app/pkg/markdown/markdown.go@@ -1,6 +1,7 @@package markdownimport (+ "html""html/template""strings"@@ -29,7 +30,8 @@ var simpleRenderer = SimpleRenderer(simpleHTMLExtensions)// Simple turns a markdown into HTML using few rulesfunc Simple(input string) template.HTML {- output := blackfriday.Markdown([]byte(input), simpleRenderer, mdExtns)+ sanitizedInput := html.EscapeString(input)+ output := blackfriday.Markdown([]byte(sanitizedInput), simpleRenderer, mdExtns)return template.HTML(strings.TrimSpace(string(output)))}@@ -45,7 +47,8 @@ var fullRenderer = blackfriday.HtmlRenderer(fullHTMLExtensions, "", "")// Full turns a markdown into HTML using all rulesfunc Full(input string) template.HTML {- output := blackfriday.Markdown([]byte(input), fullRenderer, mdExtns)+ sanitizedInput := html.EscapeString(input)+ output := blackfriday.Markdown([]byte(sanitizedInput), fullRenderer, mdExtns)return template.HTML(strings.TrimSpace(string(output)))}@@ -54,6 +57,7 @@ var textRenderer = TextRenderer()// PlainText parses given markdown input and return only the textfunc PlainText(input string) string {- output := blackfriday.Markdown([]byte(input), textRenderer, mdExtns)+ sanitizedInput := html.EscapeString(input)+ output := blackfriday.Markdown([]byte(sanitizedInput), textRenderer, mdExtns)return strings.TrimSpace(string(output))}diff --git a/app/pkg/markdown/markdown_test.go b/app/pkg/markdown/markdown_test.goindex 6cf9fada7..f3807ff25 100644--- a/app/pkg/markdown/markdown_test.go+++ b/app/pkg/markdown/markdown_test.go@@ -13,6 +13,7 @@ func TestFullMarkdown(t *testing.T) {for input, expected := range map[string]string{"# Hello World": `<h1>Hello World</h1>`,+ "Hello <b>Beautiful</b> World": `<p>Hello <b>Beautiful</b> World</p>`,"": `<p><img src="http://example.com/hello.jpg" alt="" /></p>`,"Go to http://example.com/hello.jpg": `<p>Go to <a href="http://example.com/hello.jpg">http://example.com/hello.jpg</a></p>`,`-123@@ -52,6 +53,7 @@ func TestPlainTextMarkdown(t *testing.T) {for input, expected := range map[string]string{"**Hello World**": `Hello World`,+ "Hello <b>Beautiful</b> World": `Hello <b>Beautiful</b> World`,"[My Link](http://example.com/)": `My Link`,"": ``,"Go to http://example.com/hello.jpg": `Go to http://example.com/hello.jpg`,@@ -103,6 +105,7 @@ How are you?`: `<p>Hello World</p>How are you?`: `<p>Hello World</p><p>How are you?</p>`,+ `Hello <b>Beautiful</b> World`: `<p>Hello <b>Beautiful</b> World</p>`,} {output := markdown.Simple(input)Expect(output).Equals(template.HTML(expected))diff --git a/public/services/markdown.spec.ts b/public/services/markdown.spec.tsindex 84c4e0551..4e7975c60 100644--- a/public/services/markdown.spec.ts+++ b/public/services/markdown.spec.ts@@ -16,6 +16,11 @@ const testCases = [expectedFull: "<h1>Hello World</h1>",expectedSimple: "<p>Hello World</p>"},+ {+ input: "Hello <b>Beautiful</b> World",+ expectedFull: "<p>Hello <b>Beautiful</b> World</p>",+ expectedSimple: "<p>Hello <b>Beautiful</b> World</p>"+ },{input: "~~Option 3~~",expectedFull: "<p><del>Option 3</del></p>",diff --git a/public/services/markdown.ts b/public/services/markdown.tsindex 9a43aaedf..c8b12c395 100644--- a/public/services/markdown.ts+++ b/public/services/markdown.ts@@ -5,7 +5,8 @@ marked.setOptions({xhtml: true,smartLists: true,gfm: true,- breaks: true+ breaks: true,+ sanitize: true});const link = (href: string, title: string, text: string) => {