mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: do not mutate ipc instances across contexts (#23236)

Browse source
This commit is contained in:
Samuel Attard 2020-04-22 16:36:15 -07:00 committed by GitHub
parent 6fa05dd123
commit 8262f24fd8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
lib/renderer/api/ipc-renderer.ts
View file

@ -5,32 +5,35 @@ const v8Util = process.electronBinding('v8_util');
const ipcRenderer = v8Util.getHiddenValue<Electron.IpcRenderer>(global, 'ipc'); const ipcRenderer = v8Util.getHiddenValue<Electron.IpcRenderer>(global, 'ipc');
const internal = false; const internal = false;
ipcRenderer.send = function (channel, ...args) { // TODO(MarshallOfSound): Remove if statement when isolated_bundle and content_script_bundle are gone
if (!ipcRenderer.send) {
ipcRenderer.send = function (channel, ...args) {
return ipc.send(internal, channel, args); return ipc.send(internal, channel, args);
}; };
ipcRenderer.sendSync = function (channel, ...args) { ipcRenderer.sendSync = function (channel, ...args) {
return ipc.sendSync(internal, channel, args)[0]; return ipc.sendSync(internal, channel, args)[0];
}; };
ipcRenderer.sendToHost = function (channel, ...args) { ipcRenderer.sendToHost = function (channel, ...args) {
return ipc.sendToHost(channel, args); return ipc.sendToHost(channel, args);
}; };
ipcRenderer.sendTo = function (webContentsId, channel, ...args) { ipcRenderer.sendTo = function (webContentsId, channel, ...args) {
return ipc.sendTo(internal, false, webContentsId, channel, args); return ipc.sendTo(internal, false, webContentsId, channel, args);
}; };
ipcRenderer.invoke = async function (channel, ...args) { ipcRenderer.invoke = async function (channel, ...args) {
const { error, result } = await ipc.invoke(internal, channel, args); const { error, result } = await ipc.invoke(internal, channel, args);
if (error) { if (error) {
throw new Error(`Error invoking remote method '${channel}': ${error}`); throw new Error(`Error invoking remote method '${channel}': ${error}`);
} }
return result; return result;
}; };
ipcRenderer.postMessage = function (channel: string, message: any, transferables: any) { ipcRenderer.postMessage = function (channel: string, message: any, transferables: any) {
return ipc.postMessage(channel, message, transferables); return ipc.postMessage(channel, message, transferables);
}; };
}
export default ipcRenderer; export default ipcRenderer;

23
lib/renderer/ipc-renderer-internal.ts
View file

@ -5,26 +5,29 @@ const v8Util = process.electronBinding('v8_util');
export const ipcRendererInternal = v8Util.getHiddenValue<Electron.IpcRendererInternal>(global, 'ipc-internal'); export const ipcRendererInternal = v8Util.getHiddenValue<Electron.IpcRendererInternal>(global, 'ipc-internal');
const internal = true; const internal = true;
ipcRendererInternal.send = function (channel, ...args) { // TODO(MarshallOfSound): Remove if statement when isolated_bundle and content_script_bundle are gone
if (!ipcRendererInternal.send) {
ipcRendererInternal.send = function (channel, ...args) {
return ipc.send(internal, channel, args); return ipc.send(internal, channel, args);
}; };
ipcRendererInternal.sendSync = function (channel, ...args) { ipcRendererInternal.sendSync = function (channel, ...args) {
return ipc.sendSync(internal, channel, args)[0]; return ipc.sendSync(internal, channel, args)[0];
}; };
ipcRendererInternal.sendTo = function (webContentsId, channel, ...args) { ipcRendererInternal.sendTo = function (webContentsId, channel, ...args) {
return ipc.sendTo(internal, false, webContentsId, channel, args); return ipc.sendTo(internal, false, webContentsId, channel, args);
}; };
ipcRendererInternal.sendToAll = function (webContentsId, channel, ...args) { ipcRendererInternal.sendToAll = function (webContentsId, channel, ...args) {
return ipc.sendTo(internal, true, webContentsId, channel, args); return ipc.sendTo(internal, true, webContentsId, channel, args);
}; };
ipcRendererInternal.invoke = async function<T> (channel: string, ...args: any[]) { ipcRendererInternal.invoke = async function<T> (channel: string, ...args: any[]) {
const { error, result } = await ipc.invoke<T>(internal, channel, args); const { error, result } = await ipc.invoke<T>(internal, channel, args);
if (error) { if (error) {
throw new Error(`Error invoking remote method '${channel}': ${error}`); throw new Error(`Error invoking remote method '${channel}': ${error}`);
} }
return result; return result;
}; };
}