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

Merge pull request #97 from glyptodon/fix-permission-filtering

Browse Source 
GUAC-1100: Add permission filtering to tree retrieval.
This commit is contained in:
James Muehlner
2015-02-28 22:22:33 -08:00
parent fd7343a3e0 00ccad54e8
commit 03f94c15cd
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/ConnectionGroupTree.java
View File

@@ -33,6 +33,7 @@ import org.glyptodon.guacamole.net.auth.Connection;
import org.glyptodon.guacamole.net.auth.ConnectionGroup; import org.glyptodon.guacamole.net.auth.ConnectionGroup;
import org.glyptodon.guacamole.net.auth.UserContext; import org.glyptodon.guacamole.net.auth.UserContext;
import org.glyptodon.guacamole.net.auth.permission.ObjectPermission; import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;
import org.glyptodon.guacamole.net.auth.permission.ObjectPermissionSet;
import org.glyptodon.guacamole.net.basic.rest.connection.APIConnection; import org.glyptodon.guacamole.net.basic.rest.connection.APIConnection;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -160,10 +161,17 @@ public class ConnectionGroupTree {
* @param parents * @param parents
* The parents whose descendants should be added to the tree. * The parents whose descendants should be added to the tree.
* *
* @param permissions
* If specified and non-empty, limit added connections to only
* connections for which the current user has any of the given
* permissions. Otherwise, all visible connections are added.
* Connection groups are unaffected by this parameter.
*
* @throws GuacamoleException * @throws GuacamoleException
* If an error occurs while retrieving the descendants. * If an error occurs while retrieving the descendants.
*/ */
private void addDescendants(Collection<ConnectionGroup> parents) private void addDescendants(Collection<ConnectionGroup> parents,
List<ObjectPermission.Type> permissions)
throws GuacamoleException { throws GuacamoleException {
// If no parents, nothing to do // If no parents, nothing to do
@@ -179,6 +187,12 @@ public class ConnectionGroupTree {
childConnectionGroupIdentifiers.addAll(parent.getConnectionGroupIdentifiers()); childConnectionGroupIdentifiers.addAll(parent.getConnectionGroupIdentifiers());
} }
// Filter identifiers based on permissions, if requested
if (permissions != null && !permissions.isEmpty()) {
ObjectPermissionSet permissionSet = userContext.self().getConnectionPermissions();
childConnectionIdentifiers = permissionSet.getAccessibleObjects(permissions, childConnectionIdentifiers);
}
// Retrieve child connections // Retrieve child connections
if (!childConnectionIdentifiers.isEmpty()) { if (!childConnectionIdentifiers.isEmpty()) {
Collection<Connection> childConnections = userContext.getConnectionDirectory().getAll(childConnectionIdentifiers); Collection<Connection> childConnections = userContext.getConnectionDirectory().getAll(childConnectionIdentifiers);
@@ -189,7 +203,7 @@ public class ConnectionGroupTree {
if (!childConnectionGroupIdentifiers.isEmpty()) { if (!childConnectionGroupIdentifiers.isEmpty()) {
Collection<ConnectionGroup> childConnectionGroups = userContext.getConnectionGroupDirectory().getAll(childConnectionGroupIdentifiers); Collection<ConnectionGroup> childConnectionGroups = userContext.getConnectionGroupDirectory().getAll(childConnectionGroupIdentifiers);
addConnectionGroups(childConnectionGroups); addConnectionGroups(childConnectionGroups);
addDescendants(childConnectionGroups); addDescendants(childConnectionGroups, permissions);
} }
} }
@@ -225,7 +239,7 @@ public class ConnectionGroupTree {
retrievedGroups.put(root.getIdentifier(), this.rootAPIGroup); retrievedGroups.put(root.getIdentifier(), this.rootAPIGroup);
// Add all descendants // Add all descendants
addDescendants(Collections.singleton(root)); addDescendants(Collections.singleton(root), permissions);
} }