This is an automated email from the ASF dual-hosted git repository.
mjumper pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit 6c43611f5198a18cfaf582fcbc1fbcfb1efbda1f
Merge: b2d7b83d9 06d321fe5
Author: Mike Jumper <mjum...@apache.org>
AuthorDate: Wed Sep 28 15:06:40 2022 -0700
GUACAMOLE-1656: Merge support for per-user KSM vaults.
.../jdbc/JDBCAuthenticationProviderService.java | 4 +-
.../guacamole/auth/jdbc/user/UserService.java | 4 -
.../vault/conf/VaultAttributeService.java | 30 +++
.../guacamole/vault/user/VaultUserContext.java | 57 +++-
.../vault/ksm/GuacamoleExceptionSupplier.java} | 33 ++-
.../vault/ksm/KsmAuthenticationProviderModule.java | 9 +
.../vault/ksm/conf/KsmAttributeService.java | 299 ++++++++++++++++++++-
.../vault/ksm/conf/KsmConfigurationService.java | 26 ++
.../guacamole/vault/ksm/secret/KsmClient.java | 42 ++-
.../vault/ksm/secret/KsmSecretService.java | 159 ++++++++++-
.../guacamole/vault/ksm/user/KsmConnection.java | 70 +++++
.../vault/ksm/user/KsmConnectionGroup.java | 58 ++--
.../guacamole/vault/ksm/user/KsmDirectory.java | 93 +++++++
.../vault/ksm/user/KsmDirectoryService.java | 277 +++++++------------
.../apache/guacamole/vault/ksm/user/KsmUser.java | 115 ++++++++
.../guacamole/vault/ksm/user/KsmUserFactory.java} | 24 +-
.../src/main/resources/translations/en.json | 10 +
.../guacamole/net/auth/DelegatingUserContext.java | 5 +
.../org/apache/guacamole/net/auth/UserContext.java | 17 ++
.../src/app/rest/services/schemaService.js | 28 ++
.../settings/directives/guacSettingsPreferences.js | 78 +++++-
.../settings/templates/settingsPreferences.html | 9 +
.../src/main/frontend/src/translations/en.json | 2 +
.../guacamole/rest/schema/SchemaResource.java | 20 ++
.../guacamole/rest/user/UserObjectTranslator.java | 19 +-
.../apache/guacamole/rest/user/UserResource.java | 13 +-
26 files changed, 1215 insertions(+), 286 deletions(-)
