From e7bfe9e8292736882d8f7cac79c727599394d3c2 Mon Sep 17 00:00:00 2001 From: tison Date: Wed, 18 Nov 2026 16:46:52 +0800 Subject: [PATCH 1/4] build(deps)!: migrate RSA signing to rsa 0.10 Enable PKCS#1 v1.5 and use the fallible signing API with OS-backed blinding. Raise the workspace MSRV to Rust 1.87 and migrate JWT callers and key-format tests to the new key and RNG types. BREAKING CHANGE: The workspace requires Rust 1.87, and callers passing a key to encode_rs256 must use rsa 0.10. --- Cargo.toml | 5 +++-- core/Cargo.toml | 1 + core/src/jwt.rs | 22 ++++++++----------- .../provide_credential/client_certificate.rs | 8 +++---- services/google/Cargo.toml | 1 + .../service_account_token.rs | 8 +++---- services/google/src/sign_request.rs | 19 ++++++++-------- services/google/tests/oauth_token_endpoint.rs | 6 ++--- services/oracle/Cargo.toml | 2 ++ services/oracle/src/sign_request.rs | 19 +++++++--------- services/oracle/tests/private_key_formats.rs | 19 ++++++++-------- website/docs/getting-started.md | 5 +---- .../docs/reference/versioning-and-targets.md | 4 +--- 13 files changed, 56 insertions(+), 63 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f1a60482..5c830b30 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ resolver = "3" edition = "2024" license = "Apache-2.0" repository = "https://github.com/apache/reqsign" -rust-version = "1.86.0" +rust-version = "1.87.0" [workspace.dependencies] # Workspace dependencies @@ -54,6 +54,7 @@ dotenvy = "0.15" env_logger = "0.11" form_urlencoded = "1" futures = "0.3" +getrandom = { version = "0.4", features = ["sys_rng"] } hex = "0.4" hmac = "0.13" http = "1" @@ -66,7 +67,7 @@ pretty_assertions = "1.3" prost = "0.14" quick-xml = { version = "0.42.0", features = ["serialize"] } reqwest = { version = "0.13.1", default-features = false } -rsa = { version = "0.9.2", features = ["pkcs5", "sha2"] } +rsa = { version = "0.10.0", features = ["pkcs1v15", "pkcs5"] } rust-ini = { version = "0.21" } serde = { version = "1", features = ["derive"] } serde_json = { version = "1" } diff --git a/core/Cargo.toml b/core/Cargo.toml index ab32f593..dedfb318 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -60,3 +60,4 @@ windows-sys = { version = "0.61.0", features = [ [dev-dependencies] asyncband = { workspace = true, features = ["oneshot"] } futures = { workspace = true } +getrandom = { workspace = true } diff --git a/core/src/jwt.rs b/core/src/jwt.rs index 413ff8fb..6bef11f4 100644 --- a/core/src/jwt.rs +++ b/core/src/jwt.rs @@ -19,12 +19,9 @@ use base64::Engine; use base64::engine::general_purpose::URL_SAFE_NO_PAD; -use rsa::RsaPrivateKey; -use rsa::pkcs1v15::SigningKey; +use rsa::PrivateKey; use rsa::pkcs8::DecodePrivateKey; -use rsa::rand_core::OsRng; use rsa::sha2::Sha256; -use rsa::signature::{RandomizedSigner, SignatureEncoding}; use serde::Serialize; use crate::{Error, Result}; @@ -33,7 +30,7 @@ use crate::{Error, Result}; /// /// RS256 is RSA PKCS#1 v1.5 with SHA-256. The caller owns the JWT header and /// claims shape so service-specific fields such as `x5t` stay service-local. -pub fn encode_rs256(header: &H, claims: &C, private_key: &RsaPrivateKey) -> Result +pub fn encode_rs256(header: &H, claims: &C, private_key: &PrivateKey) -> Result where H: Serialize, C: Serialize, @@ -42,10 +39,10 @@ where let encoded_claims = encode_json(claims)?; let signing_input = format!("{encoded_header}.{encoded_claims}"); - let mut rng = OsRng; - let signing_key = SigningKey::::new(private_key.clone()); - let signature = signing_key.sign_with_rng(&mut rng, signing_input.as_bytes()); - let encoded_signature = URL_SAFE_NO_PAD.encode(signature.to_bytes()); + let signature = private_key + .pkcs1v15_sign::(signing_input.as_bytes()) + .map_err(|e| Error::unexpected("failed to sign JWT").with_source(e))?; + let encoded_signature = URL_SAFE_NO_PAD.encode(signature); Ok(format!("{signing_input}.{encoded_signature}")) } @@ -59,7 +56,7 @@ where let private_key_pem = std::str::from_utf8(private_key_pem).map_err(|e| { Error::credential_invalid("RSA private key PEM is not valid UTF-8").with_source(e) })?; - let private_key = RsaPrivateKey::from_pkcs8_pem(private_key_pem).map_err(|e| { + let private_key = PrivateKey::from_pkcs8_pem(private_key_pem).map_err(|e| { Error::credential_invalid("failed to parse PKCS#8 RSA private key PEM").with_source(e) })?; @@ -79,8 +76,8 @@ where mod tests { use super::*; use base64::engine::general_purpose::URL_SAFE_NO_PAD; + use getrandom::SysRng; use rsa::pkcs1v15::{Signature, VerifyingKey}; - use rsa::rand_core::OsRng; use rsa::signature::Verifier; use serde_json::json; @@ -101,8 +98,7 @@ mod tests { #[test] fn encode_rs256_keeps_jws_shape_and_verifiable_signature() -> Result<()> { - let mut rng = OsRng; - let private_key = RsaPrivateKey::new(&mut rng, 2048) + let private_key = PrivateKey::new(&mut SysRng, 2048) .map_err(|e| Error::unexpected("failed to generate test RSA key").with_source(e))?; let jwt = encode_rs256( diff --git a/services/azure-storage/src/provide_credential/client_certificate.rs b/services/azure-storage/src/provide_credential/client_certificate.rs index 5cd98cc9..f14388bb 100644 --- a/services/azure-storage/src/provide_credential/client_certificate.rs +++ b/services/azure-storage/src/provide_credential/client_certificate.rs @@ -26,7 +26,7 @@ use base64::Engine; use base64::engine::general_purpose::URL_SAFE_NO_PAD; use reqsign_core::time::Timestamp; use reqsign_core::{Context, ProvideCredential}; -use rsa::RsaPrivateKey; +use rsa::PrivateKey; use rsa::pkcs8::DecodePrivateKey; use serde::Serialize; use sha1::{Digest, Sha1}; @@ -99,7 +99,7 @@ impl ClientCertificateCredentialProvider { &self, ctx: &Context, path: &str, - ) -> Result<(Vec, RsaPrivateKey), reqsign_core::Error> { + ) -> Result<(Vec, PrivateKey), reqsign_core::Error> { let cert_data = ctx.file_read(path).await.map_err(|e| { reqsign_core::Error::credential_invalid(format!("Failed to read certificate file: {e}")) })?; @@ -141,7 +141,7 @@ impl ClientCertificateCredentialProvider { })?; // Parse private key - let private_key = RsaPrivateKey::from_pkcs8_pem(&private_key_pem).map_err(|e| { + let private_key = PrivateKey::from_pkcs8_pem(&private_key_pem).map_err(|e| { reqsign_core::Error::credential_invalid(format!( "Failed to parse private key from PEM: {e}" )) @@ -163,7 +163,7 @@ impl ClientCertificateCredentialProvider { tenant_id: &str, client_id: &str, cert_der: &[u8], - private_key: &RsaPrivateKey, + private_key: &PrivateKey, ) -> Result { let now = SystemTime::now() .duration_since(UNIX_EPOCH) diff --git a/services/google/Cargo.toml b/services/google/Cargo.toml index c76a5d31..ecdd7a13 100644 --- a/services/google/Cargo.toml +++ b/services/google/Cargo.toml @@ -64,6 +64,7 @@ reqsign-core = { workspace = true, features = ["jwt"] } asyncband = { workspace = true, features = ["semaphore"] } dotenvy = { workspace = true } env_logger = { workspace = true } +getrandom = { workspace = true } reqsign-file-read-tokio = { workspace = true } reqsign-http-send-reqwest = { workspace = true } reqwest = { workspace = true, features = ["default-tls"] } diff --git a/services/google/src/provide_credential/service_account_token.rs b/services/google/src/provide_credential/service_account_token.rs index 6e1d86ad..27bd4ae0 100644 --- a/services/google/src/provide_credential/service_account_token.rs +++ b/services/google/src/provide_credential/service_account_token.rs @@ -340,12 +340,12 @@ mod tests { use std::sync::{Arc, Mutex}; use bytes::Bytes; + use getrandom::SysRng; use http::{HeaderMap, Method}; use reqsign_core::hash::base64_decode; use reqsign_core::{ErrorKind, FileRead, Granter, HttpSend, StaticEnv, time::Timestamp}; - use rsa::RsaPrivateKey; + use rsa::PrivateKey; use rsa::pkcs8::{EncodePrivateKey, LineEnding}; - use rsa::rand_core::OsRng; use serde_json::Value; use crate::{ @@ -436,7 +436,7 @@ mod tests { } fn service_account() -> ServiceAccount { - let key = RsaPrivateKey::new(&mut OsRng, 1024).expect("test RSA key must generate"); + let key = PrivateKey::new(&mut SysRng, 1024).expect("test RSA key must generate"); let private_key = key .to_pkcs8_pem(LineEnding::LF) .expect("test RSA key must encode") @@ -494,7 +494,7 @@ mod tests { fn decode_jwt_json(segment: &str) -> Value { let mut standard = segment.replace('-', "+").replace('_', "/"); - while standard.len() % 4 != 0 { + while !standard.len().is_multiple_of(4) { standard.push('='); } serde_json::from_slice(&base64_decode(&standard).expect("JWT segment must decode")) diff --git a/services/google/src/sign_request.rs b/services/google/src/sign_request.rs index a9fd3704..7cf787e2 100644 --- a/services/google/src/sign_request.rs +++ b/services/google/src/sign_request.rs @@ -18,10 +18,8 @@ use http::{Uri, header}; use log::debug; use percent_encoding::{percent_decode_str, utf8_percent_encode}; -use rsa::pkcs1v15::SigningKey; use rsa::pkcs8::DecodePrivateKey; -use rsa::rand_core::OsRng; -use rsa::signature::RandomizedSigner; +use rsa::sha2::Sha256; use serde::{Deserialize, Serialize}; use std::time::Duration; @@ -261,14 +259,16 @@ impl RequestSigner { } fn sign_with_service_account(private_key_pem: &str, string_to_sign: &str) -> Result { - let mut rng = OsRng; - let private_key = rsa::RsaPrivateKey::from_pkcs8_pem(private_key_pem).map_err(|e| { + let private_key = rsa::PrivateKey::from_pkcs8_pem(private_key_pem).map_err(|e| { reqsign_core::Error::unexpected("failed to parse private key").with_source(e) })?; - let signing_key = SigningKey::::new(private_key); - let signature = signing_key.sign_with_rng(&mut rng, string_to_sign.as_bytes()); + let signature = private_key + .pkcs1v15_sign::(string_to_sign.as_bytes()) + .map_err(|e| { + reqsign_core::Error::unexpected("failed to sign request").with_source(e) + })?; - Ok(signature.to_string()) + Ok(hex_encode_upper(&signature)) } fn build_signed_query_with_service_account( @@ -688,6 +688,7 @@ fn append_query_fragment(uri: &Uri, fragment: &str) -> Result { mod tests { use super::*; use bytes::Bytes; + use getrandom::SysRng; use http::header; use reqsign_core::{ErrorKind, HttpSend, ProvideCredential, Signer}; use rsa::pkcs8::{EncodePrivateKey, LineEnding}; @@ -1063,7 +1064,7 @@ mod tests { #[tokio::test] async fn service_account_exchange_preserves_optional_expiration_response() -> Result<()> { - let private_key = rsa::RsaPrivateKey::new(&mut OsRng, 1024) + let private_key = rsa::PrivateKey::new(&mut SysRng, 1024) .expect("private key must generate") .to_pkcs8_pem(LineEnding::LF) .expect("private key must encode") diff --git a/services/google/tests/oauth_token_endpoint.rs b/services/google/tests/oauth_token_endpoint.rs index e7b6db05..4520bad5 100644 --- a/services/google/tests/oauth_token_endpoint.rs +++ b/services/google/tests/oauth_token_endpoint.rs @@ -18,6 +18,7 @@ use std::sync::{Arc, Mutex, OnceLock}; use bytes::Bytes; +use getrandom::SysRng; use http::{Request, Response, StatusCode}; use reqsign_core::hash::base64_decode; use reqsign_core::{Context, Error, ErrorKind, Granter, HttpSend, ProvideCredential, Result}; @@ -27,9 +28,8 @@ use reqsign_google::{ ServerSideCredentialAccessBoundaryGranter, ServiceAccount, ServiceAccountTokenCredentialProvider, StaticCredentialProvider, }; -use rsa::RsaPrivateKey; +use rsa::PrivateKey; use rsa::pkcs8::{EncodePrivateKey, LineEnding}; -use rsa::rand_core::OsRng; use serde::Deserialize; use serde_json::{Value, json}; @@ -65,7 +65,7 @@ fn service_account() -> ServiceAccount { ServiceAccount { private_key: KEY .get_or_init(|| { - RsaPrivateKey::new(&mut OsRng, 1024) + PrivateKey::new(&mut SysRng, 1024) .unwrap() .to_pkcs8_pem(LineEnding::LF) .unwrap() diff --git a/services/oracle/Cargo.toml b/services/oracle/Cargo.toml index 4cacc181..9f71707d 100644 --- a/services/oracle/Cargo.toml +++ b/services/oracle/Cargo.toml @@ -37,6 +37,8 @@ rust-ini = { workspace = true } [dev-dependencies] env_logger = "0.11" +getrandom = { workspace = true } +pkcs8 = { version = "0.11", features = ["getrandom"] } reqsign-file-read-tokio = { workspace = true } reqsign-http-send-reqwest = { workspace = true } tokio = { version = "1", features = ["test-util", "macros", "rt-multi-thread"] } diff --git a/services/oracle/src/sign_request.rs b/services/oracle/src/sign_request.rs index 3115831d..98c1ca14 100644 --- a/services/oracle/src/sign_request.rs +++ b/services/oracle/src/sign_request.rs @@ -23,10 +23,8 @@ use log::debug; use reqsign_core::Result; use reqsign_core::time::Timestamp; use reqsign_core::{Context, SignRequest, SigningCredential, SigningRequest}; -use rsa::pkcs1v15::SigningKey; use rsa::sha2::Sha256; -use rsa::signature::{SignatureEncoding, Signer}; -use rsa::{RsaPrivateKey, pkcs1::DecodeRsaPrivateKey, pkcs8::DecodePrivateKey}; +use rsa::{PrivateKey, pkcs1::DecodeRsaPrivateKey, pkcs8::DecodePrivateKey}; use std::fmt::Write; use std::time::Duration; @@ -95,18 +93,17 @@ impl SignRequest for RequestSigner { // Read private key from file let private_key_content = ctx.file_read_as_string(&cred.key_file).await?; // Older OpenSSL versions produce PKCS#1 PEM keys with `openssl genrsa`. - let private_key = RsaPrivateKey::from_pkcs8_pem(&private_key_content) - .or_else(|_| RsaPrivateKey::from_pkcs1_pem(&private_key_content)) + let private_key = PrivateKey::from_pkcs8_pem(&private_key_content) + .or_else(|_| PrivateKey::from_pkcs1_pem(&private_key_content)) .map_err(|e| { reqsign_core::Error::credential_invalid(format!("Failed to read private key: {e}")) })?; // Sign the string - let signing_key = SigningKey::::new(private_key); - let signature = signing_key - .try_sign(string_to_sign.as_bytes()) + let signature = private_key + .pkcs1v15_sign::(string_to_sign.as_bytes()) .map_err(|e| reqsign_core::Error::unexpected(format!("Failed to sign: {e}")))?; - let encoded_signature = general_purpose::STANDARD.encode(signature.to_bytes()); + let encoded_signature = general_purpose::STANDARD.encode(signature); // Set headers signing_req @@ -153,9 +150,9 @@ fn build_string_to_sign( #[cfg(test)] mod tests { use super::*; + use getrandom::SysRng; use reqsign_core::FileRead; use rsa::pkcs8::{EncodePrivateKey, LineEnding}; - use rsa::rand_core::OsRng; const RAW_QUERY: &str = "slash=%2F&hash=%23&=%26&equals=%3D&space=%20&encoded-plus=%2B&literal-plus=+&double=%252F&dup=first&dup=second&=empty-key&empty=&flag&flag=&"; @@ -193,7 +190,7 @@ mod tests { string_to_sign.contains(&format!("(request-target): get /object%2Fname?{RAW_QUERY}")) ); - let private_key = RsaPrivateKey::new(&mut OsRng, 1024).expect("key generation must work"); + let private_key = PrivateKey::new(&mut SysRng, 1024).expect("key generation must work"); let private_key = private_key .to_pkcs8_pem(LineEnding::LF) .expect("private key must encode") diff --git a/services/oracle/tests/private_key_formats.rs b/services/oracle/tests/private_key_formats.rs index 5bd7cad2..c11578a9 100644 --- a/services/oracle/tests/private_key_formats.rs +++ b/services/oracle/tests/private_key_formats.rs @@ -18,24 +18,24 @@ use std::sync::LazyLock; use base64::{Engine as _, engine::general_purpose::STANDARD}; +use getrandom::SysRng; use http::header::{AUTHORIZATION, DATE}; +use pkcs8::{EncodePrivateKey, EncodePublicKey, LineEnding}; use reqsign_core::{Context, ErrorKind, FileRead, Result, SignRequest, Signer}; use reqsign_oracle::{Credential, RequestSigner, StaticCredentialProvider}; use rsa::pkcs1::EncodeRsaPrivateKey; use rsa::pkcs1v15::{Signature, VerifyingKey}; -use rsa::pkcs8::{EncodePrivateKey, EncodePublicKey, LineEnding}; -use rsa::rand_core::OsRng; use rsa::sha2::Sha256; use rsa::signature::Verifier; -use rsa::{RsaPrivateKey, RsaPublicKey}; +use rsa::{PrivateKey, PublicKey}; const KEY_PATH: &str = "test-key.pem"; const REQUEST_URI: &str = "https://iaas.example.com:8443/20160918/instances?name=a%2Fb&name=c+%20d"; -fn private_key() -> &'static RsaPrivateKey { +fn private_key() -> &'static PrivateKey { // Generate one ephemeral key for all formats; never read a developer's OCI files. - static KEY: LazyLock = LazyLock::new(|| { - RsaPrivateKey::new(&mut OsRng, 2048).expect("test RSA key generation must succeed") + static KEY: LazyLock = LazyLock::new(|| { + PrivateKey::new(&mut SysRng, 2048).expect("test RSA key generation must succeed") }); &KEY } @@ -108,7 +108,7 @@ async fn verify_signed_request(pem: &str) -> anyhow::Result<()> { original_uri.path_and_query().expect("request target"), original_uri.authority().expect("request authority"), ); - let verifier = VerifyingKey::::new(RsaPublicKey::from(private_key())); + let verifier = VerifyingKey::::new(PublicKey::from(private_key())); verifier.verify(signing_input.as_bytes(), &signature)?; assert!(verifier.verify(b"different request", &signature).is_err()); Ok(()) @@ -156,14 +156,13 @@ async fn assert_rejected_without_mutation(pem: &str) -> anyhow::Result<()> { #[tokio::test] async fn public_keys_are_rejected_without_mutating_request() -> anyhow::Result<()> { - let pem = RsaPublicKey::from(private_key()).to_public_key_pem(LineEnding::LF)?; + let pem = PublicKey::from(private_key()).to_public_key_pem(LineEnding::LF)?; assert_rejected_without_mutation(&pem).await } #[tokio::test] async fn encrypted_private_keys_are_rejected_without_mutating_request() -> anyhow::Result<()> { - let pem = - private_key().to_pkcs8_encrypted_pem(&mut OsRng, "test-passphrase", LineEnding::LF)?; + let pem = private_key().to_pkcs8_encrypted_pem("test-passphrase", LineEnding::LF)?; assert_rejected_without_mutation(&pem).await } diff --git a/website/docs/getting-started.md b/website/docs/getting-started.md index 8d64c67a..8eea1e87 100644 --- a/website/docs/getting-started.md +++ b/website/docs/getting-started.md @@ -52,10 +52,7 @@ cargo add http anyhow | `volcengine` | Volcengine TOS | | `full` | Everything above | -The default `default-context` feature wires a ready-to-use runtime (Tokio -file reading, reqwest HTTP, Tokio command execution). Keep it unless you are -[bringing your own runtime](/docs/guides/custom-runtimes/). Requires -Rust 1.86.0+. +The default `default-context` feature wires a ready-to-use runtime (Tokio file reading, reqwest HTTP, Tokio command execution). Keep it unless you are [bringing your own runtime](/docs/guides/custom-runtimes/). Requires Rust 1.87.0+. ## 2. Sign your first request diff --git a/website/docs/reference/versioning-and-targets.md b/website/docs/reference/versioning-and-targets.md index 7ce34eaf..9b10562b 100644 --- a/website/docs/reference/versioning-and-targets.md +++ b/website/docs/reference/versioning-and-targets.md @@ -58,9 +58,7 @@ majors are published with each ## Targets -**Rust version.** The workspace declares `rust-version = "1.86.0"` — the -minimum supported Rust. CI tracks stable; MSRV bumps are treated as -observable changes, not patch-level noise. +**Rust version.** The workspace requires Rust 1.87.0 or later. CI tracks stable. Raising the minimum supported Rust version is a user-visible change. **Native.** Reqsign is pure Rust with no C dependencies of its own; CI exercises Linux, macOS, and Windows. The default context components (Tokio From 23aada2f8a453ef307cfce2caaa9b5bd29efa5bb Mon Sep 17 00:00:00 2001 From: tison Date: Wed, 18 Nov 2026 16:46:52 +0800 Subject: [PATCH 2/4] build(deps): update fast-uri to 3.1.9 in the website lockfile --- website/pnpm-lock.yaml | 277 +++++++++++++++++++++++------------------ 1 file changed, 156 insertions(+), 121 deletions(-) diff --git a/website/pnpm-lock.yaml b/website/pnpm-lock.yaml index 99a9877b..4e11aabe 100644 --- a/website/pnpm-lock.yaml +++ b/website/pnpm-lock.yaml @@ -157,12 +157,12 @@ packages: resolution: {integrity: sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==} engines: {node: '>=6.9.0'} - '@babel/generator@7.29.7': - resolution: {integrity: sha512-DkXD5OJQaAQIdZ1bt3UZdEnHAn9Imd3IVBdX03UFe+ony9Ojw5pzr9YVKGDY1jt+Gcn/FnGkNf8r+Vj5NOJWtQ==} + '@babel/generator@7.29.12': + resolution: {integrity: sha512-2W76mhjrpQFO1lK5e8IvGYB2D0YZ7S2R1Z2BjO2ZUYuW+amcpK/z60U6ZZmzskwoa7sJ6XohP/Wg8H5KxXI/IA==} engines: {node: '>=6.9.0'} - '@babel/generator@7.29.8': - resolution: {integrity: sha512-gZbepsdh3WDtgZKWL+vTPh71LSBrm/Y4/QDZBVCcYfmeTEEuoOYwlSy+G1StfJg+/Zy550u/3TATbm7qDbbMtg==} + '@babel/generator@7.29.7': + resolution: {integrity: sha512-DkXD5OJQaAQIdZ1bt3UZdEnHAn9Imd3IVBdX03UFe+ony9Ojw5pzr9YVKGDY1jt+Gcn/FnGkNf8r+Vj5NOJWtQ==} engines: {node: '>=6.9.0'} '@babel/helper-annotate-as-pure@7.29.7': @@ -232,6 +232,10 @@ packages: resolution: {integrity: sha512-brcMGQaVzIeUb+6/bs1Av0f8YuNNjKY2JyvfRCsFuFsdKccEQ5Ges2y74D74NZ1Rz8lKJ9ksJkfqwQFJ/iNEyQ==} engines: {node: '>=6.9.0'} + '@babel/helper-string-parser@7.29.11': + resolution: {integrity: sha512-snZbO7MEDOof+hvNa97EjEY7qD7h2kwvQr5AJC3ZhQudKW5dnej6k3kP9NQV88hJwaS8vDqRLFo9rivLEhle2g==} + engines: {node: '>=6.9.0'} + '@babel/helper-string-parser@7.29.7': resolution: {integrity: sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==} engines: {node: '>=6.9.0'} @@ -248,17 +252,17 @@ packages: resolution: {integrity: sha512-iES0Skag9ERIF68aXadpO6dbXa03mNWK3sEqJaMnLNs/eC3l0lkImdfoy6Y09/SfkpawdAB4RjQ7PVA7TcVGdw==} engines: {node: '>=6.9.0'} - '@babel/helpers@7.29.7': - resolution: {integrity: sha512-1k2lAGRMfHTcwuNYcCNUmaUffmQv8KWMfh2iJUUeRlwlwH4FdNG7mfPI10NPfLHJFThE4Tyr4mv7kTNZOiPuBg==} + '@babel/helpers@7.29.10': + resolution: {integrity: sha512-EMCx3AGZ3WfAl6ht7AyQoPm2Lh+BGYEMdc4Q6Hf7uSCDOZFuLq44qNwL+iaim8VlyYhRAo4X43+weadK8ZB4Yg==} engines: {node: '>=6.9.0'} - '@babel/parser@7.29.7': - resolution: {integrity: sha512-hnORnjP/1P/zFEndoeX+n+t1RwWRJiJpM/jO7FW32Kn9r5+sJB2JWOdYo4L6k78j15eCwY3Gm/7364B1EMwtNg==} + '@babel/parser@7.29.12': + resolution: {integrity: sha512-WJ7JBp/Q4+z/ImydtI7jS6NVco5++632ExBemSX+Ysb+G1lCwQ5BVo3SY+jGGOcZXI4ZccbZSUSJLNBW6eEpJg==} engines: {node: '>=6.0.0'} hasBin: true - '@babel/parser@7.29.9': - resolution: {integrity: sha512-CjXrNHTnvqBVqHgdBysY3vk2T8tpJHb5/RMeHJBTyVa9xgugCB0CJTx/3oO8RV2QRQP391RWpB7D6hLjm8V9uA==} + '@babel/parser@7.29.7': + resolution: {integrity: sha512-hnORnjP/1P/zFEndoeX+n+t1RwWRJiJpM/jO7FW32Kn9r5+sJB2JWOdYo4L6k78j15eCwY3Gm/7364B1EMwtNg==} engines: {node: '>=6.0.0'} hasBin: true @@ -710,6 +714,10 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 + '@babel/runtime@7.29.10': + resolution: {integrity: sha512-NpugTzbKgGrNe45Ui32cN8vCFFMxVtP/9rtfwv0nP5FRDAjvYBxJcLVpYA9mr1jxP6cnIT7x9LUzuDTbWYYNRA==} + engines: {node: '>=6.9.0'} + '@babel/runtime@7.29.7': resolution: {integrity: sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==} engines: {node: '>=6.9.0'} @@ -718,22 +726,22 @@ packages: resolution: {integrity: sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==} engines: {node: '>=6.9.0'} + '@babel/traverse@7.29.12': + resolution: {integrity: sha512-MscXe/NAZcOkYEsRajHZFt3ynsb22PUi6CTrp5U7+RYycR9By84mn9mFN54YgfITiqK4hFx3Ju3tZSyzfpS5ew==} + engines: {node: '>=6.9.0'} + '@babel/traverse@7.29.7': resolution: {integrity: sha512-EhlfNQtZ+NK22w5BM61ciuiq1m58ed33Wr1Xan//ZRTy6hgjnwyCffRYwzsGXdASJSUJ1guZILsErh1eQcl+zw==} engines: {node: '>=6.9.0'} - '@babel/traverse@7.29.8': - resolution: {integrity: sha512-I5z7H3bf/41ktsNVLtpN0wAa336HkqIHQ5BuPLEhTkt1jVSyZpeNKIzTgEWmlxjdg81R0IgUCcaE+Ok3NvrfZg==} + '@babel/types@7.29.11': + resolution: {integrity: sha512-WCsemW40Cpc6gouC1SrY6PBaZ+oLRlEVY9XBvZBI7il/HyUrb2nJ505wE1MHEFyDZNnrWDEuy4jL50WVHfTTSQ==} engines: {node: '>=6.9.0'} '@babel/types@7.29.7': resolution: {integrity: sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==} engines: {node: '>=6.9.0'} - '@babel/types@7.29.8': - resolution: {integrity: sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg==} - engines: {node: '>=6.9.0'} - '@colors/colors@1.5.0': resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==} engines: {node: '>=0.1.90'} @@ -1898,6 +1906,9 @@ packages: '@types/estree-jsx@1.0.5': resolution: {integrity: sha512-52CcUVNFyfb1A2ALocQw/Dd1BQFNmSdkuC3BkZ6iqhdMfQz7JWOFRuJFloOzjk+6WijU56m9oKXFAXc7o3Towg==} + '@types/estree@1.0.10': + resolution: {integrity: sha512-lTyOMnOcmRBzdCv6/4zUZCrEhV0xrqQiUZBZtVcbmLHBXKLnN8q89v/wKRF/Q0HbwVsqbIG3o5HDoFl9sduM+g==} + '@types/estree@1.0.9': resolution: {integrity: sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==} @@ -1958,8 +1969,8 @@ packages: '@types/node@26.1.2': resolution: {integrity: sha512-Vu4a5UFA9rIIFJ7rB/Vaafh9lrCQszopTCx6KjFboXTGQbPNasehVR5TEiithSDGyd1DEiUByggTZsg8jukeIg==} - '@types/node@26.6.4': - resolution: {integrity: sha512-ldVPDCzj7fsaGZrLB0NuHuTvJcsNasysBAqMolr/cgxrLd1xbqxIr3XJiPnHHJUCxj5sNF1vnRj9aWnrVh5Jcg==} + '@types/node@26.6.6': + resolution: {integrity: sha512-MzQj+8Kx3XI40OmUAE6Qoh58ZMNstNNMwn2nfd3qWsfe7nDNSqJNzes4njhz6AHwrSHOffSLwXU6yb474Q4aog==} '@types/parse5@5.0.3': resolution: {integrity: sha512-kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw==} @@ -2099,6 +2110,11 @@ packages: engines: {node: '>=0.4.0'} hasBin: true + acorn@8.19.0: + resolution: {integrity: sha512-oJlA3XiRm7Cyk6qFD2Jn8ak9B7jSy0qy00ADO3+8dpT0LSjFihQYv4C02LFCSYJV3Q37xYwwRy5m+IpIiUzqWw==} + engines: {node: '>=0.4.0'} + hasBin: true + address@2.0.3: resolution: {integrity: sha512-XNAb/a6TCqou+TufU8/u11HCu9x1gYvOoxLwtlXgIqmkrYQADVv6ljyW2zwiPhHz9R1gItAWpuDrdJMmrOBFEA==} engines: {node: '>= 16.0.0'} @@ -2260,8 +2276,8 @@ packages: resolution: {integrity: sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==} engines: {node: 18 || 20 || >=22} - baseline-browser-mapping@2.11.27: - resolution: {integrity: sha512-ElY12DaROGuan+lMmZ8Cvo/ZUbXPe7Enc/9VU/b1T3Kp4dwytRcNdR8DoSJN5SNJT/CuvcCA0DHDVmMOCePdRQ==} + baseline-browser-mapping@2.11.34: + resolution: {integrity: sha512-Aqr8mA1kIvyJ3UY5YAY7ib8LSo1DmDMbMnVqGPtsKW1LxaFQFwn9Eb3yvq2fUKJsRvaXjnAV7R5osqETapzNiA==} engines: {node: '>=6.0.0'} hasBin: true @@ -2372,8 +2388,8 @@ packages: caniuse-lite@1.0.30001806: resolution: {integrity: sha512-72Cuvd95zbSYPKq6Fhg8eDJRlzgWDf7/mtoZv6Qe/DYNCEBdNxoA3+rZAU2ZhGCpZlns3EssFavaZomckT5Uuw==} - caniuse-lite@1.0.30001814: - resolution: {integrity: sha512-/Uaf1lAzr59XcMpW0o96WoEfr+VXK2OX4U9AgFoiSHsVJ4HppnIFUjtYzsyDH2+tgANaQb2/oxYGwCPapN1FpA==} + caniuse-lite@1.0.30001820: + resolution: {integrity: sha512-gfWD6MxqVCqAOwmODfZf7DchWvlrA+SRdNX7ceLfg3xRqe5ssjjpF7EgslC/0tiLiNTajdaNN/q8c/5u/7Gz8w==} ccount@2.0.1: resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==} @@ -2871,8 +2887,8 @@ packages: ee-first@1.1.1: resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} - electron-to-chromium@1.5.444: - resolution: {integrity: sha512-5ss/uJfoDYDHT0lfJzT6FbcskIzROIOPf0BbbFkGcvDzoJU7i//9GDrwwIHQVmIsrAGiF3ihpADBRIsrEFt1rQ==} + electron-to-chromium@1.5.472: + resolution: {integrity: sha512-s4+nfT29b0FKpVKoaIxl2pWsoNcn7A/nMPSrxayw4T3BsmPeV2lF9Y06BsAQeMGhCTQ4nYJ5XST7jkqe4ZEqFw==} emoji-regex@8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} @@ -3040,8 +3056,8 @@ packages: fast-json-stable-stringify@2.1.0: resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} - fast-uri@3.1.8: - resolution: {integrity: sha512-GZMtZUTNRpOVIECoXwLNZS5xUGE+mVNbTB8h/7Rwh2TFWcBQiPzTgyZi05BF9UMZKkLJv8XBRJTlU7zg8+ZfMg==} + fast-uri@3.1.9: + resolution: {integrity: sha512-hS/0Wt3Ya043oKXs0sIxrMpKQITXhMLIrVAKKXi4gozGC9v7YRWVnXIZzjNPTO02M9BdxLCWqK1yRXgNziVyJQ==} fast-xml-builder@1.3.0: resolution: {integrity: sha512-F74cZEdCvuw9P41GAC3rod4X04jjWGM1JPEv/GWSqFTWLsdyMSBMBMlm9Hk3GLBgLBbdBNY8yee0pQh2RBVESQ==} @@ -4073,8 +4089,8 @@ packages: minimist@1.2.8: resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==} - minimizer-webpack-plugin@5.13.0: - resolution: {integrity: sha512-OO1NF2zHj6sf4CNv2AsUWYcS8WEwkVKQDXxxKzlOxx1Xl+WlqYtVC+oNlGNwGkLAOnpj277BSHypWwRtd9w4JQ==} + minimizer-webpack-plugin@5.14.0: + resolution: {integrity: sha512-PnvQXCJxhgH2ZVVO7Lj0sM6q8L1XGxnUvd8wVQIRwi8khMCLq5wg0Ngxe44bcuZL2FSN81RdVE7YHEVzTKsQDQ==} engines: {node: '>= 10.13.0'} peerDependencies: '@minify-html/node': '*' @@ -4172,8 +4188,8 @@ packages: node-html-parser@7.1.0: resolution: {integrity: sha512-iJo8b2uYGT40Y8BTyy5ufL6IVbN8rbm/1QK2xffXU/1a/v3AAa0d1YAoqBNYqaS4R/HajkWIpIfdE6KcyFh1AQ==} - node-releases@2.0.57: - resolution: {integrity: sha512-kQK9LGGFiHtrWiNhZtA7Qbw17AQz+dmsEKODRIVTXA9+e5MS/2gZEBhYJt13GrAz5/IOZKddH/0Z3TP/Zgo+yw==} + node-releases@2.0.63: + resolution: {integrity: sha512-6li2QanLsAXpIH2R6j77MzRyvOyrvdTqlKtO4CgBdHGNvN99ZZfyxszHc5o5+IZBWD5u6Hzwg83JoGXmqZNG9Q==} engines: {node: '>=18'} nopt@1.0.10: @@ -5069,9 +5085,15 @@ packages: resolution: {integrity: sha512-eflK8wEtyOE6+hsaRVPxvUKYCpRgzLqDTb8krvAsRIwOGlHoSgYLgBXoubGgLd2fT41/OUYdb48v4k4WWHQurA==} engines: {node: '>= 10.13.0'} - schema-utils@4.5.0: - resolution: {integrity: sha512-zJlMCZ0cAR5p/Y4oVpRoqioDMJcGxaXRrQ/4rP4WyR84vc5z/DolXdbvXeDpTwbtocDFr2rhPqHPErDCUtz2kA==} + schema-utils@4.8.2: + resolution: {integrity: sha512-iKlak3OFHF0dgD1nZRvgWQzG+P1TiEcMnLSBtIVBg937z5Jd6WE1c3SyZkXIyCfPHowL35yMsVvIjotm1c1qiw==} engines: {node: '>= 10.13.0'} + hasBin: true + peerDependencies: + webpack: ^5.112.0 + peerDependenciesMeta: + webpack: + optional: true search-insights@2.17.3: resolution: {integrity: sha512-RQPdCYTa8A68uM2jwxoY842xDhvx3E5LFL1LxvxCNMev4o5mLuokczhzjAgGwUZBAmOKZknArSxLKmXtIi2AxQ==} @@ -5438,6 +5460,9 @@ packages: tslib@2.8.1: resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==} + tslib@2.9.1: + resolution: {integrity: sha512-a4Ux9VKuIMHsOS7ENbEq6hK2ZGYIT27Rtl0E4eD9KqwxhKiQeMZE/9xb3IdYwWaSOyIBQLExhQgXDTYoiCxnWA==} + tsyringe@4.10.0: resolution: {integrity: sha512-axr3IdNuVIxnaK5XGEUFTu3YmAQ6lllgrvqfEoR16g/HGnYY/6We4oWENtAnzK6/LpJ2ur9PAb80RBt7/U4ugw==} engines: {node: '>= 6.0.0'} @@ -5534,8 +5559,8 @@ packages: resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==} engines: {node: '>= 0.8'} - update-browserslist-db@1.3.3: - resolution: {integrity: sha512-pJ2sYawQS0R/WI928Gj5GlPhTGzbMelq0+4INtSYNDV9ErKJcX6xjGWkoG/VnB3dpUm00zALaqkrUD77pO5TDQ==} + update-browserslist-db@1.3.4: + resolution: {integrity: sha512-t8wonIOdQyOjtPd2VktlBu6QjTVTks6v8bSi7kd0r2Vll8TK1JYDZtRRdbmCHOAMphkZgrzK+L+vXK4pyZ8t4A==} hasBin: true peerDependencies: browserslist: '>= 4.21.0' @@ -5601,8 +5626,8 @@ packages: vfile@6.0.3: resolution: {integrity: sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==} - watchpack@2.5.2: - resolution: {integrity: sha512-6i/00NBjP4yGPs+caKSyRfpTF/8Torsu0MOW3mMzIbhgISFder8i7xbqgHlLMwJrdiN8ndBV3UA1/AfzPSr+jg==} + watchpack@2.6.3: + resolution: {integrity: sha512-s3NZy0QpTY9qGqzc0wtz4qI28z3+5qKbbAec4MV4G9N3CfgZ9wgvQRr0cl2jh/tqkWG1NWHkmVMHZpCamev5Wg==} engines: {node: '>=10.13.0'} wbuf@1.7.3: @@ -5649,8 +5674,8 @@ packages: resolution: {integrity: sha512-hXXvrjtx2PLYx4qruKl+kyRSLc52V+cCvMxRjmKwoA+CBbbF5GfIBtR6kCvl0fYGqTUPKB+1ktVmTHqMOzgCBg==} engines: {node: '>=18.0.0'} - webpack-sources@3.6.0: - resolution: {integrity: sha512-EIMmPVvNI0CYXyRPp34F2Qk7W37/BZVZIofS6LAUnrNjCVahS+hO4mxwFJDjQjODTGZDtVzLYoN2+1dYkhk9qA==} + webpack-sources@3.7.0: + resolution: {integrity: sha512-PdUhbCycwEgiS1hB/FBDksWKg/ashAIuJKqwdbPn8/dFVgU5LxQiBvG0js6VRRIzPujMrStYCczywp82P0KWng==} engines: {node: '>=10.13.0'} webpack@5.109.2: @@ -5912,14 +5937,14 @@ snapshots: '@babel/core@7.29.7': dependencies: '@babel/code-frame': 7.29.7 - '@babel/generator': 7.29.8 + '@babel/generator': 7.29.12 '@babel/helper-compilation-targets': 7.29.7 '@babel/helper-module-transforms': 7.29.7(@babel/core@7.29.7) - '@babel/helpers': 7.29.7 - '@babel/parser': 7.29.9 + '@babel/helpers': 7.29.10 + '@babel/parser': 7.29.12 '@babel/template': 7.29.7 - '@babel/traverse': 7.29.8 - '@babel/types': 7.29.8 + '@babel/traverse': 7.29.12 + '@babel/types': 7.29.11 '@jridgewell/remapping': 2.3.5 convert-source-map: 2.0.0 debug: 4.4.3 @@ -5929,18 +5954,18 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/generator@7.29.7': + '@babel/generator@7.29.12': dependencies: - '@babel/parser': 7.29.7 - '@babel/types': 7.29.7 + '@babel/parser': 7.29.12 + '@babel/types': 7.29.11 '@jridgewell/gen-mapping': 0.3.13 '@jridgewell/trace-mapping': 0.3.31 jsesc: 3.1.0 - '@babel/generator@7.29.8': + '@babel/generator@7.29.7': dependencies: - '@babel/parser': 7.29.9 - '@babel/types': 7.29.8 + '@babel/parser': 7.29.7 + '@babel/types': 7.29.7 '@jridgewell/gen-mapping': 0.3.13 '@jridgewell/trace-mapping': 0.3.31 jsesc: 3.1.0 @@ -5999,8 +6024,8 @@ snapshots: '@babel/helper-module-imports@7.29.7': dependencies: - '@babel/traverse': 7.29.8 - '@babel/types': 7.29.8 + '@babel/traverse': 7.29.12 + '@babel/types': 7.29.11 transitivePeerDependencies: - supports-color @@ -6009,7 +6034,7 @@ snapshots: '@babel/core': 7.29.7 '@babel/helper-module-imports': 7.29.7 '@babel/helper-validator-identifier': 7.29.7 - '@babel/traverse': 7.29.8 + '@babel/traverse': 7.29.12 transitivePeerDependencies: - supports-color @@ -6044,6 +6069,8 @@ snapshots: transitivePeerDependencies: - supports-color + '@babel/helper-string-parser@7.29.11': {} + '@babel/helper-string-parser@7.29.7': {} '@babel/helper-validator-identifier@7.29.7': {} @@ -6058,18 +6085,18 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/helpers@7.29.7': + '@babel/helpers@7.29.10': dependencies: '@babel/template': 7.29.7 - '@babel/types': 7.29.8 + '@babel/types': 7.29.11 - '@babel/parser@7.29.7': + '@babel/parser@7.29.12': dependencies: - '@babel/types': 7.29.7 + '@babel/types': 7.29.11 - '@babel/parser@7.29.9': + '@babel/parser@7.29.7': dependencies: - '@babel/types': 7.29.8 + '@babel/types': 7.29.7 '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.29.7(@babel/core@7.29.7)': dependencies: @@ -6646,44 +6673,46 @@ snapshots: transitivePeerDependencies: - supports-color + '@babel/runtime@7.29.10': {} + '@babel/runtime@7.29.7': {} '@babel/template@7.29.7': dependencies: '@babel/code-frame': 7.29.7 - '@babel/parser': 7.29.9 - '@babel/types': 7.29.8 + '@babel/parser': 7.29.12 + '@babel/types': 7.29.11 - '@babel/traverse@7.29.7': + '@babel/traverse@7.29.12': dependencies: '@babel/code-frame': 7.29.7 - '@babel/generator': 7.29.7 + '@babel/generator': 7.29.12 '@babel/helper-globals': 7.29.7 - '@babel/parser': 7.29.7 + '@babel/parser': 7.29.12 '@babel/template': 7.29.7 - '@babel/types': 7.29.7 + '@babel/types': 7.29.11 debug: 4.4.3 transitivePeerDependencies: - supports-color - '@babel/traverse@7.29.8': + '@babel/traverse@7.29.7': dependencies: '@babel/code-frame': 7.29.7 - '@babel/generator': 7.29.8 + '@babel/generator': 7.29.7 '@babel/helper-globals': 7.29.7 - '@babel/parser': 7.29.9 + '@babel/parser': 7.29.7 '@babel/template': 7.29.7 - '@babel/types': 7.29.8 + '@babel/types': 7.29.7 debug: 4.4.3 transitivePeerDependencies: - supports-color - '@babel/types@7.29.7': + '@babel/types@7.29.11': dependencies: - '@babel/helper-string-parser': 7.29.7 + '@babel/helper-string-parser': 7.29.11 '@babel/helper-validator-identifier': 7.29.7 - '@babel/types@7.29.8': + '@babel/types@7.29.7': dependencies: '@babel/helper-string-parser': 7.29.7 '@babel/helper-validator-identifier': 7.29.7 @@ -8201,17 +8230,17 @@ snapshots: '@emnapi/core@1.11.3': dependencies: '@emnapi/wasi-threads': 1.2.3 - tslib: 2.8.1 + tslib: 2.9.1 optional: true '@emnapi/runtime@1.11.3': dependencies: - tslib: 2.8.1 + tslib: 2.9.1 optional: true '@emnapi/wasi-threads@1.2.3': dependencies: - tslib: 2.8.1 + tslib: 2.9.1 optional: true '@hapi/hoek@9.3.0': {} @@ -8652,7 +8681,7 @@ snapshots: '@slorber/react-helmet-async@1.3.0(react-dom@19.2.8(react@19.2.8))(react@19.2.8)': dependencies: - '@babel/runtime': 7.29.7 + '@babel/runtime': 7.29.10 invariant: 2.2.4 prop-types: 15.8.1 react: 19.2.8 @@ -8878,7 +8907,7 @@ snapshots: '@tybys/wasm-util@0.10.4': dependencies: - tslib: 2.8.1 + tslib: 2.9.1 optional: true '@types/body-parser@1.19.6': @@ -8907,6 +8936,8 @@ snapshots: dependencies: '@types/estree': 1.0.9 + '@types/estree@1.0.10': {} + '@types/estree@1.0.9': {} '@types/express-serve-static-core@4.19.9': @@ -8971,7 +9002,7 @@ snapshots: dependencies: undici-types: 8.3.0 - '@types/node@26.6.4': + '@types/node@26.6.6': dependencies: undici-types: 8.9.0 @@ -9150,6 +9181,8 @@ snapshots: acorn@8.18.0: {} + acorn@8.19.0: {} + address@2.0.3: {} aggregate-error@3.1.0: @@ -9184,7 +9217,7 @@ snapshots: ajv@8.20.0: dependencies: fast-deep-equal: 3.1.3 - fast-uri: 3.1.8 + fast-uri: 3.1.9 json-schema-traverse: 1.0.0 require-from-string: 2.0.2 @@ -9317,7 +9350,7 @@ snapshots: balanced-match@4.0.4: {} - baseline-browser-mapping@2.11.27: {} + baseline-browser-mapping@2.11.34: {} batch@0.6.1: {} @@ -9388,11 +9421,11 @@ snapshots: browserslist@4.28.7: dependencies: - baseline-browser-mapping: 2.11.27 - caniuse-lite: 1.0.30001814 - electron-to-chromium: 1.5.444 - node-releases: 2.0.57 - update-browserslist-db: 1.3.3(browserslist@4.28.7) + baseline-browser-mapping: 2.11.34 + caniuse-lite: 1.0.30001820 + electron-to-chromium: 1.5.472 + node-releases: 2.0.63 + update-browserslist-db: 1.3.4(browserslist@4.28.7) buffer-from@1.1.2: {} @@ -9455,7 +9488,7 @@ snapshots: caniuse-lite@1.0.30001806: {} - caniuse-lite@1.0.30001814: {} + caniuse-lite@1.0.30001820: {} ccount@2.0.1: {} @@ -9981,7 +10014,7 @@ snapshots: ee-first@1.1.1: {} - electron-to-chromium@1.5.444: {} + electron-to-chromium@1.5.472: {} emoji-regex@8.0.0: {} @@ -10175,7 +10208,7 @@ snapshots: fast-json-stable-stringify@2.1.0: {} - fast-uri@3.1.8: {} + fast-uri@3.1.9: {} fast-xml-builder@1.3.0: dependencies: @@ -10806,7 +10839,7 @@ snapshots: jest-worker@27.5.1: dependencies: - '@types/node': 26.6.4 + '@types/node': 26.6.6 merge-stream: 2.0.0 supports-color: 8.1.1 @@ -11532,11 +11565,10 @@ snapshots: minimist@1.2.8: {} - minimizer-webpack-plugin@5.13.0(@swc/core@1.15.47)(@swc/html@1.15.47)(lightningcss@1.33.0)(postcss@8.5.25)(webpack@5.109.2(@swc/core@1.15.47)(postcss@8.5.25)): + minimizer-webpack-plugin@5.14.0(@swc/core@1.15.47)(@swc/html@1.15.47)(lightningcss@1.33.0)(postcss@8.5.25)(webpack@5.109.2(@swc/core@1.15.47)(postcss@8.5.25)): dependencies: - '@jridgewell/trace-mapping': 0.3.31 jest-worker: 27.5.1 - schema-utils: 4.5.0 + schema-utils: 4.8.2(webpack@5.109.2(@swc/core@1.15.47)(postcss@8.5.25)) terser: 5.51.2 webpack: 5.109.2(@swc/core@1.15.47)(postcss@8.5.25) optionalDependencies: @@ -11545,11 +11577,10 @@ snapshots: lightningcss: 1.33.0 postcss: 8.5.25 - minimizer-webpack-plugin@5.13.0(@swc/core@1.15.47)(clean-css@5.3.3)(cssnano@6.1.2(postcss@8.5.25))(html-minifier-terser@7.2.0)(postcss@8.5.25)(webpack@5.109.2(@swc/core@1.15.47)(postcss@8.5.25)): + minimizer-webpack-plugin@5.14.0(@swc/core@1.15.47)(clean-css@5.3.3)(cssnano@6.1.2(postcss@8.5.25))(html-minifier-terser@7.2.0)(postcss@8.5.25)(webpack@5.109.2(@swc/core@1.15.47)(postcss@8.5.25)): dependencies: - '@jridgewell/trace-mapping': 0.3.31 jest-worker: 27.5.1 - schema-utils: 4.5.0 + schema-utils: 4.8.2(webpack@5.109.2(@swc/core@1.15.47)(postcss@8.5.25)) terser: 5.51.2 webpack: 5.109.2(@swc/core@1.15.47)(postcss@8.5.25) optionalDependencies: @@ -11559,11 +11590,10 @@ snapshots: html-minifier-terser: 7.2.0 postcss: 8.5.25 - minimizer-webpack-plugin@5.13.0(@swc/core@1.15.47)(postcss@8.5.25)(webpack@5.109.2(@swc/core@1.15.47)(postcss@8.5.25)): + minimizer-webpack-plugin@5.14.0(@swc/core@1.15.47)(postcss@8.5.25)(webpack@5.109.2(@swc/core@1.15.47)(postcss@8.5.25)): dependencies: - '@jridgewell/trace-mapping': 0.3.31 jest-worker: 27.5.1 - schema-utils: 4.5.0 + schema-utils: 4.8.2(webpack@5.109.2(@swc/core@1.15.47)(postcss@8.5.25)) terser: 5.51.2 webpack: 5.109.2(@swc/core@1.15.47)(postcss@8.5.25) optionalDependencies: @@ -11608,7 +11638,7 @@ snapshots: css-select: 5.2.2 he: 1.2.0 - node-releases@2.0.57: {} + node-releases@2.0.63: {} nopt@1.0.10: dependencies: @@ -12626,12 +12656,14 @@ snapshots: ajv-formats: 2.1.1(ajv@8.20.0) ajv-keywords: 5.1.0(ajv@8.20.0) - schema-utils@4.5.0: + schema-utils@4.8.2(webpack@5.109.2(@swc/core@1.15.47)(postcss@8.5.25)): dependencies: '@types/json-schema': 7.0.15 ajv: 8.20.0 ajv-formats: 3.0.1(ajv@8.20.0) ajv-keywords: 5.1.0(ajv@8.20.0) + optionalDependencies: + webpack: 5.109.2(@swc/core@1.15.47)(postcss@8.5.25) search-insights@2.17.3: {} @@ -12962,7 +12994,7 @@ snapshots: terser@5.51.2: dependencies: '@jridgewell/source-map': 0.3.11 - acorn: 8.18.0 + acorn: 8.19.0 commander: 2.20.3 source-map-support: 0.5.21 @@ -13005,6 +13037,9 @@ snapshots: tslib@2.8.1: {} + tslib@2.9.1: + optional: true + tsyringe@4.10.0: dependencies: tslib: 1.14.1 @@ -13115,7 +13150,7 @@ snapshots: unpipe@1.0.0: {} - update-browserslist-db@1.3.3(browserslist@4.28.7): + update-browserslist-db@1.3.4(browserslist@4.28.7): dependencies: browserslist: 4.28.7 escalade: 3.2.0 @@ -13194,7 +13229,7 @@ snapshots: '@types/unist': 3.0.3 vfile-message: 4.0.3 - watchpack@2.5.2: + watchpack@2.6.3: dependencies: graceful-fs: 4.2.11 @@ -13288,16 +13323,16 @@ snapshots: flat: 5.0.2 wildcard: 2.0.1 - webpack-sources@3.6.0: {} + webpack-sources@3.7.0: {} webpack@5.109.2(@swc/core@1.15.47)(@swc/html@1.15.47)(lightningcss@1.33.0)(postcss@8.5.25): dependencies: - '@types/estree': 1.0.9 + '@types/estree': 1.0.10 '@types/json-schema': 7.0.15 '@webassemblyjs/ast': 1.14.1 '@webassemblyjs/wasm-edit': 1.14.1 '@webassemblyjs/wasm-parser': 1.14.1 - acorn: 8.18.0 + acorn: 8.19.0 browserslist: 4.28.7 chrome-trace-event: 1.0.4 enhanced-resolve: 5.26.0 @@ -13306,12 +13341,12 @@ snapshots: events: 3.3.0 graceful-fs: 4.2.11 mime-db: 1.54.0 - minimizer-webpack-plugin: 5.13.0(@swc/core@1.15.47)(@swc/html@1.15.47)(lightningcss@1.33.0)(postcss@8.5.25)(webpack@5.109.2(@swc/core@1.15.47)(postcss@8.5.25)) + minimizer-webpack-plugin: 5.14.0(@swc/core@1.15.47)(@swc/html@1.15.47)(lightningcss@1.33.0)(postcss@8.5.25)(webpack@5.109.2(@swc/core@1.15.47)(postcss@8.5.25)) neo-async: 2.6.2 - schema-utils: 4.5.0 + schema-utils: 4.8.2(webpack@5.109.2(@swc/core@1.15.47)(postcss@8.5.25)) tapable: 2.3.3 - watchpack: 2.5.2 - webpack-sources: 3.6.0 + watchpack: 2.6.3 + webpack-sources: 3.7.0 transitivePeerDependencies: - '@minify-html/node' - '@napi-rs/image' @@ -13332,12 +13367,12 @@ snapshots: webpack@5.109.2(@swc/core@1.15.47)(clean-css@5.3.3)(cssnano@6.1.2(postcss@8.5.25))(html-minifier-terser@7.2.0)(postcss@8.5.25): dependencies: - '@types/estree': 1.0.9 + '@types/estree': 1.0.10 '@types/json-schema': 7.0.15 '@webassemblyjs/ast': 1.14.1 '@webassemblyjs/wasm-edit': 1.14.1 '@webassemblyjs/wasm-parser': 1.14.1 - acorn: 8.18.0 + acorn: 8.19.0 browserslist: 4.28.7 chrome-trace-event: 1.0.4 enhanced-resolve: 5.26.0 @@ -13346,12 +13381,12 @@ snapshots: events: 3.3.0 graceful-fs: 4.2.11 mime-db: 1.54.0 - minimizer-webpack-plugin: 5.13.0(@swc/core@1.15.47)(clean-css@5.3.3)(cssnano@6.1.2(postcss@8.5.25))(html-minifier-terser@7.2.0)(postcss@8.5.25)(webpack@5.109.2(@swc/core@1.15.47)(postcss@8.5.25)) + minimizer-webpack-plugin: 5.14.0(@swc/core@1.15.47)(clean-css@5.3.3)(cssnano@6.1.2(postcss@8.5.25))(html-minifier-terser@7.2.0)(postcss@8.5.25)(webpack@5.109.2(@swc/core@1.15.47)(postcss@8.5.25)) neo-async: 2.6.2 - schema-utils: 4.5.0 + schema-utils: 4.8.2(webpack@5.109.2(@swc/core@1.15.47)(postcss@8.5.25)) tapable: 2.3.3 - watchpack: 2.5.2 - webpack-sources: 3.6.0 + watchpack: 2.6.3 + webpack-sources: 3.7.0 transitivePeerDependencies: - '@minify-html/node' - '@napi-rs/image' @@ -13372,12 +13407,12 @@ snapshots: webpack@5.109.2(@swc/core@1.15.47)(postcss@8.5.25): dependencies: - '@types/estree': 1.0.9 + '@types/estree': 1.0.10 '@types/json-schema': 7.0.15 '@webassemblyjs/ast': 1.14.1 '@webassemblyjs/wasm-edit': 1.14.1 '@webassemblyjs/wasm-parser': 1.14.1 - acorn: 8.18.0 + acorn: 8.19.0 browserslist: 4.28.7 chrome-trace-event: 1.0.4 enhanced-resolve: 5.26.0 @@ -13386,12 +13421,12 @@ snapshots: events: 3.3.0 graceful-fs: 4.2.11 mime-db: 1.54.0 - minimizer-webpack-plugin: 5.13.0(@swc/core@1.15.47)(postcss@8.5.25)(webpack@5.109.2(@swc/core@1.15.47)(postcss@8.5.25)) + minimizer-webpack-plugin: 5.14.0(@swc/core@1.15.47)(postcss@8.5.25)(webpack@5.109.2(@swc/core@1.15.47)(postcss@8.5.25)) neo-async: 2.6.2 - schema-utils: 4.5.0 + schema-utils: 4.8.2(webpack@5.109.2(@swc/core@1.15.47)(postcss@8.5.25)) tapable: 2.3.3 - watchpack: 2.5.2 - webpack-sources: 3.6.0 + watchpack: 2.6.3 + webpack-sources: 3.7.0 transitivePeerDependencies: - '@minify-html/node' - '@napi-rs/image' From 4d69ca3d04e39c17d8df741009cd70b0c854b361 Mon Sep 17 00:00:00 2001 From: tison Date: Wed, 18 Nov 2026 16:46:52 +0800 Subject: [PATCH 3/4] ci: update Azure login, Python setup, and tool installation actions --- .github/workflows/azure_storage.yml | 12 ++++++------ .github/workflows/bootstrap_rust_crates.yml | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/azure_storage.yml b/.github/workflows/azure_storage.yml index 1688ad33..994d4426 100644 --- a/.github/workflows/azure_storage.yml +++ b/.github/workflows/azure_storage.yml @@ -95,7 +95,7 @@ jobs: AZURE_TENANT_ID: op://reqsign/azure-storage/tenant_id AZURE_CLIENT_ID: op://reqsign/azure-storage/client_id - name: Log in to Azure with GitHub OIDC - uses: azure/login@532459ea530d8321f2fb9bb10d1e0bcf23869a43 # v3.0.0 + uses: azure/login@7ddb5af1ef8758cf1353cf3b42f940aee27ba21c # v3.0.2 with: client-id: ${{ env.AZURE_CLIENT_ID }} tenant-id: ${{ env.AZURE_TENANT_ID }} @@ -142,7 +142,7 @@ jobs: AZURE_TENANT_ID: op://reqsign/azure-storage/tenant_id AZURE_CLIENT_ID: op://reqsign/azure-storage/client_id - name: Log in to Azure with GitHub OIDC - uses: azure/login@532459ea530d8321f2fb9bb10d1e0bcf23869a43 # v3.0.0 + uses: azure/login@7ddb5af1ef8758cf1353cf3b42f940aee27ba21c # v3.0.2 with: client-id: ${{ env.AZURE_CLIENT_ID }} tenant-id: ${{ env.AZURE_TENANT_ID }} @@ -266,7 +266,7 @@ jobs: AZURE_TENANT_ID: op://reqsign/azure-storage/tenant_id AZURE_CLIENT_ID: op://reqsign/azure-storage/client_id - name: Log in to Azure with GitHub OIDC - uses: azure/login@532459ea530d8321f2fb9bb10d1e0bcf23869a43 # v3.0.0 + uses: azure/login@7ddb5af1ef8758cf1353cf3b42f940aee27ba21c # v3.0.2 with: client-id: ${{ env.AZURE_CLIENT_ID }} tenant-id: ${{ env.AZURE_TENANT_ID }} @@ -348,7 +348,7 @@ jobs: AZURE_TENANT_ID: op://reqsign/azure-storage/tenant_id AZURE_CLIENT_ID: op://reqsign/azure-storage/client_id - name: Log in to Azure with GitHub OIDC - uses: azure/login@532459ea530d8321f2fb9bb10d1e0bcf23869a43 # v3.0.0 + uses: azure/login@7ddb5af1ef8758cf1353cf3b42f940aee27ba21c # v3.0.2 with: client-id: ${{ env.AZURE_CLIENT_ID }} tenant-id: ${{ env.AZURE_TENANT_ID }} @@ -387,7 +387,7 @@ jobs: AZURE_TENANT_ID: op://reqsign/azure-storage/tenant_id AZURE_CLIENT_ID: op://reqsign/azure-storage/client_id - name: Log in to Azure with GitHub OIDC - uses: azure/login@532459ea530d8321f2fb9bb10d1e0bcf23869a43 # v3.0.0 + uses: azure/login@7ddb5af1ef8758cf1353cf3b42f940aee27ba21c # v3.0.2 with: client-id: ${{ env.AZURE_CLIENT_ID }} tenant-id: ${{ env.AZURE_TENANT_ID }} @@ -491,7 +491,7 @@ jobs: AZURE_TENANT_ID: op://reqsign/azure-storage/tenant_id AZURE_CLIENT_ID: op://reqsign/azure-storage/client_id - name: Log in to Azure with GitHub OIDC - uses: azure/login@532459ea530d8321f2fb9bb10d1e0bcf23869a43 # v3.0.0 + uses: azure/login@7ddb5af1ef8758cf1353cf3b42f940aee27ba21c # v3.0.2 with: client-id: ${{ env.AZURE_CLIENT_ID }} tenant-id: ${{ env.AZURE_TENANT_ID }} diff --git a/.github/workflows/bootstrap_rust_crates.yml b/.github/workflows/bootstrap_rust_crates.yml index 5df96659..a59b9a32 100644 --- a/.github/workflows/bootstrap_rust_crates.yml +++ b/.github/workflows/bootstrap_rust_crates.yml @@ -41,7 +41,7 @@ jobs: run: | test "${GITHUB_REF}" = "refs/heads/main" test "$(git rev-parse HEAD)" = "${GITHUB_SHA}" - - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 + - uses: actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0 # v7.1.0 with: python-version: "3.11" - name: Audit and bootstrap crates.io packages diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7fad757f..d820dfbb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,7 +54,7 @@ jobs: with: persist-credentials: false - name: Install Hawkeye - uses: taiki-e/install-action@f7e5d7c961414b23f5b25b2da9294395d08513ad # v2.87.26 + uses: taiki-e/install-action@cfdb7ed4ccc7c7dce37759eae89dc5674b469b39 # v2.90.3 with: tool: hawkeye@7.0.0 - name: Check license headers diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3df67998..c28530aa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -52,7 +52,7 @@ jobs: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: false - - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 + - uses: actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0 # v7.1.0 with: python-version: "3.11" - name: Test release helpers @@ -78,7 +78,7 @@ jobs: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: false - - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 + - uses: actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0 # v7.1.0 with: python-version: "3.11" - name: Publish Rust crates From c87b830c127ed9572555734ba3a6fa9637fda7ed Mon Sep 17 00:00:00 2001 From: tison Date: Wed, 18 Nov 2026 17:03:47 +0800 Subject: [PATCH 4/4] build(deps): retain rsa 0.9 and Rust 1.86 The public JWT helper accepts keys from rsa 0.9. Keep that API and the workspace Rust 1.86 requirement while updating the website and CI dependencies. --- Cargo.toml | 5 ++--- core/Cargo.toml | 1 - core/src/jwt.rs | 22 +++++++++++-------- .../provide_credential/client_certificate.rs | 8 +++---- services/google/Cargo.toml | 1 - .../service_account_token.rs | 8 +++---- services/google/src/sign_request.rs | 19 ++++++++-------- services/google/tests/oauth_token_endpoint.rs | 6 ++--- services/oracle/Cargo.toml | 2 -- services/oracle/src/sign_request.rs | 19 +++++++++------- services/oracle/tests/private_key_formats.rs | 19 ++++++++-------- website/docs/getting-started.md | 5 ++++- .../docs/reference/versioning-and-targets.md | 4 +++- 13 files changed, 63 insertions(+), 56 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5c830b30..f1a60482 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ resolver = "3" edition = "2024" license = "Apache-2.0" repository = "https://github.com/apache/reqsign" -rust-version = "1.87.0" +rust-version = "1.86.0" [workspace.dependencies] # Workspace dependencies @@ -54,7 +54,6 @@ dotenvy = "0.15" env_logger = "0.11" form_urlencoded = "1" futures = "0.3" -getrandom = { version = "0.4", features = ["sys_rng"] } hex = "0.4" hmac = "0.13" http = "1" @@ -67,7 +66,7 @@ pretty_assertions = "1.3" prost = "0.14" quick-xml = { version = "0.42.0", features = ["serialize"] } reqwest = { version = "0.13.1", default-features = false } -rsa = { version = "0.10.0", features = ["pkcs1v15", "pkcs5"] } +rsa = { version = "0.9.2", features = ["pkcs5", "sha2"] } rust-ini = { version = "0.21" } serde = { version = "1", features = ["derive"] } serde_json = { version = "1" } diff --git a/core/Cargo.toml b/core/Cargo.toml index dedfb318..ab32f593 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -60,4 +60,3 @@ windows-sys = { version = "0.61.0", features = [ [dev-dependencies] asyncband = { workspace = true, features = ["oneshot"] } futures = { workspace = true } -getrandom = { workspace = true } diff --git a/core/src/jwt.rs b/core/src/jwt.rs index 6bef11f4..413ff8fb 100644 --- a/core/src/jwt.rs +++ b/core/src/jwt.rs @@ -19,9 +19,12 @@ use base64::Engine; use base64::engine::general_purpose::URL_SAFE_NO_PAD; -use rsa::PrivateKey; +use rsa::RsaPrivateKey; +use rsa::pkcs1v15::SigningKey; use rsa::pkcs8::DecodePrivateKey; +use rsa::rand_core::OsRng; use rsa::sha2::Sha256; +use rsa::signature::{RandomizedSigner, SignatureEncoding}; use serde::Serialize; use crate::{Error, Result}; @@ -30,7 +33,7 @@ use crate::{Error, Result}; /// /// RS256 is RSA PKCS#1 v1.5 with SHA-256. The caller owns the JWT header and /// claims shape so service-specific fields such as `x5t` stay service-local. -pub fn encode_rs256(header: &H, claims: &C, private_key: &PrivateKey) -> Result +pub fn encode_rs256(header: &H, claims: &C, private_key: &RsaPrivateKey) -> Result where H: Serialize, C: Serialize, @@ -39,10 +42,10 @@ where let encoded_claims = encode_json(claims)?; let signing_input = format!("{encoded_header}.{encoded_claims}"); - let signature = private_key - .pkcs1v15_sign::(signing_input.as_bytes()) - .map_err(|e| Error::unexpected("failed to sign JWT").with_source(e))?; - let encoded_signature = URL_SAFE_NO_PAD.encode(signature); + let mut rng = OsRng; + let signing_key = SigningKey::::new(private_key.clone()); + let signature = signing_key.sign_with_rng(&mut rng, signing_input.as_bytes()); + let encoded_signature = URL_SAFE_NO_PAD.encode(signature.to_bytes()); Ok(format!("{signing_input}.{encoded_signature}")) } @@ -56,7 +59,7 @@ where let private_key_pem = std::str::from_utf8(private_key_pem).map_err(|e| { Error::credential_invalid("RSA private key PEM is not valid UTF-8").with_source(e) })?; - let private_key = PrivateKey::from_pkcs8_pem(private_key_pem).map_err(|e| { + let private_key = RsaPrivateKey::from_pkcs8_pem(private_key_pem).map_err(|e| { Error::credential_invalid("failed to parse PKCS#8 RSA private key PEM").with_source(e) })?; @@ -76,8 +79,8 @@ where mod tests { use super::*; use base64::engine::general_purpose::URL_SAFE_NO_PAD; - use getrandom::SysRng; use rsa::pkcs1v15::{Signature, VerifyingKey}; + use rsa::rand_core::OsRng; use rsa::signature::Verifier; use serde_json::json; @@ -98,7 +101,8 @@ mod tests { #[test] fn encode_rs256_keeps_jws_shape_and_verifiable_signature() -> Result<()> { - let private_key = PrivateKey::new(&mut SysRng, 2048) + let mut rng = OsRng; + let private_key = RsaPrivateKey::new(&mut rng, 2048) .map_err(|e| Error::unexpected("failed to generate test RSA key").with_source(e))?; let jwt = encode_rs256( diff --git a/services/azure-storage/src/provide_credential/client_certificate.rs b/services/azure-storage/src/provide_credential/client_certificate.rs index f14388bb..5cd98cc9 100644 --- a/services/azure-storage/src/provide_credential/client_certificate.rs +++ b/services/azure-storage/src/provide_credential/client_certificate.rs @@ -26,7 +26,7 @@ use base64::Engine; use base64::engine::general_purpose::URL_SAFE_NO_PAD; use reqsign_core::time::Timestamp; use reqsign_core::{Context, ProvideCredential}; -use rsa::PrivateKey; +use rsa::RsaPrivateKey; use rsa::pkcs8::DecodePrivateKey; use serde::Serialize; use sha1::{Digest, Sha1}; @@ -99,7 +99,7 @@ impl ClientCertificateCredentialProvider { &self, ctx: &Context, path: &str, - ) -> Result<(Vec, PrivateKey), reqsign_core::Error> { + ) -> Result<(Vec, RsaPrivateKey), reqsign_core::Error> { let cert_data = ctx.file_read(path).await.map_err(|e| { reqsign_core::Error::credential_invalid(format!("Failed to read certificate file: {e}")) })?; @@ -141,7 +141,7 @@ impl ClientCertificateCredentialProvider { })?; // Parse private key - let private_key = PrivateKey::from_pkcs8_pem(&private_key_pem).map_err(|e| { + let private_key = RsaPrivateKey::from_pkcs8_pem(&private_key_pem).map_err(|e| { reqsign_core::Error::credential_invalid(format!( "Failed to parse private key from PEM: {e}" )) @@ -163,7 +163,7 @@ impl ClientCertificateCredentialProvider { tenant_id: &str, client_id: &str, cert_der: &[u8], - private_key: &PrivateKey, + private_key: &RsaPrivateKey, ) -> Result { let now = SystemTime::now() .duration_since(UNIX_EPOCH) diff --git a/services/google/Cargo.toml b/services/google/Cargo.toml index ecdd7a13..c76a5d31 100644 --- a/services/google/Cargo.toml +++ b/services/google/Cargo.toml @@ -64,7 +64,6 @@ reqsign-core = { workspace = true, features = ["jwt"] } asyncband = { workspace = true, features = ["semaphore"] } dotenvy = { workspace = true } env_logger = { workspace = true } -getrandom = { workspace = true } reqsign-file-read-tokio = { workspace = true } reqsign-http-send-reqwest = { workspace = true } reqwest = { workspace = true, features = ["default-tls"] } diff --git a/services/google/src/provide_credential/service_account_token.rs b/services/google/src/provide_credential/service_account_token.rs index 27bd4ae0..6e1d86ad 100644 --- a/services/google/src/provide_credential/service_account_token.rs +++ b/services/google/src/provide_credential/service_account_token.rs @@ -340,12 +340,12 @@ mod tests { use std::sync::{Arc, Mutex}; use bytes::Bytes; - use getrandom::SysRng; use http::{HeaderMap, Method}; use reqsign_core::hash::base64_decode; use reqsign_core::{ErrorKind, FileRead, Granter, HttpSend, StaticEnv, time::Timestamp}; - use rsa::PrivateKey; + use rsa::RsaPrivateKey; use rsa::pkcs8::{EncodePrivateKey, LineEnding}; + use rsa::rand_core::OsRng; use serde_json::Value; use crate::{ @@ -436,7 +436,7 @@ mod tests { } fn service_account() -> ServiceAccount { - let key = PrivateKey::new(&mut SysRng, 1024).expect("test RSA key must generate"); + let key = RsaPrivateKey::new(&mut OsRng, 1024).expect("test RSA key must generate"); let private_key = key .to_pkcs8_pem(LineEnding::LF) .expect("test RSA key must encode") @@ -494,7 +494,7 @@ mod tests { fn decode_jwt_json(segment: &str) -> Value { let mut standard = segment.replace('-', "+").replace('_', "/"); - while !standard.len().is_multiple_of(4) { + while standard.len() % 4 != 0 { standard.push('='); } serde_json::from_slice(&base64_decode(&standard).expect("JWT segment must decode")) diff --git a/services/google/src/sign_request.rs b/services/google/src/sign_request.rs index 7cf787e2..a9fd3704 100644 --- a/services/google/src/sign_request.rs +++ b/services/google/src/sign_request.rs @@ -18,8 +18,10 @@ use http::{Uri, header}; use log::debug; use percent_encoding::{percent_decode_str, utf8_percent_encode}; +use rsa::pkcs1v15::SigningKey; use rsa::pkcs8::DecodePrivateKey; -use rsa::sha2::Sha256; +use rsa::rand_core::OsRng; +use rsa::signature::RandomizedSigner; use serde::{Deserialize, Serialize}; use std::time::Duration; @@ -259,16 +261,14 @@ impl RequestSigner { } fn sign_with_service_account(private_key_pem: &str, string_to_sign: &str) -> Result { - let private_key = rsa::PrivateKey::from_pkcs8_pem(private_key_pem).map_err(|e| { + let mut rng = OsRng; + let private_key = rsa::RsaPrivateKey::from_pkcs8_pem(private_key_pem).map_err(|e| { reqsign_core::Error::unexpected("failed to parse private key").with_source(e) })?; - let signature = private_key - .pkcs1v15_sign::(string_to_sign.as_bytes()) - .map_err(|e| { - reqsign_core::Error::unexpected("failed to sign request").with_source(e) - })?; + let signing_key = SigningKey::::new(private_key); + let signature = signing_key.sign_with_rng(&mut rng, string_to_sign.as_bytes()); - Ok(hex_encode_upper(&signature)) + Ok(signature.to_string()) } fn build_signed_query_with_service_account( @@ -688,7 +688,6 @@ fn append_query_fragment(uri: &Uri, fragment: &str) -> Result { mod tests { use super::*; use bytes::Bytes; - use getrandom::SysRng; use http::header; use reqsign_core::{ErrorKind, HttpSend, ProvideCredential, Signer}; use rsa::pkcs8::{EncodePrivateKey, LineEnding}; @@ -1064,7 +1063,7 @@ mod tests { #[tokio::test] async fn service_account_exchange_preserves_optional_expiration_response() -> Result<()> { - let private_key = rsa::PrivateKey::new(&mut SysRng, 1024) + let private_key = rsa::RsaPrivateKey::new(&mut OsRng, 1024) .expect("private key must generate") .to_pkcs8_pem(LineEnding::LF) .expect("private key must encode") diff --git a/services/google/tests/oauth_token_endpoint.rs b/services/google/tests/oauth_token_endpoint.rs index 4520bad5..e7b6db05 100644 --- a/services/google/tests/oauth_token_endpoint.rs +++ b/services/google/tests/oauth_token_endpoint.rs @@ -18,7 +18,6 @@ use std::sync::{Arc, Mutex, OnceLock}; use bytes::Bytes; -use getrandom::SysRng; use http::{Request, Response, StatusCode}; use reqsign_core::hash::base64_decode; use reqsign_core::{Context, Error, ErrorKind, Granter, HttpSend, ProvideCredential, Result}; @@ -28,8 +27,9 @@ use reqsign_google::{ ServerSideCredentialAccessBoundaryGranter, ServiceAccount, ServiceAccountTokenCredentialProvider, StaticCredentialProvider, }; -use rsa::PrivateKey; +use rsa::RsaPrivateKey; use rsa::pkcs8::{EncodePrivateKey, LineEnding}; +use rsa::rand_core::OsRng; use serde::Deserialize; use serde_json::{Value, json}; @@ -65,7 +65,7 @@ fn service_account() -> ServiceAccount { ServiceAccount { private_key: KEY .get_or_init(|| { - PrivateKey::new(&mut SysRng, 1024) + RsaPrivateKey::new(&mut OsRng, 1024) .unwrap() .to_pkcs8_pem(LineEnding::LF) .unwrap() diff --git a/services/oracle/Cargo.toml b/services/oracle/Cargo.toml index 9f71707d..4cacc181 100644 --- a/services/oracle/Cargo.toml +++ b/services/oracle/Cargo.toml @@ -37,8 +37,6 @@ rust-ini = { workspace = true } [dev-dependencies] env_logger = "0.11" -getrandom = { workspace = true } -pkcs8 = { version = "0.11", features = ["getrandom"] } reqsign-file-read-tokio = { workspace = true } reqsign-http-send-reqwest = { workspace = true } tokio = { version = "1", features = ["test-util", "macros", "rt-multi-thread"] } diff --git a/services/oracle/src/sign_request.rs b/services/oracle/src/sign_request.rs index 98c1ca14..3115831d 100644 --- a/services/oracle/src/sign_request.rs +++ b/services/oracle/src/sign_request.rs @@ -23,8 +23,10 @@ use log::debug; use reqsign_core::Result; use reqsign_core::time::Timestamp; use reqsign_core::{Context, SignRequest, SigningCredential, SigningRequest}; +use rsa::pkcs1v15::SigningKey; use rsa::sha2::Sha256; -use rsa::{PrivateKey, pkcs1::DecodeRsaPrivateKey, pkcs8::DecodePrivateKey}; +use rsa::signature::{SignatureEncoding, Signer}; +use rsa::{RsaPrivateKey, pkcs1::DecodeRsaPrivateKey, pkcs8::DecodePrivateKey}; use std::fmt::Write; use std::time::Duration; @@ -93,17 +95,18 @@ impl SignRequest for RequestSigner { // Read private key from file let private_key_content = ctx.file_read_as_string(&cred.key_file).await?; // Older OpenSSL versions produce PKCS#1 PEM keys with `openssl genrsa`. - let private_key = PrivateKey::from_pkcs8_pem(&private_key_content) - .or_else(|_| PrivateKey::from_pkcs1_pem(&private_key_content)) + let private_key = RsaPrivateKey::from_pkcs8_pem(&private_key_content) + .or_else(|_| RsaPrivateKey::from_pkcs1_pem(&private_key_content)) .map_err(|e| { reqsign_core::Error::credential_invalid(format!("Failed to read private key: {e}")) })?; // Sign the string - let signature = private_key - .pkcs1v15_sign::(string_to_sign.as_bytes()) + let signing_key = SigningKey::::new(private_key); + let signature = signing_key + .try_sign(string_to_sign.as_bytes()) .map_err(|e| reqsign_core::Error::unexpected(format!("Failed to sign: {e}")))?; - let encoded_signature = general_purpose::STANDARD.encode(signature); + let encoded_signature = general_purpose::STANDARD.encode(signature.to_bytes()); // Set headers signing_req @@ -150,9 +153,9 @@ fn build_string_to_sign( #[cfg(test)] mod tests { use super::*; - use getrandom::SysRng; use reqsign_core::FileRead; use rsa::pkcs8::{EncodePrivateKey, LineEnding}; + use rsa::rand_core::OsRng; const RAW_QUERY: &str = "slash=%2F&hash=%23&=%26&equals=%3D&space=%20&encoded-plus=%2B&literal-plus=+&double=%252F&dup=first&dup=second&=empty-key&empty=&flag&flag=&"; @@ -190,7 +193,7 @@ mod tests { string_to_sign.contains(&format!("(request-target): get /object%2Fname?{RAW_QUERY}")) ); - let private_key = PrivateKey::new(&mut SysRng, 1024).expect("key generation must work"); + let private_key = RsaPrivateKey::new(&mut OsRng, 1024).expect("key generation must work"); let private_key = private_key .to_pkcs8_pem(LineEnding::LF) .expect("private key must encode") diff --git a/services/oracle/tests/private_key_formats.rs b/services/oracle/tests/private_key_formats.rs index c11578a9..5bd7cad2 100644 --- a/services/oracle/tests/private_key_formats.rs +++ b/services/oracle/tests/private_key_formats.rs @@ -18,24 +18,24 @@ use std::sync::LazyLock; use base64::{Engine as _, engine::general_purpose::STANDARD}; -use getrandom::SysRng; use http::header::{AUTHORIZATION, DATE}; -use pkcs8::{EncodePrivateKey, EncodePublicKey, LineEnding}; use reqsign_core::{Context, ErrorKind, FileRead, Result, SignRequest, Signer}; use reqsign_oracle::{Credential, RequestSigner, StaticCredentialProvider}; use rsa::pkcs1::EncodeRsaPrivateKey; use rsa::pkcs1v15::{Signature, VerifyingKey}; +use rsa::pkcs8::{EncodePrivateKey, EncodePublicKey, LineEnding}; +use rsa::rand_core::OsRng; use rsa::sha2::Sha256; use rsa::signature::Verifier; -use rsa::{PrivateKey, PublicKey}; +use rsa::{RsaPrivateKey, RsaPublicKey}; const KEY_PATH: &str = "test-key.pem"; const REQUEST_URI: &str = "https://iaas.example.com:8443/20160918/instances?name=a%2Fb&name=c+%20d"; -fn private_key() -> &'static PrivateKey { +fn private_key() -> &'static RsaPrivateKey { // Generate one ephemeral key for all formats; never read a developer's OCI files. - static KEY: LazyLock = LazyLock::new(|| { - PrivateKey::new(&mut SysRng, 2048).expect("test RSA key generation must succeed") + static KEY: LazyLock = LazyLock::new(|| { + RsaPrivateKey::new(&mut OsRng, 2048).expect("test RSA key generation must succeed") }); &KEY } @@ -108,7 +108,7 @@ async fn verify_signed_request(pem: &str) -> anyhow::Result<()> { original_uri.path_and_query().expect("request target"), original_uri.authority().expect("request authority"), ); - let verifier = VerifyingKey::::new(PublicKey::from(private_key())); + let verifier = VerifyingKey::::new(RsaPublicKey::from(private_key())); verifier.verify(signing_input.as_bytes(), &signature)?; assert!(verifier.verify(b"different request", &signature).is_err()); Ok(()) @@ -156,13 +156,14 @@ async fn assert_rejected_without_mutation(pem: &str) -> anyhow::Result<()> { #[tokio::test] async fn public_keys_are_rejected_without_mutating_request() -> anyhow::Result<()> { - let pem = PublicKey::from(private_key()).to_public_key_pem(LineEnding::LF)?; + let pem = RsaPublicKey::from(private_key()).to_public_key_pem(LineEnding::LF)?; assert_rejected_without_mutation(&pem).await } #[tokio::test] async fn encrypted_private_keys_are_rejected_without_mutating_request() -> anyhow::Result<()> { - let pem = private_key().to_pkcs8_encrypted_pem("test-passphrase", LineEnding::LF)?; + let pem = + private_key().to_pkcs8_encrypted_pem(&mut OsRng, "test-passphrase", LineEnding::LF)?; assert_rejected_without_mutation(&pem).await } diff --git a/website/docs/getting-started.md b/website/docs/getting-started.md index 8eea1e87..8d64c67a 100644 --- a/website/docs/getting-started.md +++ b/website/docs/getting-started.md @@ -52,7 +52,10 @@ cargo add http anyhow | `volcengine` | Volcengine TOS | | `full` | Everything above | -The default `default-context` feature wires a ready-to-use runtime (Tokio file reading, reqwest HTTP, Tokio command execution). Keep it unless you are [bringing your own runtime](/docs/guides/custom-runtimes/). Requires Rust 1.87.0+. +The default `default-context` feature wires a ready-to-use runtime (Tokio +file reading, reqwest HTTP, Tokio command execution). Keep it unless you are +[bringing your own runtime](/docs/guides/custom-runtimes/). Requires +Rust 1.86.0+. ## 2. Sign your first request diff --git a/website/docs/reference/versioning-and-targets.md b/website/docs/reference/versioning-and-targets.md index 9b10562b..7ce34eaf 100644 --- a/website/docs/reference/versioning-and-targets.md +++ b/website/docs/reference/versioning-and-targets.md @@ -58,7 +58,9 @@ majors are published with each ## Targets -**Rust version.** The workspace requires Rust 1.87.0 or later. CI tracks stable. Raising the minimum supported Rust version is a user-visible change. +**Rust version.** The workspace declares `rust-version = "1.86.0"` — the +minimum supported Rust. CI tracks stable; MSRV bumps are treated as +observable changes, not patch-level noise. **Native.** Reqsign is pure Rust with no C dependencies of its own; CI exercises Linux, macOS, and Windows. The default context components (Tokio