Merge pull request #89 from glyptodon/fix-permission-check

GUAC-1089: Fix badly broken connection group permission checks.
This commit is contained in:
James Muehlner
2015-02-18 21:43:11 -08:00

View File

@@ -199,9 +199,9 @@ public class ConnectionGroupDirectory implements Directory<String, ConnectionGro
MySQLConnectionGroup mySQLConnectionGroup = (MySQLConnectionGroup) object; MySQLConnectionGroup mySQLConnectionGroup = (MySQLConnectionGroup) object;
// Verify permission to update // Verify permission to update
permissionCheckService.verifyConnectionAccess(currentUser, permissionCheckService.verifyConnectionGroupAccess(currentUser,
mySQLConnectionGroup.getConnectionGroupID(), mySQLConnectionGroup.getConnectionGroupID(),
MySQLConstants.CONNECTION_UPDATE); MySQLConstants.CONNECTION_GROUP_UPDATE);
// Perform update // Perform update
connectionGroupService.updateConnectionGroup(mySQLConnectionGroup); connectionGroupService.updateConnectionGroup(mySQLConnectionGroup);
@@ -252,8 +252,8 @@ public class ConnectionGroupDirectory implements Directory<String, ConnectionGro
if(mySQLConnectionGroup == null) if(mySQLConnectionGroup == null)
throw new GuacamoleResourceNotFoundException("Connection group not found."); throw new GuacamoleResourceNotFoundException("Connection group not found.");
// Verify permission to update the connection // Verify permission to update the connection group
permissionCheckService.verifyConnectionAccess(currentUser, permissionCheckService.verifyConnectionGroupAccess(currentUser,
mySQLConnectionGroup.getConnectionGroupID(), mySQLConnectionGroup.getConnectionGroupID(),
MySQLConstants.CONNECTION_GROUP_UPDATE); MySQLConstants.CONNECTION_GROUP_UPDATE);