Skip to content

fix: escape XML-entities in codeSyntaxHighlight plugin when language is unspecified (fix #3220) #3221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hexwayteam wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: escape XML-entities in codeSyntaxHighlight plugin when language is unspecified (fix #3220) #3221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions plugins/code-syntax-highlight/src/renderers/toHTMLRenderers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { MdNode, CodeBlockMdNode } from '@toast-ui/editor';
import type { HTMLToken } from '@toast-ui/toastmark';
import { PrismJs } from '@t/index';
import { escapeXml } from '@/utils/common';

const BACKTICK_COUNT = 3;

Expand All @@ -17,6 +18,7 @@ export function getHTMLRenderers(prism: PrismJs) {
}

let content = node.literal!;
let contentEscaped = false;

if (infoWords.length && infoWords[0].length) {
const [lang] = infoWords;
Expand All @@ -28,9 +30,12 @@ export function getHTMLRenderers(prism: PrismJs) {

if (registeredLang) {
content = prism.highlight(node.literal!, registeredLang, lang);
contentEscaped = true;
}
}

content = contentEscaped ? content : escapeXml(content);

return [
{ type: 'openTag', tagName: 'pre', classNames: preClasses },
{ type: 'openTag', tagName: 'code', attributes: codeAttrs },
Expand Down
25 changes: 25 additions & 0 deletions plugins/code-syntax-highlight/src/utils/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,28 @@
export function flatten<T>(arr: T[]): T[] {
return arr.reduce<T[]>((a, b) => a.concat(Array.isArray(b) ? flatten(b) : b), []);
}

const XMLSPECIAL = '[&<>"]';
const reXmlSpecial = new RegExp(XMLSPECIAL, 'g');

function replaceUnsafeChar(char: string) {
switch (char) {
case '&':
return '&amp;';
case '<':
return '&lt;';
case '>':
return '&gt;';
case '"':
return '&quot;';
default:
return char;
}
}

export function escapeXml(text: string) {
if (reXmlSpecial.test(text)) {
return text.replace(reXmlSpecial, replaceUnsafeChar);
}
return text;
}