#243 Escape xpath names when they contain tabs or quotes.

KevinJump · Jun 3, 2021 · 372d3c3 · 372d3c3
1 parent 29b88df
commit 372d3c3
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/uSync8.Core/Tracking/SyncBaseTracker.cs b/uSync8.Core/Tracking/SyncBaseTracker.cs
@@ -510,10 +510,21 @@ private string MakeKeyPath(string key, string keyValue, bool isAttribute)
         {
             if (isAttribute)
             {
-                return $"[@{key} = '{keyValue}']";
+                return $"[@{key} = {EscapeXPathString(keyValue)}]";
             }
 
-            return $"[{key} = '{keyValue}']";
+            return $"[{key} = {EscapeXPathString(keyValue)}]";
+        }
+
+        private string EscapeXPathString(string value)
+        {
+            if (!value.Contains("'"))
+                return '\'' + value + '\'';
+
+            if (!value.Contains("\""))
+                return '"' + value + '"';
+
+            return "concat('" + value.Replace("'", "',\"'\",'") + "')";
         }
 
         private XElement GetTarget(IEnumerable<XElement> items, string key, string value, bool isAttribute)

diff --git a/uSync8.Core/Tracking/SyncXmlTracker.cs b/uSync8.Core/Tracking/SyncXmlTracker.cs
@@ -215,14 +215,26 @@ private string MakeSelectionPath(XElement node, string keys)
                 var value = GetKeyValue(node, key);
                 if (!string.IsNullOrWhiteSpace(value))
                 {
-                    selectionPath += $"[{key} = '{value}']";
+                    selectionPath += $"[{key} = {EscapeXPathString(value)}]";
                 }
 
             }
 
             return selectionPath.Replace("][", " and ");
         }
 
+        private string EscapeXPathString(string value)
+        {
+            if (!value.Contains("'"))
+                return '\'' + value + '\'';
+
+            if (!value.Contains("\""))
+                return '"' + value + '"';
+
+            return "concat('" + value.Replace("'", "',\"'\",'") + "')";
+        }
+
+
         private string MakeSelectionName(XElement node, string keys)
         {
             var names = new List<string>();