@metamask/snaps-execution-environments 0.38.0-flask.1 → 0.38.1-flask.1

package/CHANGELOG.md

@@ -6,6 +6,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.38.1-flask.1]
+### Changed
+- Update LavaMoat packages to latest versions ([#1657](https://github.com/MetaMask/snaps/pull/1657))
+
+### Removed
+- Remove direct dependency on SES ([#1660](https://github.com/MetaMask/snaps/pull/1660))
+  - It's now a dev dependency, as it's only used in development.
+
+### Fixed
+- Pass correct scuttle args ([#1654](https://github.com/MetaMask/snaps/pull/1654))
+
 ## [0.38.0-flask.1]
 ### Added
 - Add `onInstall` and `onUpdate` lifecycle hooks ([#1643](https://github.com/MetaMask/snaps/pull/1643))
@@ -21,7 +32,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - The version of the package no longer needs to match the version of all other
     MetaMask Snaps packages.
 
-[Unreleased]: https://github.com/MetaMask/snaps/compare/@metamask/snaps-execution-environments@0.38.0-flask.1...HEAD
+[Unreleased]: https://github.com/MetaMask/snaps/compare/@metamask/snaps-execution-environments@0.38.1-flask.1...HEAD
+[0.38.1-flask.1]: https://github.com/MetaMask/snaps/compare/@metamask/snaps-execution-environments@0.38.0-flask.1...@metamask/snaps-execution-environments@0.38.1-flask.1
 [0.38.0-flask.1]: https://github.com/MetaMask/snaps/compare/@metamask/snaps-execution-environments@0.37.3-flask.1...@metamask/snaps-execution-environments@0.38.0-flask.1
 [0.37.3-flask.1]: https://github.com/MetaMask/snaps/compare/@metamask/snaps-execution-environments@0.37.2-flask.1...@metamask/snaps-execution-environments@0.37.3-flask.1
 [0.37.2-flask.1]: https://github.com/MetaMask/snaps/releases/tag/@metamask/snaps-execution-environments@0.37.2-flask.1

package/dist/browserify/iframe/index.html

@@ -95,8 +95,7 @@
     // security options are hard-coded at build time
     const {
       scuttleGlobalThis,
-      scuttleGlobalThisExceptions,
-    } = {"scuttleGlobalThis":true,"scuttleGlobalThisExceptions":["postMessage","removeEventListener","isSecureContext"]}
+    } = {"scuttleGlobalThis":{"enabled":true,"exceptions":["postMessage","removeEventListener","isSecureContext"]}}
 
     function getGlobalRef () {
       if (typeof globalThis !== 'undefined') {
@@ -2525,7 +2524,7 @@ const        evadeHtmlCommentTest=  (src)=>{
 // /////////////////////////////////////////////////////////////////////////////
 $h‍_once.evadeHtmlCommentTest(evadeHtmlCommentTest);
 const importPattern=  new FERAL_REG_EXP(
-  '(^|[^.])\\bimport(\\s*(?:\\(|/[/*]))',
+  '(^|[^.]|\\.\\.\\.)\\bimport(\\s*(?:\\(|/[/*]))',
   'g');
 
 
@@ -10963,7 +10962,6 @@ function observeImports(map, importName, importIndex) {
     globalThisRefs,
     // security options
     scuttleGlobalThis,
-    scuttleGlobalThisExceptions,
     debugMode,
     runWithPrecompiledModules,
     reportStatsHook,
@@ -10991,7 +10989,6 @@ function observeImports(map, importName, importIndex) {
       getExternalCompartment,
       globalThisRefs,
       scuttleGlobalThis,
-      scuttleGlobalThisExceptions,
       debugMode,
       runWithPrecompiledModules,
       reportStatsHook,
@@ -11010,8 +11007,7 @@ function observeImports(map, importName, importIndex) {
     prepareModuleInitializerArgs,
     getExternalCompartment,
     globalThisRefs = ['globalThis'],
-    scuttleGlobalThis = false,
-    scuttleGlobalThisExceptions = [],
+    scuttleGlobalThis = {},
     debugMode = false,
     runWithPrecompiledModules = false,
     reportStatsHook = () => {},
@@ -11557,6 +11553,7 @@ module.exports = {
   return module.exports
 })()
 
+    const scuttleOpts = generateScuttleOpts(scuttleGlobalThis)
     const moduleCache = new Map()
     const packageCompartmentCache = new Map()
     const globalStore = new Map()
@@ -11565,22 +11562,11 @@ module.exports = {
     const rootPackageCompartment = createRootPackageCompartment(globalRef)
 
     // scuttle globalThis right after we used it to create the root package compartment
-    if (scuttleGlobalThis) {
-      if (!Array.isArray(scuttleGlobalThisExceptions)) {
-        throw new Error(`LavaMoat - scuttleGlobalThisExceptions must be an array, got "${typeof scuttleGlobalThisExceptions}"`)
+    if (scuttleOpts.enabled) {
+      if (!Array.isArray(scuttleOpts.exceptions)) {
+        throw new Error(`LavaMoat - scuttleGlobalThis.exceptions must be an array, got "${typeof scuttleOpts.exceptions}"`)
       }
-      // turn scuttleGlobalThisExceptions regexes strings to actual regexes
-      for (let i = 0; i < scuttleGlobalThisExceptions.length; i++) {
-        const prop = scuttleGlobalThisExceptions[i]
-        if (!prop.startsWith('/')) {
-          continue
-        }
-        const parts = prop.split('/')
-        const pattern = parts.slice(1, -1).join('/')
-        const flags = parts[parts.length - 1]
-        scuttleGlobalThisExceptions[i] = new RegExp(pattern, flags)
-      }
-      performScuttleGlobalThis(globalRef, scuttleGlobalThisExceptions)
+      scuttleOpts.scuttlerFunc(globalRef, realm => performScuttleGlobalThis(realm, scuttleOpts.exceptions))
     }
 
     const kernel = {
@@ -11593,6 +11579,43 @@ module.exports = {
     Object.freeze(kernel)
     return kernel
 
+    // generate final scuttling options (1) by taking default
+    // options into consideration, (2) turning RE strings into
+    // actual REs and (3) without mutating original opts object
+    function generateScuttleOpts(originalOpts) {
+      const defaultOpts = {
+        enabled: true,
+        exceptions: [],
+        scuttlerName: '',
+      }
+      const opts = Object.assign({},
+        originalOpts === true ? { ... defaultOpts } : { ...originalOpts },
+        { scuttlerFunc: (globalRef, scuttle) => scuttle(globalRef) },
+        { exceptions: (originalOpts.exceptions || defaultOpts.exceptions).map(e => toRE(e)) },
+      )
+      if (opts.scuttlerName) {
+        if (!globalRef[opts.scuttlerName]) {
+          throw new Error(
+            `LavaMoat - 'scuttlerName' function "${opts.scuttlerName}" expected on globalRef.` +
+            'To learn more visit https://github.com/LavaMoat/LavaMoat/pull/462.',
+          )
+        }
+        opts.scuttlerFunc = globalRef[opts.scuttlerName]
+      }
+      return opts
+
+      function toRE(except) {
+        // turn scuttleGlobalThis.exceptions regexes strings to actual regexes
+        if (!except.startsWith('/')) {
+          return except
+        }
+        const parts = except.split('/')
+        const pattern = parts.slice(1, -1).join('/')
+        const flags = parts[parts.length - 1]
+        return new RegExp(pattern, flags)
+      }
+    }
+
     function performScuttleGlobalThis (globalRef, extraPropsToAvoid = new Array()) {
       const props = new Array()
       getPrototypeChain(globalRef)
@@ -11995,7 +12018,6 @@ module.exports = {
       globalRef,
       globalThisRefs,
       scuttleGlobalThis,
-      scuttleGlobalThisExceptions,
       debugMode,
       runWithPrecompiledModules,
       reportStatsHook,

package/dist/browserify/node-process/bundle.js

@@ -89,7 +89,6 @@
     // security options are hard-coded at build time
     const {
       scuttleGlobalThis,
-      scuttleGlobalThisExceptions,
     } = {}
 
     function getGlobalRef () {
@@ -2519,7 +2518,7 @@ const        evadeHtmlCommentTest=  (src)=>{
 // /////////////////////////////////////////////////////////////////////////////
 $h‍_once.evadeHtmlCommentTest(evadeHtmlCommentTest);
 const importPattern=  new FERAL_REG_EXP(
-  '(^|[^.])\\bimport(\\s*(?:\\(|/[/*]))',
+  '(^|[^.]|\\.\\.\\.)\\bimport(\\s*(?:\\(|/[/*]))',
   'g');
 
 
@@ -10957,7 +10956,6 @@ function observeImports(map, importName, importIndex) {
     globalThisRefs,
     // security options
     scuttleGlobalThis,
-    scuttleGlobalThisExceptions,
     debugMode,
     runWithPrecompiledModules,
     reportStatsHook,
@@ -10985,7 +10983,6 @@ function observeImports(map, importName, importIndex) {
       getExternalCompartment,
       globalThisRefs,
       scuttleGlobalThis,
-      scuttleGlobalThisExceptions,
       debugMode,
       runWithPrecompiledModules,
       reportStatsHook,
@@ -11004,8 +11001,7 @@ function observeImports(map, importName, importIndex) {
     prepareModuleInitializerArgs,
     getExternalCompartment,
     globalThisRefs = ['globalThis'],
-    scuttleGlobalThis = false,
-    scuttleGlobalThisExceptions = [],
+    scuttleGlobalThis = {},
     debugMode = false,
     runWithPrecompiledModules = false,
     reportStatsHook = () => {},
@@ -11551,6 +11547,7 @@ module.exports = {
   return module.exports
 })()
 
+    const scuttleOpts = generateScuttleOpts(scuttleGlobalThis)
     const moduleCache = new Map()
     const packageCompartmentCache = new Map()
     const globalStore = new Map()
@@ -11559,22 +11556,11 @@ module.exports = {
     const rootPackageCompartment = createRootPackageCompartment(globalRef)
 
     // scuttle globalThis right after we used it to create the root package compartment
-    if (scuttleGlobalThis) {
-      if (!Array.isArray(scuttleGlobalThisExceptions)) {
-        throw new Error(`LavaMoat - scuttleGlobalThisExceptions must be an array, got "${typeof scuttleGlobalThisExceptions}"`)
+    if (scuttleOpts.enabled) {
+      if (!Array.isArray(scuttleOpts.exceptions)) {
+        throw new Error(`LavaMoat - scuttleGlobalThis.exceptions must be an array, got "${typeof scuttleOpts.exceptions}"`)
       }
-      // turn scuttleGlobalThisExceptions regexes strings to actual regexes
-      for (let i = 0; i < scuttleGlobalThisExceptions.length; i++) {
-        const prop = scuttleGlobalThisExceptions[i]
-        if (!prop.startsWith('/')) {
-          continue
-        }
-        const parts = prop.split('/')
-        const pattern = parts.slice(1, -1).join('/')
-        const flags = parts[parts.length - 1]
-        scuttleGlobalThisExceptions[i] = new RegExp(pattern, flags)
-      }
-      performScuttleGlobalThis(globalRef, scuttleGlobalThisExceptions)
+      scuttleOpts.scuttlerFunc(globalRef, realm => performScuttleGlobalThis(realm, scuttleOpts.exceptions))
     }
 
     const kernel = {
@@ -11587,6 +11573,43 @@ module.exports = {
     Object.freeze(kernel)
     return kernel
 
+    // generate final scuttling options (1) by taking default
+    // options into consideration, (2) turning RE strings into
+    // actual REs and (3) without mutating original opts object
+    function generateScuttleOpts(originalOpts) {
+      const defaultOpts = {
+        enabled: true,
+        exceptions: [],
+        scuttlerName: '',
+      }
+      const opts = Object.assign({},
+        originalOpts === true ? { ... defaultOpts } : { ...originalOpts },
+        { scuttlerFunc: (globalRef, scuttle) => scuttle(globalRef) },
+        { exceptions: (originalOpts.exceptions || defaultOpts.exceptions).map(e => toRE(e)) },
+      )
+      if (opts.scuttlerName) {
+        if (!globalRef[opts.scuttlerName]) {
+          throw new Error(
+            `LavaMoat - 'scuttlerName' function "${opts.scuttlerName}" expected on globalRef.` +
+            'To learn more visit https://github.com/LavaMoat/LavaMoat/pull/462.',
+          )
+        }
+        opts.scuttlerFunc = globalRef[opts.scuttlerName]
+      }
+      return opts
+
+      function toRE(except) {
+        // turn scuttleGlobalThis.exceptions regexes strings to actual regexes
+        if (!except.startsWith('/')) {
+          return except
+        }
+        const parts = except.split('/')
+        const pattern = parts.slice(1, -1).join('/')
+        const flags = parts[parts.length - 1]
+        return new RegExp(pattern, flags)
+      }
+    }
+
     function performScuttleGlobalThis (globalRef, extraPropsToAvoid = new Array()) {
       const props = new Array()
       getPrototypeChain(globalRef)
@@ -11989,7 +12012,6 @@ module.exports = {
       globalRef,
       globalThisRefs,
       scuttleGlobalThis,
-      scuttleGlobalThisExceptions,
       debugMode,
       runWithPrecompiledModules,
       reportStatsHook,

package/dist/browserify/node-thread/bundle.js

@@ -89,7 +89,6 @@
     // security options are hard-coded at build time
     const {
       scuttleGlobalThis,
-      scuttleGlobalThisExceptions,
     } = {}
 
     function getGlobalRef () {
@@ -2519,7 +2518,7 @@ const        evadeHtmlCommentTest=  (src)=>{
 // /////////////////////////////////////////////////////////////////////////////
 $h‍_once.evadeHtmlCommentTest(evadeHtmlCommentTest);
 const importPattern=  new FERAL_REG_EXP(
-  '(^|[^.])\\bimport(\\s*(?:\\(|/[/*]))',
+  '(^|[^.]|\\.\\.\\.)\\bimport(\\s*(?:\\(|/[/*]))',
   'g');
 
 
@@ -10957,7 +10956,6 @@ function observeImports(map, importName, importIndex) {
     globalThisRefs,
     // security options
     scuttleGlobalThis,
-    scuttleGlobalThisExceptions,
     debugMode,
     runWithPrecompiledModules,
     reportStatsHook,
@@ -10985,7 +10983,6 @@ function observeImports(map, importName, importIndex) {
       getExternalCompartment,
       globalThisRefs,
       scuttleGlobalThis,
-      scuttleGlobalThisExceptions,
       debugMode,
       runWithPrecompiledModules,
       reportStatsHook,
@@ -11004,8 +11001,7 @@ function observeImports(map, importName, importIndex) {
     prepareModuleInitializerArgs,
     getExternalCompartment,
     globalThisRefs = ['globalThis'],
-    scuttleGlobalThis = false,
-    scuttleGlobalThisExceptions = [],
+    scuttleGlobalThis = {},
     debugMode = false,
     runWithPrecompiledModules = false,
     reportStatsHook = () => {},
@@ -11551,6 +11547,7 @@ module.exports = {
   return module.exports
 })()
 
+    const scuttleOpts = generateScuttleOpts(scuttleGlobalThis)
     const moduleCache = new Map()
     const packageCompartmentCache = new Map()
     const globalStore = new Map()
@@ -11559,22 +11556,11 @@ module.exports = {
     const rootPackageCompartment = createRootPackageCompartment(globalRef)
 
     // scuttle globalThis right after we used it to create the root package compartment
-    if (scuttleGlobalThis) {
-      if (!Array.isArray(scuttleGlobalThisExceptions)) {
-        throw new Error(`LavaMoat - scuttleGlobalThisExceptions must be an array, got "${typeof scuttleGlobalThisExceptions}"`)
+    if (scuttleOpts.enabled) {
+      if (!Array.isArray(scuttleOpts.exceptions)) {
+        throw new Error(`LavaMoat - scuttleGlobalThis.exceptions must be an array, got "${typeof scuttleOpts.exceptions}"`)
       }
-      // turn scuttleGlobalThisExceptions regexes strings to actual regexes
-      for (let i = 0; i < scuttleGlobalThisExceptions.length; i++) {
-        const prop = scuttleGlobalThisExceptions[i]
-        if (!prop.startsWith('/')) {
-          continue
-        }
-        const parts = prop.split('/')
-        const pattern = parts.slice(1, -1).join('/')
-        const flags = parts[parts.length - 1]
-        scuttleGlobalThisExceptions[i] = new RegExp(pattern, flags)
-      }
-      performScuttleGlobalThis(globalRef, scuttleGlobalThisExceptions)
+      scuttleOpts.scuttlerFunc(globalRef, realm => performScuttleGlobalThis(realm, scuttleOpts.exceptions))
     }
 
     const kernel = {
@@ -11587,6 +11573,43 @@ module.exports = {
     Object.freeze(kernel)
     return kernel
 
+    // generate final scuttling options (1) by taking default
+    // options into consideration, (2) turning RE strings into
+    // actual REs and (3) without mutating original opts object
+    function generateScuttleOpts(originalOpts) {
+      const defaultOpts = {
+        enabled: true,
+        exceptions: [],
+        scuttlerName: '',
+      }
+      const opts = Object.assign({},
+        originalOpts === true ? { ... defaultOpts } : { ...originalOpts },
+        { scuttlerFunc: (globalRef, scuttle) => scuttle(globalRef) },
+        { exceptions: (originalOpts.exceptions || defaultOpts.exceptions).map(e => toRE(e)) },
+      )
+      if (opts.scuttlerName) {
+        if (!globalRef[opts.scuttlerName]) {
+          throw new Error(
+            `LavaMoat - 'scuttlerName' function "${opts.scuttlerName}" expected on globalRef.` +
+            'To learn more visit https://github.com/LavaMoat/LavaMoat/pull/462.',
+          )
+        }
+        opts.scuttlerFunc = globalRef[opts.scuttlerName]
+      }
+      return opts
+
+      function toRE(except) {
+        // turn scuttleGlobalThis.exceptions regexes strings to actual regexes
+        if (!except.startsWith('/')) {
+          return except
+        }
+        const parts = except.split('/')
+        const pattern = parts.slice(1, -1).join('/')
+        const flags = parts[parts.length - 1]
+        return new RegExp(pattern, flags)
+      }
+    }
+
     function performScuttleGlobalThis (globalRef, extraPropsToAvoid = new Array()) {
       const props = new Array()
       getPrototypeChain(globalRef)
@@ -11989,7 +12012,6 @@ module.exports = {
       globalRef,
       globalThisRefs,
       scuttleGlobalThis,
-      scuttleGlobalThisExceptions,
       debugMode,
       runWithPrecompiledModules,
       reportStatsHook,

package/dist/browserify/offscreen/index.html

@@ -95,8 +95,7 @@
     // security options are hard-coded at build time
     const {
       scuttleGlobalThis,
-      scuttleGlobalThisExceptions,
-    } = {"scuttleGlobalThis":true,"scuttleGlobalThisExceptions":["postMessage","removeEventListener","isSecureContext"]}
+    } = {"scuttleGlobalThis":{"enabled":true,"exceptions":["postMessage","removeEventListener","isSecureContext"]}}
 
     function getGlobalRef () {
       if (typeof globalThis !== 'undefined') {
@@ -2525,7 +2524,7 @@ const        evadeHtmlCommentTest=  (src)=>{
 // /////////////////////////////////////////////////////////////////////////////
 $h‍_once.evadeHtmlCommentTest(evadeHtmlCommentTest);
 const importPattern=  new FERAL_REG_EXP(
-  '(^|[^.])\\bimport(\\s*(?:\\(|/[/*]))',
+  '(^|[^.]|\\.\\.\\.)\\bimport(\\s*(?:\\(|/[/*]))',
   'g');
 
 
@@ -10963,7 +10962,6 @@ function observeImports(map, importName, importIndex) {
     globalThisRefs,
     // security options
     scuttleGlobalThis,
-    scuttleGlobalThisExceptions,
     debugMode,
     runWithPrecompiledModules,
     reportStatsHook,
@@ -10991,7 +10989,6 @@ function observeImports(map, importName, importIndex) {
       getExternalCompartment,
       globalThisRefs,
       scuttleGlobalThis,
-      scuttleGlobalThisExceptions,
       debugMode,
       runWithPrecompiledModules,
       reportStatsHook,
@@ -11010,8 +11007,7 @@ function observeImports(map, importName, importIndex) {
     prepareModuleInitializerArgs,
     getExternalCompartment,
     globalThisRefs = ['globalThis'],
-    scuttleGlobalThis = false,
-    scuttleGlobalThisExceptions = [],
+    scuttleGlobalThis = {},
     debugMode = false,
     runWithPrecompiledModules = false,
     reportStatsHook = () => {},
@@ -11557,6 +11553,7 @@ module.exports = {
   return module.exports
 })()
 
+    const scuttleOpts = generateScuttleOpts(scuttleGlobalThis)
     const moduleCache = new Map()
     const packageCompartmentCache = new Map()
     const globalStore = new Map()
@@ -11565,22 +11562,11 @@ module.exports = {
     const rootPackageCompartment = createRootPackageCompartment(globalRef)
 
     // scuttle globalThis right after we used it to create the root package compartment
-    if (scuttleGlobalThis) {
-      if (!Array.isArray(scuttleGlobalThisExceptions)) {
-        throw new Error(`LavaMoat - scuttleGlobalThisExceptions must be an array, got "${typeof scuttleGlobalThisExceptions}"`)
+    if (scuttleOpts.enabled) {
+      if (!Array.isArray(scuttleOpts.exceptions)) {
+        throw new Error(`LavaMoat - scuttleGlobalThis.exceptions must be an array, got "${typeof scuttleOpts.exceptions}"`)
       }
-      // turn scuttleGlobalThisExceptions regexes strings to actual regexes
-      for (let i = 0; i < scuttleGlobalThisExceptions.length; i++) {
-        const prop = scuttleGlobalThisExceptions[i]
-        if (!prop.startsWith('/')) {
-          continue
-        }
-        const parts = prop.split('/')
-        const pattern = parts.slice(1, -1).join('/')
-        const flags = parts[parts.length - 1]
-        scuttleGlobalThisExceptions[i] = new RegExp(pattern, flags)
-      }
-      performScuttleGlobalThis(globalRef, scuttleGlobalThisExceptions)
+      scuttleOpts.scuttlerFunc(globalRef, realm => performScuttleGlobalThis(realm, scuttleOpts.exceptions))
     }
 
     const kernel = {
@@ -11593,6 +11579,43 @@ module.exports = {
     Object.freeze(kernel)
     return kernel
 
+    // generate final scuttling options (1) by taking default
+    // options into consideration, (2) turning RE strings into
+    // actual REs and (3) without mutating original opts object
+    function generateScuttleOpts(originalOpts) {
+      const defaultOpts = {
+        enabled: true,
+        exceptions: [],
+        scuttlerName: '',
+      }
+      const opts = Object.assign({},
+        originalOpts === true ? { ... defaultOpts } : { ...originalOpts },
+        { scuttlerFunc: (globalRef, scuttle) => scuttle(globalRef) },
+        { exceptions: (originalOpts.exceptions || defaultOpts.exceptions).map(e => toRE(e)) },
+      )
+      if (opts.scuttlerName) {
+        if (!globalRef[opts.scuttlerName]) {
+          throw new Error(
+            `LavaMoat - 'scuttlerName' function "${opts.scuttlerName}" expected on globalRef.` +
+            'To learn more visit https://github.com/LavaMoat/LavaMoat/pull/462.',
+          )
+        }
+        opts.scuttlerFunc = globalRef[opts.scuttlerName]
+      }
+      return opts
+
+      function toRE(except) {
+        // turn scuttleGlobalThis.exceptions regexes strings to actual regexes
+        if (!except.startsWith('/')) {
+          return except
+        }
+        const parts = except.split('/')
+        const pattern = parts.slice(1, -1).join('/')
+        const flags = parts[parts.length - 1]
+        return new RegExp(pattern, flags)
+      }
+    }
+
     function performScuttleGlobalThis (globalRef, extraPropsToAvoid = new Array()) {
       const props = new Array()
       getPrototypeChain(globalRef)
@@ -11995,7 +12018,6 @@ module.exports = {
       globalRef,
       globalThisRefs,
       scuttleGlobalThis,
-      scuttleGlobalThisExceptions,
       debugMode,
       runWithPrecompiledModules,
       reportStatsHook,

package/dist/browserify/worker-executor/bundle.js

@@ -89,8 +89,7 @@
     // security options are hard-coded at build time
     const {
       scuttleGlobalThis,
-      scuttleGlobalThisExceptions,
-    } = {"scuttleGlobalThis":true,"scuttleGlobalThisExceptions":["postMessage","removeEventListener","isSecureContext"]}
+    } = {"scuttleGlobalThis":{"enabled":true,"exceptions":["postMessage","removeEventListener","isSecureContext"]}}
 
     function getGlobalRef () {
       if (typeof globalThis !== 'undefined') {
@@ -2519,7 +2518,7 @@ const        evadeHtmlCommentTest=  (src)=>{
 // /////////////////////////////////////////////////////////////////////////////
 $h‍_once.evadeHtmlCommentTest(evadeHtmlCommentTest);
 const importPattern=  new FERAL_REG_EXP(
-  '(^|[^.])\\bimport(\\s*(?:\\(|/[/*]))',
+  '(^|[^.]|\\.\\.\\.)\\bimport(\\s*(?:\\(|/[/*]))',
   'g');
 
 
@@ -10957,7 +10956,6 @@ function observeImports(map, importName, importIndex) {
     globalThisRefs,
     // security options
     scuttleGlobalThis,
-    scuttleGlobalThisExceptions,
     debugMode,
     runWithPrecompiledModules,
     reportStatsHook,
@@ -10985,7 +10983,6 @@ function observeImports(map, importName, importIndex) {
       getExternalCompartment,
       globalThisRefs,
       scuttleGlobalThis,
-      scuttleGlobalThisExceptions,
       debugMode,
       runWithPrecompiledModules,
       reportStatsHook,
@@ -11004,8 +11001,7 @@ function observeImports(map, importName, importIndex) {
     prepareModuleInitializerArgs,
     getExternalCompartment,
     globalThisRefs = ['globalThis'],
-    scuttleGlobalThis = false,
-    scuttleGlobalThisExceptions = [],
+    scuttleGlobalThis = {},
     debugMode = false,
     runWithPrecompiledModules = false,
     reportStatsHook = () => {},
@@ -11551,6 +11547,7 @@ module.exports = {
   return module.exports
 })()
 
+    const scuttleOpts = generateScuttleOpts(scuttleGlobalThis)
     const moduleCache = new Map()
     const packageCompartmentCache = new Map()
     const globalStore = new Map()
@@ -11559,22 +11556,11 @@ module.exports = {
     const rootPackageCompartment = createRootPackageCompartment(globalRef)
 
     // scuttle globalThis right after we used it to create the root package compartment
-    if (scuttleGlobalThis) {
-      if (!Array.isArray(scuttleGlobalThisExceptions)) {
-        throw new Error(`LavaMoat - scuttleGlobalThisExceptions must be an array, got "${typeof scuttleGlobalThisExceptions}"`)
+    if (scuttleOpts.enabled) {
+      if (!Array.isArray(scuttleOpts.exceptions)) {
+        throw new Error(`LavaMoat - scuttleGlobalThis.exceptions must be an array, got "${typeof scuttleOpts.exceptions}"`)
       }
-      // turn scuttleGlobalThisExceptions regexes strings to actual regexes
-      for (let i = 0; i < scuttleGlobalThisExceptions.length; i++) {
-        const prop = scuttleGlobalThisExceptions[i]
-        if (!prop.startsWith('/')) {
-          continue
-        }
-        const parts = prop.split('/')
-        const pattern = parts.slice(1, -1).join('/')
-        const flags = parts[parts.length - 1]
-        scuttleGlobalThisExceptions[i] = new RegExp(pattern, flags)
-      }
-      performScuttleGlobalThis(globalRef, scuttleGlobalThisExceptions)
+      scuttleOpts.scuttlerFunc(globalRef, realm => performScuttleGlobalThis(realm, scuttleOpts.exceptions))
     }
 
     const kernel = {
@@ -11587,6 +11573,43 @@ module.exports = {
     Object.freeze(kernel)
     return kernel
 
+    // generate final scuttling options (1) by taking default
+    // options into consideration, (2) turning RE strings into
+    // actual REs and (3) without mutating original opts object
+    function generateScuttleOpts(originalOpts) {
+      const defaultOpts = {
+        enabled: true,
+        exceptions: [],
+        scuttlerName: '',
+      }
+      const opts = Object.assign({},
+        originalOpts === true ? { ... defaultOpts } : { ...originalOpts },
+        { scuttlerFunc: (globalRef, scuttle) => scuttle(globalRef) },
+        { exceptions: (originalOpts.exceptions || defaultOpts.exceptions).map(e => toRE(e)) },
+      )
+      if (opts.scuttlerName) {
+        if (!globalRef[opts.scuttlerName]) {
+          throw new Error(
+            `LavaMoat - 'scuttlerName' function "${opts.scuttlerName}" expected on globalRef.` +
+            'To learn more visit https://github.com/LavaMoat/LavaMoat/pull/462.',
+          )
+        }
+        opts.scuttlerFunc = globalRef[opts.scuttlerName]
+      }
+      return opts
+
+      function toRE(except) {
+        // turn scuttleGlobalThis.exceptions regexes strings to actual regexes
+        if (!except.startsWith('/')) {
+          return except
+        }
+        const parts = except.split('/')
+        const pattern = parts.slice(1, -1).join('/')
+        const flags = parts[parts.length - 1]
+        return new RegExp(pattern, flags)
+      }
+    }
+
     function performScuttleGlobalThis (globalRef, extraPropsToAvoid = new Array()) {
       const props = new Array()
       getPrototypeChain(globalRef)
@@ -11989,7 +12012,6 @@ module.exports = {
       globalRef,
       globalThisRefs,
       scuttleGlobalThis,
-      scuttleGlobalThisExceptions,
       debugMode,
       runWithPrecompiledModules,
       reportStatsHook,

package/dist/browserify/worker-pool/index.html

@@ -95,8 +95,7 @@
     // security options are hard-coded at build time
     const {
       scuttleGlobalThis,
-      scuttleGlobalThisExceptions,
-    } = {"scuttleGlobalThis":true,"scuttleGlobalThisExceptions":["postMessage","removeEventListener","isSecureContext"]}
+    } = {"scuttleGlobalThis":{"enabled":true,"exceptions":["postMessage","removeEventListener","isSecureContext"]}}
 
     function getGlobalRef () {
       if (typeof globalThis !== 'undefined') {
@@ -2525,7 +2524,7 @@ const        evadeHtmlCommentTest=  (src)=>{
 // /////////////////////////////////////////////////////////////////////////////
 $h‍_once.evadeHtmlCommentTest(evadeHtmlCommentTest);
 const importPattern=  new FERAL_REG_EXP(
-  '(^|[^.])\\bimport(\\s*(?:\\(|/[/*]))',
+  '(^|[^.]|\\.\\.\\.)\\bimport(\\s*(?:\\(|/[/*]))',
   'g');
 
 
@@ -10963,7 +10962,6 @@ function observeImports(map, importName, importIndex) {
     globalThisRefs,
     // security options
     scuttleGlobalThis,
-    scuttleGlobalThisExceptions,
     debugMode,
     runWithPrecompiledModules,
     reportStatsHook,
@@ -10991,7 +10989,6 @@ function observeImports(map, importName, importIndex) {
       getExternalCompartment,
       globalThisRefs,
       scuttleGlobalThis,
-      scuttleGlobalThisExceptions,
       debugMode,
       runWithPrecompiledModules,
       reportStatsHook,
@@ -11010,8 +11007,7 @@ function observeImports(map, importName, importIndex) {
     prepareModuleInitializerArgs,
     getExternalCompartment,
     globalThisRefs = ['globalThis'],
-    scuttleGlobalThis = false,
-    scuttleGlobalThisExceptions = [],
+    scuttleGlobalThis = {},
     debugMode = false,
     runWithPrecompiledModules = false,
     reportStatsHook = () => {},
@@ -11557,6 +11553,7 @@ module.exports = {
   return module.exports
 })()
 
+    const scuttleOpts = generateScuttleOpts(scuttleGlobalThis)
     const moduleCache = new Map()
     const packageCompartmentCache = new Map()
     const globalStore = new Map()
@@ -11565,22 +11562,11 @@ module.exports = {
     const rootPackageCompartment = createRootPackageCompartment(globalRef)
 
     // scuttle globalThis right after we used it to create the root package compartment
-    if (scuttleGlobalThis) {
-      if (!Array.isArray(scuttleGlobalThisExceptions)) {
-        throw new Error(`LavaMoat - scuttleGlobalThisExceptions must be an array, got "${typeof scuttleGlobalThisExceptions}"`)
+    if (scuttleOpts.enabled) {
+      if (!Array.isArray(scuttleOpts.exceptions)) {
+        throw new Error(`LavaMoat - scuttleGlobalThis.exceptions must be an array, got "${typeof scuttleOpts.exceptions}"`)
       }
-      // turn scuttleGlobalThisExceptions regexes strings to actual regexes
-      for (let i = 0; i < scuttleGlobalThisExceptions.length; i++) {
-        const prop = scuttleGlobalThisExceptions[i]
-        if (!prop.startsWith('/')) {
-          continue
-        }
-        const parts = prop.split('/')
-        const pattern = parts.slice(1, -1).join('/')
-        const flags = parts[parts.length - 1]
-        scuttleGlobalThisExceptions[i] = new RegExp(pattern, flags)
-      }
-      performScuttleGlobalThis(globalRef, scuttleGlobalThisExceptions)
+      scuttleOpts.scuttlerFunc(globalRef, realm => performScuttleGlobalThis(realm, scuttleOpts.exceptions))
     }
 
     const kernel = {
@@ -11593,6 +11579,43 @@ module.exports = {
     Object.freeze(kernel)
     return kernel
 
+    // generate final scuttling options (1) by taking default
+    // options into consideration, (2) turning RE strings into
+    // actual REs and (3) without mutating original opts object
+    function generateScuttleOpts(originalOpts) {
+      const defaultOpts = {
+        enabled: true,
+        exceptions: [],
+        scuttlerName: '',
+      }
+      const opts = Object.assign({},
+        originalOpts === true ? { ... defaultOpts } : { ...originalOpts },
+        { scuttlerFunc: (globalRef, scuttle) => scuttle(globalRef) },
+        { exceptions: (originalOpts.exceptions || defaultOpts.exceptions).map(e => toRE(e)) },
+      )
+      if (opts.scuttlerName) {
+        if (!globalRef[opts.scuttlerName]) {
+          throw new Error(
+            `LavaMoat - 'scuttlerName' function "${opts.scuttlerName}" expected on globalRef.` +
+            'To learn more visit https://github.com/LavaMoat/LavaMoat/pull/462.',
+          )
+        }
+        opts.scuttlerFunc = globalRef[opts.scuttlerName]
+      }
+      return opts
+
+      function toRE(except) {
+        // turn scuttleGlobalThis.exceptions regexes strings to actual regexes
+        if (!except.startsWith('/')) {
+          return except
+        }
+        const parts = except.split('/')
+        const pattern = parts.slice(1, -1).join('/')
+        const flags = parts[parts.length - 1]
+        return new RegExp(pattern, flags)
+      }
+    }
+
     function performScuttleGlobalThis (globalRef, extraPropsToAvoid = new Array()) {
       const props = new Array()
       getPrototypeChain(globalRef)
@@ -11995,7 +12018,6 @@ module.exports = {
       globalRef,
       globalThisRefs,
       scuttleGlobalThis,
-      scuttleGlobalThisExceptions,
       debugMode,
       runWithPrecompiledModules,
       reportStatsHook,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/snaps-execution-environments",
-  "version": "0.38.0-flask.1",
+  "version": "0.38.1-flask.1",
   "description": "Snap sandbox environments for executing SES javascript",
   "repository": {
     "type": "git",
@@ -54,7 +54,6 @@
     "json-rpc-engine": "^6.1.0",
     "nanoid": "^3.1.31",
     "pump": "^3.0.0",
-    "ses": "^0.18.1",
     "stream-browserify": "^3.0.0",
     "superstruct": "^1.0.3"
   },
@@ -65,8 +64,8 @@
     "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
     "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
     "@lavamoat/allow-scripts": "^2.3.1",
-    "@lavamoat/lavapack": "^5.1.2",
-    "@lavamoat/lavatube": "^0.0.1",
+    "@lavamoat/lavapack": "^5.2.1",
+    "@lavamoat/lavatube": "^0.2.3",
     "@metamask/auto-changelog": "^3.1.0",
     "@metamask/eslint-config": "^12.1.0",
     "@metamask/eslint-config-jest": "^12.1.0",
@@ -107,13 +106,14 @@
     "jest": "^29.0.2",
     "jest-fetch-mock": "^3.0.3",
     "lavamoat": "^7.0.0",
-    "lavamoat-browserify": "^15.6.0",
+    "lavamoat-browserify": "^15.7.1",
     "memfs": "^3.4.13",
     "prettier": "^2.7.1",
     "prettier-plugin-packagejson": "^2.2.11",
     "process": "^0.11.10",
     "rimraf": "^4.1.2",
     "serve-handler": "^6.1.5",
+    "ses": "^0.18.1",
     "terser": "^5.17.7",
     "ts-node": "^10.9.1",
     "tsconfig-paths": "^4.2.0",