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

GUACAMOLE-220: Correct user vs. entity wording in documentation.

Browse Source
This commit is contained in:
Michael Jumper
2018-09-27 19:45:30 -07:00
parent 8399b252cd
commit 4a5f271702
2 changed files with 8 additions and 8 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/permission/PermissionService.java
View File

@@ -136,7 +136,7 @@ public interface PermissionService<PermissionSetType extends PermissionSet<Permi
* The permissions to delete. * The permissions to delete.
* *
* @throws GuacamoleException * @throws GuacamoleException
* If the entity lacks permission to delete the permissions, or an error * If the user lacks permission to delete the permissions, or an error
* occurs while deleting the permissions. * occurs while deleting the permissions.
*/ */
void deletePermissions(ModeledAuthenticatedUser user, void deletePermissions(ModeledAuthenticatedUser user,

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

@@ -68,7 +68,7 @@ public class SystemPermissionService
SystemPermissionModel model = new SystemPermissionModel(); SystemPermissionModel model = new SystemPermissionModel();
// Populate model object with data from user and permission // Populate model object with data from entity and permission
model.setEntityID(targetEntity.getModel().getEntityID()); model.setEntityID(targetEntity.getModel().getEntityID());
model.setType(permission.getType()); model.setType(permission.getType());
@@ -81,7 +81,7 @@ public class SystemPermissionService
ModeledPermissions<? extends EntityModel> targetEntity, ModeledPermissions<? extends EntityModel> targetEntity,
Set<String> effectiveGroups) throws GuacamoleException { Set<String> effectiveGroups) throws GuacamoleException {
// Create permission set for requested user // Create permission set for requested entity
SystemPermissionSet permissionSet = systemPermissionSetProvider.get(); SystemPermissionSet permissionSet = systemPermissionSetProvider.get();
permissionSet.init(user, targetEntity, effectiveGroups); permissionSet.init(user, targetEntity, effectiveGroups);
@@ -144,13 +144,13 @@ public class SystemPermissionService
* *
* @param effectiveGroups * @param effectiveGroups
* The identifiers of all groups that should be taken into account * The identifiers of all groups that should be taken into account
* when determining the permissions effectively granted to the user. If * when determining the permissions effectively granted to the entity.
* no groups are given, only permissions directly granted to the user * If no groups are given, only permissions directly granted to the
* will be used. * entity will be used.
* *
* @return * @return
* true if permission of the given type has been granted to the given * true if permission of the given type has been granted to the given
* user, false otherwise. * entity, false otherwise.
* *
* @throws GuacamoleException * @throws GuacamoleException
* If an error occurs while retrieving the requested permission. * If an error occurs while retrieving the requested permission.
@@ -164,7 +164,7 @@ public class SystemPermissionService
if (canReadPermissions(user, targetEntity)) if (canReadPermissions(user, targetEntity))
return getPermissionMapper().selectOne(targetEntity.getModel(), type, effectiveGroups) != null; return getPermissionMapper().selectOne(targetEntity.getModel(), type, effectiveGroups) != null;
// User cannot read this user's permissions // User cannot read this entity's permissions
throw new GuacamoleSecurityException("Permission denied."); throw new GuacamoleSecurityException("Permission denied.");
} }