GUACAMOLE-220: Merge LDAP user group support.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/c0008aed Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/c0008aed Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/c0008aed Branch: refs/heads/staging/1.0.0 Commit: c0008aed62e2c422e7f6ac7f47653a7754573506 Parents: fd1928e b355106 Author: James Muehlner <james.muehl...@guac-dev.org> Authored: Thu Nov 8 20:42:51 2018 -0800 Committer: James Muehlner <james.muehl...@guac-dev.org> Committed: Thu Nov 8 20:42:51 2018 -0800 ---------------------------------------------------------------------- .../auth/jdbc/sharing/user/SharedUser.java | 13 +- .../ldap/AuthenticationProviderService.java | 15 +- .../auth/ldap/ConfigurationService.java | 18 + .../ldap/LDAPAuthenticationProviderModule.java | 3 + .../auth/ldap/LDAPGuacamoleProperties.java | 12 + .../guacamole/auth/ldap/ObjectQueryService.java | 326 +++++++++++++++++++ .../auth/ldap/connection/ConnectionService.java | 175 ++++------ .../auth/ldap/group/UserGroupService.java | 224 +++++++++++++ .../auth/ldap/user/AuthenticatedUser.java | 22 +- .../guacamole/auth/ldap/user/UserContext.java | 59 +++- .../guacamole/auth/ldap/user/UserService.java | 232 ++----------- .../quickconnect/QuickConnectUserContext.java | 19 +- .../apache/guacamole/net/auth/AbstractUser.java | 171 +++++++++- .../guacamole/net/auth/AbstractUserGroup.java | 183 +++++++++++ .../guacamole/net/auth/RelatedObjectSet.java | 26 ++ .../auth/permission/ObjectPermissionSet.java | 52 +++ .../auth/permission/SystemPermissionSet.java | 46 +++ .../auth/simple/SimpleObjectPermissionSet.java | 68 +++- .../net/auth/simple/SimpleRelatedObjectSet.java | 7 +- .../auth/simple/SimpleSystemPermissionSet.java | 7 +- .../guacamole/net/auth/simple/SimpleUser.java | 110 ++----- .../net/auth/simple/SimpleUserContext.java | 23 +- .../net/auth/simple/SimpleUserGroup.java | 47 +++ 23 files changed, 1424 insertions(+), 434 deletions(-) ----------------------------------------------------------------------