From de62732ac8d1251c53de2e4b174b68c0bea412bf Mon Sep 17 00:00:00 2001 From: mbecker20 Date: Thu, 9 Oct 2025 20:12:51 -0700 Subject: [PATCH] bump jwt lib --- Cargo.lock | 57 +++++++++++++++++++++++++++++++++++----- Cargo.toml | 2 +- bin/core/src/auth/jwt.rs | 2 +- 3 files changed, 52 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ec8d24f59..91359796b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -243,6 +243,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "879b6c89592deb404ba4dc0ae6b58ffd1795c78991cbb5b8bc441c48a070440d" dependencies = [ "aws-lc-sys", + "untrusted 0.7.1", "zeroize", ] @@ -2730,15 +2731,19 @@ dependencies = [ [[package]] name = "jsonwebtoken" -version = "9.3.1" +version = "10.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a87cc7a48537badeae96744432de36f4be2b4a34a05a5ef32e9dd8a1c169dde" +checksum = "f1417155a38e99d7704ddb3ea7445fe57fdbd5d756d727740a9ed8b9ebaed6e1" dependencies = [ + "aws-lc-rs", "base64 0.22.1", + "getrandom 0.2.16", "js-sys", - "ring", + "pem", "serde", "serde_json", + "signature", + "simple_asn1", ] [[package]] @@ -3315,6 +3320,16 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + [[package]] name = "num-bigint-dig" version = "0.8.4" @@ -3653,6 +3668,16 @@ dependencies = [ "digest", ] +[[package]] +name = "pem" +version = "3.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38af38e8470ac9dee3ce1bae1af9c1671fffc44ddfd8bd1d0a3445bf349a8ef3" +dependencies = [ + "base64 0.22.1", + "serde", +] + [[package]] name = "pem-rfc7468" version = "0.7.0" @@ -4174,7 +4199,7 @@ dependencies = [ "cfg-if", "getrandom 0.2.16", "libc", - "untrusted", + "untrusted 0.9.0", "windows-sys 0.52.0", ] @@ -4338,7 +4363,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ "ring", - "untrusted", + "untrusted 0.9.0", ] [[package]] @@ -4350,7 +4375,7 @@ dependencies = [ "aws-lc-rs", "ring", "rustls-pki-types", - "untrusted", + "untrusted 0.9.0", ] [[package]] @@ -4411,7 +4436,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ "ring", - "untrusted", + "untrusted 0.9.0", ] [[package]] @@ -4749,6 +4774,18 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "simple_asn1" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "297f631f50729c8c99b84667867963997ec0b50f32b2a7dbcab828ef0541e8bb" +dependencies = [ + "num-bigint", + "num-traits", + "thiserror 2.0.17", + "time", +] + [[package]] name = "siphasher" version = "1.0.1" @@ -5579,6 +5616,12 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + [[package]] name = "untrusted" version = "0.9.0" diff --git a/Cargo.toml b/Cargo.toml index c5e42f220..df3c95af5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -102,7 +102,7 @@ envy = "0.4.2" # CRYPTO / AUTH uuid = { version = "1.18.1", features = ["v4", "fast-rng", "serde"] } -jsonwebtoken = { version = "9.3.1", default-features = false } # locked back with octorust +jsonwebtoken = { version = "10.0.0", features = ["aws_lc_rs"] } # locked back with octorust rustls = { version = "0.23.32", features = ["aws-lc-rs"] } pem-rfc7468 = { version = "0.7.0", features = ["alloc"] } openidconnect = "4.0.1" diff --git a/bin/core/src/auth/jwt.rs b/bin/core/src/auth/jwt.rs index 14532f926..1e35a840f 100644 --- a/bin/core/src/auth/jwt.rs +++ b/bin/core/src/auth/jwt.rs @@ -18,7 +18,7 @@ use crate::helpers::random_string; type ExchangeTokenMap = Mutex>; -#[derive(Serialize, Deserialize)] +#[derive(Serialize, Deserialize, Clone)] pub struct JwtClaims { pub id: String, pub iat: u128,