make private keys return a future

MAIF · Jan 23, 2025 · 32fd389 · 32fd389
1 parent 6a7e8b3
commit 32fd389
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/otoroshi/app/gateway/handlers.scala b/otoroshi/app/gateway/handlers.scala
@@ -707,11 +707,12 @@ class GatewayRequestHandler(
 
   def jwks() =
     actionBuilder.async { req =>
-      val extensionsPublicKeys = env.adminExtensions.publicKeys()
-      JWKSHelper.jwks(req, Seq.empty).map {
-        case Left(body) if extensionsPublicKeys.isEmpty => Results.NotFound(body)
-        case Left(_) if extensionsPublicKeys.isEmpty => Results.Ok(Json.obj("keys" -> JsArray(extensionsPublicKeys.map(_.raw))))
-        case Right(keys) => Results.Ok(JsArray(keys ++ extensionsPublicKeys.map(_.raw)))
+      env.adminExtensions.publicKeys().flatMap { extensionsPublicKeys =>
+        JWKSHelper.jwks(req, Seq.empty).map {
+          case Left(body) if extensionsPublicKeys.isEmpty => Results.NotFound(body)
+          case Left(_) if extensionsPublicKeys.isEmpty => Results.Ok(Json.obj("keys" -> JsArray(extensionsPublicKeys.map(_.raw))))
+          case Right(keys) => Results.Ok(JsArray(keys ++ extensionsPublicKeys.map(_.raw)))
+        }
       }
     }
 

diff --git a/otoroshi/app/next/extensions/example.scala b/otoroshi/app/next/extensions/example.scala
@@ -234,10 +234,10 @@ class FooAdminExtension(val env: Env) extends AdminExtension {
     }
   }
 
-  override def publicKeys(): Seq[PublicKeyJwk] = {
+  override def publicKeys(): Future[Seq[PublicKeyJwk]] = {
     val jwk = new OctetKeyPairGenerator(Curve.Ed25519).keyID("fake-key").generate
     val publicJWK = jwk.toPublicJWK.toJSONString.parseJson
-    Seq(PublicKeyJwk(publicJWK))
+    Seq(PublicKeyJwk(publicJWK)).vfuture
     // Seq(PublicKeyJwk(Json.obj(
     //   "kty" -> "OKP",
     //   "crv" -> "Ed25519",

diff --git a/otoroshi/app/next/extensions/extension.scala b/otoroshi/app/next/extensions/extension.scala
@@ -181,7 +181,7 @@ trait AdminExtension {
   def wellKnownRoutes(): Seq[AdminExtensionWellKnownRoute]                        = Seq.empty
   def wellKnownOverridesRoutes(): Seq[AdminExtensionWellKnownRoute]               = Seq.empty
   def vaults(): Seq[AdminExtensionVault]                                          = Seq.empty
-  def publicKeys(): Future[Seq[PublicKeyJwk]]                                     = Future.successful(Seq.empty)
+  def publicKeys(): Future[Seq[PublicKeyJwk]]                                     = Seq.empty.vfuture
   def configuration: Configuration                                                = env.configuration
     .getOptional[Configuration](s"otoroshi.admin-extensions.configurations.${id.cleanup}")
     .getOrElse(Configuration.empty)
@@ -538,11 +538,11 @@ class AdminExtensions(env: Env, _extensions: Seq[AdminExtension]) {
 
   def publicKeys(): Future[Seq[PublicKeyJwk]] = {
     if (hasExtensions) {
-      extensions.mapAsync { ext =>
+      extensions.flatmapAsync { ext =>
         ext.publicKeys()
       }
     } else {
-      Seq.empty
+      Seq.empty.vfuture
     }
   }