From 492b75c24d9c17e3d4faacf3b2ad74074414bb05 Mon Sep 17 00:00:00 2001 From: Todd Martin <106564991+trmartin4@users.noreply.github.com> Date: Fri, 8 Sep 2023 13:15:24 -0400 Subject: [PATCH] [EC-598] Window Messaging Fix; (#6223) Co-authored-by: Cesar Gonzalez Co-authored-by: SmithThe4th --- .../src/vault/fido2/content/messaging/messenger.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/browser/src/vault/fido2/content/messaging/messenger.ts b/apps/browser/src/vault/fido2/content/messaging/messenger.ts index 0f6929c5bcb..103a0c23191 100644 --- a/apps/browser/src/vault/fido2/content/messaging/messenger.ts +++ b/apps/browser/src/vault/fido2/content/messaging/messenger.ts @@ -24,10 +24,16 @@ type Handler = ( export class Messenger { static forDOMCommunication(window: Window) { + const windowOrigin = window.location.origin; + return new Messenger({ - postMessage: window.postMessage.bind(window), + postMessage: (message) => window.postMessage(message, windowOrigin), messages$: new Observable((subscriber) => { const eventListener = (event: MessageEvent) => { + if (event.origin !== windowOrigin) { + return; + } + subscriber.next(event.data); };