Another attempt at doing things without a shell... (#3769)

Author: bwateratmsft

src/debugging/netcore/NetCoreDebugHelper.ts

@@ -5,7 +5,7 @@
 
 import * as fse from 'fs-extra';
 import * as path from 'path';
-import { CommandLineArgs, composeArgs, ContainerOS, innerQuoted, VoidCommandResponse, withArg } from '../../runtimes/docker';
+import { CommandLineArgs, composeArgs, ContainerOS, VoidCommandResponse, withArg, withQuotedArg } from '../../runtimes/docker';
 import { DialogResponses, IActionContext, UserCancelledError } from '@microsoft/vscode-azext-utils';
 import { DebugConfiguration, MessageItem, ProgressLocation, window } from 'vscode';
 import { ext } from '../../extensionVariables';
@@ -312,13 +312,13 @@ export class NetCoreDebugHelper implements DebugHelper {
             containerCommand = 'cmd';
             containerCommandArgs = composeArgs(
                 withArg('/C'),
-                withArg(innerQuoted(`IF EXIST "${debuggerPath}" (exit 0) else (exit 1)`))
+                withQuotedArg(`IF EXIST "${debuggerPath}" (exit 0) else (exit 1)`)
             )();
         } else {
             containerCommand = '/bin/sh';
             containerCommandArgs = composeArgs(
                 withArg('-c'),
-                withArg(innerQuoted(`if [ -f ${debuggerPath} ]; then exit 0; else exit 1; fi;`))
+                withQuotedArg(`if [ -f ${debuggerPath} ]; then exit 0; else exit 1; fi;`)
             )();
         }
 

src/runtimes/docker/clients/DockerClientBase/DockerClientBase.ts

@@ -5,7 +5,7 @@
 
 import * as path from 'path';
 import * as readline from 'readline';
-import type { ShellQuotedString } from 'vscode';
+import { ShellQuotedString, ShellQuoting } from 'vscode';
 import { GeneratorCommandResponse, PromiseCommandResponse, VoidCommandResponse } from '../../contracts/CommandRunner';
 import {
     BuildImageCommandOptions,
@@ -76,7 +76,6 @@ import { CancellationError } from '../../utils/CancellationError';
 import {
     CommandLineArgs,
     composeArgs,
-    innerQuoted,
     withArg,
     withFlagArg,
     withNamedArg,
@@ -1559,13 +1558,13 @@ export abstract class DockerClientBase extends ConfigurableClient implements ICo
                 '/C',
                 // Path is intentionally *not* quoted--no good quoting options work, but
                 // `cd` doesn't seem to care, so cd to the path and then do dir
-                innerQuoted(`cd ${options.path} & dir /A-S /-C`) as ShellQuotedString,
+                { value: `cd ${options.path} & dir /A-S /-C`, quoting: ShellQuoting.Strong }
             ];
         } else {
             command = [
                 '/bin/sh',
                 '-c',
-                innerQuoted(`ls -lA '${options.path}'`) as ShellQuotedString,
+                { value: `ls -lA "${options.path}"`, quoting: ShellQuoting.Strong }
             ];
         }
 
@@ -1611,7 +1610,7 @@ export abstract class DockerClientBase extends ConfigurableClient implements ICo
             const command = [
                 'cmd',
                 '/C',
-                innerQuoted(`cd ${folder} & type ${file}`) as ShellQuotedString,
+                { value: `cd ${folder} & type ${file}`, quoting: ShellQuoting.Strong }
             ];
 
             return this.getExecContainerCommandArgs(

src/runtimes/docker/clients/DockerClientBase/withDockerFilterArg.ts

@@ -4,11 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ShellQuotedString } from 'vscode';
-import { CommandLineCurryFn, innerQuoted, withNamedArg } from '../../utils/commandLineBuilder';
+import { CommandLineCurryFn, withNamedArg } from '../../utils/commandLineBuilder';
 
-// The Docker CLI requires weak quoting of the --filter argument
 export function withDockerFilterArg(filter: string | ShellQuotedString | (string | ShellQuotedString | null | undefined)[] | null | undefined): CommandLineCurryFn {
-    return withNamedArg('--filter', Array.isArray(filter) ? filter.map(innerQuoted) : innerQuoted(filter));
+    return withNamedArg('--filter', filter);
 }
 
 export function withDockerBooleanFilterArg(filter: string, value: boolean | null | undefined): CommandLineCurryFn {

src/runtimes/docker/clients/DockerClientBase/withDockerJsonFormatArg.ts

@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { innerQuoted, withNamedArg } from '../../utils/commandLineBuilder';
+import { withNamedArg } from '../../utils/commandLineBuilder';
 
-// The Docker CLI requires weak quoting of the --format argument
-export const withDockerJsonFormatArg = withNamedArg('--format', innerQuoted('{{json .}}'));
+export const withDockerJsonFormatArg = withNamedArg('--format', '{{json .}}');

src/runtimes/docker/commandRunners/shellStream.ts

@@ -51,7 +51,7 @@ export class ShellStreamCommandRunnerFactory<TOptions extends ShellStreamCommand
                     accumulator = new AccumulatorStream();
                 }
 
-                await spawnStreamAsync(command, args, { ...this.options, stdOutPipe: accumulator, shell: true });
+                await spawnStreamAsync(command, args, { ...this.options, stdOutPipe: accumulator });
 
                 throwIfCancellationRequested(this.options.cancellationToken);
 
@@ -85,7 +85,7 @@ export class ShellStreamCommandRunnerFactory<TOptions extends ShellStreamCommand
         const innerGenerator = commandResponse.parseStream(dataStream, !!this.options.strict);
 
         // The process promise will be awaited only after the innerGenerator finishes
-        const processPromise = spawnStreamAsync(command, args, { ...this.options, stdOutPipe: dataStream, shell: true });
+        const processPromise = spawnStreamAsync(command, args, { ...this.options, stdOutPipe: dataStream });
 
         for await (const element of innerGenerator) {
             yield element;

src/runtimes/docker/utils/commandLineBuilder.ts

@@ -90,7 +90,7 @@ type WithNamedArgOptions = {
  */
 export function withNamedArg(
     name: string,
-    args: Array<ShellQuotedString | string | undefined> | ShellQuotedString | string | null | undefined,
+    args: Array<ShellQuotedString | string | null | undefined> | ShellQuotedString | string | null | undefined,
     { assignValue = false, shouldQuote = true }: WithNamedArgOptions = {},
 ): CommandLineCurryFn {
     return (cmdLineArgs: CommandLineArgs = []) => {

src/runtimes/docker/utils/spawnStreamAsync.ts

@@ -149,10 +149,8 @@ export async function spawnStreamAsync(
     // *nix
     const shell = options.shellProvider?.getShellOrDefault(options.shell) ?? options.shell;
 
-    // Apply quoting using the given shell provider or default
-    // Because Docker is reparsing arguments containing spaces, the arguments *must* be quoted,
-    // even though they are being supplied as whole strings without shell execution
-    const normalizedArgs: string[] = Shell.getShellOrDefault(options.shellProvider).quote(args);
+    // If there is a shell provider, apply its quoting, otherwise just flatten arguments into strings
+    const normalizedArgs: string[] = options.shellProvider?.quote(args) ?? args.map(arg => typeof arg === 'string' ? arg : arg.value);
 
     if (cancellationToken.isCancellationRequested) {
         throw new CancellationError('Command cancelled', cancellationToken);