Merge pull request #92 from sebadob/impl-alg-in-pub-jwks

impl alg in pub JWKS
sebadob · Oct 24, 2023 · c9073cb · c9073cb
2 parents b57656f + 740f101
commit c9073cb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/rauthy-models/src/entity/jwk.rs b/rauthy-models/src/entity/jwk.rs
@@ -148,7 +148,7 @@ pub struct JWKS {
 
 // CRUD
 impl JWKS {
-    pub async fn find_pk(data: &web::Data<AppState>) -> Result<Self, ErrorResponse> {
+    pub async fn find_pk(data: &web::Data<AppState>) -> Result<JWKS, ErrorResponse> {
         if let Some(jwks) = cache_get!(
             JWKS,
             CACHE_NAME_12HR.to_string(),
@@ -198,7 +198,8 @@ impl JWKS {
 
 #[derive(Clone, Debug, Default, Serialize, Deserialize)]
 pub struct JWKSPublicKey {
-    pub kty: String,         // RSA | OKP
+    pub kty: String, // RSA | OKP
+    pub alg: String,
     pub crv: Option<String>, // Ed25519
     pub kid: String,
     pub n: Option<String>, // RSA
@@ -210,6 +211,7 @@ impl JWKSPublicKey {
     pub fn from_key_pair(key_pair: &JwkKeyPair) -> Self {
         let get_rsa = |kid: String, comp: algorithms::RSAPublicKeyComponents| JWKSPublicKey {
             kty: "RSA".to_string(),
+            alg: key_pair.typ.to_string(),
             crv: None,
             kid,
             n: Some(base64_url_encode(&comp.n)),
@@ -219,6 +221,7 @@ impl JWKSPublicKey {
 
         let get_ed25519 = |kid: String, x: String| JWKSPublicKey {
             kty: "OKP".to_string(),
+            alg: key_pair.typ.to_string(),
             crv: Some("Ed25519".to_string()),
             kid,
             n: None,

diff --git a/rauthy-models/src/response.rs b/rauthy-models/src/response.rs
@@ -114,6 +114,7 @@ impl From<JWKS> for JWKSCerts {
 #[derive(Debug, Serialize, ToSchema)]
 pub struct JWKSPublicKeyCerts {
     pub kty: String, // RSA | OCT
+    pub alg: String,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub crv: Option<String>, // Ed25519
     pub kid: String,
@@ -129,6 +130,7 @@ impl From<JWKSPublicKey> for JWKSPublicKeyCerts {
     fn from(pk: JWKSPublicKey) -> Self {
         Self {
             kty: pk.kty,
+            alg: pk.alg,
             crv: pk.crv,
             kid: pk.kid,
             n: pk.n,