Add wildcard support to webchannels

replayio · Dec 14, 2023 · 866c141 · 866c141
1 parent abf2e86
commit 866c141
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/devtools/server/actors/replay/auth.js b/devtools/server/actors/replay/auth.js
@@ -233,11 +233,12 @@ function initializeRecordingWebChannel() {
   );
   const localUrl = "http://localhost:8080/";
 
+  registerWebChannel(/^https:\/\/.+.replay.io$/);
   registerWebChannel(pageUrl);
   registerWebChannel(localUrl);
 
   function registerWebChannel(url) {
-    const urlForWebChannel = Services.io.newURI(url);
+    const urlForWebChannel = url instanceof RegExp ? url : Services.io.newURI(url);
     const channel = new WebChannel("record-replay-token", urlForWebChannel);
 
     channel.listen((...args) => handleAuthChannelMessage(channel, ...args));

diff --git a/toolkit/modules/WebChannel.jsm b/toolkit/modules/WebChannel.jsm
@@ -119,6 +119,10 @@ var WebChannel = function(id, originOrPermission) {
     // restrict based on the site's origin, not on other origin attributes
     // such as containers or private browsing.
     this._originCheckCallback = requestPrincipal => {
+      if (originOrPermission instanceof RegExp) {
+        return originOrPermission.test(requestPrincipal.originNoSuffix);
+      }
+
       return originOrPermission.prePath === requestPrincipal.originNoSuffix;
     };
   }