Fix JENKINS-19830

jenkinsci · Aug 23, 2014 · 03fdb89 · 03fdb89
1 parent 6fd8607
commit 03fdb89
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 14 deletions.
diff --git a/src/main/java/hudson/plugins/msbuild/MsBuildBuilder.java b/src/main/java/hudson/plugins/msbuild/MsBuildBuilder.java
@@ -10,6 +10,7 @@
 
 import java.io.IOException;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * @author kyle.sweeney@valtech.com
@@ -131,12 +132,11 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
             args.add(tokenizeArgs(normalizedArgs));
 
         //Build /P:key1=value1;key2=value2 ...
-        Map<String, String> variables = build.getBuildVariables();
-
-        if (buildVariablesAsProperties && variables.size() != 0) {
+        Map<String, String> propertiesVariables = getPropertiesVariables(build);
+        if (buildVariablesAsProperties && propertiesVariables.size() != 0) {
             StringBuffer parameters = new StringBuffer();
             parameters.append("/p:");
-            for (Map.Entry<String, String> entry : variables.entrySet()) {
+            for (Map.Entry<String, String> entry : propertiesVariables.entrySet()) {
                 parameters.append(entry.getKey()).append("=").append(entry.getValue()).append(";");
             }
             parameters.delete(parameters.length() - 1, parameters.length());
@@ -188,6 +188,24 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
         }
     }
 
+
+    private Map<String, String> getPropertiesVariables(AbstractBuild build) {
+
+        Map<String, String> buildVariables = build.getBuildVariables();
+
+        final Set<String> sensitiveBuildVariables = build.getSensitiveBuildVariables();
+        if (sensitiveBuildVariables == null || sensitiveBuildVariables.size() == 0) {
+            return buildVariables;
+        }
+
+        for (String sensitiveBuildVariable : sensitiveBuildVariables) {
+            buildVariables.remove(sensitiveBuildVariable);
+        }
+
+        return buildVariables;
+    }
+
+
     @Override
     public Descriptor<Builder> getDescriptor() {
         return (DescriptorImpl) super.getDescriptor();

diff --git a/...main/resources/hudson/plugins/msbuild/MsBuildBuilder/help-buildVariablesAsProperties.html b/...main/resources/hudson/plugins/msbuild/MsBuildBuilder/help-buildVariablesAsProperties.html
@@ -2,7 +2,4 @@
     <p>
         If set to true, Jenkins build variables will be passed to MSBuild as /p:name=value pairs.
     </p>
-    <p>
-        <strong>Beware</strong> that enabling this feature may cause sensitive information such as passwords to appear in the console log.
-    </p>
 </div>
diff --git a/...n/resources/hudson/plugins/msbuild/MsBuildBuilder/help-buildVariablesAsProperties_fr.html b/...n/resources/hudson/plugins/msbuild/MsBuildBuilder/help-buildVariablesAsProperties_fr.html
@@ -1,9 +1,5 @@
 <div>
-	<p>
-		Si coché, les variables de la build Jenkins vont être passées au MSBuild de la forme suivante : /p:name=value
-	</p>
-	<p>
-		<strong>Attention :</strong> Activer cette option peut entraîner que des informations sensibles telles que des
-		mots de passe apparaissent dans la console de sortie.
-	</p>
+    <p>
+        Si coché, les variables de la build Jenkins vont être passées au MSBuild de la forme suivante : /p:name=value
+    </p>
 </div>