fix: ignoring browser extension traffic

src/index.js

@@ -10,10 +10,9 @@ import {
   addTrustedModules,
   getCurrentModuleInfo,
   setAllowsAll,
-  setIgnoreExtensions,
   setPermissions,
 } from './module';
-import patch, {SandwormError} from './patch';
+import patch, {SandwormError, setIgnoreExtensions} from './patch';
 
 let initialized = false;
 let ready = false;

src/module.js

@@ -5,7 +5,7 @@ const cachedPermissions = {};
 const defaultPermissions = {module: 'root', permissions: true};
 let permissions = [defaultPermissions];
 let trustedModules = ['sandworm', 'react-dom', 'scheduler'];
-let ignoreExtensions = true;
+
 const sourcemaps = {};
 
 export const addSourceMap = (file, map) => {
@@ -16,10 +16,6 @@ export const addTrustedModules = (additionalTrustedModules) => {
   trustedModules = [...trustedModules, ...additionalTrustedModules];
 };
 
-export const setIgnoreExtensions = (ignoreExtensionsOption) => {
-  ignoreExtensions = !!ignoreExtensionsOption;
-};
-
 export const setPermissions = (newPermissions = []) => {
   if (!Array.isArray(newPermissions)) {
     return;
@@ -143,21 +139,21 @@ export const getCurrentModuleInfo = ({stack: stackInput, allowURLs = false} = {}
       )
       .filter((v) => v !== undefined);
     let name = 'root';
+    let isExtension = false;
 
     if (modules.length) {
-      if (
-        ignoreExtensions &&
-        (modules[0].startsWith('chrome-extension://') || modules[0].startsWith('moz-extension://'))
-      ) {
-        name = 'root';
-      } else if (modules[0] === modules[modules.length - 1]) {
+      if (modules[0] === modules[modules.length - 1]) {
         [name] = modules;
       } else {
         name = modules.filter((v, i, a) => a.indexOf(v) === i).join('>');
       }
+
+      isExtension = !!modules.find(
+        (m) => m.startsWith('chrome-extension://') || m.startsWith('moz-extension://'),
+      );
     }
 
-    return {name, stack, directCaller, lastModuleCaller};
+    return {name, stack, directCaller, lastModuleCaller, isExtension};
   } catch (error) {
     logger.error(error);
     return {name: 'root', error: error.message};

src/patch.js

@@ -1,6 +1,12 @@
 import logger from './logger';
 import {getCurrentModuleInfo, isModuleAllowedToExecute} from './module';
 
+let ignoreExtensions = true;
+
+export const setIgnoreExtensions = (ignoreExtensionsOption) => {
+  ignoreExtensions = !!ignoreExtensionsOption;
+};
+
 export class SandwormError extends Error {
   constructor(message) {
     super(message);
@@ -22,14 +28,16 @@ const buildPatch = (family, method, track = () => {}) =>
       stack,
       directCaller,
       lastModuleCaller,
+      isExtension,
       error,
     } = getCurrentModuleInfo({
       allowURLs: true,
     });
 
     if (
-      typeof method.minArgsToTrigger === 'number' &&
-      (args?.length || 0) < method.minArgsToTrigger
+      (typeof method.minArgsToTrigger === 'number' &&
+        (args?.length || 0) < method.minArgsToTrigger) ||
+      (ignoreExtensions && isExtension)
     ) {
       allowed = true;
     } else {

tests/unit/module.test.js

@@ -10,7 +10,6 @@ import {
   isModuleAllowedToExecute,
   mapStackItemToSource,
   setAllowsAll,
-  setIgnoreExtensions,
   setPermissions,
 } from '../../src/module';
 
@@ -294,7 +293,6 @@ describe('module', () => {
       }).name,
     ).toBe('module-name>other');
 
-    // Ignore extensions by default
     expect(
       getCurrentModuleInfo({
         stack: [
@@ -305,22 +303,19 @@ describe('module', () => {
         ],
         allowURLs: true,
       }).name,
-    ).toBe('root');
+    ).toBe('chrome-extension://214324234523/test.js>module-name>other');
 
-    // Allow extensions
-    setIgnoreExtensions(false);
     expect(
       getCurrentModuleInfo({
         stack: [
           {file: 'project/node_modules/other/root.js', line: 1, column: 1},
           {file: 'app.js', line: 1, column: 1},
+          {file: 'moz-extension://214324234523/test.js', line: 1, column: 1},
           {file: 'project/node_modules/module-name/dist/index.js', line: 1, column: 1},
-          {file: 'chrome-extension://214324234523/test.js', line: 1, column: 1},
         ],
         allowURLs: true,
-      }).name,
-    ).toBe('chrome-extension://214324234523/test.js>module-name>other');
-    setIgnoreExtensions(true);
+      }).isExtension,
+    ).toBeTruthy();
 
     // Ignore URLs by default
     expect(

tests/unit/patch.test.js

@@ -1,5 +1,5 @@
 const moduleLib = require('../../src/module');
-const {default: patch, SandwormError} = require('../../src/patch');
+const {default: patch, SandwormError, setIgnoreExtensions} = require('../../src/patch');
 
 const getCurrentModuleInfoMock = jest.fn(() => ({
   name: 'root',
@@ -100,4 +100,35 @@ describe('patch', () => {
 
     expect(() => mod.testArgsLimit(1, 2)).toThrowError(SandwormError);
   });
+
+  test('ignore extensions', () => {
+    moduleLib.getCurrentModuleInfo = jest.fn(() => ({
+      name: 'chrome-extension://aaa/test.js>one>two',
+      stack: [],
+      isExtension: true,
+    }));
+
+    mod.test(1);
+    expect(moduleLib.getCurrentModuleInfo).toBeCalledTimes(1);
+    expect(moduleLib.isModuleAllowedToExecute).not.toBeCalled();
+    expect(originalTest).toBeCalledTimes(1);
+
+    moduleLib.getCurrentModuleInfo = jest.fn(() => ({
+      name: 'module>moz-extension://aaa/test.js>another',
+      stack: [],
+      isExtension: true,
+    }));
+
+    mod.test(1);
+    expect(moduleLib.getCurrentModuleInfo).toBeCalledTimes(1);
+    expect(moduleLib.isModuleAllowedToExecute).not.toBeCalled();
+    expect(originalTest).toBeCalledTimes(2);
+
+    setIgnoreExtensions(false);
+    mod.test(1);
+    expect(moduleLib.getCurrentModuleInfo).toBeCalledTimes(2);
+    expect(moduleLib.isModuleAllowedToExecute).toBeCalledTimes(1);
+    expect(originalTest).toBeCalledTimes(3);
+    setIgnoreExtensions(true);
+  });
 });