Skip to content
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

[FIX] Announcement banner link opening in the same page #27554

Merged
merged 4 commits into from
Dec 19, 2022
Merged

[FIX] Announcement banner link opening in the same page #27554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
789c0b2
fix: announcement link parsing
hugocostadev Dec 15, 2022
5379c3d
fix: adding hook to always keep target and rel attribute to links
hugocostadev Dec 16, 2022
aef1a66
Merge branch 'develop' into fix/announcement-parser
kodiakhq[bot] Dec 19, 2022
b8ab31a
Merge branch 'develop' into fix/announcement-parser
kodiakhq[bot] Dec 19, 2022
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
14 changes: 13 additions & 1 deletion apps/meteor/client/components/MarkdownText.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ marked.Lexer.rules.gfm = {
};

const linkMarked = (href: string | null, _title: string | null, text: string): string =>
`<a href="${href}" target="_blank" rel="nofollow">${text}</a> `;
`<a href="${href}" target="_blank" rel="nofollow noopener noreferrer">${text}</a> `;
const paragraphMarked = (text: string): string => text;
const brMarked = (): string => ' ';
const listItemMarked = (text: string): string => {
Expand All @@ -46,6 +46,9 @@ inlineRenderer.hr = horizontalRuleMarked;
inlineWithoutBreaks.link = linkMarked;
inlineWithoutBreaks.paragraph = paragraphMarked;
inlineWithoutBreaks.br = brMarked;
inlineWithoutBreaks.image = brMarked;
inlineWithoutBreaks.code = paragraphMarked;
inlineWithoutBreaks.codespan = paragraphMarked;
inlineWithoutBreaks.listitem = listItemMarked;
inlineWithoutBreaks.hr = horizontalRuleMarked;

Expand Down Expand Up @@ -118,6 +121,15 @@ const MarkdownText: FC<Partial<MarkdownTextParams>> = ({
}
})();

// Add a hook to make all links open a new window
dompurify.addHook('afterSanitizeAttributes', (node) => {
// set all elements owning target to target=_blank
if ('target' in node) {
node.setAttribute('target', '_blank');
node.setAttribute('rel', 'nofollow noopener noreferrer');
}
});

return preserveHtml ? html : html && sanitizer(html, { ADD_ATTR: ['target'], ALLOWED_URI_REGEXP: getRegexp(schemes) });
}, [preserveHtml, sanitizer, content, variant, markedOptions, parseEmoji, schemes]);

Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/client/views/room/Announcement/Announcement.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ const Announcement: FC<AnnouncementParams> = ({ announcement, announcementDetail
: setModal(
<GenericModal icon={null} title={t('Announcement')} confirmText={t('Close')} onConfirm={closeModal} onClose={closeModal}>
<Box>
<MarkdownText content={announcement} />
<MarkdownText content={announcement} parseEmoji />
</Box>
</GenericModal>,
);
};

return announcement ? (
<AnnouncementComponent onClickOpen={(e: MouseEvent<HTMLAnchorElement>): void => handleClick(e)}>
<MarkdownText variant='inlineWithoutBreaks' content={announcement} withTruncatedText />
<MarkdownText variant='inlineWithoutBreaks' content={announcement} withTruncatedText parseEmoji />
</AnnouncementComponent>
) : null;
};
Expand Down