GUAC-1132: Add identifier to connection records.

extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ModeledConnectionRecord.java

@@ -52,6 +52,11 @@ public class ModeledConnectionRecord implements ConnectionRecord {
         this.model = model;
     }
 
+    @Override
+    public String getIdentifier() {
+        return model.getConnectionIdentifier();
+    }
+
     @Override
     public Date getStartDate() {
         return model.getStartDate();

extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/ActiveConnectionRecord.java

@@ -150,6 +150,11 @@ public class ActiveConnectionRecord implements ConnectionRecord {
         return balancingGroup != null;
     }
 
+    @Override
+    public String getIdentifier() {
+        return connection.getIdentifier();
+    }
+    
     @Override
     public Date getStartDate() {
         return startDate;

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/ConnectionRecord.java

@@ -33,6 +33,16 @@ import org.glyptodon.guacamole.net.GuacamoleSocket;
  */
 public interface ConnectionRecord {
 
+    /**
+     * Returns the identifier of the connection associated with this connection
+     * record.
+     *
+     * @return
+     *     The identifier of the connection associated with this connection
+     *     record.
+     */
+    public String getIdentifier();
+    
     /**
      * Returns the date and time the connection began.
      *

guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/tunnel/APITunnel.java

@@ -32,6 +32,11 @@ import org.glyptodon.guacamole.net.auth.ConnectionRecord;
  */
 public class APITunnel {
 
+    /**
+     * The identifier of the connection associated with this tunnel.
+     */
+    private final String identifier;
+    
     /**
      * The date and time the connection began.
      */
@@ -60,12 +65,23 @@ public class APITunnel {
      *     The record to copy data from.
      */
     public APITunnel(ConnectionRecord record) {
+        this.identifier = record.getIdentifier();
         this.startDate  = record.getStartDate();
         this.remoteHost = record.getRemoteHost();
         this.username   = record.getUsername();
         this.uuid       = "STUB"; // STUB
     }
 
+    /**
+     * Returns the identifier of the connection associated with this tunnel.
+     *
+     * @return
+     *     The identifier of the connection associated with this tunnel.
+     */
+    public String getIdentifier() {
+        return identifier;
+    }
+    
     /**
      * Returns the date and time the connection began.
      *

guacamole/src/main/webapp/app/rest/types/ActiveTunnel.js

@@ -40,6 +40,13 @@ angular.module('rest').factory('ActiveTunnel', [function defineActiveTunnel() {
         // Use empty object by default
         template = template || {};
 
+        /**
+         * The identifier of the connection associated with this tunnel.
+         *
+         * @type String
+         */
+        this.identifier = template.identifier;
+
         /**
          * The time that the tunnel began, in seconds since
          * 1970-01-01 00:00:00 UTC.