Merge pull request #1027 from HubSpot/improve-full-jinjava-escape-filter

jasmith-hs · web-flow · commit 2b6c90c96af0 · 2023-03-20T08:58:08.000-04:00
In EscapeJinjavaFilter, escape both double closing braces to not have better consistency
diff --git a/src/main/java/com/hubspot/jinjava/lib/filter/EscapeJinjavaFilter.java b/src/main/java/com/hubspot/jinjava/lib/filter/EscapeJinjavaFilter.java
@@ -58,6 +58,7 @@ public static String escapeJinjavaEntities(String input) {
   public static String escapeFullJinjavaEntities(String input) {
     return input
       .replace("{{", BLBRACE + BLBRACE)
+      .replace("}}", BRBRACE + BRBRACE)
       .replaceAll("\\{([{%#])", BLBRACE + "$1")
       .replaceAll("([}%#])}", "$1" + BRBRACE);
   }
diff --git a/src/test/java/com/hubspot/jinjava/lib/filter/EscapeJinjavaFilterTest.java b/src/test/java/com/hubspot/jinjava/lib/filter/EscapeJinjavaFilterTest.java
@@ -37,7 +37,7 @@ public void testDoesNotEscapeJson() {
         f.filter("{'foo': 'bar', '{{{ foo }}}': '{% bar %}'}", interpreter, "false")
       )
       .isEqualTo(
-        "{'foo': 'bar', '&lbrace;&lbrace;{ foo }&rbrace;}': '&lbrace;% bar %&rbrace;'}"
+        "{'foo': 'bar', '&lbrace;&lbrace;{ foo &rbrace;&rbrace;}': '&lbrace;% bar %&rbrace;'}"
       );
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ public static String escapeJinjavaEntities(String input) {`
`58`	`58`	`public static String escapeFullJinjavaEntities(String input) {`
`59`	`59`	`return input`
`60`	`60`	`.replace("{{", BLBRACE + BLBRACE)`
	`61`	`+ .replace("}}", BRBRACE + BRBRACE)`
`61`	`62`	`.replaceAll("\\{([{%#])", BLBRACE + "$1")`
`62`	`63`	`.replaceAll("([}%#])}", "$1" + BRBRACE);`
`63`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public void testDoesNotEscapeJson() {`
`37`	`37`	`f.filter("{'foo': 'bar', '{{{ foo }}}': '{% bar %}'}", interpreter, "false")`
`38`	`38`	`)`
`39`	`39`	`.isEqualTo(`
`40`		`- "{'foo': 'bar', '{{{ foo }}}': '{% bar %}'}"`
	`40`	`+ "{'foo': 'bar', '{{{ foo }}}': '{% bar %}'}"`
`41`	`41`	`);`
`42`	`42`	`}`
`43`	`43`	`}`