SECURITY-3051

jenkinsci · Mar 31, 2023 · f46b7fa · f46b7fa
1 parent acd5fec
commit f46b7fa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/azurekeyvaultplugin/AzureKeyVaultStep.java b/src/main/java/org/jenkinsci/plugins/azurekeyvaultplugin/AzureKeyVaultStep.java
@@ -15,7 +15,6 @@
 import hudson.util.ListBoxModel;
 import io.jenkins.plugins.azuresdk.HttpClientRetriever;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -25,6 +24,7 @@
 import javax.security.auth.login.CredentialNotFoundException;
 import jenkins.YesNoMaybe;
 import org.apache.commons.lang3.StringUtils;
+import org.jenkinsci.plugins.credentialsbinding.masking.SecretPatterns;
 import org.jenkinsci.plugins.workflow.steps.AbstractStepExecutionImpl;
 import org.jenkinsci.plugins.workflow.steps.BodyExecutionCallback;
 import org.jenkinsci.plugins.workflow.steps.BodyInvoker;
@@ -174,7 +174,7 @@ public boolean start() throws Exception {
                     EnvironmentExpander.merge(context.get(EnvironmentExpander.class), new AzureKeyVaultEnvironmentExpander(secrets)),
                     BodyInvoker.mergeConsoleLogFilters(
                             context.get(ConsoleLogFilter.class),
-                            new MaskingConsoleLogFilter(StandardCharsets.UTF_8.name(), new ArrayList<>(secrets.values()))
+                            new MaskingConsoleLogFilter(StandardCharsets.UTF_8.name(), SecretPatterns.getAggregateSecretPattern(secrets.values()))
                     )
             );
             invoker.start();

diff --git a/src/main/java/org/jenkinsci/plugins/azurekeyvaultplugin/MaskingConsoleLogFilter.java b/src/main/java/org/jenkinsci/plugins/azurekeyvaultplugin/MaskingConsoleLogFilter.java
@@ -4,19 +4,19 @@
 import hudson.model.Run;
 import java.io.OutputStream;
 import java.io.Serializable;
-import java.util.List;
+import java.util.regex.Pattern;
 import org.jenkinsci.plugins.credentialsbinding.masking.SecretPatterns;
 
 public class MaskingConsoleLogFilter extends ConsoleLogFilter
         implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private final String charsetName;
-    private final List<String> valuesToMask;
+    private final Pattern valuesToMask;
 
 
     public MaskingConsoleLogFilter(final String charsetName,
-                                   final List<String> valuesToMask
+                                   final Pattern valuesToMask
     ) {
         this.charsetName = charsetName;
         this.valuesToMask = valuesToMask;
@@ -27,7 +27,7 @@ public OutputStream decorateLogger(
             Run run,
             final OutputStream logger
     ) {
-        return new SecretPatterns.MaskingOutputStream(logger, () -> SecretPatterns.getAggregateSecretPattern(valuesToMask), charsetName);
+        return new SecretPatterns.MaskingOutputStream(logger, () -> valuesToMask, charsetName);
     }
 
 }