Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 2 deletions src/lib/utils/url-link-converter.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ export function convertUrlsToLinks(text) {

// Add the URL as a clickable link
const url = match[0];
result += `<a href="${url}" target="_blank" rel="noopener noreferrer">${url}</a>`;
const escapedUrl = escapeHtml(url);
result += `<a href="${escapedUrl}" target="_blank" rel="noopener noreferrer">${escapedUrl}</a>`;

lastIndex = httpsUrlRegex.lastIndex;
}
Expand All @@ -91,4 +92,4 @@ export function convertUrlsToLinks(text) {
});

return result;
}
}
12 changes: 12 additions & 0 deletions src/lib/utils/url-link-converter.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { describe, expect, it } from 'vitest';

import { convertUrlsToLinks } from './url-link-converter.js';

describe('convertUrlsToLinks', () => {
it('escapes ampersands inside linked URLs', () => {
const html = convertUrlsToLinks('See https://example.com/search?a=1&b=2');

expect(html).toContain('href="https://example.com/search?a=1&amp;b=2"');
expect(html).toContain('>https://example.com/search?a=1&amp;b=2</a>');
});
});
Loading