Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-15 09:27:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: fix shell injection in task spawning

Browse source 
closes #9058
This commit is contained in:
Aleksey Kladov 2021-05-31 19:51:19 +03:00
parent 020610f453
commit ee995dbfd4
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
editors/code/src/tasks.ts
View file

@ -80,7 +80,7 @@ export async function buildCargoTask(
throwOnError: boolean = false throwOnError: boolean = false
): Promise<vscode.Task> { ): Promise<vscode.Task> {
let exec: vscode.ShellExecution | undefined = undefined; let exec: vscode.ProcessExecution | vscode.ShellExecution | undefined = undefined;
if (customRunner) { if (customRunner) {
const runnerCommand = `${customRunner}.buildShellExecution`; const runnerCommand = `${customRunner}.buildShellExecution`;
@ -105,13 +105,13 @@ export async function buildCargoTask(
if (!exec) { if (!exec) {
// Check whether we must use a user-defined substitute for cargo. // Check whether we must use a user-defined substitute for cargo.
const cargoCommand = definition.overrideCargo ? definition.overrideCargo : toolchain.cargoPath(); // Split on spaces to allow overrides like "wrapper cargo".
const overrideCargo = definition.overrideCargo ?? definition.overrideCargo;
const cargoCommand = overrideCargo?.split(" ") ?? [toolchain.cargoPath()];
// Prepare the whole command as one line. It is required if user has provided override command which contains spaces, const fullCommand = [...cargoCommand, ...args];
// for example "wrapper cargo". Without manual preparation the overridden command will be quoted and fail to execute.
const fullCommand = [cargoCommand, ...args].join(" ");
exec = new vscode.ShellExecution(fullCommand, definition); exec = new vscode.ProcessExecution(fullCommand[0], fullCommand.slice(1), definition);
} }
return new vscode.Task( return new vscode.Task(