Merge pull request #477 from Dohbedoh/JENKINS-71529

[JENKINS-71529] Fix sensitive word boundaries matching
jenkinsci · Jun 26, 2023 · b4e66d4 · b4e66d4
2 parents ba6a7bc + 32fd393
commit b4e66d4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/main/java/com/cloudbees/jenkins/support/filter/SensitiveContentFilter.java b/src/main/java/com/cloudbees/jenkins/support/filter/SensitiveContentFilter.java
@@ -114,7 +114,7 @@ public synchronized void reload() {
                         trie.add(lowerCaseOriginal);
                     }
                 }));
-        this.mappingsPattern.set(Pattern.compile("\\b" + trie.getRegex() + "\\b", Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE));
+        this.mappingsPattern.set(Pattern.compile("(?<!\\w)" + trie.getRegex() + "(?!\\w)", Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE));
         this.replacementsMap.set(replacementsMap);
         LOGGER.log(Level.FINE, "Took " + (System.currentTimeMillis()-startTime) + "ms to reload");
     }

diff --git a/src/test/java/com/cloudbees/jenkins/support/util/WordReplacerTest.java b/src/test/java/com/cloudbees/jenkins/support/util/WordReplacerTest.java
@@ -6,6 +6,7 @@
 import hudson.Functions;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.recipes.WithTimeout;
 
 import java.util.ArrayList;
@@ -326,6 +327,22 @@ public void replacementByShorterWordTest() {
         assertEquals(result, WordReplacer.replaceWords(input, triePattern(words), replacementsMap(words, replaces)));
     }
 
+    @Test
+    @Issue("JENKINS-71529")
+    public void testBoundaries() {
+        String specialChars = "~`!@#$%^&*()_+-={}[]|\\:\";'<>?,./";
+        String[] words = new String[specialChars.length()];
+        String[] replaces = new String[specialChars.length()];
+        for(int i=0; i< specialChars.length(); i++) {
+            words[i] = specialChars.charAt(i) + "word" + specialChars.charAt(i);
+            replaces[i] = "**" + words[i] + "**";
+        }
+        String result = String.join(" ", replaces);
+
+        assertEquals(result, WordReplacer.replaceWords(String.join(" ", words), words, replaces));
+        assertEquals(result, WordReplacer.replaceWords(String.join(" ", words), triePattern(words), replacementsMap(words, replaces)));
+    }
+
     private List<String> generateFakeListString(int lines) {
         assertTrue(lines < 1001);
         return Stream.generate(() -> FilteredOutputStreamTest.FAKE_TEXT).limit(lines).collect(Collectors.toList());
@@ -382,7 +399,7 @@ private Pattern triePattern(String [] originals, boolean lowercase) {
         for (String search : originals) {
             trie.add(lowercase ? search.toLowerCase(Locale.ENGLISH): search);
         }
-        return Pattern.compile("\\b" + trie.getRegex() + "\\b", Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+        return Pattern.compile("(?<!\\w)" + trie.getRegex() + "(?!\\w)", Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
     }
 
 
@@ -434,6 +451,6 @@ private Pattern unionPattern(String [] originals) {
             buf.deleteCharAt(buf.length() - 1);
             buf.append(')');
         }
-        return Pattern.compile("\\b" + buf.toString() + "\\b", Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+        return Pattern.compile("(?<!\\w)" + buf + "(?!\\w)", Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
     }
 }