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-1193: Include connection identifier within history records.

Browse Source
This commit is contained in:
Michael Jumper
2015-09-23 16:02:17 -07:00
parent e1908bf6e8
commit 3c5f72b288
5 changed files with 44 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

@@ -51,6 +51,11 @@ public class ModeledConnectionRecord implements ConnectionRecord {
this.model = model;
}
@Override
public String getConnectionIdentifier() {
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/tunnel/ActiveConnectionRecord.java
View File

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

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

@@ -32,6 +32,16 @@ import java.util.Date;
*/
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 getConnectionIdentifier();
/**
* Returns the date and time the connection began.
*

17
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/history/APIConnectionRecord.java
View File

@@ -32,6 +32,11 @@ import org.glyptodon.guacamole.net.auth.ConnectionRecord;
*/
public class APIConnectionRecord {
/**
* The identifier of the connection associated with this record.
*/
private final String connectionIdentifier;
/**
* The date and time the connection began.
*/
@@ -66,6 +71,7 @@ public class APIConnectionRecord {
* The record to copy data from.
*/
public APIConnectionRecord(ConnectionRecord record) {
this.connectionIdentifier = record.getConnectionIdentifier();
this.startDate = record.getStartDate();
this.endDate = record.getEndDate();
this.remoteHost = record.getRemoteHost();
@@ -73,6 +79,17 @@ public class APIConnectionRecord {
this.active = record.isActive();
}
/**
* Returns the identifier of the connection associated with this
* record.
*
* @return
* The identifier of the connection associated with this record.
*/
public String getConnectionIdentifier() {
return connectionIdentifier;
}
/**
* Returns the date and time the connection began.
*

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

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