mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(editor): Return early in ws message handler if no 'command' keyword is found (#7946)

Browse source 
## Summary
Avoid processing websocket messages not n8n sent (filter on 'command'
keyword)
This commit is contained in:
Csaba Tuncsik 2023-12-08 13:42:50 +01:00 committed by GitHub
parent dcf12867b3
commit 5b2defc867
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 81 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
packages/editor-ui/src/components/WorkflowPreview.vue
View file

@ -136,7 +136,9 @@ const onMouseLeave = () => {
}; };
const receiveMessage = ({ data }: MessageEvent) => { const receiveMessage = ({ data }: MessageEvent) => {
if (data?.includes('"command"')) { if (!data?.includes?.('"command"')) {
return;
}
try { try {
const json = JSON.parse(data); const json = JSON.parse(data);
if (json.command === 'n8nReady') { if (json.command === 'n8nReady') {
@ -151,7 +153,6 @@ const receiveMessage = ({ data }: MessageEvent) => {
} catch (e) { } catch (e) {
console.error(e); console.error(e);
} }
}
}; };
const onDocumentScroll = () => { const onDocumentScroll = () => {
if (insideIframe.value) { if (insideIframe.value) {

14
packages/editor-ui/src/components/__tests__/WorkflowPreview.test.ts
View file

@ -247,4 +247,18 @@ describe('WorkflowPreview', () => {
expect(emitted()).toEqual({}); expect(emitted()).toEqual({});
}); });
}); });
it('should not do anything if no "command" is sent in the message and the `includes` method cannot be applied to the data', async () => {
const { emitted } = renderComponent({
pinia,
props: {},
});
window.postMessage(null, '*');
await waitFor(() => {
expect(console.error).not.toHaveBeenCalled();
expect(emitted()).toEqual({});
});
});
}); });

5
packages/editor-ui/src/views/NodeView.vue
View file

@ -4312,7 +4312,9 @@ export default defineComponent({
} }
}, },
async onPostMessageReceived(message: MessageEvent) { async onPostMessageReceived(message: MessageEvent) {
if (message?.data?.includes('"command"')) { if (!message?.data?.includes?.('"command"')) {
return;
}
try { try {
const json = JSON.parse(message.data); const json = JSON.parse(message.data);
if (json && json.command === 'openWorkflow') { if (json && json.command === 'openWorkflow') {
@ -4363,7 +4365,6 @@ export default defineComponent({
this.workflowsStore.activeWorkflowExecution = json.execution; this.workflowsStore.activeWorkflowExecution = json.execution;
} }
} catch (e) {} } catch (e) {}
}
}, },
async onImportWorkflowDataEvent(data: IDataObject) { async onImportWorkflowDataEvent(data: IDataObject) {
await this.importWorkflowData(data.data as IWorkflowDataUpdate, 'file'); await this.importWorkflowData(data.data as IWorkflowDataUpdate, 'file');