safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 05:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-1132: Add identifier to connection records.

Browse Source
This commit is contained in:
Michael Jumper
2015-03-16 16:11:20 -07:00
parent 3a4f6b85dd
commit 5cf48c7498
5 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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();

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

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

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

@@ -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.
*

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

@@ -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.
*

7
guacamole/src/main/webapp/app/rest/types/ActiveTunnel.js
View File

@@ -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.