👌 Update regex

DataDog · Apr 14, 2022 · 44a3a36 · 44a3a36
1 parent a8d22c1
commit 44a3a36
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/packages/core/src/transport/eventBridge.spec.ts b/packages/core/src/transport/eventBridge.spec.ts
@@ -13,6 +13,7 @@ describe('canUseEventBridge', () => {
     expect(canUseEventBridge('foo.bar')).toBeTrue()
     expect(canUseEventBridge('baz.foo.bar')).toBeTrue()
     expect(canUseEventBridge('www.foo.bar')).toBeTrue()
+    expect(canUseEventBridge('www.qux.foo.bar')).toBeTrue()
   })
 
   it('should not detect when the bridge is present and the webView host is not allowed', () => {

diff --git a/packages/core/src/transport/eventBridge.ts b/packages/core/src/transport/eventBridge.ts
@@ -31,8 +31,8 @@ export function canUseEventBridge(hostname = window.location.hostname): boolean
   return (
     !!bridge &&
     bridge.getAllowedWebViewHosts().some((host) => {
-      const escapedHost = host.replace(/\./g, '\\$&')
-      const isDomainOrSubDomain = new RegExp(`(^|.+\\.)${escapedHost}$`)
+      const escapedHost = host.replace(/\./g, '\\.&')
+      const isDomainOrSubDomain = new RegExp(`^(.+\\.)*${escapedHost}$`)
       return !!isDomainOrSubDomain.exec(hostname)
     })
   )