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

Ticket #269: Connection permission check should actually check connections. Add generatedKey elements to generatorConfig.xml such that IDs are queried back after insert of users and connections.

Browse Source
This commit is contained in:
Michael Jumper
2013-03-01 11:41:39 -08:00
parent dbafe68cd4
commit 2ee554694b
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/UserDirectory.java
View File

@@ -405,12 +405,12 @@ public class UserDirectory implements Directory<String, net.sourceforge.guacamol
// Get list of administerable connection IDs // Get list of administerable connection IDs
List<Integer> administerableConnectionIDs = List<Integer> administerableConnectionIDs =
permissionCheckService.retrieveUserIDs(this.user_id, permissionCheckService.retrieveConnectionIDs(this.user_id,
MySQLConstants.CONNECTION_ADMINISTER); MySQLConstants.CONNECTION_ADMINISTER);
// Get set of names corresponding to administerable connections // Get set of names corresponding to administerable connections
Map<String, Integer> administerableConnections = Map<String, Integer> administerableConnections =
userService.translateUsernames(administerableConnectionIDs); connectionService.translateNames(administerableConnectionIDs);
// Insert all given permissions // Insert all given permissions
for (ConnectionPermission permission : permissions) { for (ConnectionPermission permission : permissions) {

6
extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/PermissionCheckService.java
View File

@@ -290,7 +290,7 @@ public class PermissionCheckService {
// Construct permission from data // Construct permission from data
UserPermission permission = new UserPermission( UserPermission permission = new UserPermission(
UserPermission.Type.valueOf(userPermission.getPermission()), UserPermission.Type.valueOf(userPermission.getPermission()),
affectedUsers.get(userPermission.getUser_id()) affectedUsers.get(userPermission.getAffected_user_id())
); );
// Add to set // Add to set
@@ -327,7 +327,7 @@ public class PermissionCheckService {
connectionIDs.add(connectionPermission.getConnection_id()); connectionIDs.add(connectionPermission.getConnection_id());
// Get corresponding names // Get corresponding names
Map<Integer, String> affectedUsers = Map<Integer, String> affectedConnections =
connectionService.retrieveNames(connectionIDs); connectionService.retrieveNames(connectionIDs);
// Add connection permissions // Add connection permissions
@@ -336,7 +336,7 @@ public class PermissionCheckService {
// Construct permission from data // Construct permission from data
ConnectionPermission permission = new ConnectionPermission( ConnectionPermission permission = new ConnectionPermission(
ConnectionPermission.Type.valueOf(connectionPermission.getPermission()), ConnectionPermission.Type.valueOf(connectionPermission.getPermission()),
affectedUsers.get(connectionPermission.getUser_id()) affectedConnections.get(connectionPermission.getConnection_id())
); );
// Add to set // Add to set

4
extensions/guacamole-auth-mysql/src/main/resources/generatorConfig.xml
View File

@@ -32,6 +32,8 @@
domainObjectName="Connection" > domainObjectName="Connection" >
<property name="useActualColumnNames" value="true"/> <property name="useActualColumnNames" value="true"/>
<property name="ignoreQualifiersAtRuntime" value="true"/> <property name="ignoreQualifiersAtRuntime" value="true"/>
<generatedKey column="connection_id" identity="true"
sqlStatement="SELECT LAST_INSERT_ID()"/>
</table> </table>
<table tableName="guacamole_connection_parameter" <table tableName="guacamole_connection_parameter"
@@ -64,6 +66,8 @@
domainObjectName="User" > domainObjectName="User" >
<property name="useActualColumnNames" value="true"/> <property name="useActualColumnNames" value="true"/>
<property name="ignoreQualifiersAtRuntime" value="true"/> <property name="ignoreQualifiersAtRuntime" value="true"/>
<generatedKey column="user_id" identity="true"
sqlStatement="SELECT LAST_INSERT_ID()"/>
</table> </table>
<table tableName="guacamole_user_permission" <table tableName="guacamole_user_permission"