GUACAMOLE-5: Expose sharing profile permissions. Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/c304a981 Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/c304a981 Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/c304a981
Branch: refs/heads/master Commit: c304a981e1f0c4e975f6d5a492cf3a8453609cb4 Parents: a03b76d Author: Michael Jumper <[email protected]> Authored: Tue Jul 19 16:47:31 2016 -0700 Committer: Michael Jumper <[email protected]> Committed: Tue Jul 19 22:26:30 2016 -0700 ---------------------------------------------------------------------- .../org/apache/guacamole/auth/jdbc/user/ModeledUser.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/c304a981/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledUser.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledUser.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledUser.java index 26bdbcf..72ee691 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledUser.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledUser.java @@ -38,6 +38,7 @@ import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.auth.jdbc.activeconnection.ActiveConnectionPermissionService; import org.apache.guacamole.auth.jdbc.permission.ConnectionGroupPermissionService; import org.apache.guacamole.auth.jdbc.permission.ConnectionPermissionService; +import org.apache.guacamole.auth.jdbc.permission.SharingProfilePermissionService; import org.apache.guacamole.auth.jdbc.permission.UserPermissionService; import org.apache.guacamole.form.BooleanField; import org.apache.guacamole.form.DateField; @@ -49,7 +50,6 @@ import org.apache.guacamole.net.auth.User; import org.apache.guacamole.net.auth.permission.ObjectPermissionSet; import org.apache.guacamole.net.auth.permission.SystemPermission; import org.apache.guacamole.net.auth.permission.SystemPermissionSet; -import org.apache.guacamole.net.auth.simple.SimpleObjectPermissionSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -161,6 +161,12 @@ public class ModeledUser extends ModeledDirectoryObject<UserModel> implements Us private ConnectionGroupPermissionService connectionGroupPermissionService; /** + * Service for retrieving sharing profile permissions. + */ + @Inject + private SharingProfilePermissionService sharingProfilePermissionService; + + /** * Service for retrieving active connection permissions. */ @Inject @@ -255,7 +261,7 @@ public class ModeledUser extends ModeledDirectoryObject<UserModel> implements Us @Override public ObjectPermissionSet getSharingProfilePermissions() throws GuacamoleException { - return new SimpleObjectPermissionSet(); + return sharingProfilePermissionService.getPermissionSet(getCurrentUser(), this); } @Override
