XML Var. substitution - Escape XML characters (#6980)

* xml poc * patch task versions * addressed review comments
microsoft · Apr 20, 2018 · 7bee928 · 7bee928
1 parent b740df3
commit 7bee928
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 5 deletions.
diff --git a/Tasks/AzureRmWebAppDeployment/task.json b/Tasks/AzureRmWebAppDeployment/task.json
@@ -18,7 +18,7 @@
     "version": {
         "Major": 4,
         "Minor": 1,
-        "Patch": 0
+        "Patch": 1
     },
     "releaseNotes": "What's new in version 4.* (preview)<br />Supports Kudu Zip Deploy<br />Supports App Service Environments<br />Improved UI for discovering different App service types supported by the task<br/>Click [here](https://aka.ms/azurermwebdeployreadme) for more Information.",
     "minimumAgentVersion": "2.104.1",

diff --git a/Tasks/AzureRmWebAppDeployment/task.loc.json b/Tasks/AzureRmWebAppDeployment/task.loc.json
@@ -18,7 +18,7 @@
   "version": {
     "Major": 4,
     "Minor": 1,
-    "Patch": 0
+    "Patch": 1
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",
   "minimumAgentVersion": "2.104.1",

diff --git a/Tasks/Common/webdeployment-common/Tests/L1XmlVarSub/Web.config b/Tasks/Common/webdeployment-common/Tests/L1XmlVarSub/Web.config
@@ -28,6 +28,7 @@
     <add key="UnobtrusiveJavaScriptEnabled" value="true" />
     <add key="rmappname" value="true"/>
     <add key="log_level" value="" />
+    <add key="Content-Security-Policy" value="default-src 'self' 'unsafe-inline' 'unsafe-eval';" />
   </appSettings>
   <applicationSettings>
     <myCustomSection>

diff --git a/Tasks/Common/webdeployment-common/Tests/L1XmlVarSub/Web_Expected.config b/Tasks/Common/webdeployment-common/Tests/L1XmlVarSub/Web_Expected.config
@@ -28,6 +28,7 @@
     <add key="UnobtrusiveJavaScriptEnabled" value="true" />
     <add key="rmappname" value="true"/>
     <add key="log_level" value="error,warning" />
+    <add key="Content-Security-Policy" value="default-src 'self' 'unsafe-inline' 'unsafe-eval';" />
   </appSettings>
   <applicationSettings>
     <myCustomSection>

diff --git a/Tasks/Common/webdeployment-common/xmlvariablesubstitutionutility.ts b/Tasks/Common/webdeployment-common/xmlvariablesubstitutionutility.ts
@@ -112,7 +112,9 @@ export function substituteXmlVariables(configFile, tags, variableMap, parameterF
         tl.debug(error);
         return;
     }
-    var replacableTokenValues = {};
+    var replacableTokenValues = {
+        "APOS_CHARACTER_TOKEN": "'"
+    };
     var isSubstitutionApplied: boolean = false;
     for(var tag of tags) {
         var nodes = ltxDomUtiltiyInstance.getElementsByTagName(tag); 
@@ -146,6 +148,7 @@ export function substituteXmlVariables(configFile, tags, variableMap, parameterF
     }
 
     if(isSubstitutionApplied) {
+        replaceEscapeXMLCharacters(xmlDocument);
         var domContent = ( fileEncodeType[1]? '\uFEFF' : '' ) + ltxDomUtiltiyInstance.getContentWithHeader(xmlDocument);
         for(var replacableTokenValue in replacableTokenValues) {
             tl.debug('Substituting original value in place of temp_name: ' + replacableTokenValue);
@@ -262,4 +265,18 @@ function updateXmlConnectionStringsNodeAttribute(xmlDomNode, variableMap, replac
     }
 
     return isSubstitutionApplied;
+}
+
+function replaceEscapeXMLCharacters(xmlDOMNode) {
+    if(!xmlDOMNode || typeof xmlDOMNode == 'string') {
+        return;
+    }
+
+    for(var xmlAttribute in xmlDOMNode.attrs) {
+        xmlDOMNode.attrs[xmlAttribute] = xmlDOMNode.attrs[xmlAttribute].replace(/'/g, "APOS_CHARACTER_TOKEN");
+    }
+
+    for(var xmlChild of xmlDOMNode.children) {
+        replaceEscapeXMLCharacters(xmlChild);
+    }
 }
diff --git a/Tasks/IISWebAppDeploymentOnMachineGroup/task.json b/Tasks/IISWebAppDeploymentOnMachineGroup/task.json
@@ -15,7 +15,7 @@
     "version": {
         "Major": 0,
         "Minor": 0,
-        "Patch": 37
+        "Patch": 38
     },
     "demands": [],
     "minimumAgentVersion": "2.104.1",

diff --git a/Tasks/IISWebAppDeploymentOnMachineGroup/task.loc.json b/Tasks/IISWebAppDeploymentOnMachineGroup/task.loc.json
@@ -15,7 +15,7 @@
   "version": {
     "Major": 0,
     "Minor": 0,
-    "Patch": 37
+    "Patch": 38
   },
   "demands": [],
   "minimumAgentVersion": "2.104.1",