YourSelfHosted/memos
1
0
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-06-05 22:09:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix XSS in renderer (#875)

Browse Source 
chore: fix xss in renderer
This commit is contained in:
boojack
2022-12-29 23:27:56 +08:00
committed by GitHub
parent 9169b3f2cd
commit 64e5c343c5
6 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/labs/marked/index.ts
View File

@@ -47,7 +47,7 @@ export const marked = (markdownStr: string, blockParsers = blockElementParserLis
const 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);
}
}

3
web/src/labs/marked/parser/Bold.ts
View File

@@ -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>`;
};

3
web/src/labs/marked/parser/BoldEmphasis.ts
View File

@@ -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>`;
};

3
web/src/labs/marked/parser/Emphasis.ts
View File

@@ -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>`;
};

2
web/src/labs/marked/parser/Link.ts
View File

@@ -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>`;
};

5
web/src/labs/marked/parser/Strikethrough.ts
View File

@@ -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 {