Merge branch 'bug_23246/rudderc_does_not_escape_correctly_the_double_…

…quotes_in_componentkey_in_windows_techniques_pr' into branches/rudder/8.0
Normation · Aug 9, 2023 · 68f85ce · 68f85ce
2 parents 0ff459f + b06e1b7
commit 68f85ce
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/policies/rudderc/templates/technique.ps1.askama b/policies/rudderc/templates/technique.ps1.askama
@@ -27,7 +27,7 @@ function {{ id|dsc_case }} {
 
 {% for m in methods %}
     $reportId=$reportIdBase + "{{ m.id }}"
-    $componentKey = "{{ m.component_key }}"
+    $componentKey = "{{ m.component_key|escape_double_quotes }}"
     $reportParams = @{
         ClassPrefix = ([Rudder.Condition]::canonify(("{{ m.class_prefix }}_" + $componentKey)))
         ComponentKey = $componentKey

diff --git a/policies/rudderc/tests/cases/general/escaping/technique.ps1 b/policies/rudderc/tests/cases/general/escaping/technique.ps1
@@ -22,7 +22,7 @@
 
 
     $reportId=$reportIdBase + "a86ce2e5-d5b6-45cc-87e8-c11cca71d966"
-    $componentKey = "${sys.host} . | / ${sys.${host}} ' '' ''' $ $$ " "" \ \\😋aà3"
+    $componentKey = "${sys.host} . | / ${sys.${host}} ' '' ''' $ $$ `" `"`" \ \\😋aà3"
     $reportParams = @{
         ClassPrefix = ([Rudder.Condition]::canonify(("package_present_" + $componentKey)))
         ComponentKey = $componentKey

diff --git a/policies/rudderc/tests/cases/general/ntp/technique.ps1 b/policies/rudderc/tests/cases/general/ntp/technique.ps1
@@ -54,7 +54,7 @@
     }
 
     $reportId=$reportIdBase + "cf06e919-02b7-41a7-a03f-4239592f3c12"
-    $componentKey = "/bin/true "# ${node.inventory[os][fullName]}""
+    $componentKey = "/bin/true `"# ${node.inventory[os][fullName]}`""
     $reportParams = @{
         ClassPrefix = ([Rudder.Condition]::canonify(("package_install_" + $componentKey)))
         ComponentKey = $componentKey