Fixed JMX CredentialsProvider

Author: jisedlac

visualvm/jmx/src/org/graalvm/visualvm/jmx/CredentialsProvider.java

@@ -25,6 +25,7 @@
 
 package org.graalvm.visualvm.jmx;
 
+import java.util.Arrays;
 import org.graalvm.visualvm.application.Application;
 import org.graalvm.visualvm.core.datasource.Storage;
 import org.graalvm.visualvm.core.datasupport.Utils;
@@ -110,7 +111,7 @@ public Custom(String username, char[] password, boolean persistent) {
 
 
         public Map<String, ?> getEnvironment(Application application, Storage storage) {
-            return createMap(user, pword);
+            return createMap(user, pword == null ? null : Arrays.copyOf(pword, pword.length));
         }
 
         public String getEnvironmentId(Storage storage) {
@@ -145,7 +146,8 @@ public static class Persistent extends CredentialsProvider {
 
         public Map<String, ?> getEnvironment(Application application, Storage storage) {
             String user = storage.getCustomProperty(PROPERTY_USER);
-            char[] pword = storage.getCustomProperty(PROPERTY_PWORD).toCharArray();
+            char[] pword = storage.getCustomProperty(PROPERTY_PWORD) == null ?
+                           null : storage.getCustomProperty(PROPERTY_PWORD).toCharArray();
             return createMap(user, pword);
         }
 
@@ -162,8 +164,8 @@ String getUsername(Storage storage) { return storage.getCustomProperty(
                                                      PROPERTY_USER); }
 
         boolean hasPassword(Storage storage) {
-            String pword = storage.getCustomProperty(PROPERTY_PWORD);
-            return pword != null && pword.length() > 0;
+            if (storage.getCustomProperty(PROPERTY_PWORD) == null) return false;
+            return storage.getCustomProperty(PROPERTY_PWORD).length() > 0;
         }
 
         boolean isPersistent(Storage storage) {
@@ -175,19 +177,25 @@ boolean isPersistent(Storage storage) {
 
     // --- Private implementation ----------------------------------------------
 
+    // NOTE: clears the pword parameter!
     private static Map<String, ?> createMap(String username, char[] pword) {
         Map map = new HashMap();
 
-        if (username != null && !username.isEmpty())
-            map.put(JMXConnector.CREDENTIALS, new String[] { username, new String(decodePassword(pword)) });
+        if (username != null && !username.isEmpty()) {
+            map.put(JMXConnector.CREDENTIALS, new String[] { username, pword == null ? null : new String(decodePassword(pword)) });
+        } else {
+            if (pword != null) Arrays.fill(pword, (char)0);
+        }
 
         return map;
     }
 
+    // NOTE: clears the pword parameter!
     private static char[] encodePassword(char[] pword) {
         return pword == null ? null : Utils.encodePassword(pword);
     }
 
+    // NOTE: clears the pword parameter!
     private static char[] decodePassword(char[] pword) {
         return pword == null ? null : Utils.decodePassword(pword);
     }