Merge pull request #143 from ubitricity/master

Add support for non-printable HTTP passwords

Author: TVolden

OCPP-J/src/main/java/eu/chargetime/ocpp/WebSocketTransmitter.java

@@ -31,6 +31,7 @@ of this software and associated documentation files (the "Software"), to deal
 import java.net.ConnectException;
 import java.net.Proxy;
 import java.net.URI;
+import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
@@ -68,10 +69,18 @@ public void connect(String uri, RadioEvents events) {
 
     Map<String, String> httpHeaders = new HashMap<>();
     String username = configuration.getParameter(JSONConfiguration.USERNAME_PARAMETER);
-    String password = configuration.getParameter(JSONConfiguration.PASSWORD_PARAMETER);
+    Object password = configuration.getParameter(JSONConfiguration.PASSWORD_PARAMETER);
+    byte[] credentials = null;
     if (username != null && password != null) {
-      String credentials = username + ":" + password;
-      byte[] base64Credentials = Base64.getEncoder().encode(credentials.getBytes());
+      if (password instanceof String) {
+        credentials = (username + ":" + password).getBytes(StandardCharsets.UTF_8);
+      } else if (password instanceof byte[]) {
+        credentials =
+            joinByteArrays((username + ":").getBytes(StandardCharsets.UTF_8), (byte[]) password);
+      }
+    }
+    if (credentials != null) {
+      byte[] base64Credentials = Base64.getEncoder().encode(credentials);
       httpHeaders.put("Authorization", "Basic " + new String(base64Credentials));
     }
 
@@ -132,6 +141,13 @@ public void onError(Exception ex) {
     }
   }
 
+  byte[] joinByteArrays(byte[] a, byte[] b) {
+    byte[] result = new byte[a.length + b.length];
+    System.arraycopy(a, 0, result, 0, a.length);
+    System.arraycopy(b, 0, result, a.length, b.length);
+    return result;
+  }
+
   void configure() {
     client.setReuseAddr(configuration.getParameter(JSONConfiguration.REUSE_ADDR_PARAMETER, false));
     client.setTcpNoDelay(