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

GUAC-1103: Explicitly cast permission types.

Browse Source
This commit is contained in:
Michael Jumper
2015-03-02 17:39:43 -08:00
parent 4e08c10f94
commit 06a7ab4cec
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionGroupPermissionMapper.xml
View File

@@ -61,7 +61,7 @@
JOIN guacamole_user ON guacamole_connection_group_permission.user_id = guacamole_user.user_id JOIN guacamole_user ON guacamole_connection_group_permission.user_id = guacamole_user.user_id
WHERE WHERE
guacamole_connection_group_permission.user_id = #{user.objectID,jdbcType=INTEGER} 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} AND connection_group_id = #{identifier,jdbcType=VARCHAR}
</select> </select>
@@ -81,7 +81,7 @@
AND permission IN AND permission IN
<foreach collection="permissions" item="permission" <foreach collection="permissions" item="permission"
open="(" separator="," close=")"> open="(" separator="," close=")">
#{permission,jdbcType=VARCHAR} #{permission,jdbcType=VARCHAR}::guacamole_object_permission_type
</foreach> </foreach>
</select> </select>
@@ -94,7 +94,7 @@
<foreach collection="permissions" item="permission" <foreach collection="permissions" item="permission"
open="(" separator="," close=")"> open="(" separator="," close=")">
(#{permission.userID,jdbcType=INTEGER}, (#{permission.userID,jdbcType=INTEGER},
#{permission.type,jdbcType=VARCHAR}, #{permission.type,jdbcType=VARCHAR}::guacamole_object_permission_type,
#{permission.objectIdentifier,jdbcType=VARCHAR}) #{permission.objectIdentifier,jdbcType=VARCHAR})
</foreach> </foreach>
@@ -111,7 +111,7 @@
VALUES VALUES
<foreach collection="permissions" item="permission" separator=","> <foreach collection="permissions" item="permission" separator=",">
(#{permission.userID,jdbcType=INTEGER}, (#{permission.userID,jdbcType=INTEGER},
#{permission.type,jdbcType=VARCHAR}, #{permission.type,jdbcType=VARCHAR}::guacamole_object_permission_type,
#{permission.objectIdentifier,jdbcType=VARCHAR}) #{permission.objectIdentifier,jdbcType=VARCHAR})
</foreach> </foreach>

8
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionPermissionMapper.xml
View File

@@ -61,7 +61,7 @@
JOIN guacamole_user ON guacamole_connection_permission.user_id = guacamole_user.user_id JOIN guacamole_user ON guacamole_connection_permission.user_id = guacamole_user.user_id
WHERE WHERE
guacamole_connection_permission.user_id = #{user.objectID,jdbcType=INTEGER} 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} AND connection_id = #{identifier,jdbcType=VARCHAR}
</select> </select>
@@ -81,7 +81,7 @@
AND permission IN AND permission IN
<foreach collection="permissions" item="permission" <foreach collection="permissions" item="permission"
open="(" separator="," close=")"> open="(" separator="," close=")">
#{permission,jdbcType=VARCHAR} #{permission,jdbcType=VARCHAR}::guacamole_object_permission_type
</foreach> </foreach>
</select> </select>
@@ -94,7 +94,7 @@
<foreach collection="permissions" item="permission" <foreach collection="permissions" item="permission"
open="(" separator="," close=")"> open="(" separator="," close=")">
(#{permission.userID,jdbcType=INTEGER}, (#{permission.userID,jdbcType=INTEGER},
#{permission.type,jdbcType=VARCHAR}, #{permission.type,jdbcType=VARCHAR}::guacamole_object_permission_type,
#{permission.objectIdentifier,jdbcType=VARCHAR}) #{permission.objectIdentifier,jdbcType=VARCHAR})
</foreach> </foreach>
@@ -111,7 +111,7 @@
VALUES VALUES
<foreach collection="permissions" item="permission" separator=","> <foreach collection="permissions" item="permission" separator=",">
(#{permission.userID,jdbcType=INTEGER}, (#{permission.userID,jdbcType=INTEGER},
#{permission.type,jdbcType=VARCHAR}, #{permission.type,jdbcType=VARCHAR}::guacamole_object_permission_type,
#{permission.objectIdentifier,jdbcType=VARCHAR}) #{permission.objectIdentifier,jdbcType=VARCHAR})
</foreach> </foreach>

6
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionMapper.xml
View File

@@ -58,7 +58,7 @@
JOIN guacamole_user ON guacamole_system_permission.user_id = guacamole_user.user_id JOIN guacamole_user ON guacamole_system_permission.user_id = guacamole_user.user_id
WHERE WHERE
guacamole_system_permission.user_id = #{user.objectID,jdbcType=INTEGER} guacamole_system_permission.user_id = #{user.objectID,jdbcType=INTEGER}
AND permission = #{type,jdbcType=VARCHAR} AND permission = #{type,jdbcType=VARCHAR}::guacamole_system_permission_type
</select> </select>
@@ -70,7 +70,7 @@
<foreach collection="permissions" item="permission" <foreach collection="permissions" item="permission"
open="(" separator="," close=")"> open="(" separator="," close=")">
(#{permission.userID,jdbcType=INTEGER}, (#{permission.userID,jdbcType=INTEGER},
#{permission.type,jdbcType=VARCHAR}) #{permission.type,jdbcType=VARCHAR}::guacamole_system_permission_type)
</foreach> </foreach>
</delete> </delete>
@@ -85,7 +85,7 @@
VALUES VALUES
<foreach collection="permissions" item="permission" separator=","> <foreach collection="permissions" item="permission" separator=",">
(#{permission.userID,jdbcType=INTEGER}, (#{permission.userID,jdbcType=INTEGER},
#{permission.type,jdbcType=VARCHAR}) #{permission.type,jdbcType=VARCHAR}::guacamole_system_permission_type)
</foreach> </foreach>
</insert> </insert>

12
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/UserPermissionMapper.xml
View File

@@ -63,7 +63,7 @@
JOIN guacamole_user affected ON guacamole_user_permission.affected_user_id = affected.user_id JOIN guacamole_user affected ON guacamole_user_permission.affected_user_id = affected.user_id
WHERE WHERE
guacamole_user_permission.user_id = #{user.objectID,jdbcType=INTEGER} 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} AND affected.username = #{identifier,jdbcType=VARCHAR}
</select> </select>
@@ -84,7 +84,7 @@
AND permission IN AND permission IN
<foreach collection="permissions" item="permission" <foreach collection="permissions" item="permission"
open="(" separator="," close=")"> open="(" separator="," close=")">
#{permission,jdbcType=VARCHAR} #{permission,jdbcType=VARCHAR}::guacamole_object_permission_type
</foreach> </foreach>
</select> </select>
@@ -100,7 +100,7 @@
<foreach collection="permissions" item="permission" <foreach collection="permissions" item="permission"
open="(" separator="," close=")"> open="(" separator="," close=")">
(#{permission.userID,jdbcType=INTEGER}, (#{permission.userID,jdbcType=INTEGER},
#{permission.type,jdbcType=VARCHAR}, #{permission.type,jdbcType=VARCHAR}::guacamole_object_permission_type,
#{permission.objectIdentifier,jdbcType=VARCHAR}) #{permission.objectIdentifier,jdbcType=VARCHAR})
</foreach> </foreach>
@@ -117,9 +117,9 @@
SELECT permissions.user_id, permissions.permission, guacamole_user.user_id FROM SELECT permissions.user_id, permissions.permission, guacamole_user.user_id FROM
<foreach collection="permissions" item="permission" <foreach collection="permissions" item="permission"
open="(" separator="UNION ALL" close=")"> open="(" separator="UNION ALL" close=")">
SELECT #{permission.userID,jdbcType=INTEGER} AS user_id, SELECT #{permission.userID,jdbcType=INTEGER} AS user_id,
#{permission.type,jdbcType=VARCHAR} AS permission, #{permission.type,jdbcType=VARCHAR}::guacamole_object_permission_type AS permission,
#{permission.objectIdentifier,jdbcType=VARCHAR} AS username #{permission.objectIdentifier,jdbcType=VARCHAR} AS username
</foreach> </foreach>
AS permissions AS permissions
JOIN guacamole_user ON guacamole_user.username = permissions.username; JOIN guacamole_user ON guacamole_user.username = permissions.username;