yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: HTML import escapes dollar signs in code (#6638) (#6645)

Browse Source
This commit is contained in:
panos--
2024-03-06 14:00:50 +01:00
committed by GitHub
parent 98eba29cdd
commit dce4fd6adc
3 changed files with 73 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
server/commands/documentImporter.test.ts
View File

@@ -213,4 +213,76 @@ describe("documentImporter", () => {
expect(error).toEqual("File type executable/zip not supported"); expect(error).toEqual("File type executable/zip not supported");
}); });
it("should escape dollar signs in HTML input", async () => {
const user = await buildUser();
const fileName = "test.html";
const content = `
<!DOCTYPE html>
<html>
<head>
<title>Test</title>
</head>
<body>
<p>$100</p>
</body>
</html>
`;
const response = await documentImporter({
user,
mimeType: "text/html",
fileName,
content,
ip,
});
expect(response.text).toEqual("\\$100");
});
it("should not escape dollar signs in inline code in HTML input", async () => {
const user = await buildUser();
const fileName = "test.html";
const content = `
<!DOCTYPE html>
<html>
<head>
<title>Test</title>
</head>
<body>
<code>echo $foo</code>
</body>
</html>
`;
const response = await documentImporter({
user,
mimeType: "text/html",
fileName,
content,
ip,
});
expect(response.text).toEqual("`echo $foo`");
});
it("should not escape dollar signs in code blocks in HTML input", async () => {
const user = await buildUser();
const fileName = "test.html";
const content = `
<!DOCTYPE html>
<html>
<head>
<title>Test</title>
</head>
<body>
<pre><code>echo $foo</code></pre>
</body>
</html>
`;
const response = await documentImporter({
user,
mimeType: "text/html",
fileName,
content,
ip,
});
expect(response.text).toEqual("```\necho $foo\n```");
});
}); });

4
server/commands/documentImporter.ts
View File

@@ -63,10 +63,6 @@ async function documentImporter({
// to match our hardbreak parser. // to match our hardbreak parser.
text = text.trim().replace(/<br>/gi, "\\n"); text = text.trim().replace(/<br>/gi, "\\n");
// Escape any dollar signs in the text to prevent them being interpreted as
// math blocks
text = text.replace(/\$/g, "\\$");
// Remove any closed and immediately reopened formatting marks // Remove any closed and immediately reopened formatting marks
text = text.replace(/\*\*\*\*/gi, "").replace(/____/gi, ""); text = text.replace(/\*\*\*\*/gi, "").replace(/____/gi, "");

1
server/utils/turndown/index.ts
View File

@@ -57,6 +57,7 @@ const escapes: [RegExp, string][] = [
[/^>/g, "\\>"], [/^>/g, "\\>"],
[/_/g, "\\_"], [/_/g, "\\_"],
[/^(\d+)\. /g, "$1\\. "], [/^(\d+)\. /g, "$1\\. "],
[/\$/g, "\\$"],
]; ];
/** /**