🐛 Fix JENKINS-69219 (#134)

Added check for delimited vs. non-delimited tokens

Author: slide

src/main/java/org/jenkinsci/plugins/tokenmacro/Parser.java

@@ -175,15 +175,15 @@ private void parseDelimitedToken(CharacterIterator c) throws MacroEvaluationExce
             throw new MacroEvaluationException("Missing } in macro usage");
         }
 
-        processToken(c.getIndex());
+        processToken(c.getIndex(), true);
         c.next();
     }
 
     private void parseNonDelimitedToken(CharacterIterator c) throws MacroEvaluationException, IOException, InterruptedException {
         String token = parseIdentifier(c);
         if(StringUtils.isNotBlank(token)) {
             startToken(token);
-            processToken(c.getIndex());
+            processToken(c.getIndex(), false);
         }
     }
 
@@ -450,7 +450,7 @@ boolean addTransform(Transform t) {
         return true;
     }
 
-    boolean processToken(int currentIndex) throws IOException, InterruptedException, MacroEvaluationException {
+    boolean processToken(int currentIndex, boolean isDelimited) throws IOException, InterruptedException, MacroEvaluationException {
         String replacement = null;
 
         List<TokenMacro> all = new ArrayList<TokenMacro>(TokenMacro.all());
@@ -492,7 +492,7 @@ boolean processToken(int currentIndex) throws IOException, InterruptedException,
             throw new MacroEvaluationException(String.format("Unrecognized macro '%s' in '%s'", tokenName, stringWithMacro));
 
         if (replacement == null && !throwException) { // just put the token back in since we don't want to throw the exception
-            output.append(stringWithMacro.substring(tokenStartIndex, currentIndex+1));
+            output.append(stringWithMacro.substring(tokenStartIndex, currentIndex+(isDelimited ? 1 : 0)));
         } else if (replacement != null) {
             while(transforms != null && transforms.size() > 0) {
                 Transform t = transforms.pop();

src/test/java/org/jenkinsci/plugins/tokenmacro/TokenMacroTest.java

@@ -235,6 +235,17 @@ public void testNoToken() throws Exception {
         assertEquals("^false$",TokenMacro.expandAll(b, TaskListener.NULL, "^false$"));
     }
 
+    @Test
+    @Issue("JENKINS-68219")
+    public void testAddedCharacter() throws Exception {
+        FreeStyleProject p = j.createFreeStyleProject("foo");
+        FreeStyleBuild b = p.scheduleBuild2(0).get();
+
+        listener = StreamTaskListener.fromStdout();
+        assertEquals("\"$hello/$dear\"",
+                TokenMacro.expand(b,listener,"\"$hello/$dear\"", false, Collections.EMPTY_LIST));
+    }
+
     public class PrivateTestMacro extends TokenMacro {
         private static final String MACRO_NAME = "TEST_PRIVATE";