development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-28 13:29:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

109216 Sanitize Process Environment before spawning terminal instance

Browse source
This commit is contained in:
Jean Kayitare 2020-11-03 19:56:38 +02:00 committed by meganrogge
parent 72aa675fc9
commit 2b81396e0a
No known key found for this signature in database
GPG key ID: 3155C8B2F0428C81
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/vs/platform/externalTerminal/node/externalTerminalService.ts
View file

@ -14,6 +14,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
import { optional } from 'vs/platform/instantiation/common/instantiation';
import { FileAccess } from 'vs/base/common/network';
import { ITerminalEnvironment } from 'vs/platform/terminal/common/terminal';
import { sanitizeProcessEnvironment } from 'vs/base/common/processes';
const TERMINAL_TITLE = nls.localize('console.title', "VS Code Console");
@ -71,8 +72,8 @@ export class WindowsExternalTerminalService extends ExternalTerminalService impl
}
return new Promise<void>((c, e) => {
const env = cwd ? { cwd: cwd } : undefined;
const child = spawner.spawn(command, cmdArgs, env);
const env = getSanitizedEnvironment(process);
const child = spawner.spawn(command, cmdArgs, { cwd, env });
child.on('error', e);
child.on('exit', () => c());
});
@ -91,7 +92,7 @@ export class WindowsExternalTerminalService extends ExternalTerminalService impl
];
// merge environment variables into a copy of the process.env
const env = Object.assign({}, process.env, envVars);
const env = Object.assign({}, getSanitizedEnvironment(process), envVars);
// delete environment variables that have a null value
Object.keys(env).filter(v => env[v] === null).forEach(key => delete env[key]);
@ -319,8 +320,8 @@ export class LinuxExternalTerminalService extends ExternalTerminalService implem
return new Promise<void>((c, e) => {
execPromise.then(exec => {
const env = cwd ? { cwd } : undefined;
const child = spawner.spawn(exec, [], env);
const env = getSanitizedEnvironment(process);
const child = spawner.spawn(exec, [], { cwd, env });
child.on('error', e);
child.on('exit', () => c());
});
@ -328,6 +329,12 @@ export class LinuxExternalTerminalService extends ExternalTerminalService implem
}
}
function getSanitizedEnvironment(process: NodeJS.Process) {
const env = process.env;
sanitizeProcessEnvironment(env);
return env;
}
/**
* tries to turn OS errors into more meaningful error messages
*/