Extra safety around getting source window from post message

krakenjs · Jan 2, 2019 · 11eb25e · 11eb25e
1 parent 02c36e4
commit 11eb25e
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/drivers/receive/index.js b/src/drivers/receive/index.js
@@ -124,11 +124,19 @@ export function messageListener(event : { source : CrossDomainWindowType, origin
 
     // $FlowFixMe
     let messageEvent : MessageEvent = {
-        source: event.source || event.sourceElement,
+        source: event.source || event.sourceElement || event.srcElement,
         origin: event.origin || (event.originalEvent && event.originalEvent.origin),
         data:   event.data
     };
 
+    if (!messageEvent.source) {
+        throw new Error(`Post message did not have source window`);
+    }
+
+    if (!messageEvent.origin) {
+        throw new Error(`Post message did not have origin domain`);
+    }
+
     if (__TEST__) {
         if (needsGlobalMessagingForBrowser() && isSameTopWindow(messageEvent.source, window) === false) {
             return;