jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-07-21 18:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(child-writer): Reduce env vars passed during elevation (#1872)

Browse Source 
As we're not escaping env vars properly in `permissions.getEnvironmentCommandPrefix()`,
passing the entire environment along can cause another instance of the "stuck at starting"
problem, thus we limit the vars explicitly passed along again, keeping PATH and DEBUG.

Change-Type: patch
This commit is contained in:
Jonas Hermsmeier 2017-11-22 17:56:10 +01:00 committed by GitHub
parent a35ac7613e
commit f9085667d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/child-writer/writer-proxy.js
View File

@ -101,7 +101,10 @@ permissions.isElevated().then((elevated) => {
// For debugging purposes // For debugging purposes
console.log(`Running: ${commandArguments.join(' ')}`) console.log(`Running: ${commandArguments.join(' ')}`)
const commandEnv = _.assign({}, process.env, { const commandEnv = {
PATH: process.env.PATH,
DEBUG: process.env.DEBUG,
XDG_RUNTIME_DIR: process.env.XDG_RUNTIME_DIR,
ELECTRON_RUN_AS_NODE: 1, ELECTRON_RUN_AS_NODE: 1,
IPC_SERVER_ID: process.env.IPC_SERVER_ID, IPC_SERVER_ID: process.env.IPC_SERVER_ID,
IPC_CLIENT_ID: process.env.IPC_CLIENT_ID, IPC_CLIENT_ID: process.env.IPC_CLIENT_ID,
@ -110,8 +113,7 @@ permissions.isElevated().then((elevated) => {
// desktop integration script from presenting the // desktop integration script from presenting the
// "installation" dialog. // "installation" dialog.
SKIP: 1 SKIP: 1
}
})
return permissions.elevateCommand(commandArguments, { return permissions.elevateCommand(commandArguments, {
applicationName: packageJSON.displayName, applicationName: packageJSON.displayName,
@ -176,11 +178,6 @@ permissions.isElevated().then((elevated) => {
ipc.of[process.env.IPC_SERVER_ID].on('connect', () => { ipc.of[process.env.IPC_SERVER_ID].on('connect', () => {
// Inherit the parent evnironment // Inherit the parent evnironment
const childEnv = _.assign({}, process.env, { const childEnv = _.assign({}, process.env, {
// The CLI might call operating system utilities (like `diskutil`),
// so we must ensure the `PATH` is inherited.
PATH: process.env.PATH,
ELECTRON_RUN_AS_NODE: 1, ELECTRON_RUN_AS_NODE: 1,
ETCHER_CLI_ROBOT: 1, ETCHER_CLI_ROBOT: 1,