Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

redirect exec calls from renderer to main process #5803

Merged
merged 1 commit into from
Aug 1, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion app/plugins.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable eslint-comments/disable-enable-pair */
/* eslint-disable @typescript-eslint/no-unsafe-return */
/* eslint-disable @typescript-eslint/no-unsafe-call */
import {app, dialog, BrowserWindow, App} from 'electron';
import {app, dialog, BrowserWindow, App, ipcMain} from 'electron';
import {resolve, basename} from 'path';
import {writeFileSync} from 'fs';
import Config from 'electron-store';
Expand All @@ -15,6 +15,8 @@ import {install} from './plugins/install';
import {plugs} from './config/paths';
import mapKeys from './utils/map-keys';
import {configOptions} from '../lib/config';
import {promisify} from 'util';
import {exec, execFile} from 'child_process';

// local storage
const cache = new Config();
Expand Down Expand Up @@ -449,3 +451,13 @@ export const decorateSessionClass = <T>(Session: T): T => {
};

export {toDependencies as _toDependencies};

ipcMain.handle('child_process.exec', (event, args) => {
const {command, options} = args;
return promisify(exec)(command, options);
});

ipcMain.handle('child_process.execFile', (event, _args) => {
const {file, args, options} = _args;
return promisify(execFile)(file, args, options);
});
58 changes: 58 additions & 0 deletions lib/utils/ipc-child-process.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
import {ipcRenderer} from 'electron';

export function exec(command: string, options?: any, callback?: (..._args: any) => void) {
if (typeof options === 'function') {
callback = options;
options = {};
}
ipcRenderer.invoke('child_process.exec', {command, options}).then(
({stdout, stderr}) => callback?.(null, stdout, stderr),
(error) => callback?.(error, '', '')
);
}

export function execSync() {
console.error('Calling execSync from renderer is disabled');
}

export function execFile(file: string, args?: any, options?: any, callback?: (..._args: any) => void) {
if (typeof options === 'function') {
callback = options;
options = null;
}
if (typeof args === 'function') {
callback = args;
args = null;
options = null;
}
ipcRenderer.invoke('child_process.execFile', {file, args, options}).then(
({stdout, stderr}) => callback?.(null, stdout, stderr),
(error) => callback?.(error, '', '')
);
}

export function execFileSync() {
console.error('Calling execFileSync from renderer is disabled');
}

export function spawn() {
console.error('Calling spawn from renderer is disabled');
}

export function spawnSync() {
console.error('Calling spawnSync from renderer is disabled');
}

export function fork() {
console.error('Calling fork from renderer is disabled');
}

export default {
exec,
execSync,
execFile,
execFileSync,
spawn,
spawnSync,
fork
};
4 changes: 4 additions & 0 deletions lib/utils/plugins.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ import {
} from '../hyper';
import {Middleware} from 'redux';
import {ObjectTypedKeys} from './object';
import IPCChildProcess from './ipc-child-process';
import ChildProcess from 'child_process';

// remote interface to `../plugins`
const plugins = remote.require('./plugins') as typeof import('../../app/plugins');
Expand Down Expand Up @@ -182,6 +184,8 @@ Module._load = function _load(path: string) {
return Notification;
case 'hyper/decorate':
return decorate;
case 'child_process':
return process.platform === 'darwin' ? IPCChildProcess : ChildProcess;
default:
// eslint-disable-next-line prefer-rest-params
return originalLoad.apply(this, arguments);
Expand Down