[FIXED JENKINS-11934] Once a job config has been submitted, new/updat…

…ed global passwords are not masked
jenkinsci · Dec 1, 2011 · 736389f · 736389f
1 parent 64e1fb4
commit 736389f
Showing 1 changed file with 12 additions and 14 deletions.
diff --git a/src/main/java/com/michelin/cio/hudson/plugins/maskpasswords/MaskPasswordsBuildWrapper.java b/src/main/java/com/michelin/cio/hudson/plugins/maskpasswords/MaskPasswordsBuildWrapper.java
@@ -63,22 +63,29 @@
  */
 public final class MaskPasswordsBuildWrapper extends BuildWrapper {
 
-    /**
-     * {@code allPasswords} contains all the passwords that have to be masked.
-     */
-    private transient List<String> allPasswords = new ArrayList<String>();
     private final List<VarPasswordPair> varPasswordPairs;
 
     @DataBoundConstructor
     public MaskPasswordsBuildWrapper(List<VarPasswordPair> varPasswordPairs) {
         this.varPasswordPairs = varPasswordPairs;
+    }
+
+    /**
+     * This method is invoked before {@link #makeBuildVariables()} and {@link
+     * #setUp()}.
+     */
+    @Override
+    public OutputStream decorateLogger(AbstractBuild build, OutputStream logger) {
+        List<String> allPasswords = new ArrayList<String>();  // all passwords to be masked
+        MaskPasswordsConfig config = MaskPasswordsConfig.getInstance();
 
         // global passwords
-        List<VarPasswordPair> globalVarPasswordPairs = MaskPasswordsConfig.getInstance().getGlobalVarPasswordPairs();
+        List<VarPasswordPair> globalVarPasswordPairs = config.getGlobalVarPasswordPairs();
         for(VarPasswordPair globalVarPasswordPair: globalVarPasswordPairs) {
             allPasswords.add(globalVarPasswordPair.getPassword());
         }
 
+        // job's passwords
         if(varPasswordPairs != null) {
             for(VarPasswordPair varPasswordPair: varPasswordPairs) {
                 String password = varPasswordPair.getPassword();
@@ -87,15 +94,6 @@ public MaskPasswordsBuildWrapper(List<VarPasswordPair> varPasswordPairs) {
                 }
             }
         }
-    }
-
-    /**
-     * This method is invoked before {@link #makeBuildVariables()} and {@link
-     * #setUp()}.
-     */
-    @Override
-    public OutputStream decorateLogger(AbstractBuild build, OutputStream logger) {
-        MaskPasswordsConfig config = MaskPasswordsConfig.getInstance();
 
         // find build parameters which are passwords (PasswordParameterValue)
         ParametersAction params = build.getAction(ParametersAction.class);