[FIXED JENKINS-11515] Mask passwords config not saved when no global …

…passwords are defined
jenkinsci · Oct 27, 2011 · 1259f4f · 1259f4f
1 parent d2aa32d
commit 1259f4f
Showing 1 changed file with 20 additions and 7 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
@@ -222,22 +222,35 @@ public boolean configure(StaplerRequest req, JSONObject json) throws FormExcepti
                 getConfig().clear();
 
                 LOGGER.fine("Processing the maskedParamDefs and selectedMaskedParamDefs JSON objects");
+                JSONObject submittedForm = req.getSubmittedForm();
 
                 // parameter definitions to be automatically masked
-                JSONArray paramDefinitions = req.getSubmittedForm().getJSONArray("maskedParamDefs");
-                JSONArray selectedParamDefinitions = req.getSubmittedForm().getJSONArray("selectedMaskedParamDefs");
+                JSONArray paramDefinitions = submittedForm.getJSONArray("maskedParamDefs");
+                JSONArray selectedParamDefinitions = submittedForm.getJSONArray("selectedMaskedParamDefs");
                 for(int i = 0; i < selectedParamDefinitions.size(); i++) {
                     if(selectedParamDefinitions.getBoolean(i)) {
                         getConfig().addMaskedPasswordParameterDefinition(paramDefinitions.getString(i));
                     }
                 }
 
                 // global var/password pairs
-                JSONArray jSONArray = req.getSubmittedForm().getJSONArray("globalVarPasswordPairs");
-                for(int i = 0; i < jSONArray.size(); i++) {
-                    getConfig().addGlobalVarPasswordPair(new VarPasswordPair(
-                            jSONArray.getJSONObject(i).getString("var"),
-                            jSONArray.getJSONObject(i).getString("password")));
+                if(submittedForm.has("globalVarPasswordPairs")) {
+                    Object o = submittedForm.get("globalVarPasswordPairs");
+
+                    if(o instanceof JSONArray) {
+                        JSONArray jsonArray = submittedForm.getJSONArray("globalVarPasswordPairs");
+                        for(int i = 0; i < jsonArray.size(); i++) {
+                            getConfig().addGlobalVarPasswordPair(new VarPasswordPair(
+                                    jsonArray.getJSONObject(i).getString("var"),
+                                    jsonArray.getJSONObject(i).getString("password")));
+                        }
+                    }
+                    else if(o instanceof JSONObject) {
+                        JSONObject jsonObject = submittedForm.getJSONObject("globalVarPasswordPairs");
+                        getConfig().addGlobalVarPasswordPair(new VarPasswordPair(
+                                jsonObject.getString("var"),
+                                jsonObject.getString("password")));
+                    }
                 }
 
                 MaskPasswordsConfig.save(getConfig());