fix: emit IPC event in correct context if isolation and sandbox enabled (backport: 4-0-x)

atom/renderer/atom_sandboxed_renderer_client.cc

@@ -116,8 +116,10 @@ class AtomSandboxedRenderFrameObserver : public AtomRenderFrameObserver {
 
     auto* isolate = blink::MainThreadIsolate();
     v8::HandleScope handle_scope(isolate);
-    auto context = frame->MainWorldScriptContext();
+
+    auto context = renderer_client_->GetContext(frame, isolate);
     v8::Context::Scope context_scope(context);
+
     v8::Local<v8::Value> argv[] = {mate::ConvertToV8(isolate, channel),
                                    mate::ConvertToV8(isolate, args),
                                    mate::ConvertToV8(isolate, sender_id)};

spec/api-ipc-renderer-spec.js

@@ -139,63 +139,54 @@ describe('ipc renderer module', () => {
       contents = null
     })
 
-    it('sends message to WebContents', done => {
-      contents = webContents.create({
-        preload: path.join(fixtures, 'module', 'preload-inject-ipc.js')
-      })
-
-      const payload = 'Hello World!'
-
-      ipcRenderer.once('pong', (event, data) => {
-        expect(payload).to.equal(data)
-        done()
-      })
-
-      contents.once('did-finish-load', () => {
-        ipcRenderer.sendTo(contents.id, 'ping', payload)
-      })
-
-      contents.loadFile(path.join(fixtures, 'pages', 'ping-pong.html'))
-    })
+    const generateSpecs = (description, webPreferences) => {
+      describe(description, () => {
+        it('sends message to WebContents', done => {
+          contents = webContents.create({
+            preload: path.join(fixtures, 'module', 'preload-ipc-ping-pong.js'),
+            ...webPreferences
+          })
 
-    it('sends message to WebContents (sanboxed renderer)', done => {
-      contents = webContents.create({
-        preload: path.join(fixtures, 'module', 'preload-inject-ipc.js'),
-        sandbox: true
-      })
+          const payload = 'Hello World!'
 
-      const payload = 'Hello World!'
+          ipcRenderer.once('pong', (event, data) => {
+            expect(payload).to.equal(data)
+            done()
+          })
 
-      ipcRenderer.once('pong', (event, data) => {
-        expect(payload).to.equal(data)
-        done()
-      })
+          contents.once('did-finish-load', () => {
+            ipcRenderer.sendTo(contents.id, 'ping', payload)
+          })
 
-      contents.once('did-finish-load', () => {
-        ipcRenderer.sendTo(contents.id, 'ping', payload)
-      })
+          contents.loadFile(path.join(fixtures, 'pages', 'base-page.html'))
+        })
 
-      contents.loadFile(path.join(fixtures, 'pages', 'ping-pong.html'))
-    })
+        it('sends message to WebContents (channel has special chars)', done => {
+          contents = webContents.create({
+            preload: path.join(fixtures, 'module', 'preload-ipc-ping-pong.js'),
+            ...webPreferences
+          })
 
-    it('sends message to WebContents (channel has special chars)', done => {
-      contents = webContents.create({
-        preload: path.join(fixtures, 'module', 'preload-inject-ipc.js')
-      })
+          const payload = 'Hello World!'
 
-      const payload = 'Hello World!'
+          ipcRenderer.once('pong-æøåü', (event, data) => {
+            expect(payload).to.equal(data)
+            done()
+          })
 
-      ipcRenderer.once('pong-æøåü', (event, data) => {
-        expect(payload).to.equal(data)
-        done()
-      })
+          contents.once('did-finish-load', () => {
+            ipcRenderer.sendTo(contents.id, 'ping-æøåü', payload)
+          })
 
-      contents.once('did-finish-load', () => {
-        ipcRenderer.sendTo(contents.id, 'ping-æøåü', payload)
+          contents.loadFile(path.join(fixtures, 'pages', 'base-page.html'))
+        })
       })
+    }
 
-      contents.loadFile(path.join(fixtures, 'pages', 'ping-pong.html'))
-    })
+    generateSpecs('without sandbox', {})
+    generateSpecs('with sandbox', { sandbox: true })
+    generateSpecs('with contextIsolation', { contextIsolation: true })
+    generateSpecs('with contextIsolation + sandbox', { contextIsolation: true, sandbox: true })
   })
 
   describe('remote listeners', () => {

spec/fixtures/module/preload-ipc-ping-pong.js

@@ -0,0 +1,9 @@
+const { ipcRenderer } = require('electron')
+
+ipcRenderer.on('ping', function (event, payload) {
+  ipcRenderer.sendTo(event.senderId, 'pong', payload)
+})
+
+ipcRenderer.on('ping-æøåü', function (event, payload) {
+  ipcRenderer.sendTo(event.senderId, 'pong-æøåü', payload)
+})