Merge pull request #25 from delinea-sagar/master

Fixed the masking issue with special characters

Author: tylerezimmerman

.changes/1.0.8.md

@@ -0,0 +1,4 @@
+## 1.0.8 - 2024-05-22
+### 🐛 Bug Fix
+
+- Fixed the masking issue with special characters.

CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
+## 1.0.8 - 2024-05-22
+### 🐛 Bug Fix
+
+- Fixed the masking issue with special characters.
 ## 1.0.7 - 2024-04-10
 ### 🐛 Bug Fix
 

Taskfile.yml

@@ -18,7 +18,7 @@ tasks:
   bump:
     desc: bump the version using changie
     cmds:
-      - changie batch 1.0.7
+      - changie batch 1.0.8
       - changie merge
       - git add .changes/*
       - git add CHANGELOG.md

pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <groupId>io.jenkins.plugins</groupId>
     <artifactId>thycotic-secret-server</artifactId>
-    <version>1.0.7</version>
+    <version>1.0.8</version>
     <packaging>hpi</packaging>
     <properties>
         <!-- Baseline Jenkins version you use to build the plugin. Users must have this version or newer to run. -->
@@ -57,17 +57,17 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
-            <version>${spring.version}</version>
+            <version>5.3.24</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>${spring.version}</version>
+            <version>5.3.24</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>${spring.version}</version>
+            <version>5.3.24</version>
         </dependency>
         <dependency>
             <groupId>com.thycotic.secrets</groupId>

src/main/java/com/thycotic/secrets/jenkins/ServerConsoleLogFilter.java

@@ -6,6 +6,7 @@
 import java.io.OutputStream;
 import java.io.Serializable;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -38,12 +39,24 @@ public OutputStream decorateLogger(Run run, final OutputStream logger) throws IO
     }
 
     public static Pattern getAggregateSecretPattern(List<String> patterns) {
-        String aggregatedPattern = String.join("|", patterns);
+        List<String> escapedPatterns = new ArrayList<>();
+        for (String pattern : patterns) {
+            escapedPatterns.add(ServerConsoleLogFilter.escapeSpecialCharacters(pattern));
+        }
+        String aggregatedPattern = String.join("|", escapedPatterns);
         try {
             return Pattern.compile(aggregatedPattern);
         } catch (PatternSyntaxException e) {
             System.err.println("Error compiling pattern: " + e.getMessage());
             return null;
         }
     }
+
+    private static String escapeSpecialCharacters(String input) {
+        String[] specialChars = {"\\", "^", "$", ".", "|", "?", "*", "+", "(", ")", "[", "]", "{", "}", "~", "@", "#", "%", "&", "_", "-", "=", "!", "/"};
+        for (String specialChar : specialChars) {
+            input = input.replace(specialChar, "\\" + specialChar);
+        }
+        return input;
+    }
 }