azure-pipelines-tasks-azurermdeploycommon 3.221.1 → 3.221.3

package/operations/AzureAppServiceUtility.js

@@ -141,17 +141,35 @@ class AzureAppServiceUtility {
     getKuduAuthHeader(publishingCredentials) {
         return __awaiter(this, void 0, void 0, function* () {
             const scmPolicyCheck = yield this.isSitePublishingCredentialsEnabled();
+            let token = "";
+            let method = "";
+            const password = publishingCredentials.properties["publishingPassword"];
+            const userName = publishingCredentials.properties["publishingUserName"];
             if (scmPolicyCheck === false) {
-                tl.debug('Kudu: Getting Bearer token');
-                const accessToken = yield this._appService._client.getCredentials().getToken();
-                return "Bearer " + accessToken;
+                token = yield this._appService._client.getCredentials().getToken();
+                method = "Bearer";
+                // Though bearer AuthN is used, lets try to set publish profile password for mask hints to maintain compat with old behavior for MSDEPLOY. 
+                // This needs to be cleaned up once MSDEPLOY suppport is reomve. Safe handle the exception setting up mask hint as we dont want to fail here.
+                try {
+                    tl.setVariable(`AZURE_APP_MSDEPLOY_${this._appService.getSlot()}_PASSWORD`, password, true);
+                }
+                catch (error) {
+                    // safe handle the exception setting up mask hint
+                    tl.debug(`Setting mask hint for publish profile password failed with error: ${error}`);
+                }
             }
             else {
-                tl.setVariable(`AZURE_APP_SERVICE_KUDU_${this._appService.getSlot()}_PASSWORD`, publishingCredentials.properties["publishingPassword"], true);
-                var accessToken = (new Buffer(publishingCredentials.properties["publishingUserName"] + ':' + publishingCredentials.properties["publishingPassword"]).toString('base64'));
-                tl.debug("Kudu: using basic auth.");
-                return "Basic " + accessToken;
+                tl.setVariable(`AZURE_APP_SERVICE_KUDU_${this._appService.getSlot()}_PASSWORD`, password, true);
+                const buffer = new Buffer(userName + ':' + password);
+                token = buffer.toString('base64');
+                method = "Basic";
             }
+            const authMethodtelemetry = {
+                authMethod: method
+            };
+            tl.debug(`Using ${method} authentication method for Kudu service.`);
+            console.log("##vso[telemetry.publish area=TaskDeploymentMethod;feature=AzureAppServiceDeployment]" + JSON.stringify(authMethodtelemetry));
+            return method + " " + token;
         });
     }
     getPhysicalPath(virtualApplication) {

package/operations/AzureAppServiceUtility.ts

@@ -134,17 +134,41 @@ export class AzureAppServiceUtility {
     private async getKuduAuthHeader(publishingCredentials: any): Promise<string> {
         const scmPolicyCheck = await this.isSitePublishingCredentialsEnabled(); 
 
+        let token = "";
+        let method = "";
+
+        const password = publishingCredentials.properties["publishingPassword"];
+        const userName = publishingCredentials.properties["publishingUserName"];
+
         if(scmPolicyCheck === false) {
-            tl.debug('Kudu: Getting Bearer token');
-            const accessToken = await this._appService._client.getCredentials().getToken();
-            return "Bearer " + accessToken;
-        } else {
-            tl.setVariable(`AZURE_APP_SERVICE_KUDU_${this._appService.getSlot()}_PASSWORD`, publishingCredentials.properties["publishingPassword"], true);
-            var accessToken = (new Buffer(publishingCredentials.properties["publishingUserName"] + ':' + publishingCredentials.properties["publishingPassword"]).toString('base64'));
-            tl.debug("Kudu: using basic auth.");
+            token = await this._appService._client.getCredentials().getToken();
+            method = "Bearer";
+
+            
+            // Though bearer AuthN is used, lets try to set publish profile password for mask hints to maintain compat with old behavior for MSDEPLOY. 
+            // This needs to be cleaned up once MSDEPLOY suppport is reomve. Safe handle the exception setting up mask hint as we dont want to fail here.
+            try {      
+                tl.setVariable(`AZURE_APP_MSDEPLOY_${this._appService.getSlot()}_PASSWORD`, password, true);
+            }
+            catch (error) {
+                // safe handle the exception setting up mask hint
+                tl.debug(`Setting mask hint for publish profile password failed with error: ${error}`);
+            }
 
-            return "Basic " + accessToken;
+        } else {
+            tl.setVariable(`AZURE_APP_SERVICE_KUDU_${this._appService.getSlot()}_PASSWORD`, password, true);
+            const buffer = new Buffer(userName + ':' + password);
+            token = buffer.toString('base64');
+            method = "Basic";
         }
+
+        const authMethodtelemetry = {
+            authMethod: method
+        };
+        tl.debug(`Using ${method} authentication method for Kudu service.`);
+        console.log("##vso[telemetry.publish area=TaskDeploymentMethod;feature=AzureAppServiceDeployment]" + JSON.stringify(authMethodtelemetry));
+
+        return method + " " + token;
     }
 
     public async getPhysicalPath(virtualApplication: string): Promise<string> {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "azure-pipelines-tasks-azurermdeploycommon",
-    "version": "3.221.1",
+    "version": "3.221.3",
     "description": "Common Lib for Azure ARM REST apis",
     "repository": {
         "type": "git",