GUACAMOLE-220: Merge add base extension API support for user groups.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/1ac08257 Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/1ac08257 Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/1ac08257 Branch: refs/heads/master Commit: 1ac08257bcc63f1130c8f295a8dbaba7b19cfe33 Parents: 456ad7f e75e971 Author: Nick Couchman <[email protected]> Authored: Sun Apr 22 15:45:46 2018 -0400 Committer: Nick Couchman <[email protected]> Committed: Sun Apr 22 15:45:46 2018 -0400 ---------------------------------------------------------------------- .../sharing/user/SharedAuthenticatedUser.java | 7 + .../auth/jdbc/sharing/user/SharedUser.java | 18 +++ .../jdbc/user/ModeledAuthenticatedUser.java | 5 + .../guacamole/auth/jdbc/user/ModeledUser.java | 19 +++ .../auth/jdbc/user/ModeledUserContext.java | 13 ++ .../net/auth/AbstractAuthenticatedUser.java | 7 + .../guacamole/net/auth/AbstractUserContext.java | 25 ++++ .../guacamole/net/auth/AuthenticatedUser.java | 19 +++ .../guacamole/net/auth/DelegatingUser.java | 16 +++ .../net/auth/DelegatingUserContext.java | 10 ++ .../guacamole/net/auth/DelegatingUserGroup.java | 125 +++++++++++++++++ .../apache/guacamole/net/auth/Permissions.java | 129 +++++++++++++++++ .../guacamole/net/auth/RelatedObjectSet.java | 78 +++++++++++ .../org/apache/guacamole/net/auth/User.java | 85 ++---------- .../apache/guacamole/net/auth/UserContext.java | 25 ++++ .../apache/guacamole/net/auth/UserGroup.java | 77 +++++++++++ .../simple/SimpleAuthenticationProvider.java | 7 + .../net/auth/simple/SimpleRelatedObjectSet.java | 88 ++++++++++++ .../guacamole/net/auth/simple/SimpleUser.java | 18 +++ .../rest/connection/ConnectionResource.java | 9 +- .../connectiongroup/ConnectionGroupTree.java | 8 +- .../rest/directory/DirectoryResource.java | 8 +- .../rest/permission/APIPermissionSet.java | 41 +++--- .../sharingprofile/SharingProfileResource.java | 9 +- .../guacamole/rest/user/APIUserWrapper.java | 18 +++ .../guacamole/rest/user/UserResource.java | 21 ++- .../controllers/manageConnectionController.js | 2 +- .../manageConnectionGroupController.js | 2 +- .../manageSharingProfileController.js | 2 +- .../manage/controllers/manageUserController.js | 2 +- .../app/navigation/services/userPageService.js | 4 +- .../app/rest/services/permissionService.js | 137 ++++++++++++------- .../directives/guacSettingsConnections.js | 2 +- .../directives/guacSettingsPreferences.js | 2 +- .../settings/directives/guacSettingsUsers.js | 2 +- 35 files changed, 874 insertions(+), 166 deletions(-) ----------------------------------------------------------------------
