credentialProvider;
-
- /**
- * {@inheritDoc}
- *
- * Azure Key Vault allows strictly a-z, A-Z, 0-9, and "-". This
- * implementation strips out all contiguous groups of characters which are
- * not allowed by Azure Key Vault, replacing them with a single dash.
- */
- @Override
- public String canonicalize(String nameComponent) {
- Matcher disallowed = DISALLOWED_CHARACTERS.matcher(nameComponent);
- return disallowed.replaceAll("-");
- }
-
- @Override
- protected CachedSecret refreshCachedSecret(String name)
- throws GuacamoleException {
-
- int ttl = confService.getSecretTTL();
- String url = confService.getVaultURL();
-
- CompletableFuture retrievedValue = new CompletableFuture<>();
-
- // getSecretAsync() still blocks for around half a second, despite
- // technically being asynchronous
- (new Thread() {
-
- @Override
- public void run() {
- try {
-
- // Retrieve requested secret from Azure Key Vault
- KeyVaultClient client = new KeyVaultClient(credentialProvider.get());
- client.getSecretAsync(url, name, new ServiceCallback() {
-
- @Override
- public void failure(Throwable t) {
- retrievedValue.completeExceptionally(t);
- }
-
- @Override
- public void success(SecretBundle secret) {
- String value = (secret != null) ? secret.value() : null;
- retrievedValue.complete(value);
- }
-
- });
-
- }
- catch (AzureKeyVaultAuthenticationException e) {
- retrievedValue.completeExceptionally(e);
- }
- }
-
- }).start();
-
- // Cache retrieved value
- return new CachedSecret(retrievedValue, ttl);
-
- }
-
- @Override
- public Map> getTokens(GuacamoleConfiguration config,
- TokenFilter filter) throws GuacamoleException {
- return Collections.emptyMap();
- }
-
-}
diff --git a/extensions/guacamole-vault/modules/guacamole-vault-azure/src/main/resources/guac-manifest.json b/extensions/guacamole-vault/modules/guacamole-vault-azure/src/main/resources/guac-manifest.json
deleted file mode 100644
index 9f6ee94a4..000000000
--- a/extensions/guacamole-vault/modules/guacamole-vault-azure/src/main/resources/guac-manifest.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-
- "guacamoleVersion" : "1.4.0",
-
- "name" : "Azure Key Vault",
- "namespace" : "azure-keyvault",
-
- "authProviders" : [
- "org.apache.guacamole.vault.azure.AzureKeyVaultAuthenticationProvider"
- ],
-
- "translations" : [
- "translations/en.json"
- ]
-
-}
diff --git a/extensions/guacamole-vault/modules/guacamole-vault-dist/pom.xml b/extensions/guacamole-vault/modules/guacamole-vault-dist/pom.xml
index a5042dfb8..1b2cb5996 100644
--- a/extensions/guacamole-vault/modules/guacamole-vault-dist/pom.xml
+++ b/extensions/guacamole-vault/modules/guacamole-vault-dist/pom.xml
@@ -42,13 +42,6 @@
-
-
- org.apache.guacamole
- guacamole-vault-azure
- 1.4.0
-
-
org.apache.guacamole
diff --git a/extensions/guacamole-vault/modules/guacamole-vault-dist/src/main/assembly/dist.xml b/extensions/guacamole-vault/modules/guacamole-vault-dist/src/main/assembly/dist.xml
index 30c93f41a..6f41e5278 100644
--- a/extensions/guacamole-vault/modules/guacamole-vault-dist/src/main/assembly/dist.xml
+++ b/extensions/guacamole-vault/modules/guacamole-vault-dist/src/main/assembly/dist.xml
@@ -33,14 +33,6 @@
-
-
- azure
-
- org.apache.guacamole:guacamole-vault-azure
-
-
-
ksm
diff --git a/extensions/guacamole-vault/pom.xml b/extensions/guacamole-vault/pom.xml
index 80eb3da57..0933f08fe 100644
--- a/extensions/guacamole-vault/pom.xml
+++ b/extensions/guacamole-vault/pom.xml
@@ -46,7 +46,6 @@
modules/guacamole-vault-base
- modules/guacamole-vault-azure
modules/guacamole-vault-ksm
diff --git a/pom.xml b/pom.xml
index 2b9b1641f..2dd057056 100644
--- a/pom.xml
+++ b/pom.xml
@@ -382,11 +382,6 @@
jackson-dataformat-yaml
${jackson.version}
-
- com.fasterxml.jackson.datatype
- jackson-datatype-joda
- ${jackson.version}
-
com.fasterxml.jackson.module
jackson-module-jaxb-annotations