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

GUACAMOLE-360: Merge update active connection permission check to support user groups.

Browse Source
This commit is contained in:
Nick Couchman
2018-10-01 21:15:51 -04:00
parent 658ce78846 ea142d15ce
commit 220d9b2994
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionService.java
View File

@@ -97,7 +97,7 @@ public class ActiveConnectionPermissionService
permissions.add(new ObjectPermission(ObjectPermission.Type.READ, identifier)); permissions.add(new ObjectPermission(ObjectPermission.Type.READ, identifier));
// If we're an admin, or the connection is ours, then we can DELETE // If we're an admin, or the connection is ours, then we can DELETE
if (isAdmin || targetUser.getIdentifier().equals(record.getUsername())) if (isAdmin || targetEntity.isUser(record.getUsername()))
permissions.add(new ObjectPermission(ObjectPermission.Type.DELETE, identifier)); permissions.add(new ObjectPermission(ObjectPermission.Type.DELETE, identifier));
} }

15
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledPermissions.java
View File

@@ -105,6 +105,21 @@ public abstract class ModeledPermissions<ModelType extends EntityModel>
return getModel().getEntityType() == EntityType.USER; return getModel().getEntityType() == EntityType.USER;
} }
/**
* Returns whether the underlying entity represents a specific user having
* the given username.
*
* @param username
* The username of a user.
*
* @return
* true if the underlying entity is a user that has the given username,
* false otherwise.
*/
public boolean isUser(String username) {
return isUser() && getIdentifier().equals(username);
}
/** /**
* Returns whether the underlying entity is a user group. Entities may be * Returns whether the underlying entity is a user group. Entities may be
* either users or user groups. * either users or user groups.

2
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/AbstractPermissionService.java
View File

@@ -101,7 +101,7 @@ public abstract class AbstractPermissionService<PermissionSetType extends Permis
throws GuacamoleException { throws GuacamoleException {
// A user can always read their own permissions // A user can always read their own permissions
if (targetEntity.isUser() && user.getUser().getIdentifier().equals(targetEntity.getIdentifier())) if (targetEntity.isUser(user.getUser().getIdentifier()))
return true; return true;
// A system adminstrator can do anything // A system adminstrator can do anything