fix: capture the promise global to avoid userland mutation

build/webpack/webpack.config.base.js

@@ -74,7 +74,10 @@ module.exports = ({
           global: ['@electron/internal/renderer/webpack-provider', '_global'],
           Buffer: ['@electron/internal/renderer/webpack-provider', 'Buffer'],
         })
-      ] : [])
+      ] : []),
+      new webpack.ProvidePlugin({
+        capturedGlobals: ['@electron/internal/common/webpack-globals-provider', 'globals'],
+      }),
     ]
   })
-}
+}

lib/.eslintrc

@@ -0,0 +1,8 @@
+{
+  "rules": {
+    "no-restricted-globals": ["error", "primordials", "Promise"]
+  },
+  "globals": {
+    "capturedGlobals": true
+  }
+}

lib/browser/api/web-contents.js

@@ -11,6 +11,10 @@ const NavigationController = require('@electron/internal/browser/navigation-cont
 const { ipcMainInternal } = require('@electron/internal/browser/ipc-main-internal')
 const ipcMainUtils = require('@electron/internal/browser/ipc-main-internal-utils')
 
+const {
+  Promise
+} = capturedGlobals
+
 // session is not used here, the purpose is to make sure session is initalized
 // before the webContents module.
 // eslint-disable-next-line

lib/browser/desktop-capturer.ts

@@ -2,6 +2,10 @@ import { EventEmitter } from 'events'
 
 const { createDesktopCapturer } = process.electronBinding('desktop_capturer')
 
+const {
+  Promise
+} = capturedGlobals
+
 const deepEqual = (a: ElectronInternal.GetSourcesOptions, b: ElectronInternal.GetSourcesOptions) => JSON.stringify(a) === JSON.stringify(b)
 
 let currentlyRunning: {

lib/browser/devtools.ts

@@ -5,6 +5,10 @@ import * as url from 'url'
 import { ipcMainInternal } from '@electron/internal/browser/ipc-main-internal'
 import * as ipcMainUtils from '@electron/internal/browser/ipc-main-internal-utils'
 
+const {
+  Promise
+} = capturedGlobals
+
 const convertToMenuTemplate = function (items: ContextMenuItem[], handler: (id: number) => void) {
   return items.map(function (item) {
     const transformed: Electron.MenuItemConstructorOptions = item.type === 'subMenu' ? {

lib/browser/init.ts

@@ -5,6 +5,10 @@ import * as util from 'util'
 
 const Module = require('module')
 
+const {
+  Promise
+} = capturedGlobals
+
 // We modified the original process.argv to let node.js load the init.js,
 // we need to restore it here.
 process.argv.splice(1, 1)

lib/browser/ipc-main-impl.ts

@@ -1,6 +1,10 @@
 import { EventEmitter } from 'events'
 import { IpcMainInvokeEvent } from 'electron'
 
+const {
+  Promise
+} = capturedGlobals
+
 export class IpcMainImpl extends EventEmitter {
   private _invokeHandlers: Map<string, (e: IpcMainInvokeEvent, ...args: any[]) => void> = new Map();
 

lib/browser/ipc-main-internal-utils.ts

@@ -1,5 +1,9 @@
 import { ipcMainInternal } from '@electron/internal/browser/ipc-main-internal'
 
+const {
+  Promise
+} = capturedGlobals
+
 type IPCHandler = (event: Electron.IpcMainInvokeEvent, ...args: any[]) => any
 
 export const handleSync = function <T extends IPCHandler> (channel: string, handler: T) {

lib/browser/navigation-controller.js

@@ -2,6 +2,10 @@
 
 const { ipcMainInternal } = require('@electron/internal/browser/ipc-main-internal')
 
+const {
+  Promise
+} = capturedGlobals
+
 // The history operation in renderer is redirected to browser.
 ipcMainInternal.on('ELECTRON_NAVIGATION_CONTROLLER_GO_BACK', function (event) {
   event.sender.goBack()

lib/browser/remote/server.ts

@@ -11,6 +11,10 @@ const v8Util = process.electronBinding('v8_util')
 const eventBinding = process.electronBinding('event')
 const features = process.electronBinding('features')
 
+const {
+  Promise
+} = capturedGlobals
+
 if (!features.isRemoteModuleEnabled()) {
   throw new Error('remote module is disabled')
 }

lib/browser/rpc-server.js

@@ -13,6 +13,10 @@ const ipcMainUtils = require('@electron/internal/browser/ipc-main-internal-utils
 const guestViewManager = require('@electron/internal/browser/guest-view-manager')
 const clipboardUtils = require('@electron/internal/common/clipboard-utils')
 
+const {
+  Promise
+} = capturedGlobals
+
 const emitCustomEvent = function (contents, eventName, ...args) {
   const event = eventBinding.createWithSender(contents)
 

lib/common/asar.js

@@ -8,6 +8,8 @@
   const path = require('path')
   const util = require('util')
 
+  const Promise = global.Promise // eslint-disable-line no-restricted-globals
+
   const envNoAsar = process.env.ELECTRON_NO_ASAR &&
       process.type !== 'browser' &&
       process.type !== 'renderer'

lib/common/webpack-globals-provider.ts

@@ -0,0 +1,10 @@
+// Captures original globals into a scope to ensure that userland modifications do
+// not impact Electron.  Note that users doing:
+//
+// global.Promise.resolve = myFn
+//
+// Will mutate this captured one as well and that is OK.
+
+export const globals = {
+  Promise: global.Promise
+}

lib/renderer/api/remote.js

@@ -7,6 +7,10 @@ const { CallbacksRegistry } = require('@electron/internal/renderer/remote/callba
 const { isPromise, isSerializableObject } = require('@electron/internal/common/remote/type-utils')
 const { ipcRendererInternal } = require('@electron/internal/renderer/ipc-renderer-internal')
 
+const {
+  Promise
+} = capturedGlobals
+
 const callbacksRegistry = new CallbacksRegistry()
 const remoteObjectCache = v8Util.createIDWeakMap()
 

lib/renderer/chrome-api.ts

@@ -4,6 +4,10 @@ import * as url from 'url'
 
 import { Event } from '@electron/internal/renderer/extensions/event'
 
+const {
+  Promise
+} = capturedGlobals
+
 class Tab {
   public id: number
 

spec/api-remote-spec.js

@@ -517,4 +517,22 @@ ifdescribe(features.isRemoteModuleEnabled())('remote module', () => {
       const arr = new RUint8Array()
     })
   })
+
+  describe('with an overriden global Promise constrctor', () => {
+    let original
+
+    before(() => {
+      original = Promise
+    })
+
+    it('using a promise based method  resolves correctly', async () => {
+      expect(await remote.getGlobal('returnAPromise')(123)).to.equal(123)
+      global.Promise = { resolve: () => ({}) }
+      expect(await remote.getGlobal('returnAPromise')(456)).to.equal(456)
+    })
+
+    after(() => {
+      global.Promise = original
+    })
+  })
 })

spec/static/main.js

@@ -75,6 +75,7 @@ ipcMain.on('echo', function (event, msg) {
 })
 
 global.setTimeoutPromisified = util.promisify(setTimeout)
+global.returnAPromise = (value) => new Promise((resolve) => setTimeout(() => resolve(value), 100))
 
 process.removeAllListeners('uncaughtException')
 process.on('uncaughtException', function (error) {

typings/internal-ambient.d.ts

@@ -1,4 +1,9 @@
+interface CapturedGlobals {
+  Promise: typeof Promise;
+}
+
 declare var internalBinding: any;
+declare var capturedGlobals: CapturedGlobals;
 
 declare namespace NodeJS {
   interface FeaturesBinding {