From 06a7ab4cec58e591b27ef1d782a7402a63dca0a6 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Mon, 2 Mar 2015 17:39:43 -0800 Subject: [PATCH] GUAC-1103: Explicitly cast permission types. --- .../permission/ConnectionGroupPermissionMapper.xml | 8 ++++---- .../jdbc/permission/ConnectionPermissionMapper.xml | 8 ++++---- .../auth/jdbc/permission/SystemPermissionMapper.xml | 6 +++--- .../auth/jdbc/permission/UserPermissionMapper.xml | 12 ++++++------ 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionGroupPermissionMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionGroupPermissionMapper.xml index 40ada12a5..1d10233a9 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionGroupPermissionMapper.xml +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionGroupPermissionMapper.xml @@ -61,7 +61,7 @@ JOIN guacamole_user ON guacamole_connection_group_permission.user_id = guacamole_user.user_id WHERE guacamole_connection_group_permission.user_id = #{user.objectID,jdbcType=INTEGER} - AND permission = #{type,jdbcType=VARCHAR} + AND permission = #{type,jdbcType=VARCHAR}::guacamole_object_permission_type AND connection_group_id = #{identifier,jdbcType=VARCHAR} @@ -81,7 +81,7 @@ AND permission IN - #{permission,jdbcType=VARCHAR} + #{permission,jdbcType=VARCHAR}::guacamole_object_permission_type @@ -94,7 +94,7 @@ (#{permission.userID,jdbcType=INTEGER}, - #{permission.type,jdbcType=VARCHAR}, + #{permission.type,jdbcType=VARCHAR}::guacamole_object_permission_type, #{permission.objectIdentifier,jdbcType=VARCHAR}) @@ -111,7 +111,7 @@ VALUES (#{permission.userID,jdbcType=INTEGER}, - #{permission.type,jdbcType=VARCHAR}, + #{permission.type,jdbcType=VARCHAR}::guacamole_object_permission_type, #{permission.objectIdentifier,jdbcType=VARCHAR}) diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionPermissionMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionPermissionMapper.xml index 9935f3cfd..4bd33de78 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionPermissionMapper.xml +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionPermissionMapper.xml @@ -61,7 +61,7 @@ JOIN guacamole_user ON guacamole_connection_permission.user_id = guacamole_user.user_id WHERE guacamole_connection_permission.user_id = #{user.objectID,jdbcType=INTEGER} - AND permission = #{type,jdbcType=VARCHAR} + AND permission = #{type,jdbcType=VARCHAR}::guacamole_object_permission_type AND connection_id = #{identifier,jdbcType=VARCHAR} @@ -81,7 +81,7 @@ AND permission IN - #{permission,jdbcType=VARCHAR} + #{permission,jdbcType=VARCHAR}::guacamole_object_permission_type @@ -94,7 +94,7 @@ (#{permission.userID,jdbcType=INTEGER}, - #{permission.type,jdbcType=VARCHAR}, + #{permission.type,jdbcType=VARCHAR}::guacamole_object_permission_type, #{permission.objectIdentifier,jdbcType=VARCHAR}) @@ -111,7 +111,7 @@ VALUES (#{permission.userID,jdbcType=INTEGER}, - #{permission.type,jdbcType=VARCHAR}, + #{permission.type,jdbcType=VARCHAR}::guacamole_object_permission_type, #{permission.objectIdentifier,jdbcType=VARCHAR}) diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionMapper.xml index 55eacd072..d472dc2ba 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionMapper.xml +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionMapper.xml @@ -58,7 +58,7 @@ JOIN guacamole_user ON guacamole_system_permission.user_id = guacamole_user.user_id WHERE guacamole_system_permission.user_id = #{user.objectID,jdbcType=INTEGER} - AND permission = #{type,jdbcType=VARCHAR} + AND permission = #{type,jdbcType=VARCHAR}::guacamole_system_permission_type @@ -70,7 +70,7 @@ (#{permission.userID,jdbcType=INTEGER}, - #{permission.type,jdbcType=VARCHAR}) + #{permission.type,jdbcType=VARCHAR}::guacamole_system_permission_type) @@ -85,7 +85,7 @@ VALUES (#{permission.userID,jdbcType=INTEGER}, - #{permission.type,jdbcType=VARCHAR}) + #{permission.type,jdbcType=VARCHAR}::guacamole_system_permission_type) diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/UserPermissionMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/UserPermissionMapper.xml index 038bb814f..b995dae19 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/UserPermissionMapper.xml +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/UserPermissionMapper.xml @@ -63,7 +63,7 @@ JOIN guacamole_user affected ON guacamole_user_permission.affected_user_id = affected.user_id WHERE guacamole_user_permission.user_id = #{user.objectID,jdbcType=INTEGER} - AND permission = #{type,jdbcType=VARCHAR} + AND permission = #{type,jdbcType=VARCHAR}::guacamole_object_permission_type AND affected.username = #{identifier,jdbcType=VARCHAR} @@ -84,7 +84,7 @@ AND permission IN - #{permission,jdbcType=VARCHAR} + #{permission,jdbcType=VARCHAR}::guacamole_object_permission_type @@ -100,7 +100,7 @@ (#{permission.userID,jdbcType=INTEGER}, - #{permission.type,jdbcType=VARCHAR}, + #{permission.type,jdbcType=VARCHAR}::guacamole_object_permission_type, #{permission.objectIdentifier,jdbcType=VARCHAR}) @@ -117,9 +117,9 @@ SELECT permissions.user_id, permissions.permission, guacamole_user.user_id FROM - SELECT #{permission.userID,jdbcType=INTEGER} AS user_id, - #{permission.type,jdbcType=VARCHAR} AS permission, - #{permission.objectIdentifier,jdbcType=VARCHAR} AS username + SELECT #{permission.userID,jdbcType=INTEGER} AS user_id, + #{permission.type,jdbcType=VARCHAR}::guacamole_object_permission_type AS permission, + #{permission.objectIdentifier,jdbcType=VARCHAR} AS username AS permissions JOIN guacamole_user ON guacamole_user.username = permissions.username;