Utils - added encodePassword(char[]) and decodePassword(char[])

Author: jisedlac

visualvm/core/src/com/sun/tools/visualvm/core/datasupport/Utils.java

@@ -35,6 +35,7 @@
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Base64;
 import java.util.Collection;
 import java.util.Collections;
@@ -443,7 +444,28 @@ public static String encodePassword(String value) {
     }
 
     /**
-     * Decodes given string using the Base64 enconding.
+     * Encodes given char[] using the Base64 encoding. The original parameter value is overwritten.
+     * 
+     * @param value char[] to be encoded.
+     * @return encoded char[].
+     * 
+     * @since VisualVM 1.4.3
+     */
+    public static char[] encodePassword(char[] value) {
+        byte[] bytes = charsToBytes(value);
+        Arrays.fill(value, (char)0);
+        
+        byte[] bytes2 = Base64.getEncoder().encode(bytes);
+        Arrays.fill(bytes, (byte)0);
+        
+        char[] chars = bytesToChars(bytes2);
+        Arrays.fill(bytes2, (byte)0);
+        
+        return chars;
+    }
+    
+    /**
+     * Decodes given string using the Base64 encoding.
      * 
      * @param value String to be decoded.
      * @return decoded String.
@@ -452,6 +474,27 @@ public static String decodePassword(String value) {
         return new String(Base64.getDecoder().decode(value));
     }
 
+    /**
+     * Decodes given char[] using the Base64 encoding. The original parameter value is overwritten.
+     * 
+     * @param value char[] to be decoded.
+     * @return decoded char[].
+     * 
+     * @since VisualVM 1.4.3
+     */
+    public static char[] decodePassword(char[] value) {
+        byte[] bytes = charsToBytes(value);
+        Arrays.fill(value, (char)0);
+        
+        byte[] bytes2 = Base64.getDecoder().decode(bytes);
+        Arrays.fill(bytes, (byte)0);
+        
+        char[] chars = bytesToChars(bytes2);
+        Arrays.fill(bytes2, (byte)0);
+        
+        return chars;
+    }
+    
     /**
      * Encodes given image to String using the Base64 encoding.
      * This is primarily intended to store small images (icons)
@@ -499,4 +542,23 @@ private static byte[] imageToBytes(Image image, String format) {
         return outputStream.toByteArray();
     }
 
+    private static byte[] charsToBytes(char[] chars) {
+        byte[] bytes = new byte[chars.length * 2];
+        for (int i = 0; i < chars.length; i++) {
+            bytes[i * 2] = (byte)((chars[i] & 0xff00) >> 8);
+            bytes[i * 2 + 1] = (byte)(chars[i] & 0x00ff);
+        }
+        return bytes;
+    }
+    
+    private static char[] bytesToChars(byte[] bytes) {
+        char[] chars = new char[bytes.length / 2];
+        for (int i = 0; i < chars.length; i++) {
+            char ch = (char)(((bytes[i * 2] & 0x00ff) << 8) +
+                              (bytes[i * 2 + 1] & 0x00ff));
+            chars[i] = ch;
+        }
+        return chars;
+    }
+    
 }