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

Jump to bottom

[FIX] Markdown link parser #15794

Merged
merged 8 commits into from
Nov 18, 2019
Merged

[FIX] Markdown link parser #15794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
92f85fa
Regression messageAttachments
ggazzo Nov 4, 2019
2560bdd
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into develop
ggazzo Nov 5, 2019
0462c06
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into develop
ggazzo Nov 6, 2019
ed8ce0e
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into develop
ggazzo Nov 14, 2019
d1be45c
improve url validation
ggazzo Nov 14, 2019
aa94976
fix unit tests
ggazzo Nov 14, 2019
954ce84
Update markdown.js
ggazzo Nov 18, 2019
c7dc339
markdown invalid link test
ggazzo Nov 18, 2019
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
46 changes: 33 additions & 13 deletions app/markdown/lib/parser/original/markdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,32 @@ import s from 'underscore.string';

import { settings } from '../../../../settings';

const addAsToken = function(message, html) {
const token = `=!=${ Random.id() }=!=`;
message.tokens.push({
token,
text: html,
});

return token;
};

const URL = global.URL || require('url').URL || require('url').Url;

const validateUrl = (url) => {
try {
new URL(url);
return true;
} catch (e) {
return false;
}
};

const parseNotEscaped = function(msg, message) {
if (message && message.tokens == null) {
message.tokens = [];
}

const addAsToken = function(html) {
const token = `=!=${ Random.id() }=!=`;
message.tokens.push({
token,
text: html,
});

return token;
};

const schemes = (settings.get('Markdown_SupportSchemesForLink') || '').split(',').join('|');

if (settings.get('Markdown_Headers')) {
Expand Down Expand Up @@ -66,25 +77,34 @@ const parseNotEscaped = function(msg, message) {

// Support ![alt text](http://image url)
msg = msg.replace(new RegExp(`!\\[([^\\]]+)\\]\\(((?:${ schemes }):\\/\\/[^\\)]+)\\)`, 'gm'), (match, title, url) => {
if (!validateUrl(url)) {
return match;
}
const target = url.indexOf(Meteor.absoluteUrl()) === 0 ? '' : '_blank';
return addAsToken(`<a href="${ s.escapeHTML(url) }" title="${ s.escapeHTML(title) }" target="${ s.escapeHTML(target) }" rel="noopener noreferrer"><div class="inline-image" style="background-image: url(${ s.escapeHTML(url) });"></div></a>`);
return addAsToken(message, `<a href="${ s.escapeHTML(url) }" title="${ s.escapeHTML(title) }" target="${ s.escapeHTML(target) }" rel="noopener noreferrer"><div class="inline-image" style="background-image: url(${ s.escapeHTML(url) });"></div></a>`);
});

// Support [Text](http://link)
msg = msg.replace(new RegExp(`\\[([^\\]]+)\\]\\(((?:${ schemes }):\\/\\/[^\\)]+)\\)`, 'gm'), (match, title, url) => {
if (!validateUrl(url)) {
return match;
}
const target = url.indexOf(Meteor.absoluteUrl()) === 0 ? '' : '_blank';
title = title.replace(/&amp;/g, '&');

let escapedUrl = s.escapeHTML(url);
escapedUrl = escapedUrl.replace(/&amp;/g, '&');

return addAsToken(`<a href="${ escapedUrl }" target="${ s.escapeHTML(target) }" rel="noopener noreferrer">${ s.escapeHTML(title) }</a>`);
return addAsToken(message, `<a href="${ escapedUrl }" target="${ s.escapeHTML(target) }" rel="noopener noreferrer">${ s.escapeHTML(title) }</a>`);
});

// Support <http://link|Text>
msg = msg.replace(new RegExp(`(?:<|&lt;)((?:${ schemes }):\\/\\/[^\\|]+)\\|(.+?)(?=>|&gt;)(?:>|&gt;)`, 'gm'), (match, url, title) => {
if (!validateUrl(url)) {
return match;
}
const target = url.indexOf(Meteor.absoluteUrl()) === 0 ? '' : '_blank';
return addAsToken(`<a href="${ s.escapeHTML(url) }" target="${ s.escapeHTML(target) }" rel="noopener noreferrer">${ s.escapeHTML(title) }</a>`);
return addAsToken(message, `<a href="${ s.escapeHTML(url) }" target="${ s.escapeHTML(target) }" rel="noopener noreferrer">${ s.escapeHTML(title) }</a>`);
});

return msg;
Expand Down
2 changes: 2 additions & 0 deletions app/markdown/tests/client.tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ const link = {
'&lt;open.rocket.chat/|Open Site For Rocket.Chat&gt;': s.escapeHTML('&lt;open.rocket.chat/|Open Site For Rocket.Chat&gt;'),
'&lt;htts://rocket.chat/docs/developer-guides/testing/#testing|Testing Entry on Rocket.Chat Docs Site&gt;': s.escapeHTML('&lt;htts://rocket.chat/docs/developer-guides/testing/#testing|Testing Entry on Rocket.Chat Docs Site&gt;'),

'<http://invalid link|Text>': s.escapeHTML('<http://invalid link|Text>'),
'<http://link|Text>': linkWrapped('http://link', 'Text'),
'<https://open.rocket.chat/|Open Site For Rocket.Chat>': linkWrapped('https://open.rocket.chat/', 'Open Site For Rocket.Chat'),
'<https://open.rocket.chat/ | Open Site For Rocket.Chat>': linkWrapped('https://open.rocket.chat/ ', ' Open Site For Rocket.Chat'),
Expand All @@ -183,6 +184,7 @@ const link = {
'<open.rocket.chat/|Open Site For Rocket.Chat>': s.escapeHTML('<open.rocket.chat/|Open Site For Rocket.Chat>'),
'<htts://rocket.chat/docs/developer-guides/testing/#testing|Testing Entry on Rocket.Chat Docs Site>': s.escapeHTML('<htts://rocket.chat/docs/developer-guides/testing/#testing|Testing Entry on Rocket.Chat Docs Site>'),

'[Text](http://invalid link)': '[Text](http://invalid link)',
'[Text](http://link)': linkWrapped('http://link', 'Text'),
'[Open Site For Rocket.Chat](https://open.rocket.chat/)': linkWrapped('https://open.rocket.chat/', 'Open Site For Rocket.Chat'),
'[ Open Site For Rocket.Chat](https://open.rocket.chat/ )': linkWrapped('https://open.rocket.chat/ ', ' Open Site For Rocket.Chat'),
Expand Down