Skip to content

Fix markdown-to-storage rendering on Confluence Cloud #75

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

Merged
pchuri merged 3 commits into from
Mar 22, 2026
Merged

Fix markdown-to-storage rendering on Confluence Cloud #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab9238d
Fix markdown-to-storage rendering issues on Confluence Cloud
Mar 12, 2026
5c132c7
Add CDATA injection defense and fix entity decode order
Mar 16, 2026
c168239
Remove duplicate isCloud() method introduced by rebase
Mar 20, 2026
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
7 changes: 4 additions & 3 deletions lib/confluence-client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1073,10 +1073,11 @@ class ConfluenceClient {
// so they appear as literal characters in the CDATA output
const decodedCode = code.replace(/\n$/, '')
.replace(/"/g, '"')
.replace(/&/g, '&')
.replace(/&lt;/g, '<')
.replace(/&gt;/g, '>');
return `<ac:structured-macro ac:name="code"><ac:parameter ac:name="language">${language}</ac:parameter><ac:plain-text-body><![CDATA[${decodedCode}]]></ac:plain-text-body></ac:structured-macro>`;
.replace(/&gt;/g, '>')
.replace(/&amp;/g, '&'); // & last to avoid double-decoding
const safeCode = decodedCode.replace(/]]>/g, ']]]]><![CDATA[>');
return `<ac:structured-macro ac:name="code"><ac:parameter ac:name="language">${language}</ac:parameter><ac:plain-text-body><![CDATA[${safeCode}]]></ac:plain-text-body></ac:structured-macro>`;
});

// Convert inline code
Expand Down
10 changes: 10 additions & 0 deletions tests/confluence-client.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,16 @@ describe('ConfluenceClient', () => {
expect(result).toContain('<td><p>Cell 1</p></td>');
});

test('should escape CDATA terminators in code blocks', () => {
const markdown = '```xml\n<![CDATA[some data]]>\n```';
const result = client.markdownToStorage(markdown);

expect(result).toContain('<![CDATA[');
expect(result).toContain(']]]]><![CDATA[>');
// The literal ]]> from user code should not appear unescaped
expect(result).not.toContain('some data]]>');
});

test('should convert links to smart link format on Cloud instances', () => {
const markdown = '[Example Link](https://example.com)';
const result = client.markdownToStorage(markdown);
Expand Down
Loading