fix #1708

MAIF · Sep 13, 2023 · 3843211 · 3843211
1 parent 753b29f
commit 3843211
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/otoroshi/app/next/extensions/extension.scala b/otoroshi/app/next/extensions/extension.scala
@@ -6,6 +6,7 @@ import otoroshi.actions.{ApiAction, BackOfficeAction, PrivateAppsAction}
 import otoroshi.api.Resource
 import otoroshi.env.Env
 import otoroshi.models.{ApiKey, BackOfficeUser, EntityLocationSupport, PrivateAppsUser}
+import otoroshi.next.utils.Vault
 import otoroshi.storage.BasicStore
 import otoroshi.utils.cache.types.UnboundedTrieMap
 import otoroshi.utils.syntax.implicits._
@@ -142,6 +143,8 @@ case class AdminExtensionWellKnownRoute(
 
 case class AdminExtensionConfig(enabled: Boolean)
 
+case class AdminExtensionVault(name: String, build: (String, Configuration, Env) => Vault)
+
 trait AdminExtension {
 
   def env: Env
@@ -167,6 +170,7 @@ trait AdminExtension {
   def privateAppAuthRoutes(): Seq[AdminExtensionPrivateAppAuthRoute]     = Seq.empty
   def privateAppPublicRoutes(): Seq[AdminExtensionPrivateAppPublicRoute] = Seq.empty
   def wellKnownRoutes(): Seq[AdminExtensionWellKnownRoute]               = Seq.empty
+  def vaults(): Seq[AdminExtensionVault] = Seq.empty
 
   def configuration: Configuration = env.configuration
     .getOptional[Configuration](s"otoroshi.admin-extensions.configurations.${id.cleanup}")
@@ -243,10 +247,14 @@ class AdminExtensions(env: Env, _extensions: Seq[AdminExtension]) {
   private val wellKnownRoutes: Seq[AdminExtensionWellKnownRoute] = extensions.flatMap(_.wellKnownRoutes())
   private val wellKnownRouter                                    = new AdminExtensionRouter[AdminExtensionWellKnownRoute](wellKnownRoutes)
 
+  private val vaults: Seq[AdminExtensionVault] = extensions.flatMap(_.vaults())
+
   //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
   private val extCache = new UnboundedTrieMap[Class[_], Any]
 
+  def vault(name: String): Option[AdminExtensionVault] = vaults.find(_.name == name)
+
   def extension[A](implicit ct: ClassTag[A]): Option[A] = {
     if (hasExtensions) {
       extCache.get(ct.runtimeClass) match {

diff --git a/otoroshi/app/next/utils/vault.scala b/otoroshi/app/next/utils/vault.scala
@@ -909,7 +909,13 @@ class Vaults(env: Env) {
         } else {
           // TODO: support square https://github.com/square/keywhiz ?
           // TODO: support pinterest https://github.com/pinterest/knox ?
-          logger.error(s"unknown vault type '${typ}'")
+          env.adminExtensions.vault(typ) match {
+            case None => logger.error(s"unknown vault type '${typ}'")
+            case Some(adminVault) => {
+              logger.info(s"a vault named '${key}' of kind '${typ}' is now active !")
+              vaults.put(key, adminVault.build(key, vaultConfig.get[Configuration](key), env))
+            }
+          }
         }
       }
     }