fix(editor): Prevent clipboard XSS injection (#10805)

This commit is contained in:
Raúl Gómez Morales 2024-09-16 08:36:40 +02:00 committed by GitHub
parent cef64329a9
commit db846d3235
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 48 additions and 12 deletions

View file

@ -1,4 +1,4 @@
import { render } from '@testing-library/vue'; import { render, within } from '@testing-library/vue';
import userEvent from '@testing-library/user-event'; import userEvent from '@testing-library/user-event';
import { defineComponent, h, ref } from 'vue'; import { defineComponent, h, ref } from 'vue';
import { useClipboard } from '@/composables/useClipboard'; import { useClipboard } from '@/composables/useClipboard';
@ -8,9 +8,13 @@ const testValue = 'This is a test';
const TestComponent = defineComponent({ const TestComponent = defineComponent({
setup() { setup() {
const pasted = ref(''); const pasted = ref('');
const htmlContent = ref<HTMLElement>();
const clipboard = useClipboard({ const clipboard = useClipboard({
onPaste(data) { onPaste(data) {
pasted.value = data; pasted.value = data;
if (htmlContent.value) {
htmlContent.value.innerHTML = data;
}
}, },
}); });
@ -23,6 +27,7 @@ const TestComponent = defineComponent({
}, },
}), }),
h('div', { 'data-test-id': 'paste' }, pasted.value), h('div', { 'data-test-id': 'paste' }, pasted.value),
h('div', { 'data-test-id': 'xss-attack', ref: htmlContent }),
]); ]);
}, },
}); });
@ -68,4 +73,12 @@ describe('useClipboard()', () => {
expect(pasteElement.textContent).toEqual(testValue); expect(pasteElement.textContent).toEqual(testValue);
}); });
}); });
it('sanitizes HTML', async () => {
const unsafeHtml = 'https://www.ex.com/sfefdfd<img/src/onerror=alert(1)>fdf/xdfef.json';
const { getByTestId } = render(TestComponent);
await userEvent.paste(unsafeHtml);
expect(within(getByTestId('xss-attack')).queryByRole('img')).not.toBeInTheDocument();
});
}); });

View file

@ -1,6 +1,7 @@
import { onBeforeUnmount, onMounted, ref } from 'vue'; import { onBeforeUnmount, onMounted, ref } from 'vue';
import { useClipboard as useClipboardCore } from '@vueuse/core'; import { useClipboard as useClipboardCore } from '@vueuse/core';
import { useDebounce } from '@/composables/useDebounce'; import { useDebounce } from '@/composables/useDebounce';
import { sanitizeIfString } from '@/utils/htmlUtils';
type ClipboardEventFn = (data: string, event?: ClipboardEvent) => void; type ClipboardEventFn = (data: string, event?: ClipboardEvent) => void;
@ -42,7 +43,7 @@ export function useClipboard(
const clipboardData = event.clipboardData; const clipboardData = event.clipboardData;
if (clipboardData !== null) { if (clipboardData !== null) {
const clipboardValue = clipboardData.getData('text/plain'); const clipboardValue = sanitizeIfString(clipboardData.getData('text/plain'));
onPasteCallback.value(clipboardValue, event); onPasteCallback.value(clipboardValue, event);
} }
} }

View file

@ -1,5 +1,6 @@
import type { ElMessageBoxOptions, Action, MessageBoxInputData } from 'element-plus'; import type { ElMessageBoxOptions, Action, MessageBoxInputData } from 'element-plus';
import { ElMessageBox as MessageBox } from 'element-plus'; import { ElMessageBox as MessageBox } from 'element-plus';
import { sanitizeIfString } from '@/utils/htmlUtils';
export type MessageBoxConfirmResult = 'confirm' | 'cancel'; export type MessageBoxConfirmResult = 'confirm' | 'cancel';
@ -28,11 +29,13 @@ export function useMessage() {
}; };
if (typeof configOrTitle === 'string') { if (typeof configOrTitle === 'string') {
return await MessageBox.alert(message, configOrTitle, resolvedConfig).catch( return await MessageBox.alert(sanitizeIfString(message), configOrTitle, resolvedConfig).catch(
handleCancelOrClose, handleCancelOrClose,
); );
} }
return await MessageBox.alert(message, resolvedConfig).catch(handleCancelOrClose); return await MessageBox.alert(sanitizeIfString(message), resolvedConfig).catch(
handleCancelOrClose,
);
} }
async function confirm( async function confirm(
@ -50,12 +53,16 @@ export function useMessage() {
}; };
if (typeof configOrTitle === 'string') { if (typeof configOrTitle === 'string') {
return await MessageBox.confirm(message, configOrTitle, resolvedConfig).catch( return await MessageBox.confirm(
handleCancelOrClose, sanitizeIfString(message),
); sanitizeIfString(configOrTitle),
resolvedConfig,
).catch(handleCancelOrClose);
} }
return await MessageBox.confirm(message, resolvedConfig).catch(handleCancelOrClose); return await MessageBox.confirm(sanitizeIfString(message), resolvedConfig).catch(
handleCancelOrClose,
);
} }
async function prompt( async function prompt(
@ -70,11 +77,15 @@ export function useMessage() {
}; };
if (typeof configOrTitle === 'string') { if (typeof configOrTitle === 'string') {
return await MessageBox.prompt(message, configOrTitle, resolvedConfig).catch( return await MessageBox.prompt(
handleCancelOrClosePrompt, sanitizeIfString(message),
); sanitizeIfString(configOrTitle),
resolvedConfig,
).catch(handleCancelOrClosePrompt);
} }
return await MessageBox.prompt(message, resolvedConfig).catch(handleCancelOrClosePrompt); return await MessageBox.prompt(sanitizeIfString(message), resolvedConfig).catch(
handleCancelOrClosePrompt,
);
} }
return { return {

View file

@ -37,6 +37,17 @@ export function sanitizeHtml(dirtyHtml: string) {
return sanitizedHtml; return sanitizedHtml;
} }
/**
* Checks if the input is a string and sanitizes it by removing or escaping harmful characters,
* returning the original input if it's not a string.
*/
export const sanitizeIfString = <T>(message: T): string | T => {
if (typeof message === 'string') {
return sanitizeHtml(message);
}
return message;
};
export function setPageTitle(title: string) { export function setPageTitle(title: string) {
window.document.title = title; window.document.title = title;
} }