0.55.0

- Fix dsid.
- Update DSKeys for broker implementation.
- Capture EndpointConfig in DSTransportWs onOpen.
- Run reformat code on everything.

Author: a-hansen

build.gradle

@@ -5,7 +5,7 @@ subprojects {
     apply plugin: 'maven'
 
     group 'org.iot-dsa'
-    version '0.54.0'
+    version '0.55.0'
 
     sourceCompatibility = 1.8
     targetCompatibility = 1.8

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/protocol/DSKeys.java

@@ -132,7 +132,7 @@ public static ECPublicKey decodePublic(byte[] bytes) {
      */
     public String encodeKeys() {
         StringBuilder builder = new StringBuilder();
-        builder.append(DSBase64.encodeUrl(encodePublic()));
+        builder.append(urlEncodePublicKey());
         builder.append(" ");
         builder.append(DSBase64.encodeUrl(toUnsignedByteArray(getPrivateKey().getS())));
         return builder.toString();
@@ -142,7 +142,13 @@ public String encodeKeys() {
      * X9.63 encoding of the public key.
      */
     public byte[] encodePublic() {
-        ECPublicKey publicKey = getPublicKey();
+        return encodePublic(getPublicKey());
+    }
+
+    /**
+     * X9.63 encoding of the public key.
+     */
+    public byte[] encodePublic(ECPublicKey publicKey) {
         byte[] x = toUnsignedByteArray(publicKey.getW().getAffineX());
         byte[] y = toUnsignedByteArray(publicKey.getW().getAffineY());
         byte[] ret = new byte[x.length + y.length + 1]; //32 + 32 + 1
@@ -169,6 +175,42 @@ public String encodePublicHashDsId() {
         return ret;
     }
 
+    /**
+     * Base64 encoding (no padding and url safe) of the SHA256 hash of the public key. This is used
+     * to generate the DSID of a link.
+     *
+     * @throws DSException wrapping any security related exceptions.
+     */
+    public static String encodePublicHashDsId(String publicKey) {
+        String ret = null;
+        try {
+            byte[] pub = DSBase64.decode(publicKey);
+            MessageDigest md = MessageDigest.getInstance("SHA-256");
+            ret = DSBase64.encodeUrl(md.digest(pub));
+        } catch (Exception x) {
+            DSException.throwRuntime(x);
+        }
+        return ret;
+    }
+
+    public String generateAuth(String saltStr, String pubKey) {
+        String ret = null;
+        try {
+            byte[] salt = saltStr.getBytes("UTF-8");
+            byte[] secret = generateSharedSecret(pubKey);
+            byte[] bytes = new byte[salt.length + secret.length];
+            System.arraycopy(salt, 0, bytes, 0, salt.length);
+            System.arraycopy(secret, 0, bytes, salt.length, secret.length);
+            MessageDigest messageDigest = MessageDigest.getInstance("SHA-256");
+            messageDigest.update(bytes);
+            bytes = messageDigest.digest();
+            ret = DSBase64.encodeUrl(bytes);
+        } catch (Exception x) {
+            DSException.throwRuntime(x);
+        }
+        return ret;
+    }
+
     public static byte[] generateHmacSHA256Signature(byte[] data, byte[] secretKeyBytes) {
         byte[] ret = null;
         try {
@@ -185,11 +227,11 @@ public static byte[] generateHmacSHA256Signature(byte[] data, byte[] secretKeyBy
     /**
      * Uses the given public key to generate an ECDH shared secret.
      *
-     * @param publicKeyBytes Public key of the other party.
+     * @param pubKeyBytes Public key of the other party.
      */
-    public byte[] generateSharedSecret(byte[] publicKeyBytes) {
+    public byte[] generateSharedSecret(byte[] pubKeyBytes) {
         try {
-            ECPublicKey pubKey = decodePublic(publicKeyBytes);
+            ECPublicKey pubKey = decodePublic(pubKeyBytes);
             KeyAgreement keyAgreement = KeyAgreement.getInstance("ECDH");
             keyAgreement.init(getPrivateKey());
             keyAgreement.doPhase(pubKey, true);
@@ -203,10 +245,10 @@ public byte[] generateSharedSecret(byte[] publicKeyBytes) {
     /**
      * Uses the given public key to generate an ECDH shared secret.
      *
-     * @param base64key Base64 encoded public key of the other party.
+     * @param base64pubKey Base64 encoded public key of the other party.
      */
-    public byte[] generateSharedSecret(String base64key) {
-        return generateSharedSecret(DSBase64.decode(base64key));
+    public byte[] generateSharedSecret(String base64pubKey) {
+        return generateSharedSecret(DSBase64.decode(base64pubKey));
     }
 
     /**
@@ -388,6 +430,10 @@ public void store(OutputStream out) {
         }
     }
 
+    public String urlEncodePublicKey() {
+        return DSBase64.encodeUrl(encodePublic());
+    }
+
     /**
      * A convenience that creates a verifier and validates the signature for the given bytes.
      */

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/protocol/DSRootLink.java

@@ -26,7 +26,6 @@ public class DSRootLink extends DSLink {
     // Instance Fields
     ///////////////////////////////////////////////////////////////////////////
 
-    private String dsId;
     private DSKeys keys;
     private DSInfo main;
     private DSInfo sys = getInfo(SYS);
@@ -40,23 +39,6 @@ public class DSRootLink extends DSLink {
     // Public Methods
     ///////////////////////////////////////////////////////////////////////////
 
-    /**
-     * Returns the unique id of the connection.  This is the link name + '-' + the hash of the
-     * public key in base64.
-     *
-     * @return Never null, and url safe.
-     */
-    public String getDsId() {
-        if (dsId == null) {
-            StringBuilder buf = new StringBuilder();
-            buf.append(getLinkName());
-            buf.append('-');
-            buf.append(getKeys().encodePublicHashDsId());
-            dsId = buf.toString();
-        }
-        return dsId;
-    }
-
     /**
      * Public / private keys of the link, used to prove identity with brokers.
      */

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/protocol/DSSession.java

@@ -37,8 +37,6 @@ public abstract class DSSession extends DSNode implements DSIConnected {
     ///////////////////////////////////////////////////////////////////////////
     // Instance Fields
     ///////////////////////////////////////////////////////////////////////////
-
-    private final Object outgoingMutex = new Object();
     private int ackRcvd = -1;
     private int ackRequired = 0;
     private int ackToSend = -1;
@@ -48,6 +46,7 @@ public abstract class DSSession extends DSNode implements DSIConnected {
     private long lastTimeSend;
     private int messageId = 0;
     private int nextMessage = 1;
+    private final Object outgoingMutex = new Object();
     private ConcurrentLinkedQueue<OutboundMessage> outgoingRequests = new ConcurrentLinkedQueue<OutboundMessage>();
     private ConcurrentLinkedQueue<OutboundMessage> outgoingResponses = new ConcurrentLinkedQueue<OutboundMessage>();
     private ReadThread readThread;

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/protocol/requester/DSOutboundSubscriptions.java

@@ -34,20 +34,19 @@ public class DSOutboundSubscriptions extends DSLogger implements OutboundMessage
     ///////////////////////////////////////////////////////////////////////////
     // Instance Fields
     ///////////////////////////////////////////////////////////////////////////
-
+    private boolean connected = false;
+    private DSRuntime.Timer disconnectedTimer;
+    private boolean enqueued = false;
+    private int nextSid = 1;
+    private final Map<String, DSOutboundSubscription> pathMap =
+            new ConcurrentHashMap<String, DSOutboundSubscription>();
     private final ConcurrentLinkedQueue<DSOutboundSubscription> pendingSubscribe =
             new ConcurrentLinkedQueue<DSOutboundSubscription>();
     private final ConcurrentLinkedQueue<DSOutboundSubscription> pendingUnsubscribe =
             new ConcurrentLinkedQueue<DSOutboundSubscription>();
-    private final Map<String, DSOutboundSubscription> pathMap =
-            new ConcurrentHashMap<String, DSOutboundSubscription>();
+    private DSRequester requester;
     private final Map<Integer, DSOutboundSubscription> sidMap =
             new ConcurrentHashMap<Integer, DSOutboundSubscription>();
-    private boolean connected = false;
-    private DSRuntime.Timer disconnectedTimer;
-    private boolean enqueued = false;
-    private int nextSid = 1;
-    private DSRequester requester;
 
     ///////////////////////////////////////////////////////////////////////////
     // Constructors

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/protocol/requester/DSRequester.java

@@ -14,8 +14,6 @@
 import org.iot.dsa.dslink.requester.OutboundRequestHandler;
 import org.iot.dsa.dslink.requester.OutboundSubscribeHandler;
 import org.iot.dsa.node.DSIValue;
-import org.iot.dsa.node.DSInt;
-import org.iot.dsa.node.DSLong;
 import org.iot.dsa.node.DSMap;
 import org.iot.dsa.node.DSNode;
 

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundList.java

@@ -24,9 +24,9 @@
 import org.iot.dsa.node.DSValueType;
 import org.iot.dsa.node.action.ActionSpec;
 import org.iot.dsa.node.action.DSAction;
+import org.iot.dsa.node.event.DSEvent;
 import org.iot.dsa.node.event.DSISubscriber;
 import org.iot.dsa.node.event.DSISubscription;
-import org.iot.dsa.node.event.DSEvent;
 import org.iot.dsa.security.DSPermission;
 
 /**

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundSubscription.java

@@ -13,9 +13,9 @@
 import org.iot.dsa.node.DSInfo;
 import org.iot.dsa.node.DSNode;
 import org.iot.dsa.node.DSStatus;
+import org.iot.dsa.node.event.DSEvent;
 import org.iot.dsa.node.event.DSISubscriber;
 import org.iot.dsa.node.event.DSISubscription;
-import org.iot.dsa.node.event.DSEvent;
 import org.iot.dsa.time.DSTime;
 
 /**

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSResponder.java

@@ -3,7 +3,6 @@
 import com.acuity.iot.dsa.dslink.protocol.DSSession;
 import com.acuity.iot.dsa.dslink.protocol.DSStream;
 import com.acuity.iot.dsa.dslink.protocol.message.OutboundMessage;
-import com.acuity.iot.dsa.dslink.transport.DSTransport;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/protocol/v1/DS1ConnectionInit.java

@@ -1,13 +1,11 @@
 package com.acuity.iot.dsa.dslink.protocol.v1;
 
-import com.acuity.iot.dsa.dslink.io.DSBase64;
 import com.acuity.iot.dsa.dslink.protocol.DSRootLink;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
-import java.security.MessageDigest;
 import org.iot.dsa.dslink.DSLink;
 import org.iot.dsa.dslink.DSLinkOptions;
 import org.iot.dsa.io.json.Json;
@@ -167,23 +165,11 @@ String makeWsUrl(String wsPath) {
             if (wsPath.charAt(0) != '/') {
                 buf.append('/');
             }
-            buf.append(wsPath).append("?auth=");
             String saltStr = response.getString("salt");
             if (saltStr != null) {
-                byte[] salt = saltStr.getBytes("UTF-8");
+                buf.append(wsPath).append("?auth=");
                 String tempKey = response.getString("tempKey");
-                byte[] secret = getLink().getKeys().generateSharedSecret(tempKey);
-                byte[] bytes = new byte[salt.length + secret.length];
-                System.arraycopy(salt, 0, bytes, 0, salt.length);
-                System.arraycopy(secret, 0, bytes, salt.length, secret.length);
-                MessageDigest messageDigest = MessageDigest.getInstance("SHA-256");
-                messageDigest.update(bytes);
-                bytes = messageDigest.digest();
-                buf.append(DSBase64.encodeUrl(bytes));
-            } else {
-                //The comment for the following in the original sdk was
-                //"Fake auth parameter".  Maybe for testing?
-                buf.append("_");
+                buf.append(getLink().getKeys().generateAuth(saltStr, tempKey));
             }
             if (authToken != null) {
                 buf.append("&token=").append(authToken);
@@ -244,7 +230,7 @@ void updateSalt(String salt) {
      */
     void writeConnectionRequest(HttpURLConnection conn) throws Exception {
         DSMap map = new DSMap();
-        map.put("publicKey", DSBase64.encodeUrl(getLink().getKeys().encodePublic()));
+        map.put("publicKey", getLink().getKeys().urlEncodePublicKey());
         map.put("isRequester", link.getMain().isRequester());
         map.put("isResponder", link.getMain().isResponder());
         map.put("linkData", new DSMap());