GUACAMOLE-220: Collapse / clean up retrieval of self() and effective permissions.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/6db10c1d Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/6db10c1d Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/6db10c1d Branch: refs/heads/master Commit: 6db10c1dbbc571d416fcccdad3ae8f9918475b46 Parents: b43aa59 Author: Michael Jumper <[email protected]> Authored: Sat Apr 21 14:22:07 2018 -0700 Committer: Michael Jumper <[email protected]> Committed: Sat Apr 21 14:22:07 2018 -0700 ---------------------------------------------------------------------- .../org/apache/guacamole/rest/connection/ConnectionResource.java | 4 +--- .../org/apache/guacamole/rest/directory/DirectoryResource.java | 4 +--- .../guacamole/rest/sharingprofile/SharingProfileResource.java | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/6db10c1d/guacamole/src/main/java/org/apache/guacamole/rest/connection/ConnectionResource.java ---------------------------------------------------------------------- diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/connection/ConnectionResource.java b/guacamole/src/main/java/org/apache/guacamole/rest/connection/ConnectionResource.java index ac0a282..3149987 100644 --- a/guacamole/src/main/java/org/apache/guacamole/rest/connection/ConnectionResource.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/connection/ConnectionResource.java @@ -38,7 +38,6 @@ import org.apache.guacamole.net.auth.Directory; import org.apache.guacamole.net.auth.Permissions; import org.apache.guacamole.rest.directory.DirectoryView; 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.permission.ObjectPermission; import org.apache.guacamole.net.auth.permission.ObjectPermissionSet; @@ -121,8 +120,7 @@ public class ConnectionResource extends DirectoryObjectResource<Connection, APIC throws GuacamoleException { // Pull effective permissions - User self = userContext.self(); - Permissions effective = self.getEffectivePermissions(); + Permissions effective = userContext.self().getEffectivePermissions(); // Retrieve permission sets SystemPermissionSet systemPermissions = effective.getSystemPermissions(); http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/6db10c1d/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryResource.java ---------------------------------------------------------------------- diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryResource.java b/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryResource.java index b0d93a5..9973301 100644 --- a/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryResource.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryResource.java @@ -38,7 +38,6 @@ import org.apache.guacamole.GuacamoleUnsupportedException; import org.apache.guacamole.net.auth.Directory; import org.apache.guacamole.net.auth.Identifiable; 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.permission.ObjectPermission; import org.apache.guacamole.net.auth.permission.ObjectPermissionSet; @@ -143,8 +142,7 @@ public abstract class DirectoryResource<InternalType extends Identifiable, Exter throws GuacamoleException { // An admin user has access to all objects - User self = userContext.self(); - Permissions effective = self.getEffectivePermissions(); + Permissions effective = userContext.self().getEffectivePermissions(); SystemPermissionSet systemPermissions = effective.getSystemPermissions(); boolean isAdmin = systemPermissions.hasPermission(SystemPermission.Type.ADMINISTER); http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/6db10c1d/guacamole/src/main/java/org/apache/guacamole/rest/sharingprofile/SharingProfileResource.java ---------------------------------------------------------------------- diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/sharingprofile/SharingProfileResource.java b/guacamole/src/main/java/org/apache/guacamole/rest/sharingprofile/SharingProfileResource.java index 93187f2..4797ade 100644 --- a/guacamole/src/main/java/org/apache/guacamole/rest/sharingprofile/SharingProfileResource.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/sharingprofile/SharingProfileResource.java @@ -32,7 +32,6 @@ import org.apache.guacamole.GuacamoleSecurityException; import org.apache.guacamole.net.auth.Directory; import org.apache.guacamole.net.auth.Permissions; 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.permission.ObjectPermission; import org.apache.guacamole.net.auth.permission.ObjectPermissionSet; @@ -105,8 +104,7 @@ public class SharingProfileResource throws GuacamoleException { // Pull effective permissions - User self = userContext.self(); - Permissions effective = self.getEffectivePermissions(); + Permissions effective = userContext.self().getEffectivePermissions(); // Retrieve permission sets SystemPermissionSet systemPermissions = effective.getSystemPermissions();
