Improved quote replacement to prevent errors (#635)

camunda-community-hub · Dec 22, 2023 · ca66297 · ca66297
1 parent 9c571d2
commit ca66297
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/...main/java/org/camunda/community/migration/converter/message/MessageTemplateProcessor.java b/...main/java/org/camunda/community/migration/converter/message/MessageTemplateProcessor.java
@@ -26,9 +26,10 @@ public String decorate(MessageTemplate template, Map<String, String> context) {
       if (value == null) {
         missingVariables.add(variableName);
       } else {
-        value = value.replaceAll("\\$", "\\\\\\$");
         LOG.debug("Replacing {} with {}", variableName, value);
-        templateString = templateString.replaceAll(PREFIX + variableName + SUFFIX, value);
+        templateString =
+            templateString.replaceAll(
+                PREFIX + variableName + SUFFIX, Matcher.quoteReplacement(value));
         LOG.debug("Template after replacement: {}", templateString);
       }
     }

diff --git a/.../java/org/camunda/community/migration/converter/message/MessageTemplateProcessorTest.java b/.../java/org/camunda/community/migration/converter/message/MessageTemplateProcessorTest.java
@@ -1,6 +1,7 @@
 package org.camunda.community.migration.converter.message;
 
 import static org.assertj.core.api.Assertions.*;
+import static org.camunda.community.migration.converter.message.MessageFactory.*;
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.Collections;
@@ -52,4 +53,18 @@ void shouldReplaceAllVariablesWithSameName() {
     String message = MESSAGE_TEMPLATE_PROCESSOR.decorate(messageTemplate, context);
     assertEquals("Hello Tim, this is Tim", message);
   }
+
+  @Test
+  void shouldEscapeStuff() {
+    MessageTemplate messageTemplate =
+        new MessageTemplate(
+            Severity.INFO,
+            null,
+            "Hello {{ world }}, this is {{ template }}",
+            List.of("world", "template"));
+    Map<String, String> context =
+        ContextBuilder.builder().entry("world", "Tim").entry("template", "\\$$").build();
+    String message = MESSAGE_TEMPLATE_PROCESSOR.decorate(messageTemplate, context);
+    assertEquals("Hello Tim, this is \\$$", message);
+  }
 }