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: Collapse / clean up retrieval of self() and effective permissions.

Browse Source
This commit is contained in:
Michael Jumper
2018-04-21 14:22:07 -07:00
parent b43aa59958
commit 6db10c1dbb
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
guacamole/src/main/java/org/apache/guacamole/rest/connection/ConnectionResource.java
View File

@@ -38,7 +38,6 @@ import org.apache.guacamole.net.auth.Directory;
import org.apache.guacamole.net.auth.Permissions; import org.apache.guacamole.net.auth.Permissions;
import org.apache.guacamole.rest.directory.DirectoryView; import org.apache.guacamole.rest.directory.DirectoryView;
import org.apache.guacamole.net.auth.SharingProfile; import org.apache.guacamole.net.auth.SharingProfile;
import org.apache.guacamole.net.auth.User;
import org.apache.guacamole.net.auth.UserContext; import org.apache.guacamole.net.auth.UserContext;
import org.apache.guacamole.net.auth.permission.ObjectPermission; import org.apache.guacamole.net.auth.permission.ObjectPermission;
import org.apache.guacamole.net.auth.permission.ObjectPermissionSet; import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
@@ -121,8 +120,7 @@ public class ConnectionResource extends DirectoryObjectResource<Connection, APIC
throws GuacamoleException { throws GuacamoleException {
// Pull effective permissions // Pull effective permissions
User self = userContext.self(); Permissions effective = userContext.self().getEffectivePermissions();
Permissions effective = self.getEffectivePermissions();
// Retrieve permission sets // Retrieve permission sets
SystemPermissionSet systemPermissions = effective.getSystemPermissions(); SystemPermissionSet systemPermissions = effective.getSystemPermissions();

4
guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryResource.java
View File

@@ -38,7 +38,6 @@ import org.apache.guacamole.GuacamoleUnsupportedException;
import org.apache.guacamole.net.auth.Directory; import org.apache.guacamole.net.auth.Directory;
import org.apache.guacamole.net.auth.Identifiable; import org.apache.guacamole.net.auth.Identifiable;
import org.apache.guacamole.net.auth.Permissions; import org.apache.guacamole.net.auth.Permissions;
import org.apache.guacamole.net.auth.User;
import org.apache.guacamole.net.auth.UserContext; import org.apache.guacamole.net.auth.UserContext;
import org.apache.guacamole.net.auth.permission.ObjectPermission; import org.apache.guacamole.net.auth.permission.ObjectPermission;
import org.apache.guacamole.net.auth.permission.ObjectPermissionSet; import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
@@ -143,8 +142,7 @@ public abstract class DirectoryResource<InternalType extends Identifiable, Exter
throws GuacamoleException { throws GuacamoleException {
// An admin user has access to all objects // An admin user has access to all objects
User self = userContext.self(); Permissions effective = userContext.self().getEffectivePermissions();
Permissions effective = self.getEffectivePermissions();
SystemPermissionSet systemPermissions = effective.getSystemPermissions(); SystemPermissionSet systemPermissions = effective.getSystemPermissions();
boolean isAdmin = systemPermissions.hasPermission(SystemPermission.Type.ADMINISTER); boolean isAdmin = systemPermissions.hasPermission(SystemPermission.Type.ADMINISTER);

4
guacamole/src/main/java/org/apache/guacamole/rest/sharingprofile/SharingProfileResource.java
View File

@@ -32,7 +32,6 @@ import org.apache.guacamole.GuacamoleSecurityException;
import org.apache.guacamole.net.auth.Directory; import org.apache.guacamole.net.auth.Directory;
import org.apache.guacamole.net.auth.Permissions; import org.apache.guacamole.net.auth.Permissions;
import org.apache.guacamole.net.auth.SharingProfile; import org.apache.guacamole.net.auth.SharingProfile;
import org.apache.guacamole.net.auth.User;
import org.apache.guacamole.net.auth.UserContext; import org.apache.guacamole.net.auth.UserContext;
import org.apache.guacamole.net.auth.permission.ObjectPermission; import org.apache.guacamole.net.auth.permission.ObjectPermission;
import org.apache.guacamole.net.auth.permission.ObjectPermissionSet; import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
@@ -105,8 +104,7 @@ public class SharingProfileResource
throws GuacamoleException { throws GuacamoleException {
// Pull effective permissions // Pull effective permissions
User self = userContext.self(); Permissions effective = userContext.self().getEffectivePermissions();
Permissions effective = self.getEffectivePermissions();
// Retrieve permission sets // Retrieve permission sets
SystemPermissionSet systemPermissions = effective.getSystemPermissions(); SystemPermissionSet systemPermissions = effective.getSystemPermissions();