Fix windows credential_process containing quotes (#3330)

Author: rli

.changes/next-release/bugfix-aad85945-0f42-4547-b1e5-2c7b972e2421.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix `credential_process` retrieval when command contains quoted arguments on Windows (#3322)"
+}

jetbrains-core/src/software/aws/toolkits/jetbrains/core/credentials/ToolkitCredentialProcessProvider.kt

@@ -9,6 +9,7 @@ import com.fasterxml.jackson.databind.MapperFeature
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
+import com.intellij.execution.configurations.CommandLineTokenizer
 import com.intellij.execution.configurations.GeneralCommandLine
 import com.intellij.execution.process.ProcessOutput
 import com.intellij.execution.util.ExecUtil
@@ -24,6 +25,7 @@ import software.amazon.awssdk.utils.cache.CachedSupplier
 import software.amazon.awssdk.utils.cache.RefreshResult
 import software.aws.toolkits.resources.message
 import java.time.Instant
+import java.util.Enumeration
 
 /**
  * Similar to the SDKs ProcessCredentialsProvider, but ties in the env var system of the IDE such as getting $PATH
@@ -39,7 +41,8 @@ class ToolkitCredentialProcessProvider internal constructor(
     }
     private val cmd by lazy {
         if (SystemInfo.isWindows) {
-            GeneralCommandLine("cmd", "/C", command)
+            @Suppress("UNCHECKED_CAST")
+            GeneralCommandLine("cmd", "/C", *(CommandLineTokenizer(command) as Enumeration<String>).toList().toTypedArray())
         } else {
             GeneralCommandLine("sh", "-c", command)
         }

jetbrains-core/tst/software/aws/toolkits/jetbrains/core/credentials/ToolkitCredentialProcessProviderTest.kt

@@ -164,6 +164,34 @@ class ToolkitCredentialProcessProviderTest {
         verifyNoMoreInteractions(parser)
     }
 
+    @Test
+    fun `handles quoted commands`() {
+        val cmd = if (SystemInfo.isWindows) {
+            """
+                "dir"
+            """.trimIndent()
+        } else {
+            """
+                ls
+            """.trimIndent()
+        }
+
+        val folderWithSpaceInItsName = folder.newFolder("hello world")
+        val file = File(folderWithSpaceInItsName, "foo")
+        file.writeText("bar")
+
+        val sut = createSut("""$cmd ${folder.root.absolutePath}${File.separator}"hello world"""")
+        stubParser()
+
+        sut.resolveCredentials()
+
+        val captor = argumentCaptor<String>().apply {
+            verify(parser).parse(capture())
+        }
+
+        assertThat(captor.firstValue).contains("foo")
+    }
+
     @Test
     fun `has path`() {
         val cmd = if (SystemInfo.isWindows) {