Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
chore: fix XSS in renderer (#875)
boojack64e5c343c5f7
diff --git a/web/src/labs/marked/index.ts b/web/src/labs/marked/index.tsindex 436b99361..0d3d083ad 100644--- a/web/src/labs/marked/index.ts+++ b/web/src/labs/marked/index.ts@@ -47,7 +47,7 @@ export const marked = (markdownStr: string, blockParsers = blockElementParserLisconst matchedLength = matchedStr.length;const prefixStr = markdownStr.slice(0, matchedIndex);const suffixStr = markdownStr.slice(matchedIndex + matchedLength);- return prefixStr + matchedInlineParser.renderer(matchedStr) + marked(suffixStr, [], inlineParsers);+ return marked(prefixStr, [], inlineParsers) + matchedInlineParser.renderer(matchedStr) + marked(suffixStr, [], inlineParsers);}}diff --git a/web/src/labs/marked/parser/Bold.ts b/web/src/labs/marked/parser/Bold.tsindex 041640f21..578a6ed48 100644--- a/web/src/labs/marked/parser/Bold.ts+++ b/web/src/labs/marked/parser/Bold.ts@@ -1,4 +1,3 @@-import { escape } from "lodash";import { marked } from "..";import Link from "./Link";@@ -15,7 +14,7 @@ const renderer = (rawStr: string): string => {return rawStr;}- const parsedContent = marked(escape(matchResult[1]), [], [Link]);+ const parsedContent = marked(matchResult[1], [], [Link]);return `<strong>${parsedContent}</strong>`;};diff --git a/web/src/labs/marked/parser/BoldEmphasis.ts b/web/src/labs/marked/parser/BoldEmphasis.tsindex f434da584..0fdf37ebb 100644--- a/web/src/labs/marked/parser/BoldEmphasis.ts+++ b/web/src/labs/marked/parser/BoldEmphasis.ts@@ -1,4 +1,3 @@-import { escape } from "lodash";import { marked } from "..";import Link from "./Link";@@ -15,7 +14,7 @@ const renderer = (rawStr: string): string => {return rawStr;}- const parsedContent = marked(escape(matchResult[1]), [], [Link]);+ const parsedContent = marked(matchResult[1], [], [Link]);return `<strong><em>${parsedContent}</em></strong>`;};diff --git a/web/src/labs/marked/parser/Emphasis.ts b/web/src/labs/marked/parser/Emphasis.tsindex 7dd12df1a..e339bf3a1 100644--- a/web/src/labs/marked/parser/Emphasis.ts+++ b/web/src/labs/marked/parser/Emphasis.ts@@ -1,4 +1,3 @@-import { escape } from "lodash";import { marked } from "..";import Link from "./Link";@@ -15,7 +14,7 @@ const renderer = (rawStr: string): string => {return rawStr;}- const parsedContent = marked(escape(matchResult[1]), [], [Link]);+ const parsedContent = marked(matchResult[1], [], [Link]);return `<em>${parsedContent}</em>`;};diff --git a/web/src/labs/marked/parser/Link.ts b/web/src/labs/marked/parser/Link.tsindex 6bfc0f8a5..7b9ac4fc7 100644--- a/web/src/labs/marked/parser/Link.ts+++ b/web/src/labs/marked/parser/Link.ts@@ -17,7 +17,7 @@ const renderer = (rawStr: string): string => {if (!matchResult) {return rawStr;}- const parsedContent = marked(escape(matchResult[1]), [], [InlineCode, BoldEmphasis, Emphasis, Bold]);+ const parsedContent = marked(matchResult[1], [], [InlineCode, BoldEmphasis, Emphasis, Bold]);return `<a class='link' target='_blank' rel='noreferrer' href='${escape(matchResult[2])}'>${parsedContent}</a>`;};diff --git a/web/src/labs/marked/parser/Strikethrough.ts b/web/src/labs/marked/parser/Strikethrough.tsindex b58c92222..7dc189766 100644--- a/web/src/labs/marked/parser/Strikethrough.ts+++ b/web/src/labs/marked/parser/Strikethrough.ts@@ -1,4 +1,4 @@-import { marked } from "..";+import { escape } from "lodash";export const STRIKETHROUGH_REG = /~~(.+?)~~/;@@ -13,8 +13,7 @@ const renderer = (rawStr: string): string => {return rawStr;}- const parsedContent = marked(matchResult[1], [], []);- return `<del>${parsedContent}</del>`;+ return `<del>${escape(matchResult[1])}</del>`;};export default {