fix(context): Updated postMessage listener to stop validating non-Karma messages

twolfson · twolfson · commit 306e5651c9ff · 2016-07-13T10:53:35.000+02:00
diff --git a/client/karma.js b/client/karma.js
@@ -35,12 +35,14 @@ var Karma = function (socket, iframe, opener, navigator, location) {
       }
 
       // Take action based on the message type
-      var method = evt.data.method
-      if (!self[method]) {
-        self.error('Received `postMessage` for "' + method + '" but the method doesn\'t exist')
-        return
+      var method = evt.data.__karmaMethod
+      if (method) {
+        if (!self[method]) {
+          self.error('Received `postMessage` for "' + method + '" but the method doesn\'t exist')
+          return
+        }
+        self[method].apply(self, evt.data.__karmaArguments)
       }
-      self[method].apply(self, evt.data.arguments)
     }, false)
   }
 
diff --git a/context/karma.js b/context/karma.js
@@ -130,7 +130,7 @@ ContextKarma.getDirectCallParentKarmaMethod = function (parentWindow) {
 }
 ContextKarma.getPostMessageCallParentKarmaMethod = function (parentWindow) {
   return function postMessageCallParentKarmaMethod (method, args) {
-    parentWindow.postMessage({method: method, arguments: args}, window.location.origin)
+    parentWindow.postMessage({__karmaMethod: method, __karmaArguments: args}, window.location.origin)
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -35,12 +35,14 @@ var Karma = function (socket, iframe, opener, navigator, location) {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`// Take action based on the message type`
`38`		`- var method = evt.data.method`
`39`		`- if (!self[method]) {`
`40`		- self.error('Received `postMessage` for "' + method + '" but the method doesn\'t exist')
`41`		`- return`
	`38`	`+ var method = evt.data.__karmaMethod`
	`39`	`+ if (method) {`
	`40`	`+ if (!self[method]) {`
	`41`	+ self.error('Received `postMessage` for "' + method + '" but the method doesn\'t exist')
	`42`	`+ return`
	`43`	`+ }`
	`44`	`+ self[method].apply(self, evt.data.__karmaArguments)`
`42`	`45`	`}`
`43`		`- self[method].apply(self, evt.data.arguments)`
`44`	`46`	`}, false)`
`45`	`47`	`}`
`46`	`48`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ ContextKarma.getDirectCallParentKarmaMethod = function (parentWindow) {`
`130`	`130`	`}`
`131`	`131`	`ContextKarma.getPostMessageCallParentKarmaMethod = function (parentWindow) {`
`132`	`132`	`return function postMessageCallParentKarmaMethod (method, args) {`
`133`		`- parentWindow.postMessage({method: method, arguments: args}, window.location.origin)`
	`133`	`+ parentWindow.postMessage({__karmaMethod: method, __karmaArguments: args}, window.location.origin)`
`134`	`134`	`}`
`135`	`135`	`}`
`136`	`136`