GUACAMOLE-524: Merge allow user attributes to be used as tokens.

Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/a9637494
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/a9637494
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/a9637494

Branch: refs/heads/master
Commit: a9637494ac35136fb8ce3d02c0d14eadb643fb52
Parents: 33679a0 927c04b
Author: Nick Couchman <vn...@apache.org>
Authored: Thu Jun 21 11:14:06 2018 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Thu Jun 21 11:14:06 2018 -0400

----------------------------------------------------------------------
 .../jdbc/user/ModeledAuthenticatedUser.java     |  5 +-
 .../auth/jdbc/user/RemoteAuthenticatedUser.java | 21 +++++-
 .../ldap/AuthenticationProviderService.java     | 68 +++++++++++++++++++-
 .../auth/ldap/ConfigurationService.java         | 17 ++++-
 .../auth/ldap/LDAPGuacamoleProperties.java      | 10 +++
 .../auth/ldap/connection/ConnectionService.java |  1 -
 .../auth/ldap/user/AuthenticatedUser.java       | 17 +++++
 .../net/auth/AbstractAuthenticatedUser.java     | 11 ++++
 .../guacamole/net/auth/AuthenticatedUser.java   |  2 +-
 .../apache/guacamole/token/StandardTokens.java  | 43 +++++++++++--
 10 files changed, 181 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


Reply via email to