add usage example for #2074

MAIF · Jan 22, 2025 · 9599a96 · 9599a96
1 parent aec33a1
commit 9599a96
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/otoroshi/app/next/extensions/example.scala b/otoroshi/app/next/extensions/example.scala
@@ -3,6 +3,8 @@ package otoroshi.next.extensions
 import akka.actor.ActorSystem
 import akka.stream.Materializer
 import akka.util.ByteString
+import com.nimbusds.jose.jwk.Curve
+import com.nimbusds.jose.jwk.gen.OctetKeyPairGenerator
 import otoroshi.api._
 import otoroshi.cluster.ClusterMode
 import otoroshi.env.Env
@@ -232,6 +234,18 @@ class FooAdminExtension(val env: Env) extends AdminExtension {
     }
   }
 
+  override def publicKeys(): Seq[PublicKeyJwk] = {
+    val jwk = new OctetKeyPairGenerator(Curve.Ed25519).keyID("fake-key").generate
+    val publicJWK = jwk.toPublicJWK.toJSONString.parseJson
+    Seq(PublicKeyJwk(publicJWK))
+    // Seq(PublicKeyJwk(Json.obj(
+    //   "kty" -> "OKP",
+    //   "crv" -> "Ed25519",
+    //   "kid" -> "123",
+    //   "x" -> "sO3w8_ow469Fu7vuNEssGLC-06fz8iRRjOJN_au6vug"
+    // )))
+  }
+
   override def frontendExtensions(): Seq[AdminExtensionFrontendExtension] = {
     Seq(
       AdminExtensionFrontendExtension("/__otoroshi_assets/javascripts/extensions/foos.js")

diff --git a/otoroshi/app/plugins/apikeys.scala b/otoroshi/app/plugins/apikeys.scala
@@ -1073,7 +1073,7 @@ class ClientCredentialService extends RequestSink {
   ): Future[Result] = {
     JWKSHelper.jwks(ctx.request, conf.defaultKeyPair.some.toSeq).map {
       case Left(body)  => Results.NotFound(body)
-      case Right(body) => Results.Ok(body)
+      case Right(keys) => Results.Ok(Json.obj("keys" -> JsArray(keys)))
     }
   }
 

diff --git a/otoroshi/build.sbt b/otoroshi/build.sbt
@@ -179,6 +179,7 @@ libraryDependencies ++= Seq(
   "com.nixxcode.jvmbrotli"           % "jvmbrotli"                                 % "0.2.0",
   "io.azam.ulidj"                    % "ulidj"                                     % "1.0.4",
   "fr.maif"                         %% "wasm4s"                                    % "3.7.0" classifier "bundle",
+  "com.google.crypto.tink"           % "tink"                                      % "1.16.0",
   // included in libs as jitpack is not stable at all
   // "com.github.Opetushallitus"        % "scala-schema"                              % "2.34.0_2.12" excludeAll (
   //   ExclusionRule("com.github.spotbugs", "spotbugs-annotations"),