mirror of
https://github.com/wekan/wekan.git
synced 2025-09-22 01:50:48 +02:00
SECURITY VULNERABILITY FIX: Fix XSS bug reported today 4 hours ago by Cyb3rjunky.
Logged in users could run javascript in input fields. This affects Wekan versions v3.12-v3.84. In [Wekan v3.12](https://github.com/wekan/wekan/blob/master/CHANGELOG.md#v312-2019-08-09-wekan-release) there was [changes for XSS filter to allow inserting images, videos etc on comment WYSIWYG editor](https://github.com/wekan/wekan/pull/2593) so features related to that are now removed. After this fix, Javascript in input fields is not executed. Thanks to Cyb3rjunky and xet7 !
This commit is contained in:
parent
3a6303e5c2
commit
482682e500
1 changed files with 68 additions and 147 deletions
|
@ -1,93 +1,7 @@
|
||||||
import _sanitizeXss from 'xss';
|
|
||||||
const ASIS = 'asis';
|
|
||||||
const sanitizeXss = (input, options) => {
|
|
||||||
const defaultAllowedIframeSrc = /^(https:){0,1}\/\/.*?(youtube|vimeo|dailymotion|youku)/i;
|
|
||||||
const allowedIframeSrcRegex = (function() {
|
|
||||||
let reg = defaultAllowedIframeSrc;
|
|
||||||
const SAFE_IFRAME_SRC_PATTERN =
|
|
||||||
Meteor.settings.public.SAFE_IFRAME_SRC_PATTERN;
|
|
||||||
try {
|
|
||||||
if (SAFE_IFRAME_SRC_PATTERN !== undefined) {
|
|
||||||
reg = new RegExp(SAFE_IFRAME_SRC_PATTERN, 'i');
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
/*eslint no-console: ["error", { allow: ["warn", "error"] }] */
|
|
||||||
|
|
||||||
console.error('Wrong pattern specified', SAFE_IFRAM_SRC_PATTERN, e);
|
|
||||||
}
|
|
||||||
return reg;
|
|
||||||
})();
|
|
||||||
const targetWindow = '_blank';
|
|
||||||
const getHtmlDOM = html => {
|
|
||||||
const i = document.createElement('i');
|
|
||||||
i.innerHTML = html;
|
|
||||||
return i.firstChild;
|
|
||||||
};
|
|
||||||
options = {
|
|
||||||
onTag(tag, html, options) {
|
|
||||||
const htmlDOM = getHtmlDOM(html);
|
|
||||||
const getAttr = attr => {
|
|
||||||
return htmlDOM && attr && htmlDOM.getAttribute(attr);
|
|
||||||
};
|
|
||||||
if (tag === 'iframe') {
|
|
||||||
const clipCls = 'note-vide-clip';
|
|
||||||
if (!options.isClosing) {
|
|
||||||
const iframeCls = getAttr('class');
|
|
||||||
let safe = iframeCls.indexOf(clipCls) > -1;
|
|
||||||
const src = getAttr('src');
|
|
||||||
if (allowedIframeSrcRegex.exec(src)) {
|
|
||||||
safe = true;
|
|
||||||
}
|
|
||||||
if (safe)
|
|
||||||
return `<iframe src='${src}' class="${clipCls}" width=100% height=auto allowfullscreen></iframe>`;
|
|
||||||
} else {
|
|
||||||
// remove </iframe> tag
|
|
||||||
return '';
|
|
||||||
}
|
|
||||||
} else if (tag === 'a') {
|
|
||||||
if (!options.isClosing) {
|
|
||||||
if (getAttr(ASIS) === 'true') {
|
|
||||||
// if has a ASIS attribute, don't do anything, it's a member id
|
|
||||||
return html;
|
|
||||||
} else {
|
|
||||||
const href = getAttr('href');
|
|
||||||
if (href.match(/^((http(s){0,1}:){0,1}\/\/|\/)/)) {
|
|
||||||
// a valid url
|
|
||||||
return `<a href=${href} target=${targetWindow}>`;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/* Don't use swipebox on markdown, so that img tag can now use width
|
|
||||||
* and height parameters. https://github.com/wekan/wekan/issues/2956
|
|
||||||
* Previously this was added at https://github.com/wekan/wekan/pull/2593
|
|
||||||
} else if (tag === 'img') {
|
|
||||||
if (!options.isClosing) {
|
|
||||||
const src = getAttr('src');
|
|
||||||
if (src) {
|
|
||||||
return `<a href='${src}' class='swipebox'><img src='${src}' class="attachment-image-preview mCS_img_loaded"></a>`;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
}
|
|
||||||
return undefined;
|
|
||||||
},
|
|
||||||
onTagAttr(tag, name, value) {
|
|
||||||
if (tag === 'img' && name === 'src') {
|
|
||||||
if (value && value.substr(0, 5) === 'data:') {
|
|
||||||
// allow image with dataURI src
|
|
||||||
return `${name}='${value}'`;
|
|
||||||
}
|
|
||||||
} else if (tag === 'a' && name === 'target') {
|
|
||||||
return `${name}='${targetWindow}'`; // always change a href target to a new window
|
|
||||||
}
|
|
||||||
return undefined;
|
|
||||||
},
|
|
||||||
...options,
|
|
||||||
};
|
|
||||||
return _sanitizeXss(input, options);
|
|
||||||
};
|
|
||||||
Template.editor.onRendered(() => {
|
Template.editor.onRendered(() => {
|
||||||
const textareaSelector = 'textarea';
|
const textareaSelector = 'textarea';
|
||||||
|
const enableRicherEditor =
|
||||||
|
Meteor.settings.public.RICHER_CARD_COMMENT_EDITOR || true;
|
||||||
const mentions = [
|
const mentions = [
|
||||||
// User mentions
|
// User mentions
|
||||||
{
|
{
|
||||||
|
@ -98,13 +12,7 @@ Template.editor.onRendered(() => {
|
||||||
currentBoard
|
currentBoard
|
||||||
.activeMembers()
|
.activeMembers()
|
||||||
.map(member => {
|
.map(member => {
|
||||||
const user = Users.findOne(member.userId);
|
const username = Users.findOne(member.userId).username;
|
||||||
if (user._id === Meteor.userId()) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
const value = user.username;
|
|
||||||
const username =
|
|
||||||
value && value.match(/\s+/) ? `"${value}"` : value;
|
|
||||||
return username.includes(term) ? username : null;
|
return username.includes(term) ? username : null;
|
||||||
})
|
})
|
||||||
.filter(Boolean),
|
.filter(Boolean),
|
||||||
|
@ -124,16 +32,15 @@ Template.editor.onRendered(() => {
|
||||||
autosize($textarea);
|
autosize($textarea);
|
||||||
$textarea.escapeableTextComplete(mentions);
|
$textarea.escapeableTextComplete(mentions);
|
||||||
};
|
};
|
||||||
if (Meteor.settings.public.RICHER_CARD_COMMENT_EDITOR !== false) {
|
if (enableRicherEditor) {
|
||||||
const isSmall = Utils.isMiniScreen();
|
const isSmall = Utils.isMiniScreen();
|
||||||
const toolbar = isSmall
|
const toolbar = isSmall
|
||||||
? [
|
? [
|
||||||
['view', ['fullscreen']],
|
['view', ['fullscreen']],
|
||||||
['table', ['table']],
|
['table', ['table']],
|
||||||
['font', ['bold']],
|
['font', ['bold', 'underline']],
|
||||||
['color', ['color']],
|
|
||||||
['insert', ['video']], // iframe tag will be sanitized TODO if iframe[class=note-video-clip] can be added into safe list, insert video can be enabled
|
|
||||||
//['fontsize', ['fontsize']],
|
//['fontsize', ['fontsize']],
|
||||||
|
['color', ['color']],
|
||||||
]
|
]
|
||||||
: [
|
: [
|
||||||
['style', ['style']],
|
['style', ['style']],
|
||||||
|
@ -143,11 +50,47 @@ Template.editor.onRendered(() => {
|
||||||
['color', ['color']],
|
['color', ['color']],
|
||||||
['para', ['ul', 'ol', 'paragraph']],
|
['para', ['ul', 'ol', 'paragraph']],
|
||||||
['table', ['table']],
|
['table', ['table']],
|
||||||
['insert', ['link', 'picture', 'video']], // iframe tag will be sanitized TODO if iframe[class=note-video-clip] can be added into safe list, insert video can be enabled
|
//['insert', ['link', 'picture', 'video']], // iframe tag will be sanitized TODO if iframe[class=note-video-clip] can be added into safe list, insert video can be enabled
|
||||||
//['insert', ['link', 'picture']], // modal popup has issue somehow :(
|
//['insert', ['link', 'picture']], // modal popup has issue somehow :(
|
||||||
['view', ['fullscreen', 'help']],
|
['view', ['fullscreen', 'help']],
|
||||||
];
|
];
|
||||||
const cleanPastedHTML = sanitizeXss;
|
const cleanPastedHTML = function(input) {
|
||||||
|
const badTags = [
|
||||||
|
'style',
|
||||||
|
'script',
|
||||||
|
'applet',
|
||||||
|
'embed',
|
||||||
|
'noframes',
|
||||||
|
'noscript',
|
||||||
|
'meta',
|
||||||
|
'link',
|
||||||
|
'button',
|
||||||
|
'form',
|
||||||
|
].join('|');
|
||||||
|
const badPatterns = new RegExp(
|
||||||
|
`(?:${[
|
||||||
|
`<(${badTags})s*[^>][\\s\\S]*?<\\/\\1>`,
|
||||||
|
`<(${badTags})[^>]*?\\/>`,
|
||||||
|
].join('|')})`,
|
||||||
|
'gi',
|
||||||
|
);
|
||||||
|
let output = input;
|
||||||
|
// remove bad Tags
|
||||||
|
output = output.replace(badPatterns, '');
|
||||||
|
// remove attributes ' style="..."'
|
||||||
|
const badAttributes = new RegExp(
|
||||||
|
`(?:${[
|
||||||
|
'on\\S+=([\'"]?).*?\\1',
|
||||||
|
'href=([\'"]?)javascript:.*?\\2',
|
||||||
|
'style=([\'"]?).*?\\3',
|
||||||
|
'target=\\S+',
|
||||||
|
].join('|')})`,
|
||||||
|
'gi',
|
||||||
|
);
|
||||||
|
output = output.replace(badAttributes, '');
|
||||||
|
output = output.replace(/(<a )/gi, '$1target=_ '); // always to new target
|
||||||
|
return output;
|
||||||
|
};
|
||||||
const editor = '.editor';
|
const editor = '.editor';
|
||||||
const selectors = [
|
const selectors = [
|
||||||
`.js-new-comment-form ${editor}`,
|
`.js-new-comment-form ${editor}`,
|
||||||
|
@ -167,45 +110,25 @@ Template.editor.onRendered(() => {
|
||||||
}
|
}
|
||||||
return undefined;
|
return undefined;
|
||||||
};
|
};
|
||||||
let popupShown = false;
|
|
||||||
inputs.each(function(idx, input) {
|
inputs.each(function(idx, input) {
|
||||||
mSummernotes[idx] = $(input).summernote({
|
mSummernotes[idx] = $(input).summernote({
|
||||||
placeholder,
|
placeholder,
|
||||||
callbacks: {
|
callbacks: {
|
||||||
onKeydown(e) {
|
|
||||||
if (popupShown) {
|
|
||||||
e.preventDefault();
|
|
||||||
}
|
|
||||||
},
|
|
||||||
onKeyup(e) {
|
|
||||||
if (popupShown) {
|
|
||||||
e.preventDefault();
|
|
||||||
}
|
|
||||||
},
|
|
||||||
onInit(object) {
|
onInit(object) {
|
||||||
const originalInput = this;
|
const originalInput = this;
|
||||||
const setAutocomplete = function(jEditor) {
|
$(originalInput).on('input', function() {
|
||||||
if (jEditor !== undefined) {
|
// when comment is submitted, the original textarea will be set to '', so shall we
|
||||||
jEditor.escapeableTextComplete(mentions).on({
|
|
||||||
'textComplete:show'() {
|
|
||||||
popupShown = true;
|
|
||||||
},
|
|
||||||
'textComplete:hide'() {
|
|
||||||
popupShown = false;
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
};
|
|
||||||
$(originalInput).on('submitted', function() {
|
|
||||||
// resetCommentInput has been called
|
|
||||||
if (!this.value) {
|
if (!this.value) {
|
||||||
const sn = getSummernote(this);
|
const sn = getSummernote(this);
|
||||||
sn && sn.summernote('code', '');
|
sn && sn.summernote('reset');
|
||||||
|
object && object.editingArea.find('.note-placeholder').show();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
const jEditor = object && object.editable;
|
const jEditor = object && object.editable;
|
||||||
const toolbar = object && object.toolbar;
|
const toolbar = object && object.toolbar;
|
||||||
setAutocomplete(jEditor);
|
if (jEditor !== undefined) {
|
||||||
|
jEditor.escapeableTextComplete(mentions);
|
||||||
|
}
|
||||||
if (toolbar !== undefined) {
|
if (toolbar !== undefined) {
|
||||||
const fBtn = toolbar.find('.btn-fullscreen');
|
const fBtn = toolbar.find('.btn-fullscreen');
|
||||||
fBtn.on('click', function() {
|
fBtn.on('click', function() {
|
||||||
|
@ -215,6 +138,7 @@ Template.editor.onRendered(() => {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
onImageUpload(files) {
|
onImageUpload(files) {
|
||||||
const $summernote = getSummernote(this);
|
const $summernote = getSummernote(this);
|
||||||
if (files && files.length > 0) {
|
if (files && files.length > 0) {
|
||||||
|
@ -295,7 +219,7 @@ Template.editor.onRendered(() => {
|
||||||
const someNote = getSummernote(object);
|
const someNote = getSummernote(object);
|
||||||
const original = someNote.summernote('code');
|
const original = someNote.summernote('code');
|
||||||
const cleaned = cleanPastedHTML(original); //this is where to call whatever clean function you want. I have mine in a different file, called CleanPastedHTML.
|
const cleaned = cleanPastedHTML(original); //this is where to call whatever clean function you want. I have mine in a different file, called CleanPastedHTML.
|
||||||
someNote.summernote('code', ''); //clear original
|
someNote.summernote('reset'); //clear original
|
||||||
someNote.summernote('pasteHTML', cleaned); //this sets the displayed content editor to the cleaned pasted code.
|
someNote.summernote('pasteHTML', cleaned); //this sets the displayed content editor to the cleaned pasted code.
|
||||||
};
|
};
|
||||||
setTimeout(function() {
|
setTimeout(function() {
|
||||||
|
@ -335,6 +259,8 @@ Template.editor.onRendered(() => {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
import sanitizeXss from 'xss';
|
||||||
|
|
||||||
// XXX I believe we should compute a HTML rendered field on the server that
|
// XXX I believe we should compute a HTML rendered field on the server that
|
||||||
// would handle markdown and user mentions. We can simply have two
|
// would handle markdown and user mentions. We can simply have two
|
||||||
// fields, one source, and one compiled version (in HTML) and send only the
|
// fields, one source, and one compiled version (in HTML) and send only the
|
||||||
|
@ -356,12 +282,11 @@ Blaze.Template.registerHelper(
|
||||||
}
|
}
|
||||||
return member;
|
return member;
|
||||||
});
|
});
|
||||||
const mentionRegex = /\B@(?:(?:"([\w.\s]*)")|([\w.]+))/gi; // including space in username
|
const mentionRegex = /\B@([\w.]*)/gi;
|
||||||
|
|
||||||
let currentMention;
|
let currentMention;
|
||||||
while ((currentMention = mentionRegex.exec(content)) !== null) {
|
while ((currentMention = mentionRegex.exec(content)) !== null) {
|
||||||
const [fullMention, quoteduser, simple] = currentMention;
|
const [fullMention, username] = currentMention;
|
||||||
const username = quoteduser || simple;
|
|
||||||
const knowedUser = _.findWhere(knowedUsers, { username });
|
const knowedUser = _.findWhere(knowedUsers, { username });
|
||||||
if (!knowedUser) {
|
if (!knowedUser) {
|
||||||
continue;
|
continue;
|
||||||
|
@ -380,42 +305,38 @@ Blaze.Template.registerHelper(
|
||||||
// `userId` to the popup as usual, and we need to store it in the DOM
|
// `userId` to the popup as usual, and we need to store it in the DOM
|
||||||
// using a data attribute.
|
// using a data attribute.
|
||||||
'data-userId': knowedUser.userId,
|
'data-userId': knowedUser.userId,
|
||||||
[ASIS]: 'true',
|
|
||||||
},
|
},
|
||||||
linkValue,
|
linkValue,
|
||||||
);
|
);
|
||||||
|
|
||||||
content = content.replace(fullMention, Blaze.toHTML(link));
|
content = content.replace(fullMention, Blaze.toHTML(link));
|
||||||
}
|
}
|
||||||
|
|
||||||
return HTML.Raw(sanitizeXss(content));
|
return HTML.Raw(sanitizeXss(content));
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
|
||||||
Template.viewer.events({
|
Template.viewer.events({
|
||||||
// Viewer sometimes have click-able wrapper around them (for instance to edit
|
// Viewer sometimes have click-able wrapper around them (for instance to edit
|
||||||
// the corresponding text). Clicking a link shouldn't fire these actions, stop
|
// the corresponding text). Clicking a link shouldn't fire these actions, stop
|
||||||
// we stop these event at the viewer component level.
|
// we stop these event at the viewer component level.
|
||||||
'click a'(event, templateInstance) {
|
'click a'(event, templateInstance) {
|
||||||
let prevent = true;
|
event.stopPropagation();
|
||||||
|
|
||||||
|
// XXX We hijack the build-in browser action because we currently don't have
|
||||||
|
// `_blank` attributes in viewer links, and the transformer function is
|
||||||
|
// handled by a third party package that we can't configure easily. Fix that
|
||||||
|
// by using directly `_blank` attribute in the rendered HTML.
|
||||||
|
event.preventDefault();
|
||||||
|
|
||||||
const userId = event.currentTarget.dataset.userid;
|
const userId = event.currentTarget.dataset.userid;
|
||||||
if (userId) {
|
if (userId) {
|
||||||
Popup.open('member').call({ userId }, event, templateInstance);
|
Popup.open('member').call({ userId }, event, templateInstance);
|
||||||
} else {
|
} else {
|
||||||
const href = event.currentTarget.href;
|
const href = event.currentTarget.href;
|
||||||
const child = event.currentTarget.firstElementChild;
|
if (href) {
|
||||||
if (child && child.tagName === 'IMG') {
|
|
||||||
prevent = false;
|
|
||||||
} else if (href) {
|
|
||||||
window.open(href, '_blank');
|
window.open(href, '_blank');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (prevent) {
|
|
||||||
event.stopPropagation();
|
|
||||||
|
|
||||||
// XXX We hijack the build-in browser action because we currently don't have
|
|
||||||
// `_blank` attributes in viewer links, and the transformer function is
|
|
||||||
// handled by a third party package that we can't configure easily. Fix that
|
|
||||||
// by using directly `_blank` attribute in the rendered HTML.
|
|
||||||
event.preventDefault();
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue