Fix issue #12237 - fails when service principal key contains quotes (#12290)

jalajmsft · web-flow · commit 696966ede180 · 2020-02-04T18:48:13.000+05:30
* Fix issue #12237 - fails when service principal key contains quotes (#12260) * Fix issue #12237 - fails when service principal key contains quotes * Fix issue #12266: powershellIgnoreLASTEXITCODE not working (#12286)
diff --git a/Tasks/AzureCLIV1/azureclitask.ts b/Tasks/AzureCLIV1/azureclitask.ts
@@ -144,8 +144,10 @@ export class azureclitask {
                 this.servicePrincipalKey = cliPassword;
             }
 
+            let escapedCliPassword = cliPassword.replace(/"/g, '\\"');
+            tl.setSecret(escapedCliPassword.replace(/\\/g, '\"'));
             //login using svn
-            this.throwIfError(tl.execSync("az", "login --service-principal -u \"" + servicePrincipalId + "\" -p \"" + cliPassword + "\" --tenant \"" + tenantId + "\""), tl.loc("LoginFailed"));
+            this.throwIfError(tl.execSync("az", `login --service-principal -u "${servicePrincipalId}" -p "${escapedCliPassword}" --tenant "${tenantId}"`), tl.loc("LoginFailed"));
         }
         else if(authScheme.toLowerCase() == "managedserviceidentity") {
             //login using msi
diff --git a/Tasks/AzureCLIV1/task.json b/Tasks/AzureCLIV1/task.json
@@ -19,7 +19,7 @@
     "demands": [],
     "version": {
         "Major": 1,
-        "Minor": 157,
+        "Minor": 163,
         "Patch": 0
     },
     "minimumAgentVersion": "2.0.0",
diff --git a/Tasks/AzureCLIV1/task.loc.json b/Tasks/AzureCLIV1/task.loc.json
@@ -19,7 +19,7 @@
   "demands": [],
   "version": {
     "Major": 1,
-    "Minor": 157,
+    "Minor": 163,
     "Patch": 0
   },
   "minimumAgentVersion": "2.0.0",
diff --git a/Tasks/AzureCLIV2/azureclitask.ts b/Tasks/AzureCLIV2/azureclitask.ts
@@ -102,8 +102,10 @@ export class azureclitask {
                 this.servicePrincipalKey = cliPassword;
             }
 
+            let escapedCliPassword = cliPassword.replace(/"/g, '\\"');
+            tl.setSecret(escapedCliPassword.replace(/\\/g, '\"'));
             //login using svn
-            Utility.throwIfError(tl.execSync("az", "login --service-principal -u \"" + servicePrincipalId + "\" -p \"" + cliPassword + "\" --tenant \"" + tenantId + "\""), tl.loc("LoginFailed"));
+            Utility.throwIfError(tl.execSync("az", `login --service-principal -u "${servicePrincipalId}" -p "${escapedCliPassword}" --tenant "${tenantId}"`), tl.loc("LoginFailed"));
         }
         else if(authScheme.toLowerCase() == "managedserviceidentity") {
             //login using msi
diff --git a/Tasks/AzureCLIV2/src/Utility.ts b/Tasks/AzureCLIV2/src/Utility.ts
@@ -56,7 +56,7 @@ export class Utility {
         }
         contents.push(content.trim());
 
-        let powerShellIgnoreLASTEXITCODE: string = tl.getInput('powerShellIgnoreLASTEXITCODE', false);
+        let powerShellIgnoreLASTEXITCODE: boolean = tl.getBoolInput('powerShellIgnoreLASTEXITCODE', false);
         if (!powerShellIgnoreLASTEXITCODE) {
             contents.push(`if (!(Test-Path -LiteralPath variable:\LASTEXITCODE)) {`);
             contents.push(`    Write-Host '##vso[task.debug]$LASTEXITCODE is not set.'`);
diff --git a/Tasks/AzureCLIV2/task.json b/Tasks/AzureCLIV2/task.json
@@ -21,7 +21,7 @@
     "version": {
         "Major": 2,
         "Minor": 0,
-        "Patch": 5
+        "Patch": 7
     },
     "minimumAgentVersion": "2.0.0",
     "instanceNameFormat": "Azure CLI $(scriptPath)",
diff --git a/Tasks/AzureCLIV2/task.loc.json b/Tasks/AzureCLIV2/task.loc.json
@@ -21,7 +21,7 @@
   "version": {
     "Major": 2,
     "Minor": 0,
-    "Patch": 5
+    "Patch": 7
   },
   "minimumAgentVersion": "2.0.0",
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",

Original file line number	Diff line number	Diff line change
`@@ -144,8 +144,10 @@ export class azureclitask {`
`144`	`144`	`this.servicePrincipalKey = cliPassword;`
`145`	`145`	`}`
`146`	`146`
	`147`	`+ let escapedCliPassword = cliPassword.replace(/"/g, '\\"');`
	`148`	`+ tl.setSecret(escapedCliPassword.replace(/\\/g, '\"'));`
`147`	`149`	`//login using svn`
`148`		`- this.throwIfError(tl.execSync("az", "login --service-principal -u \"" + servicePrincipalId + "\" -p \"" + cliPassword + "\" --tenant \"" + tenantId + "\""), tl.loc("LoginFailed"));`
	`150`	+ this.throwIfError(tl.execSync("az", `login --service-principal -u "${servicePrincipalId}" -p "${escapedCliPassword}" --tenant "${tenantId}"`), tl.loc("LoginFailed"));
`149`	`151`	`}`
`150`	`152`	`else if(authScheme.toLowerCase() == "managedserviceidentity") {`
`151`	`153`	`//login using msi`
Original file line number	Diff line number	Diff line change
`@@ -102,8 +102,10 @@ export class azureclitask {`
`102`	`102`	`this.servicePrincipalKey = cliPassword;`
`103`	`103`	`}`
`104`	`104`
	`105`	`+ let escapedCliPassword = cliPassword.replace(/"/g, '\\"');`
	`106`	`+ tl.setSecret(escapedCliPassword.replace(/\\/g, '\"'));`
`105`	`107`	`//login using svn`
`106`		`- Utility.throwIfError(tl.execSync("az", "login --service-principal -u \"" + servicePrincipalId + "\" -p \"" + cliPassword + "\" --tenant \"" + tenantId + "\""), tl.loc("LoginFailed"));`
	`108`	+ Utility.throwIfError(tl.execSync("az", `login --service-principal -u "${servicePrincipalId}" -p "${escapedCliPassword}" --tenant "${tenantId}"`), tl.loc("LoginFailed"));
`107`	`109`	`}`
`108`	`110`	`else if(authScheme.toLowerCase() == "managedserviceidentity") {`
`109`	`111`	`//login using msi`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ export class Utility {`
`56`	`56`	`}`
`57`	`57`	`contents.push(content.trim());`
`58`	`58`
`59`		`- let powerShellIgnoreLASTEXITCODE: string = tl.getInput('powerShellIgnoreLASTEXITCODE', false);`
	`59`	`+ let powerShellIgnoreLASTEXITCODE: boolean = tl.getBoolInput('powerShellIgnoreLASTEXITCODE', false);`
`60`	`60`	`if (!powerShellIgnoreLASTEXITCODE) {`
`61`	`61`	contents.push(`if (!(Test-Path -LiteralPath variable:\LASTEXITCODE)) {`);
`62`	`62`	contents.push(` Write-Host '##vso[task.debug]$LASTEXITCODE is not set.'`);