Repository: incubator-guacamole-client Updated Branches: refs/heads/master 7c162fde9 -> 682a6e49a
GUACAMOLE-339: Add remote host field to database and populate appropriately. Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/f2120c8d Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/f2120c8d Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/f2120c8d Branch: refs/heads/master Commit: f2120c8d14ddb86ebdac1cf27e4c93b164401e01 Parents: 7c162fd Author: Nick Couchman <[email protected]> Authored: Sun Jul 16 21:58:28 2017 -0400 Committer: Nick Couchman <[email protected]> Committed: Sun Jul 16 21:58:28 2017 -0400 ---------------------------------------------------------------------- .../jdbc/connection/ConnectionRecordModel.java | 25 ++++++++++++++++++++ .../connection/ModeledConnectionRecord.java | 2 +- .../tunnel/AbstractGuacamoleTunnelService.java | 1 + .../schema/001-create-schema.sql | 1 + .../schema/upgrade/upgrade-pre-0.9.14.sql | 7 ++++++ .../jdbc/connection/ConnectionRecordMapper.xml | 8 ++++++- .../schema/001-create-schema.sql | 1 + .../schema/upgrade/upgrade-pre-0.9.14.sql | 7 ++++++ .../jdbc/connection/ConnectionRecordMapper.xml | 8 ++++++- 9 files changed, 57 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/f2120c8d/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordModel.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordModel.java index 791ba77..f142f4e 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordModel.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordModel.java @@ -64,6 +64,11 @@ public class ConnectionRecordModel { private String username; /** + * The remote host associated with this connection record. + */ + private String remoteHost; + + /** * The time the connection was initiated by the associated user. */ private Date startDate; @@ -217,6 +222,26 @@ public class ConnectionRecordModel { } /** + * Returns the remote host associated with this connection record. + * + * @return + * The remote host associated with this connection record. + */ + public String getRemoteHost() { + return remoteHost; + } + + /** + * Sets the remote host associated with this connection record. + * + * @param remoteHost + * The remote host to associate with this connection record. + */ + public void setRemoteHost(String remoteHost) { + this.remoteHost = remoteHost; + } + + /** * Returns the date that the associated connection was established. * * @return http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/f2120c8d/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnectionRecord.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnectionRecord.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnectionRecord.java index 2dc72da..a5e83d4 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnectionRecord.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnectionRecord.java @@ -77,7 +77,7 @@ public class ModeledConnectionRecord implements ConnectionRecord { @Override public String getRemoteHost() { - return null; + return model.getRemoteHost(); } @Override http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/f2120c8d/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java index 4054333..59ed13c 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java @@ -306,6 +306,7 @@ public abstract class AbstractGuacamoleTunnelService implements GuacamoleTunnelS recordModel.setUsername(record.getUsername()); recordModel.setConnectionIdentifier(record.getConnectionIdentifier()); recordModel.setConnectionName(record.getConnectionName()); + recordModel.setRemoteHost(record.getRemoteHost()); recordModel.setSharingProfileIdentifier(record.getSharingProfileIdentifier()); recordModel.setSharingProfileName(record.getSharingProfileName()); recordModel.setStartDate(record.getStartDate()); http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/f2120c8d/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql index 515ea72..70eafa2 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql @@ -322,6 +322,7 @@ CREATE TABLE `guacamole_connection_history` ( `history_id` int(11) NOT NULL AUTO_INCREMENT, `user_id` int(11) DEFAULT NULL, `username` varchar(128) NOT NULL, + `remote_host` varchar(128) DEFAULT NULL, `connection_id` int(11) DEFAULT NULL, `connection_name` varchar(128) NOT NULL, `sharing_profile_id` int(11) DEFAULT NULL, http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/f2120c8d/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/upgrade/upgrade-pre-0.9.14.sql ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/upgrade/upgrade-pre-0.9.14.sql b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/upgrade/upgrade-pre-0.9.14.sql index 14a016b..c975bf3 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/upgrade/upgrade-pre-0.9.14.sql +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/upgrade/upgrade-pre-0.9.14.sql @@ -30,3 +30,10 @@ ALTER TABLE guacamole_connection ALTER TABLE guacamole_connection ADD COLUMN failover_only BOOLEAN NOT NULL DEFAULT 0; + +-- +-- Add remote_host to connection history +-- + +ALTER TABLE guacamole_connection_history + ADD COLUMN remote_host VARCHAR(128) DEFAULT NULL; http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/f2120c8d/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml index 9893790..c2c12c1 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml @@ -27,6 +27,7 @@ <resultMap id="ConnectionRecordResultMap" type="org.apache.guacamole.auth.jdbc.connection.ConnectionRecordModel"> <result column="connection_id" property="connectionIdentifier" jdbcType="INTEGER"/> <result column="connection_name" property="connectionName" jdbcType="VARCHAR"/> + <result column="remote_host" property="remoteHost" jdbcType="VARCHAR"/> <result column="sharing_profile_id" property="sharingProfileIdentifier" jdbcType="INTEGER"/> <result column="sharing_profile_name" property="sharingProfileName" jdbcType="VARCHAR"/> <result column="user_id" property="userID" jdbcType="INTEGER"/> @@ -41,6 +42,7 @@ SELECT guacamole_connection_history.connection_id, guacamole_connection_history.connection_name, + guacamole_connection_history.remote_host, guacamole_connection_history.sharing_profile_id, guacamole_connection_history.sharing_profile_name, guacamole_connection_history.user_id, @@ -62,6 +64,7 @@ INSERT INTO guacamole_connection_history ( connection_id, connection_name, + remote_host, sharing_profile_id, sharing_profile_name, user_id, @@ -72,6 +75,7 @@ VALUES ( #{record.connectionIdentifier,jdbcType=VARCHAR}, #{record.connectionName,jdbcType=VARCHAR}, + #{record.remoteHost,jdbcType=VARCHAR}, #{record.sharingProfileIdentifier,jdbcType=VARCHAR}, #{record.sharingProfileName,jdbcType=VARCHAR}, (SELECT user_id FROM guacamole_user @@ -89,6 +93,7 @@ SELECT guacamole_connection_history.connection_id, guacamole_connection_history.connection_name, + guacamole_connection_history.remote_host, guacamole_connection_history.sharing_profile_id, guacamole_connection_history.sharing_profile_name, guacamole_connection_history.user_id, @@ -146,6 +151,7 @@ SELECT guacamole_connection_history.connection_id, guacamole_connection_history.connection_name, + guacamole_connection_history.remote_host, guacamole_connection_history.sharing_profile_id, guacamole_connection_history.sharing_profile_name, guacamole_connection_history.user_id, @@ -209,4 +215,4 @@ </select> -</mapper> \ No newline at end of file +</mapper> http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/f2120c8d/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql index d1b5bf5..f5372f7 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql @@ -381,6 +381,7 @@ CREATE TABLE guacamole_connection_history ( history_id serial NOT NULL, user_id integer DEFAULT NULL, username varchar(128) NOT NULL, + remote_host varchar(128) DEFAULT NULL, connection_id integer DEFAULT NULL, connection_name varchar(128) NOT NULL, sharing_profile_id integer DEFAULT NULL, http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/f2120c8d/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/upgrade/upgrade-pre-0.9.14.sql ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/upgrade/upgrade-pre-0.9.14.sql b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/upgrade/upgrade-pre-0.9.14.sql index 20882ed..438dd5a 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/upgrade/upgrade-pre-0.9.14.sql +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/upgrade/upgrade-pre-0.9.14.sql @@ -30,3 +30,10 @@ ALTER TABLE guacamole_connection ALTER TABLE guacamole_connection ADD COLUMN failover_only BOOLEAN NOT NULL DEFAULT FALSE; + +-- +-- Add remote_host to connection history +-- + +ALTER TABLE guacamole_connection_history + ADD COLUMN remote_host VARCHAR(128) DEFAULT NULL; http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/f2120c8d/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml index 455ce68..2b3e193 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml @@ -27,6 +27,7 @@ <resultMap id="ConnectionRecordResultMap" type="org.apache.guacamole.auth.jdbc.connection.ConnectionRecordModel"> <result column="connection_id" property="connectionIdentifier" jdbcType="INTEGER"/> <result column="connection_name" property="connectionName" jdbcType="VARCHAR"/> + <result column="remote_host" property="remoteHost" jdbcType="VARCHAR"/> <result column="sharing_profile_id" property="sharingProfileIdentifier" jdbcType="INTEGER"/> <result column="sharing_profile_name" property="sharingProfileName" jdbcType="VARCHAR"/> <result column="user_id" property="userID" jdbcType="INTEGER"/> @@ -41,6 +42,7 @@ SELECT guacamole_connection_history.connection_id, guacamole_connection_history.connection_name, + guacamole_connection_history.remote_host, guacamole_connection_history.sharing_profile_id, guacamole_connection_history.sharing_profile_name, guacamole_connection_history.user_id, @@ -62,6 +64,7 @@ INSERT INTO guacamole_connection_history ( connection_id, connection_name, + remote_host, sharing_profile_id, sharing_profile_name, user_id, @@ -72,6 +75,7 @@ VALUES ( #{record.connectionIdentifier,jdbcType=INTEGER}::integer, #{record.connectionName,jdbcType=VARCHAR}, + #{record.remoteHost,jdbcType=VARCHAR}, #{record.sharingProfileIdentifier,jdbcType=INTEGER}::integer, #{record.sharingProfileName,jdbcType=VARCHAR}, (SELECT user_id FROM guacamole_user @@ -89,6 +93,7 @@ SELECT guacamole_connection_history.connection_id, guacamole_connection_history.connection_name, + guacamole_connection_history.remote_host, guacamole_connection_history.sharing_profile_id, guacamole_connection_history.sharing_profile_name, guacamole_connection_history.user_id, @@ -144,6 +149,7 @@ SELECT guacamole_connection_history.connection_id, guacamole_connection_history.connection_name, + guacamole_connection_history.remote_host, guacamole_connection_history.sharing_profile_id, guacamole_connection_history.sharing_profile_name, guacamole_connection_history.user_id, @@ -207,4 +213,4 @@ </select> -</mapper> \ No newline at end of file +</mapper>
