From bdd21e150efaabcc0e3c4816545e761f899bcfc5 Mon Sep 17 00:00:00 2001 From: Leo Nash Date: Sat, 7 Feb 2026 05:37:04 +0000 Subject: [PATCH 1/2] Drop jsonwebtoken dependency --- rust/Cargo.lock | 137 +++++++++++++++++++++++++++++++ rust/auth-impls/Cargo.toml | 12 +-- rust/auth-impls/src/jwt.rs | 64 +++++++++++++-- rust/auth-impls/src/signature.rs | 2 +- 4 files changed, 200 insertions(+), 15 deletions(-) diff --git a/rust/Cargo.lock b/rust/Cargo.lock index c79bbcc..d41aff4 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -67,11 +67,14 @@ version = "0.1.0" dependencies = [ "api", "async-trait", + "base64 0.22.1", "bitcoin_hashes 0.19.0", "hex-conservative 1.0.1", "jsonwebtoken", + "rsa", "secp256k1", "serde", + "serde_json", "tokio", ] @@ -93,6 +96,12 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" +[[package]] +name = "base64ct" +version = "1.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06" + [[package]] name = "bitcoin-consensus-encoding" version = "1.0.0-rc.3" @@ -202,6 +211,12 @@ dependencies = [ "windows-link", ] +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + [[package]] name = "core-foundation" version = "0.9.4" @@ -237,6 +252,16 @@ dependencies = [ "typenum", ] +[[package]] +name = "der" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" +dependencies = [ + "const-oid", + "zeroize", +] + [[package]] name = "deranged" version = "0.5.5" @@ -253,6 +278,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", + "const-oid", "crypto-common", "subtle", ] @@ -844,6 +870,9 @@ name = "lazy_static" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +dependencies = [ + "spin", +] [[package]] name = "libc" @@ -851,6 +880,12 @@ version = "0.2.180" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc" +[[package]] +name = "libm" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" + [[package]] name = "libredox" version = "0.1.12" @@ -960,6 +995,22 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-bigint-dig" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e661dda6640fad38e827a6d4a310ff4763082116fe217f279885c97f511bb0b7" +dependencies = [ + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand 0.8.5", + "smallvec", + "zeroize", +] + [[package]] name = "num-conv" version = "0.1.0" @@ -975,6 +1026,17 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + [[package]] name = "num-traits" version = "0.2.19" @@ -982,6 +1044,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", + "libm", ] [[package]] @@ -1114,6 +1177,27 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + [[package]] name = "pkg-config" version = "0.3.32" @@ -1426,6 +1510,27 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "rsa" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8573f03f5883dcaebdfcf4725caa1ecb9c15b2ef50c43a07b816e06799bb12d" +dependencies = [ + "const-oid", + "digest", + "num-bigint-dig", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core 0.6.4", + "sha2", + "signature", + "spki", + "subtle", + "zeroize", +] + [[package]] name = "rustix" version = "0.38.44" @@ -1654,6 +1759,16 @@ dependencies = [ "libc", ] +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", + "rand_core 0.6.4", +] + [[package]] name = "simple_asn1" version = "0.6.3" @@ -1704,6 +1819,22 @@ dependencies = [ "windows-sys 0.60.2", ] +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + [[package]] name = "stable_deref_trait" version = "1.2.1" @@ -2641,6 +2772,12 @@ dependencies = [ "synstructure", ] +[[package]] +name = "zeroize" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" + [[package]] name = "zerotrie" version = "0.2.3" diff --git a/rust/auth-impls/Cargo.toml b/rust/auth-impls/Cargo.toml index a6a0698..4d64fa8 100644 --- a/rust/auth-impls/Cargo.toml +++ b/rust/auth-impls/Cargo.toml @@ -5,18 +5,20 @@ edition = "2021" rust-version.workspace = true [features] -jwt = [ "jsonwebtoken", "serde" ] +jwt = [ "base64", "serde", "serde_json", "rsa" ] sigs = [ "bitcoin_hashes", "hex-conservative", "secp256k1" ] [dependencies] -async-trait = "0.1.77" api = { path = "../api" } -jsonwebtoken = { version = "9.3.0", optional = true, default-features = false, features = ["use_pem"] } -serde = { version = "1.0.210", optional = true, default-features = false, features = ["derive"] } - +async-trait = "0.1.77" +base64 = { version = "0.22.1", optional = true, default-features = false, features = ["std"] } bitcoin_hashes = { version = "0.19", optional = true, default-features = false } hex-conservative = { version = "1.0", optional = true, default-features = false } +rsa = { version = "0.9.10", optional = true, default-features = false, features = ["sha2"] } secp256k1 = { version = "0.31", optional = true, default-features = false, features = [ "global-context" ] } +serde = { version = "1.0.210", optional = true, default-features = false, features = ["derive"] } +serde_json = { version = "1.0.149", optional = true, default-features = false, features = ["std"] } [dev-dependencies] +jsonwebtoken = { version = "9.3.0", default-features = false, features = ["use_pem"] } tokio = { version = "1.38.0", default-features = false, features = ["rt-multi-thread", "macros"] } diff --git a/rust/auth-impls/src/jwt.rs b/rust/auth-impls/src/jwt.rs index 01889de..69b5730 100644 --- a/rust/auth-impls/src/jwt.rs +++ b/rust/auth-impls/src/jwt.rs @@ -5,8 +5,11 @@ use api::auth::{AuthResponse, Authorizer}; use api::error::VssError; use async_trait::async_trait; -use jsonwebtoken::{decode, Algorithm, DecodingKey, Validation}; -use serde::{Deserialize, Serialize}; +use base64::engine::general_purpose::{STANDARD, URL_SAFE_NO_PAD}; +use base64::Engine; +use rsa::sha2::{Digest, Sha256}; +use rsa::{pkcs8::DecodePublicKey, RsaPublicKey}; +use serde::Deserialize; use std::collections::HashMap; /// A JWT based authorizer, only allows requests with verified 'JsonWebToken' signed by the given @@ -14,13 +17,13 @@ use std::collections::HashMap; /// /// Refer: https://datatracker.ietf.org/doc/html/rfc7519 pub struct JWTAuthorizer { - jwt_issuer_key: DecodingKey, + jwt_issuer_key: RsaPublicKey, } /// A set of Claims claimed by 'JsonWebToken' /// /// Refer: https://datatracker.ietf.org/doc/html/rfc7519#section-4 -#[derive(Serialize, Deserialize, Debug)] +#[derive(Deserialize, Debug)] pub(crate) struct Claims { /// The "sub" (subject) claim identifies the principal that is the subject of the JWT. /// The claims in a JWT are statements about the subject. This can be used as user identifier. @@ -31,10 +34,22 @@ pub(crate) struct Claims { const BEARER_PREFIX: &str = "Bearer "; +fn parse_public_key_pem(pem: &str) -> Result { + let body = pem + .trim() + .strip_prefix("-----BEGIN PUBLIC KEY-----") + .ok_or(String::from("Prefix not found"))? + .strip_suffix("-----END PUBLIC KEY-----") + .ok_or(String::from("Suffix not found"))?; + let body: String = body.lines().map(|line| line.trim()).collect(); + let body = STANDARD.decode(body).map_err(|_| String::from("Base64 decode failed"))?; + RsaPublicKey::from_public_key_der(&body).map_err(|_| String::from("DER decode failed")) +} + impl JWTAuthorizer { /// Creates a new instance of [`JWTAuthorizer`], fails on failure to parse the PEM formatted RSA public key pub async fn new(rsa_pem: &str) -> Result { - let jwt_issuer_key = DecodingKey::from_rsa_pem(rsa_pem.as_bytes()) + let jwt_issuer_key = parse_public_key_pem(rsa_pem) .map_err(|e| format!("Failed to parse the PEM formatted RSA public key: {}", e))?; Ok(Self { jwt_issuer_key }) } @@ -53,10 +68,41 @@ impl Authorizer for JWTAuthorizer { .strip_prefix(BEARER_PREFIX) .ok_or(VssError::AuthError("Invalid token format.".to_string()))?; - let claims = - decode::(token, &self.jwt_issuer_key, &Validation::new(Algorithm::RS256)) - .map_err(|e| VssError::AuthError(format!("Authentication failure. {}", e)))? - .claims; + let mut iter = token.split('.'); + let [header_base64, claims_base64, signature_base64] = + match [iter.next(), iter.next(), iter.next(), iter.next()] { + [Some(h), Some(c), Some(s), None] => [h, c, s], + _ => { + return Err(VssError::AuthError(String::from( + "Token does not have three parts", + ))) + }, + }; + + let header_bytes = URL_SAFE_NO_PAD + .decode(header_base64) + .map_err(|_| VssError::AuthError(String::from("Header base64 decode failed")))?; + let header: serde_json::Value = serde_json::from_slice(&header_bytes) + .map_err(|_| VssError::AuthError(String::from("Header json decode failed")))?; + match header["alg"] { + serde_json::Value::String(ref alg) if alg == "RS256" => (), + _ => return Err(VssError::AuthError(String::from("alg: RS256 not found in header"))), + } + + let (message, _) = token.rsplit_once('.').expect("There are two periods in the token"); + let signature = URL_SAFE_NO_PAD + .decode(signature_base64) + .map_err(|_| VssError::AuthError(String::from("Signature base64 decode failed")))?; + let digest = Sha256::digest(message.as_bytes()); + self.jwt_issuer_key + .verify(rsa::pkcs1v15::Pkcs1v15Sign::new::(), &digest, &signature) + .map_err(|_| VssError::AuthError(String::from("RSA verification failed")))?; + + let claims_json = URL_SAFE_NO_PAD + .decode(claims_base64) + .map_err(|_| VssError::AuthError(String::from("Claims base64 decode failed")))?; + let claims: Claims = serde_json::from_slice(&claims_json) + .map_err(|_| VssError::AuthError(String::from("Claims json decode failed")))?; Ok(AuthResponse { user_token: claims.sub }) } diff --git a/rust/auth-impls/src/signature.rs b/rust/auth-impls/src/signature.rs index 428dd57..dfc8cf6 100644 --- a/rust/auth-impls/src/signature.rs +++ b/rust/auth-impls/src/signature.rs @@ -92,7 +92,7 @@ mod tests { use crate::signature::{SignatureValidatingAuthorizer, SIGNING_CONSTANT}; use api::auth::Authorizer; use api::error::VssError; - use secp256k1::{Message, PublicKey, Secp256k1, SecretKey}; + use secp256k1::{Message, PublicKey, SecretKey}; use std::collections::HashMap; use std::fmt::Write; use std::time::SystemTime; From 582a3d53057ef980632cb35211acaa8c9d18ea82 Mon Sep 17 00:00:00 2001 From: Leo Nash Date: Tue, 10 Feb 2026 07:16:19 +0000 Subject: [PATCH 2/2] fixup: Use openssl instead of rsa --- rust/Cargo.lock | 136 +------------------------------------ rust/auth-impls/Cargo.toml | 4 +- rust/auth-impls/src/jwt.rs | 24 ++++--- 3 files changed, 18 insertions(+), 146 deletions(-) diff --git a/rust/Cargo.lock b/rust/Cargo.lock index d41aff4..fc01bf8 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -71,7 +71,7 @@ dependencies = [ "bitcoin_hashes 0.19.0", "hex-conservative 1.0.1", "jsonwebtoken", - "rsa", + "openssl", "secp256k1", "serde", "serde_json", @@ -96,12 +96,6 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" -[[package]] -name = "base64ct" -version = "1.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06" - [[package]] name = "bitcoin-consensus-encoding" version = "1.0.0-rc.3" @@ -211,12 +205,6 @@ dependencies = [ "windows-link", ] -[[package]] -name = "const-oid" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" - [[package]] name = "core-foundation" version = "0.9.4" @@ -252,16 +240,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "der" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" -dependencies = [ - "const-oid", - "zeroize", -] - [[package]] name = "deranged" version = "0.5.5" @@ -278,7 +256,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", - "const-oid", "crypto-common", "subtle", ] @@ -870,9 +847,6 @@ name = "lazy_static" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -dependencies = [ - "spin", -] [[package]] name = "libc" @@ -880,12 +854,6 @@ version = "0.2.180" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc" -[[package]] -name = "libm" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" - [[package]] name = "libredox" version = "0.1.12" @@ -995,22 +963,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-bigint-dig" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e661dda6640fad38e827a6d4a310ff4763082116fe217f279885c97f511bb0b7" -dependencies = [ - "lazy_static", - "libm", - "num-integer", - "num-iter", - "num-traits", - "rand 0.8.5", - "smallvec", - "zeroize", -] - [[package]] name = "num-conv" version = "0.1.0" @@ -1026,17 +978,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-iter" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - [[package]] name = "num-traits" version = "0.2.19" @@ -1044,7 +985,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", - "libm", ] [[package]] @@ -1177,27 +1117,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "pkcs1" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" -dependencies = [ - "der", - "pkcs8", - "spki", -] - -[[package]] -name = "pkcs8" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -dependencies = [ - "der", - "spki", -] - [[package]] name = "pkg-config" version = "0.3.32" @@ -1510,27 +1429,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rsa" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8573f03f5883dcaebdfcf4725caa1ecb9c15b2ef50c43a07b816e06799bb12d" -dependencies = [ - "const-oid", - "digest", - "num-bigint-dig", - "num-integer", - "num-traits", - "pkcs1", - "pkcs8", - "rand_core 0.6.4", - "sha2", - "signature", - "spki", - "subtle", - "zeroize", -] - [[package]] name = "rustix" version = "0.38.44" @@ -1759,16 +1657,6 @@ dependencies = [ "libc", ] -[[package]] -name = "signature" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" -dependencies = [ - "digest", - "rand_core 0.6.4", -] - [[package]] name = "simple_asn1" version = "0.6.3" @@ -1819,22 +1707,6 @@ dependencies = [ "windows-sys 0.60.2", ] -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" - -[[package]] -name = "spki" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" -dependencies = [ - "base64ct", - "der", -] - [[package]] name = "stable_deref_trait" version = "1.2.1" @@ -2772,12 +2644,6 @@ dependencies = [ "synstructure", ] -[[package]] -name = "zeroize" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" - [[package]] name = "zerotrie" version = "0.2.3" diff --git a/rust/auth-impls/Cargo.toml b/rust/auth-impls/Cargo.toml index 4d64fa8..819a748 100644 --- a/rust/auth-impls/Cargo.toml +++ b/rust/auth-impls/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" rust-version.workspace = true [features] -jwt = [ "base64", "serde", "serde_json", "rsa" ] +jwt = [ "base64", "serde", "serde_json", "openssl" ] sigs = [ "bitcoin_hashes", "hex-conservative", "secp256k1" ] [dependencies] @@ -14,7 +14,7 @@ async-trait = "0.1.77" base64 = { version = "0.22.1", optional = true, default-features = false, features = ["std"] } bitcoin_hashes = { version = "0.19", optional = true, default-features = false } hex-conservative = { version = "1.0", optional = true, default-features = false } -rsa = { version = "0.9.10", optional = true, default-features = false, features = ["sha2"] } +openssl = { version = "0.10.75", optional = true, default-features = false } secp256k1 = { version = "0.31", optional = true, default-features = false, features = [ "global-context" ] } serde = { version = "1.0.210", optional = true, default-features = false, features = ["derive"] } serde_json = { version = "1.0.149", optional = true, default-features = false, features = ["std"] } diff --git a/rust/auth-impls/src/jwt.rs b/rust/auth-impls/src/jwt.rs index 69b5730..e881228 100644 --- a/rust/auth-impls/src/jwt.rs +++ b/rust/auth-impls/src/jwt.rs @@ -7,8 +7,10 @@ use api::error::VssError; use async_trait::async_trait; use base64::engine::general_purpose::{STANDARD, URL_SAFE_NO_PAD}; use base64::Engine; -use rsa::sha2::{Digest, Sha256}; -use rsa::{pkcs8::DecodePublicKey, RsaPublicKey}; +use openssl::hash::MessageDigest; +use openssl::pkey::PKey; +use openssl::pkey::Public; +use openssl::sign::Verifier; use serde::Deserialize; use std::collections::HashMap; @@ -17,7 +19,7 @@ use std::collections::HashMap; /// /// Refer: https://datatracker.ietf.org/doc/html/rfc7519 pub struct JWTAuthorizer { - jwt_issuer_key: RsaPublicKey, + jwt_issuer_key: PKey, } /// A set of Claims claimed by 'JsonWebToken' @@ -34,7 +36,7 @@ pub(crate) struct Claims { const BEARER_PREFIX: &str = "Bearer "; -fn parse_public_key_pem(pem: &str) -> Result { +fn parse_public_key_pem(pem: &str) -> Result, String> { let body = pem .trim() .strip_prefix("-----BEGIN PUBLIC KEY-----") @@ -43,7 +45,7 @@ fn parse_public_key_pem(pem: &str) -> Result { .ok_or(String::from("Suffix not found"))?; let body: String = body.lines().map(|line| line.trim()).collect(); let body = STANDARD.decode(body).map_err(|_| String::from("Base64 decode failed"))?; - RsaPublicKey::from_public_key_der(&body).map_err(|_| String::from("DER decode failed")) + PKey::public_key_from_der(&body).map_err(|_| String::from("DER decode failed")) } impl JWTAuthorizer { @@ -93,10 +95,14 @@ impl Authorizer for JWTAuthorizer { let signature = URL_SAFE_NO_PAD .decode(signature_base64) .map_err(|_| VssError::AuthError(String::from("Signature base64 decode failed")))?; - let digest = Sha256::digest(message.as_bytes()); - self.jwt_issuer_key - .verify(rsa::pkcs1v15::Pkcs1v15Sign::new::(), &digest, &signature) - .map_err(|_| VssError::AuthError(String::from("RSA verification failed")))?; + let mut verifier = Verifier::new(MessageDigest::sha256(), &self.jwt_issuer_key) + .map_err(|_| VssError::AuthError(String::from("RSA initialization failed")))?; + if !verifier + .verify_oneshot(&signature, message.as_bytes()) + .map_err(|_| VssError::AuthError(String::from("RSA verification failed")))? + { + return Err(VssError::AuthError(String::from("RSA verification failed"))); + } let claims_json = URL_SAFE_NO_PAD .decode(claims_base64)