[JENKINS-23447] only mask sensible data when displayed on UI or persi…

…sted on disk
jenkinsci · Dec 17, 2014 · d3e2b61 · d3e2b61
1 parent d50c5a5
commit d3e2b61
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -38,7 +38,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.6</maven.compiler.source>
         <maven.compiler.target>1.6</maven.compiler.target>
-        <envinject.lib.version>1.20</envinject.lib.version>
+        <envinject.lib.version>1.21</envinject.lib.version>
         <ivy.plugin.version>1.21</ivy.plugin.version>
         <junit.version>4.9</junit.version>
         <mockito.version>1.8.5</mockito.version>

diff --git a/src/main/java/org/jenkinsci/plugins/envinject/EnvInjectAction.java b/src/main/java/org/jenkinsci/plugins/envinject/EnvInjectAction.java
@@ -1,5 +1,6 @@
 package org.jenkinsci.plugins.envinject;
 
+import com.google.common.collect.Maps;
 import hudson.model.AbstractBuild;
 import hudson.model.Action;
 import org.apache.commons.collections.map.UnmodifiableMap;
@@ -10,6 +11,7 @@
 import java.io.File;
 import java.io.ObjectStreamException;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * @author Gregory Boissinot
@@ -56,7 +58,13 @@ public String getUrlName() {
     }
 
     public Object getTarget() {
-        return new EnvInjectVarList(envMap);
+        final Set sensitiveVariables = build.getSensitiveBuildVariables();
+        return new EnvInjectVarList(Maps.transformEntries(envMap,
+                new Maps.EntryTransformer<String, String, String>() {
+                    public String transformEntry(String key, String value) {
+                        return sensitiveVariables.contains(key) ? "********" : value;
+                    }
+                }));
     }
 
     @SuppressWarnings("unused")

diff --git a/src/main/java/org/jenkinsci/plugins/envinject/EnvInjectPluginAction.java b/src/main/java/org/jenkinsci/plugins/envinject/EnvInjectPluginAction.java
@@ -1,11 +1,13 @@
 package org.jenkinsci.plugins.envinject;
 
+import com.google.common.collect.Maps;
 import hudson.EnvVars;
 import hudson.model.AbstractBuild;
 import hudson.model.EnvironmentContributingAction;
 import org.jenkinsci.lib.envinject.EnvInjectAction;
 
 import java.util.Map;
+import java.util.Set;
 
 /**
  * @author Gregory Boissinot
@@ -17,7 +19,12 @@ public EnvInjectPluginAction(AbstractBuild build, Map<String, String> envMap) {
     }
 
     public Object getTarget() {
-        return new EnvInjectVarList(envMap);
+        return new EnvInjectVarList(Maps.transformEntries(envMap,
+                new Maps.EntryTransformer<String, String, String>() {
+                    public String transformEntry(String key, String value) {
+                        return getSensibleVariables().contains(key) ? "********" : value;
+                    }
+                }));
     }
 
     public void buildEnvVars(AbstractBuild<?, ?> build, EnvVars env) {