From cc16d143e184c59ee6cec188b0078e6f1aaa4412 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Nov 2026 12:26:54 +0000 Subject: [PATCH 1/6] build(deps): update rsa requirement from 0.9.2 to 0.10.0 Updates the requirements on [rsa](https://github.com/RustCrypto/RSA) to permit the latest version. - [Changelog](https://github.com/RustCrypto/RSA/blob/v0.9.10/CHANGELOG.md) - [Commits](https://github.com/RustCrypto/RSA/compare/v0.9.2...v0.9.10) --- updated-dependencies: - dependency-name: rsa dependency-version: 0.9.10 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 1decc5f5..43a652df 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -66,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.9.2", features = ["pkcs5", "sha2"] } +rsa = { version = "0.10.0", features = ["pkcs5", "sha2"] } rust-ini = { version = "0.21" } serde = { version = "1", features = ["derive"] } serde_json = { version = "1" } From c5179a5d33e91ee64c1057f42afce96cb43fe93f Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Thu, 19 Nov 2026 11:51:13 +0100 Subject: [PATCH 2/6] build(deps): port RSA signing to rsa 0.10 rsa 0.10 removes the sha2 feature and replaces the key and signature APIs. Keep only the byte-oriented encode_rs256_pem public helper and make the key-taking helper private. Azure forwards its existing certificate private-key PEM bytes to that entry point, so the service no longer depends on rsa directly. The upgrade requires Rust 1.87, so raise the workspace MSRV and update the documented minimum. Add synthetic certificate and key fixtures to cover Google/Azure JWT signing and Oracle PKCS#1/PKCS#8 parsing without real credentials. Provenance: dependency bump from #941 (cc16d143), applied on origin/main bc8de0b. --- Cargo.toml | 4 +- core/src/jwt.rs | 117 ++++++++++-------- core/tests/fixtures/rsa-2048-pkcs8.pem | 28 +++++ services/azure-storage/Cargo.toml | 1 - .../provide_credential/client_certificate.rs | 80 +++++++++--- .../tests/fixtures/client-certificate.pem | 47 +++++++ services/google/src/lib.rs | 3 + .../service_account_token.rs | 12 +- services/google/src/sign_request.rs | 20 ++- services/google/src/test_support.rs | 20 +++ .../google/tests/fixtures/rsa-2048-pkcs8.pem | 28 +++++ services/google/tests/oauth_token_endpoint.rs | 15 +-- services/oracle/src/sign_request.rs | 18 +-- services/oracle/tests/config_profiles.rs | 15 +-- .../oracle/tests/fixtures/rsa-2048-pkcs1.pem | 27 ++++ .../fixtures/rsa-2048-pkcs8-encrypted.pem | 30 +++++ .../oracle/tests/fixtures/rsa-2048-pkcs8.pem | 28 +++++ .../oracle/tests/fixtures/rsa-2048-public.pem | 9 ++ services/oracle/tests/private_key_formats.rs | 41 +++--- website/docs/getting-started.md | 2 +- .../docs/reference/versioning-and-targets.md | 5 +- 21 files changed, 401 insertions(+), 149 deletions(-) create mode 100644 core/tests/fixtures/rsa-2048-pkcs8.pem create mode 100644 services/azure-storage/tests/fixtures/client-certificate.pem create mode 100644 services/google/src/test_support.rs create mode 100644 services/google/tests/fixtures/rsa-2048-pkcs8.pem create mode 100644 services/oracle/tests/fixtures/rsa-2048-pkcs1.pem create mode 100644 services/oracle/tests/fixtures/rsa-2048-pkcs8-encrypted.pem create mode 100644 services/oracle/tests/fixtures/rsa-2048-pkcs8.pem create mode 100644 services/oracle/tests/fixtures/rsa-2048-public.pem diff --git a/Cargo.toml b/Cargo.toml index f1a60482..beacd7cb 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 @@ -66,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.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/src/jwt.rs b/core/src/jwt.rs index 413ff8fb..a33ab483 100644 --- a/core/src/jwt.rs +++ b/core/src/jwt.rs @@ -16,15 +16,20 @@ // under the License. //! JWT encoding helpers. +//! +//! ## Migrating from `encode_rs256` +//! +//! `encode_rs256` accepted a backend RSA key type and is no longer public. +//! Serialize the private key as PKCS#8 PEM and call [`encode_rs256_pem`] +//! instead. The byte-oriented PEM entry point keeps the same behavior. use base64::Engine; use base64::engine::general_purpose::URL_SAFE_NO_PAD; -use rsa::RsaPrivateKey; +use rsa::PrivateKey; use rsa::pkcs1v15::SigningKey; use rsa::pkcs8::DecodePrivateKey; -use rsa::rand_core::OsRng; use rsa::sha2::Sha256; -use rsa::signature::{RandomizedSigner, SignatureEncoding}; +use rsa::signature::{SignatureEncoding, Signer}; use serde::Serialize; use crate::{Error, Result}; @@ -33,7 +38,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 +fn encode_rs256(header: &H, claims: &C, private_key: &PrivateKey) -> Result where H: Serialize, C: Serialize, @@ -42,9 +47,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 signature = signing_key + .try_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.to_bytes()); Ok(format!("{signing_input}.{encoded_signature}")) @@ -59,7 +65,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) })?; @@ -80,10 +86,11 @@ mod tests { use super::*; use base64::engine::general_purpose::URL_SAFE_NO_PAD; use rsa::pkcs1v15::{Signature, VerifyingKey}; - use rsa::rand_core::OsRng; use rsa::signature::Verifier; use serde_json::json; + const PRIVATE_KEY_PEM: &str = include_str!("../tests/fixtures/rsa-2048-pkcs8.pem"); + #[derive(Serialize)] struct Header<'a> { alg: &'a str, @@ -101,52 +108,54 @@ 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) - .map_err(|e| Error::unexpected("failed to generate test RSA key").with_source(e))?; - - let jwt = encode_rs256( - &Header { - alg: "RS256", - typ: "JWT", - x5t: "thumbprint", - }, - &Claims { - iss: "client", - sub: "client", - aud: "https://example.com/token", - exp: 1, - }, - &private_key, - )?; - - let parts = jwt.split('.').collect::>(); - assert_eq!(parts.len(), 3); - - let header: serde_json::Value = serde_json::from_slice( - &URL_SAFE_NO_PAD - .decode(parts[0]) - .map_err(|e| Error::unexpected("failed to decode JWT header").with_source(e))?, - ) - .map_err(|e| Error::unexpected("failed to parse JWT header").with_source(e))?; - assert_eq!( - header, - json!({ - "alg": "RS256", - "typ": "JWT", - "x5t": "thumbprint" - }) - ); - - let signature = URL_SAFE_NO_PAD - .decode(parts[2]) - .map_err(|e| Error::unexpected("failed to decode JWT signature").with_source(e))?; - let signature = Signature::try_from(signature.as_slice()) - .map_err(|e| Error::unexpected("failed to parse JWT signature").with_source(e))?; - let verifying_key = VerifyingKey::::new(private_key.to_public_key()); - verifying_key - .verify(format!("{}.{}", parts[0], parts[1]).as_bytes(), &signature) - .map_err(|e| Error::unexpected("failed to verify JWT signature").with_source(e))?; + let private_key = PrivateKey::from_pkcs8_pem(PRIVATE_KEY_PEM) + .map_err(|e| Error::unexpected("failed to parse test RSA key").with_source(e))?; + + let header = Header { + alg: "RS256", + typ: "JWT", + x5t: "thumbprint", + }; + let claims = Claims { + iss: "client", + sub: "client", + aud: "https://example.com/token", + exp: 1, + }; + + let jwts = [ + encode_rs256(&header, &claims, &private_key)?, + encode_rs256_pem(&header, &claims, PRIVATE_KEY_PEM.as_bytes())?, + ]; + + for jwt in jwts { + let parts = jwt.split('.').collect::>(); + assert_eq!(parts.len(), 3); + + let header: serde_json::Value = + serde_json::from_slice(&URL_SAFE_NO_PAD.decode(parts[0]).map_err(|e| { + Error::unexpected("failed to decode JWT header").with_source(e) + })?) + .map_err(|e| Error::unexpected("failed to parse JWT header").with_source(e))?; + assert_eq!( + header, + json!({ + "alg": "RS256", + "typ": "JWT", + "x5t": "thumbprint" + }) + ); + + let signature = URL_SAFE_NO_PAD + .decode(parts[2]) + .map_err(|e| Error::unexpected("failed to decode JWT signature").with_source(e))?; + let signature = Signature::try_from(signature.as_slice()) + .map_err(|e| Error::unexpected("failed to parse JWT signature").with_source(e))?; + let verifying_key = VerifyingKey::::new(private_key.to_public_key()); + verifying_key + .verify(format!("{}.{}", parts[0], parts[1]).as_bytes(), &signature) + .map_err(|e| Error::unexpected("failed to verify JWT signature").with_source(e))?; + } Ok(()) } diff --git a/core/tests/fixtures/rsa-2048-pkcs8.pem b/core/tests/fixtures/rsa-2048-pkcs8.pem new file mode 100644 index 00000000..75f2986c --- /dev/null +++ b/core/tests/fixtures/rsa-2048-pkcs8.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCI8XCPUpe0PkVK +8b85K66gUSm73/QeTzs62JBNglLKiULu8T2Ba/KYidEx53rWq3c1P8wtHMCQYfgE +ZlbdzmDdvKBGkX5OHkPQEU9/4/k1TSqX3af9FXiujLK8uqkOhkRCfItxz6/VbAEt +bWfpnatyKNxFYN+qGHOD8eZme5z0ebJ6k3zC/M3eqQVgyTP+GWETc1mDFeuwq2lh +5CGt/ZzV6ua6Sx5CaKzp+LBVzU/DuURGizNmKBT4S6t3CH1DevQqep8bttXDqHsR +yOcim0fv9YYAiHrETI49Yg0QsHrV4BjOqHuCOSPufJHI2yGEM/7yjCWNLZ4v9uYP +w2BQdmu3AgMBAAECggEAHrv1M61pL8I0AgRsktOrbv6YO7qhCrZkiCn3hPXFSABz +XbYVxDiqazKvGSCnEIvOBszpMYy86Qqbw70GLOS3F7zQSdY4fybKuGVSLtVG5oAJ +majdHW9WtPIN4U6RR5m5syRJlYLzpxYE06G0yxkgU9A403dQ61dugYPmXkTK7pEX +fMa+izSbZtYcGmKTs3tTIVPOToPxUQFB8s/abFex1voKY6OW9et8QiBz5uD/RL2p +1eNdixRHUOQZ/EqdWVHt5GivD5fh3s8PboANJARWwRfBCArtitJmtWg1bqMfRWr3 +hbe2qiKuObR9sf4iasdlaiOoUwmhCdNCQLm1AyltGQKBgQC/oZrbHMwSwJS5HM6W +eJpaBpILFT84y7GEoRd5YluO4ZY51zg5d/SSLjhR6/UUdXrw1suzPPP9BMeeC54S +6VzoE8k6gfa9z+8RCojVpjYZ1Bc8oSzdU7NQ/p1xEsEr4YICcpfuIXhOuhFggjWt +sz00uBfEU7NSLKBok/4pPMzk3wKBgQC28THe3y4Z1gFhPRDrDy1e2MDnoU8v6i3N +85TqA1BIebTkWDfF4Sr5gWgSv6Kaxq2IgM9gBhVgL/SugzTZctqFbgMTH5hVK6OD +vjX9CLJOIpPnk/BUZ47HQrzd8RkFVv85FEYnF4rPeMpEvCQcBMyP8olK2xd86+6J +vJ8p9K68KQKBgQCjTCwxAbYpWLCjmhe1g+pMQwMarK1mUbXhRoFBb/6DoFqqyWrh +FgZ0tyxJKyB6oa31I6UMBSoJd5Q/arj2dqQ0JAA7elpv34xiYi6+mVfK5MA0a0hX +Bqdsorw5ifjQ0uc9/LbZNu5VcBu0uODTN0U18pZWN9k8ckjzNQHF1Ejp0wKBgQCg +2RS2FpicErOH4X88jU2g9Qc3IXdUc5vuVtp5now6DPhlRMNU8pMsaQEuatv3JfRx +7n9muDKXLdL+lVIkVn2Xj5CYgdEYIZRVQyqI3dqYJILSvBo0vBCnViBlK5SKQ2GH +uDGuMV7U6Ck/ogRFtlp9vgvEizntlitXY0a2RvJTcQKBgQCEGqWgUu+nM9NhyGwk +o7nZluSKpvEVtrCA9CKZVecXiY43nUYXGj1WuG5K9TBs3MnkDWzE/SCY+Xygz79y +JCxdaRmbRxGE5Lq+Ci7m4xY8W8fVGthxTiMBiilWDYDcaxEB+x2Floie8Ydsbm5w +r21BN6gLdVmtcnjM2zhSNdby0A== +-----END PRIVATE KEY----- diff --git a/services/azure-storage/Cargo.toml b/services/azure-storage/Cargo.toml index 151672f3..9d6ae57f 100644 --- a/services/azure-storage/Cargo.toml +++ b/services/azure-storage/Cargo.toml @@ -43,7 +43,6 @@ sha1 = { workspace = true } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] pem = { workspace = true } reqsign-core = { workspace = true, features = ["jwt"] } -rsa = { workspace = true } [dev-dependencies] asyncband = { workspace = true, features = ["semaphore"] } diff --git a/services/azure-storage/src/provide_credential/client_certificate.rs b/services/azure-storage/src/provide_credential/client_certificate.rs index 5cd98cc9..a1659994 100644 --- a/services/azure-storage/src/provide_credential/client_certificate.rs +++ b/services/azure-storage/src/provide_credential/client_certificate.rs @@ -26,8 +26,6 @@ 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::pkcs8::DecodePrivateKey; use serde::Serialize; use sha1::{Digest, Sha1}; @@ -99,7 +97,7 @@ impl ClientCertificateCredentialProvider { &self, ctx: &Context, path: &str, - ) -> Result<(Vec, RsaPrivateKey), reqsign_core::Error> { + ) -> Result<(Vec, Vec), 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}")) })?; @@ -140,14 +138,7 @@ impl ClientCertificateCredentialProvider { reqsign_core::Error::credential_invalid("PEM does not contain a private key") })?; - // Parse private key - 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}" - )) - })?; - - Ok((cert_der, private_key)) + Ok((cert_der, private_key_pem.into_bytes())) } /// Calculate certificate thumbprint (x5t) @@ -163,7 +154,7 @@ impl ClientCertificateCredentialProvider { tenant_id: &str, client_id: &str, cert_der: &[u8], - private_key: &RsaPrivateKey, + private_key_pem: &[u8], ) -> Result { let now = SystemTime::now() .duration_since(UNIX_EPOCH) @@ -172,11 +163,30 @@ impl ClientCertificateCredentialProvider { })? .as_secs(); + self.create_client_assertion_at( + tenant_id, + client_id, + cert_der, + private_key_pem, + now, + generate_jti(now), + ) + } + + fn create_client_assertion_at( + &self, + tenant_id: &str, + client_id: &str, + cert_der: &[u8], + private_key_pem: &[u8], + now: u64, + jti: String, + ) -> Result { let claims = ClientAssertionClaims { aud: format!("https://login.microsoftonline.com/{tenant_id}/oauth2/v2.0/token"), exp: now + 600, // 10 minutes iss: client_id.to_string(), - jti: generate_jti(now), + jti, nbf: now, sub: client_id.to_string(), }; @@ -187,7 +197,7 @@ impl ClientCertificateCredentialProvider { x5t: self.calculate_thumbprint(cert_der), }; - reqsign_core::jwt::encode_rs256(&header, &claims, private_key) + reqsign_core::jwt::encode_rs256_pem(&header, &claims, private_key_pem) } /// Exchange client assertion for access token @@ -289,11 +299,11 @@ impl ProvideCredential for ClientCertificateCredentialProvider { }; // Load certificate and private key - let (cert_der, private_key) = self.load_certificate(ctx, &certificate_path).await?; + let (cert_der, private_key_pem) = self.load_certificate(ctx, &certificate_path).await?; // Create client assertion let client_assertion = - self.create_client_assertion(&tenant_id, &client_id, &cert_der, &private_key)?; + self.create_client_assertion(&tenant_id, &client_id, &cert_der, &private_key_pem)?; // Exchange for access token let token_response = self @@ -313,6 +323,44 @@ impl ProvideCredential for ClientCertificateCredentialProvider { #[cfg(test)] mod tests { use super::*; + use reqsign_core::FileRead; + + const CLIENT_CERTIFICATE_PEM: &str = + include_str!("../../tests/fixtures/client-certificate.pem"); + // Fixed RS256 output for the synthetic fixture and fixed timestamp/JTI below. + // This protects the certificate x5t, claims shape and PKCS#1 v1.5 signature. + const EXPECTED_CLIENT_ASSERTION: &str = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsIng1dCI6IjlsNlFzcGRYRVZ5WXI5VXI1Z1F5RkhoRnBKTSJ9.eyJhdWQiOiJodHRwczovL2xvZ2luLm1pY3Jvc29mdG9ubGluZS5jb20vdGVuYW50L29hdXRoMi92Mi4wL3Rva2VuIiwiZXhwIjoxNzAwMDAwNjAwLCJpc3MiOiJjbGllbnQiLCJqdGkiOiJmaXhlZC1qdGkiLCJuYmYiOjE3MDAwMDAwMDAsInN1YiI6ImNsaWVudCJ9.VovaDD9_dOI8PyYGC3HwefKgk9LhnZkVCkv8OegzWcuvhcm2oFUP2IipkS691hmjrtNTTORu8e8ow0M3iD1_73-ilJKvbwjNGf64EDY33b0aUG1xEVDqgeqdVa9rqltGeiuSAIBjRg01N_cRiezf6LMMWNtpbymKFxZWg0icqn08FYkhb1fvKCNaQW_fxSzfwNJv0wdM6OT9no12nuoIL8S0iCf-a7Piv14U75ECIADUvC3ssySlDxIs53tBtCOOc1sv6A59QEaR4z6MczFmVFFg8Kh1D8H51K5S9wWCCKbzZn1c_1Q-iRfnr5ZFlHIRDTYsAEI24E4aK-cLUQlF7Q"; + + #[derive(Debug)] + struct FixtureFileRead; + + impl FileRead for FixtureFileRead { + async fn file_read(&self, path: &str) -> reqsign_core::Result> { + assert_eq!(path, "client-certificate.pem"); + Ok(CLIENT_CERTIFICATE_PEM.as_bytes().to_vec()) + } + } + + #[tokio::test] + async fn client_assertion_matches_the_certificate_fixture() -> anyhow::Result<()> { + let provider = ClientCertificateCredentialProvider::new(); + let ctx = Context::new().with_file_read(FixtureFileRead); + let (cert_der, private_key_pem) = provider + .load_certificate(&ctx, "client-certificate.pem") + .await?; + assert!(private_key_pem.starts_with(b"-----BEGIN PRIVATE KEY-----")); + + let jwt = provider.create_client_assertion_at( + "tenant", + "client", + &cert_der, + &private_key_pem, + 1_700_000_000, + "fixed-jti".to_string(), + )?; + assert_eq!(jwt, EXPECTED_CLIENT_ASSERTION); + Ok(()) + } #[test] fn test_calculate_thumbprint() { diff --git a/services/azure-storage/tests/fixtures/client-certificate.pem b/services/azure-storage/tests/fixtures/client-certificate.pem new file mode 100644 index 00000000..e49d011f --- /dev/null +++ b/services/azure-storage/tests/fixtures/client-certificate.pem @@ -0,0 +1,47 @@ +-----BEGIN CERTIFICATE----- +MIIDETCCAfmgAwIBAgIUI1KXrHNC0D15vFM4HC6njixhe0kwDQYJKoZIhvcNAQEL +BQAwFzEVMBMGA1UEAwwMcmVxc2lnbi10ZXN0MCAXDTI2MTExOTEwNDAwMFoYDzIx +MjYxMDI2MTA0MDAwWjAXMRUwEwYDVQQDDAxyZXFzaWduLXRlc3QwggEiMA0GCSqG +SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCI8XCPUpe0PkVK8b85K66gUSm73/QeTzs6 +2JBNglLKiULu8T2Ba/KYidEx53rWq3c1P8wtHMCQYfgEZlbdzmDdvKBGkX5OHkPQ +EU9/4/k1TSqX3af9FXiujLK8uqkOhkRCfItxz6/VbAEtbWfpnatyKNxFYN+qGHOD +8eZme5z0ebJ6k3zC/M3eqQVgyTP+GWETc1mDFeuwq2lh5CGt/ZzV6ua6Sx5CaKzp ++LBVzU/DuURGizNmKBT4S6t3CH1DevQqep8bttXDqHsRyOcim0fv9YYAiHrETI49 +Yg0QsHrV4BjOqHuCOSPufJHI2yGEM/7yjCWNLZ4v9uYPw2BQdmu3AgMBAAGjUzBR +MB0GA1UdDgQWBBThPmGitlXZtVkVq6VL02OrcI5ewzAfBgNVHSMEGDAWgBThPmGi +tlXZtVkVq6VL02OrcI5ewzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUA +A4IBAQAcXvW+xl0FH4+q43o3EwbxdnUkEx6BogmtKAblRPyFlZVU3FHl9G8FL4rs +mDP51gHTNMcdjMwFAAJPgOsqoA4lK4cCh0iovYIDNvOD4t95rSPalu/hI6uHhSKY +ylM0PoTSXah3/Zqx8eYhC3aYmqrLNdJsGrbEQPR0NlfD+tp5w5TzDrhsEOqoFtGC +pb/kfFgCk1XE2AEGnvDSya3AASnAL+m2v4KZxbWBSUoUCcFQWL+/Id+UJSs1LOVc +LLW1gCk5OY7my4k03T5NZu00FwKWb+HxrJYkt2nDnxbWsp/m1x6a3OblJaOVIcre +8GL/Rps+/oLkNq4OtF/t5AHd1/CN +-----END CERTIFICATE----- +-----BEGIN PRIVATE KEY----- +MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCI8XCPUpe0PkVK +8b85K66gUSm73/QeTzs62JBNglLKiULu8T2Ba/KYidEx53rWq3c1P8wtHMCQYfgE +ZlbdzmDdvKBGkX5OHkPQEU9/4/k1TSqX3af9FXiujLK8uqkOhkRCfItxz6/VbAEt +bWfpnatyKNxFYN+qGHOD8eZme5z0ebJ6k3zC/M3eqQVgyTP+GWETc1mDFeuwq2lh +5CGt/ZzV6ua6Sx5CaKzp+LBVzU/DuURGizNmKBT4S6t3CH1DevQqep8bttXDqHsR +yOcim0fv9YYAiHrETI49Yg0QsHrV4BjOqHuCOSPufJHI2yGEM/7yjCWNLZ4v9uYP +w2BQdmu3AgMBAAECggEAHrv1M61pL8I0AgRsktOrbv6YO7qhCrZkiCn3hPXFSABz +XbYVxDiqazKvGSCnEIvOBszpMYy86Qqbw70GLOS3F7zQSdY4fybKuGVSLtVG5oAJ +majdHW9WtPIN4U6RR5m5syRJlYLzpxYE06G0yxkgU9A403dQ61dugYPmXkTK7pEX +fMa+izSbZtYcGmKTs3tTIVPOToPxUQFB8s/abFex1voKY6OW9et8QiBz5uD/RL2p +1eNdixRHUOQZ/EqdWVHt5GivD5fh3s8PboANJARWwRfBCArtitJmtWg1bqMfRWr3 +hbe2qiKuObR9sf4iasdlaiOoUwmhCdNCQLm1AyltGQKBgQC/oZrbHMwSwJS5HM6W +eJpaBpILFT84y7GEoRd5YluO4ZY51zg5d/SSLjhR6/UUdXrw1suzPPP9BMeeC54S +6VzoE8k6gfa9z+8RCojVpjYZ1Bc8oSzdU7NQ/p1xEsEr4YICcpfuIXhOuhFggjWt +sz00uBfEU7NSLKBok/4pPMzk3wKBgQC28THe3y4Z1gFhPRDrDy1e2MDnoU8v6i3N +85TqA1BIebTkWDfF4Sr5gWgSv6Kaxq2IgM9gBhVgL/SugzTZctqFbgMTH5hVK6OD +vjX9CLJOIpPnk/BUZ47HQrzd8RkFVv85FEYnF4rPeMpEvCQcBMyP8olK2xd86+6J +vJ8p9K68KQKBgQCjTCwxAbYpWLCjmhe1g+pMQwMarK1mUbXhRoFBb/6DoFqqyWrh +FgZ0tyxJKyB6oa31I6UMBSoJd5Q/arj2dqQ0JAA7elpv34xiYi6+mVfK5MA0a0hX +Bqdsorw5ifjQ0uc9/LbZNu5VcBu0uODTN0U18pZWN9k8ckjzNQHF1Ejp0wKBgQCg +2RS2FpicErOH4X88jU2g9Qc3IXdUc5vuVtp5now6DPhlRMNU8pMsaQEuatv3JfRx +7n9muDKXLdL+lVIkVn2Xj5CYgdEYIZRVQyqI3dqYJILSvBo0vBCnViBlK5SKQ2GH +uDGuMV7U6Ck/ogRFtlp9vgvEizntlitXY0a2RvJTcQKBgQCEGqWgUu+nM9NhyGwk +o7nZluSKpvEVtrCA9CKZVecXiY43nUYXGj1WuG5K9TBs3MnkDWzE/SCY+Xygz79y +JCxdaRmbRxGE5Lq+Ci7m4xY8W8fVGthxTiMBiilWDYDcaxEB+x2Floie8Ydsbm5w +r21BN6gLdVmtcnjM2zhSNdby0A== +-----END PRIVATE KEY----- diff --git a/services/google/src/lib.rs b/services/google/src/lib.rs index 9231bb9a..beb4c23f 100644 --- a/services/google/src/lib.rs +++ b/services/google/src/lib.rs @@ -47,6 +47,9 @@ pub use service_account_impersonation::{ mod sign_request; pub use sign_request::RequestSigner; +#[cfg(test)] +mod test_support; + mod provide_credential; pub use provide_credential::{ AuthorizedUserCredentialProvider, DefaultCredentialProvider, DefaultCredentialProviderBuilder, diff --git a/services/google/src/provide_credential/service_account_token.rs b/services/google/src/provide_credential/service_account_token.rs index 6e1d86ad..03c080e9 100644 --- a/services/google/src/provide_credential/service_account_token.rs +++ b/services/google/src/provide_credential/service_account_token.rs @@ -343,11 +343,10 @@ mod tests { 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::pkcs8::{EncodePrivateKey, LineEnding}; - use rsa::rand_core::OsRng; use serde_json::Value; + use crate::test_support::RSA_PKCS8_PEM; + use crate::{ CredentialAccessBoundaryGrant, CredentialAccessBoundaryPermissions, DefaultCredentialProvider, FileCredentialProvider, @@ -436,13 +435,8 @@ mod tests { } fn service_account() -> ServiceAccount { - 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") - .to_string(); ServiceAccount { - private_key, + private_key: RSA_PKCS8_PEM.to_string(), client_email: "provider@example.iam.gserviceaccount.com".to_string(), } } diff --git a/services/google/src/sign_request.rs b/services/google/src/sign_request.rs index a9fd3704..ff87dae2 100644 --- a/services/google/src/sign_request.rs +++ b/services/google/src/sign_request.rs @@ -20,8 +20,7 @@ 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::signature::Signer; use serde::{Deserialize, Serialize}; use std::time::Duration; @@ -261,12 +260,13 @@ 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 = signing_key + .try_sign(string_to_sign.as_bytes()) + .map_err(|e| reqsign_core::Error::unexpected("failed to sign").with_source(e))?; Ok(signature.to_string()) } @@ -690,10 +690,11 @@ mod tests { use bytes::Bytes; use http::header; use reqsign_core::{ErrorKind, HttpSend, ProvideCredential, Signer}; - use rsa::pkcs8::{EncodePrivateKey, LineEnding}; use std::sync::atomic::{AtomicUsize, Ordering}; use std::sync::{Arc, Mutex}; + use crate::test_support::RSA_PKCS8_PEM; + 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=&"; #[derive(Debug, Default)] @@ -1063,13 +1064,8 @@ mod tests { #[tokio::test] async fn service_account_exchange_preserves_optional_expiration_response() -> Result<()> { - let private_key = rsa::RsaPrivateKey::new(&mut OsRng, 1024) - .expect("private key must generate") - .to_pkcs8_pem(LineEnding::LF) - .expect("private key must encode") - .to_string(); let credential = Credential::with_service_account(ServiceAccount { - private_key, + private_key: RSA_PKCS8_PEM.to_string(), client_email: "signer@example.iam.gserviceaccount.com".to_string(), }); let mut parts = http::Request::get("https://storage.googleapis.com/bucket/object") diff --git a/services/google/src/test_support.rs b/services/google/src/test_support.rs new file mode 100644 index 00000000..bfa0e691 --- /dev/null +++ b/services/google/src/test_support.rs @@ -0,0 +1,20 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +//! Shared synthetic key material for unit tests. + +pub(crate) const RSA_PKCS8_PEM: &str = include_str!("../tests/fixtures/rsa-2048-pkcs8.pem"); diff --git a/services/google/tests/fixtures/rsa-2048-pkcs8.pem b/services/google/tests/fixtures/rsa-2048-pkcs8.pem new file mode 100644 index 00000000..75f2986c --- /dev/null +++ b/services/google/tests/fixtures/rsa-2048-pkcs8.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCI8XCPUpe0PkVK +8b85K66gUSm73/QeTzs62JBNglLKiULu8T2Ba/KYidEx53rWq3c1P8wtHMCQYfgE +ZlbdzmDdvKBGkX5OHkPQEU9/4/k1TSqX3af9FXiujLK8uqkOhkRCfItxz6/VbAEt +bWfpnatyKNxFYN+qGHOD8eZme5z0ebJ6k3zC/M3eqQVgyTP+GWETc1mDFeuwq2lh +5CGt/ZzV6ua6Sx5CaKzp+LBVzU/DuURGizNmKBT4S6t3CH1DevQqep8bttXDqHsR +yOcim0fv9YYAiHrETI49Yg0QsHrV4BjOqHuCOSPufJHI2yGEM/7yjCWNLZ4v9uYP +w2BQdmu3AgMBAAECggEAHrv1M61pL8I0AgRsktOrbv6YO7qhCrZkiCn3hPXFSABz +XbYVxDiqazKvGSCnEIvOBszpMYy86Qqbw70GLOS3F7zQSdY4fybKuGVSLtVG5oAJ +majdHW9WtPIN4U6RR5m5syRJlYLzpxYE06G0yxkgU9A403dQ61dugYPmXkTK7pEX +fMa+izSbZtYcGmKTs3tTIVPOToPxUQFB8s/abFex1voKY6OW9et8QiBz5uD/RL2p +1eNdixRHUOQZ/EqdWVHt5GivD5fh3s8PboANJARWwRfBCArtitJmtWg1bqMfRWr3 +hbe2qiKuObR9sf4iasdlaiOoUwmhCdNCQLm1AyltGQKBgQC/oZrbHMwSwJS5HM6W +eJpaBpILFT84y7GEoRd5YluO4ZY51zg5d/SSLjhR6/UUdXrw1suzPPP9BMeeC54S +6VzoE8k6gfa9z+8RCojVpjYZ1Bc8oSzdU7NQ/p1xEsEr4YICcpfuIXhOuhFggjWt +sz00uBfEU7NSLKBok/4pPMzk3wKBgQC28THe3y4Z1gFhPRDrDy1e2MDnoU8v6i3N +85TqA1BIebTkWDfF4Sr5gWgSv6Kaxq2IgM9gBhVgL/SugzTZctqFbgMTH5hVK6OD +vjX9CLJOIpPnk/BUZ47HQrzd8RkFVv85FEYnF4rPeMpEvCQcBMyP8olK2xd86+6J +vJ8p9K68KQKBgQCjTCwxAbYpWLCjmhe1g+pMQwMarK1mUbXhRoFBb/6DoFqqyWrh +FgZ0tyxJKyB6oa31I6UMBSoJd5Q/arj2dqQ0JAA7elpv34xiYi6+mVfK5MA0a0hX +Bqdsorw5ifjQ0uc9/LbZNu5VcBu0uODTN0U18pZWN9k8ckjzNQHF1Ejp0wKBgQCg +2RS2FpicErOH4X88jU2g9Qc3IXdUc5vuVtp5now6DPhlRMNU8pMsaQEuatv3JfRx +7n9muDKXLdL+lVIkVn2Xj5CYgdEYIZRVQyqI3dqYJILSvBo0vBCnViBlK5SKQ2GH +uDGuMV7U6Ck/ogRFtlp9vgvEizntlitXY0a2RvJTcQKBgQCEGqWgUu+nM9NhyGwk +o7nZluSKpvEVtrCA9CKZVecXiY43nUYXGj1WuG5K9TBs3MnkDWzE/SCY+Xygz79y +JCxdaRmbRxGE5Lq+Ci7m4xY8W8fVGthxTiMBiilWDYDcaxEB+x2Floie8Ydsbm5w +r21BN6gLdVmtcnjM2zhSNdby0A== +-----END PRIVATE KEY----- diff --git a/services/google/tests/oauth_token_endpoint.rs b/services/google/tests/oauth_token_endpoint.rs index e7b6db05..d5884181 100644 --- a/services/google/tests/oauth_token_endpoint.rs +++ b/services/google/tests/oauth_token_endpoint.rs @@ -27,12 +27,11 @@ use reqsign_google::{ ServerSideCredentialAccessBoundaryGranter, ServiceAccount, ServiceAccountTokenCredentialProvider, StaticCredentialProvider, }; -use rsa::RsaPrivateKey; -use rsa::pkcs8::{EncodePrivateKey, LineEnding}; -use rsa::rand_core::OsRng; use serde::Deserialize; use serde_json::{Value, json}; +const RSA_PKCS8_PEM: &str = include_str!("fixtures/rsa-2048-pkcs8.pem"); + const DEFAULT_URI: &str = "https://oauth2.googleapis.com/token"; const CUSTOM_URI: &str = "https://trusted.example/token?tenant=uri-secret"; @@ -63,15 +62,7 @@ impl HttpSend for MockHttp { fn service_account() -> ServiceAccount { static KEY: OnceLock = OnceLock::new(); ServiceAccount { - private_key: KEY - .get_or_init(|| { - RsaPrivateKey::new(&mut OsRng, 1024) - .unwrap() - .to_pkcs8_pem(LineEnding::LF) - .unwrap() - .to_string() - }) - .clone(), + private_key: KEY.get_or_init(|| RSA_PKCS8_PEM.to_string()).clone(), client_email: "test@example.iam.gserviceaccount.com".into(), } } diff --git a/services/oracle/src/sign_request.rs b/services/oracle/src/sign_request.rs index 3115831d..3d51bc96 100644 --- a/services/oracle/src/sign_request.rs +++ b/services/oracle/src/sign_request.rs @@ -26,7 +26,7 @@ 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,8 +95,8 @@ 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}")) })?; @@ -154,8 +154,8 @@ fn build_string_to_sign( mod tests { use super::*; use reqsign_core::FileRead; - use rsa::pkcs8::{EncodePrivateKey, LineEnding}; - use rsa::rand_core::OsRng; + + const RSA_PKCS8_PEM: &str = include_str!("../tests/fixtures/rsa-2048-pkcs8.pem"); 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,13 +193,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 = private_key - .to_pkcs8_pem(LineEnding::LF) - .expect("private key must encode") - .as_bytes() - .to_vec(); - let ctx = Context::new().with_file_read(StaticFileRead(private_key)); + let ctx = Context::new().with_file_read(StaticFileRead(RSA_PKCS8_PEM.as_bytes().to_vec())); let mut parts = http::Request::get(&original_uri).body(())?.into_parts().0; RequestSigner::new() diff --git a/services/oracle/tests/config_profiles.rs b/services/oracle/tests/config_profiles.rs index 1b7d33e1..f8a91aba 100644 --- a/services/oracle/tests/config_profiles.rs +++ b/services/oracle/tests/config_profiles.rs @@ -28,15 +28,15 @@ use reqsign_core::{ use reqsign_oracle::{ ConfigFileCredentialProvider, Credential, DefaultCredentialProvider, RequestSigner, }; +use rsa::PrivateKey; use rsa::pkcs1v15::{Signature, VerifyingKey}; -use rsa::pkcs8::{EncodePrivateKey, LineEnding}; -use rsa::rand_core::OsRng; +use rsa::pkcs8::DecodePrivateKey; use rsa::sha2::Sha256; use rsa::signature::Verifier; -use rsa::{RsaPrivateKey, RsaPublicKey}; const CONFIG_PATH: &str = "/synthetic/oci/config"; const DEFAULT_KEY: &str = "/synthetic/keys/default.pem"; +const RSA_PKCS8_PEM: &str = include_str!("fixtures/rsa-2048-pkcs8.pem"); const FIELDS: [&str; 4] = ["tenancy", "user", "key_file", "fingerprint"]; const DEFAULT_VALUES: [&str; 4] = [ "default-tenancy", @@ -395,12 +395,9 @@ async fn default_chain_loads_inherited_profile_and_respects_removed_slot() -> Re #[tokio::test] async fn inherited_profile_produces_a_verifiable_signed_request() -> anyhow::Result<()> { - let key = RsaPrivateKey::new(&mut OsRng, 2048)?; + let key = PrivateKey::from_pkcs8_pem(RSA_PKCS8_PEM)?; let (ctx, files) = context(&(defaults() + "[ADMIN]\nuser=admin-user\n"), Some("ADMIN")); - files.insert( - DEFAULT_KEY, - key.to_pkcs8_pem(LineEnding::LF)?.as_bytes().to_vec(), - ); + files.insert(DEFAULT_KEY, RSA_PKCS8_PEM.as_bytes().to_vec()); let mut parts = http::Request::get("https://iaas.example.com/instances?name=a%2Fb&name=c+d") .header("x-original", "preserved") .body(())? @@ -429,7 +426,7 @@ async fn inherited_profile_produces_a_verifiable_signed_request() -> anyhow::Res original_uri.path_and_query().unwrap(), original_uri.authority().unwrap() ); - VerifyingKey::::new(RsaPublicKey::from(&key)) + VerifyingKey::::new(key.to_public_key()) .verify(signing_input.as_bytes(), &signature)?; assert_eq!(files.reads(), [CONFIG_PATH, DEFAULT_KEY]); Ok(()) diff --git a/services/oracle/tests/fixtures/rsa-2048-pkcs1.pem b/services/oracle/tests/fixtures/rsa-2048-pkcs1.pem new file mode 100644 index 00000000..0ddec3ab --- /dev/null +++ b/services/oracle/tests/fixtures/rsa-2048-pkcs1.pem @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpQIBAAKCAQEAiPFwj1KXtD5FSvG/OSuuoFEpu9/0Hk87OtiQTYJSyolC7vE9 +gWvymInRMed61qt3NT/MLRzAkGH4BGZW3c5g3bygRpF+Th5D0BFPf+P5NU0ql92n +/RV4royyvLqpDoZEQnyLcc+v1WwBLW1n6Z2rcijcRWDfqhhzg/HmZnuc9HmyepN8 +wvzN3qkFYMkz/hlhE3NZgxXrsKtpYeQhrf2c1ermukseQmis6fiwVc1Pw7lERosz +ZigU+Eurdwh9Q3r0KnqfG7bVw6h7EcjnIptH7/WGAIh6xEyOPWINELB61eAYzqh7 +gjkj7nyRyNshhDP+8owljS2eL/bmD8NgUHZrtwIDAQABAoIBAB679TOtaS/CNAIE +bJLTq27+mDu6oQq2ZIgp94T1xUgAc122FcQ4qmsyrxkgpxCLzgbM6TGMvOkKm8O9 +Bizktxe80EnWOH8myrhlUi7VRuaACZmo3R1vVrTyDeFOkUeZubMkSZWC86cWBNOh +tMsZIFPQONN3UOtXboGD5l5Eyu6RF3zGvos0m2bWHBpik7N7UyFTzk6D8VEBQfLP +2mxXsdb6CmOjlvXrfEIgc+bg/0S9qdXjXYsUR1DkGfxKnVlR7eRorw+X4d7PD26A +DSQEVsEXwQgK7YrSZrVoNW6jH0Vq94W3tqoirjm0fbH+ImrHZWojqFMJoQnTQkC5 +tQMpbRkCgYEAv6Ga2xzMEsCUuRzOlniaWgaSCxU/OMuxhKEXeWJbjuGWOdc4OXf0 +ki44Uev1FHV68NbLszzz/QTHngueEulc6BPJOoH2vc/vEQqI1aY2GdQXPKEs3VOz +UP6dcRLBK+GCAnKX7iF4TroRYII1rbM9NLgXxFOzUiygaJP+KTzM5N8CgYEAtvEx +3t8uGdYBYT0Q6w8tXtjA56FPL+otzfOU6gNQSHm05Fg3xeEq+YFoEr+imsatiIDP +YAYVYC/0roM02XLahW4DEx+YVSujg741/QiyTiKT55PwVGeOx0K83fEZBVb/ORRG +JxeKz3jKRLwkHATMj/KJStsXfOvuibyfKfSuvCkCgYEAo0wsMQG2KViwo5oXtYPq +TEMDGqytZlG14UaBQW/+g6Baqslq4RYGdLcsSSsgeqGt9SOlDAUqCXeUP2q49nak +NCQAO3pab9+MYmIuvplXyuTANGtIVwanbKK8OYn40NLnPfy22TbuVXAbtLjg0zdF +NfKWVjfZPHJI8zUBxdRI6dMCgYEAoNkUthaYnBKzh+F/PI1NoPUHNyF3VHOb7lba +eZ6MOgz4ZUTDVPKTLGkBLmrb9yX0ce5/Zrgyly3S/pVSJFZ9l4+QmIHRGCGUVUMq +iN3amCSC0rwaNLwQp1YgZSuUikNhh7gxrjFe1OgpP6IERbZafb4LxIs57ZYrV2NG +tkbyU3ECgYEAhBqloFLvpzPTYchsJKO52ZbkiqbxFbawgPQimVXnF4mON51GFxo9 +VrhuSvUwbNzJ5A1sxP0gmPl8oM+/ciQsXWkZm0cRhOS6vgou5uMWPFvH1RrYcU4j +AYopVg2A3GsRAfsdhZaInvGHbG5ucK9tQTeoC3VZrXJ4zNs4UjXW8tA= +-----END RSA PRIVATE KEY----- diff --git a/services/oracle/tests/fixtures/rsa-2048-pkcs8-encrypted.pem b/services/oracle/tests/fixtures/rsa-2048-pkcs8-encrypted.pem new file mode 100644 index 00000000..747e414d --- /dev/null +++ b/services/oracle/tests/fixtures/rsa-2048-pkcs8-encrypted.pem @@ -0,0 +1,30 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIaqS35ndzY4ACAggA +MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBAMqb3iacKE77KDqq97hkm/BIIE +0Eq0t9Un26U/rC4vnHgpsst3LkNWDDGyTd1NG7Rb1T2IQao/fpjzZYmeXLhQsMCp +1RJl8UX435ojB8GehwPrmBE++R/L6IB9N1faIgUMGtvJfUhOelRMxLUaar9me5Kw +KgylDsB0kjYBjIQT/DHQgTXpv3o5YtqfbGFu0Ixg8A12ALeRaVSgwJ8EcEl7DUuf +8QXBNzydKgyR7QFq499YIwF8mJ6AI4fY1FUfQKDjY1IqeE1Creelnln1wmt2bz/4 +7yUffepQkforRYvsTzRBbVy6M/nnti4mW0H8BvBuQ6yj8xf7a9pCN6+ewqr+lEMG +0MnfySKjNYPXlmZHOnkd1b/W7r2vKdQ4WPCj9bHRIYSKlmV2I4V6+O/w3TGrxmMV +xMfzfS1eVOEg0ojEqv5FCS7anDTtHsKL52B5a6oDb26RMHygF03l+VPaGIzO9VLN +OS/sszJEoANXoqgLkHZ8U/KF/NSrFLQL6QAb2OIshPxHzXDhP1f0nGN4N5m0dP+Z +6VrTfW2U8xs5dn5CBdz8mdulz+KWop6cgumDjMkkY5VzQUxUU9O2cUS6VN6uGf0F +lFXgpnmznJpn+NoC+7odmMwTWZnsiiofKBFBDL5vZtnB3zFB6cQwScE3FxVdm5em +D62BKDPPJ8ZCB8hvgcK5ve1EaKpAPQF1/gmpNzNfunpfuQBpNPprL+Wv/+PUHM2H +K7yJuM3syAQRRJ/vahZwpm7JMslllD5zaXxCp83zioKksQhM4Svn4gbxOcJnL6NR +q8BvqVO4gojG/zx/JdSqYr9J+ZThtzvP7pRP+9AEP8YG5mThfKFGFBkhtv9Kwcvf +vVkNUNcv/6L3ku6GPVQB3VQ9NTk8AuXgY2Sh5YICVOcweLE+QUvmCHrdHaCGyR48 +PzhGwSztr/50Jp2TR+PGdKsTRFZFUJqKat9hgHxW1NtoTppzm+mKJAHYlFsgvXAN +EsZAfmSqs9Bt6hpbGz6nMaQDeaEGATY6jkQnx4hUVfzODth+UJ81kKR34eJzhQr5 +O9xm8zu6NrTEeCkCSMB4ezlTYl/z2BFYItu0kHc+obJPMMYITIfKvRtR3vgVPyFT +6bttOFEQ5hZzZWd4TR7JsTaPr4TX1LTnuXrjXqq5DEiUbQCljkglDs+lMnCXL81G +L+ZJOrYztJf6hKwgoYzVipdoFpb0ASkMTcCm+0+5nijIDvTbLp88vYWkU7qBv+20 ++rwVzBk8S0eQtjwpdAhoQwcOOMkCTsbasAadRjvdYpwWFBdqw5GodOgOGjhkeKDg +22mu4BLM8CdvvxiWkAq3v6+Cm+tMoCGfrU+KUpaXlXu1Hy4xiNijtFm/p6nasZKh +oR0AaFU3l2rjFvUkFKk+EMcgmcSAD/I2LNo9Vdmtr4vrvRpId5jrRpHHepWuB8xu +W/nhYJ78nrjdPcaBvMs5u+2ojIDE8xW1j4a+f8HBsBgpln+iZ6ZqQCfVp54jmip9 +gh1pI2jF2gWiywtdH+OU4xZkp4+rzgaRT//fag4+naJeOgQXeiof7/ziEuzT2fxL +zVfR9NMenTRoZoxhuMkIzvLFPJFtvuHAaMdWEW5Lhjw50/BB7212W3Y5cVcYp3Ho +8K0JJGmuDn3oBpQyDTTJJfSEfL6KbwfAukl54E84SVNL +-----END ENCRYPTED PRIVATE KEY----- diff --git a/services/oracle/tests/fixtures/rsa-2048-pkcs8.pem b/services/oracle/tests/fixtures/rsa-2048-pkcs8.pem new file mode 100644 index 00000000..75f2986c --- /dev/null +++ b/services/oracle/tests/fixtures/rsa-2048-pkcs8.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCI8XCPUpe0PkVK +8b85K66gUSm73/QeTzs62JBNglLKiULu8T2Ba/KYidEx53rWq3c1P8wtHMCQYfgE +ZlbdzmDdvKBGkX5OHkPQEU9/4/k1TSqX3af9FXiujLK8uqkOhkRCfItxz6/VbAEt +bWfpnatyKNxFYN+qGHOD8eZme5z0ebJ6k3zC/M3eqQVgyTP+GWETc1mDFeuwq2lh +5CGt/ZzV6ua6Sx5CaKzp+LBVzU/DuURGizNmKBT4S6t3CH1DevQqep8bttXDqHsR +yOcim0fv9YYAiHrETI49Yg0QsHrV4BjOqHuCOSPufJHI2yGEM/7yjCWNLZ4v9uYP +w2BQdmu3AgMBAAECggEAHrv1M61pL8I0AgRsktOrbv6YO7qhCrZkiCn3hPXFSABz +XbYVxDiqazKvGSCnEIvOBszpMYy86Qqbw70GLOS3F7zQSdY4fybKuGVSLtVG5oAJ +majdHW9WtPIN4U6RR5m5syRJlYLzpxYE06G0yxkgU9A403dQ61dugYPmXkTK7pEX +fMa+izSbZtYcGmKTs3tTIVPOToPxUQFB8s/abFex1voKY6OW9et8QiBz5uD/RL2p +1eNdixRHUOQZ/EqdWVHt5GivD5fh3s8PboANJARWwRfBCArtitJmtWg1bqMfRWr3 +hbe2qiKuObR9sf4iasdlaiOoUwmhCdNCQLm1AyltGQKBgQC/oZrbHMwSwJS5HM6W +eJpaBpILFT84y7GEoRd5YluO4ZY51zg5d/SSLjhR6/UUdXrw1suzPPP9BMeeC54S +6VzoE8k6gfa9z+8RCojVpjYZ1Bc8oSzdU7NQ/p1xEsEr4YICcpfuIXhOuhFggjWt +sz00uBfEU7NSLKBok/4pPMzk3wKBgQC28THe3y4Z1gFhPRDrDy1e2MDnoU8v6i3N +85TqA1BIebTkWDfF4Sr5gWgSv6Kaxq2IgM9gBhVgL/SugzTZctqFbgMTH5hVK6OD +vjX9CLJOIpPnk/BUZ47HQrzd8RkFVv85FEYnF4rPeMpEvCQcBMyP8olK2xd86+6J +vJ8p9K68KQKBgQCjTCwxAbYpWLCjmhe1g+pMQwMarK1mUbXhRoFBb/6DoFqqyWrh +FgZ0tyxJKyB6oa31I6UMBSoJd5Q/arj2dqQ0JAA7elpv34xiYi6+mVfK5MA0a0hX +Bqdsorw5ifjQ0uc9/LbZNu5VcBu0uODTN0U18pZWN9k8ckjzNQHF1Ejp0wKBgQCg +2RS2FpicErOH4X88jU2g9Qc3IXdUc5vuVtp5now6DPhlRMNU8pMsaQEuatv3JfRx +7n9muDKXLdL+lVIkVn2Xj5CYgdEYIZRVQyqI3dqYJILSvBo0vBCnViBlK5SKQ2GH +uDGuMV7U6Ck/ogRFtlp9vgvEizntlitXY0a2RvJTcQKBgQCEGqWgUu+nM9NhyGwk +o7nZluSKpvEVtrCA9CKZVecXiY43nUYXGj1WuG5K9TBs3MnkDWzE/SCY+Xygz79y +JCxdaRmbRxGE5Lq+Ci7m4xY8W8fVGthxTiMBiilWDYDcaxEB+x2Floie8Ydsbm5w +r21BN6gLdVmtcnjM2zhSNdby0A== +-----END PRIVATE KEY----- diff --git a/services/oracle/tests/fixtures/rsa-2048-public.pem b/services/oracle/tests/fixtures/rsa-2048-public.pem new file mode 100644 index 00000000..ee34d151 --- /dev/null +++ b/services/oracle/tests/fixtures/rsa-2048-public.pem @@ -0,0 +1,9 @@ +-----BEGIN PUBLIC KEY----- +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiPFwj1KXtD5FSvG/OSuu +oFEpu9/0Hk87OtiQTYJSyolC7vE9gWvymInRMed61qt3NT/MLRzAkGH4BGZW3c5g +3bygRpF+Th5D0BFPf+P5NU0ql92n/RV4royyvLqpDoZEQnyLcc+v1WwBLW1n6Z2r +cijcRWDfqhhzg/HmZnuc9HmyepN8wvzN3qkFYMkz/hlhE3NZgxXrsKtpYeQhrf2c +1ermukseQmis6fiwVc1Pw7lERoszZigU+Eurdwh9Q3r0KnqfG7bVw6h7EcjnIptH +7/WGAIh6xEyOPWINELB61eAYzqh7gjkj7nyRyNshhDP+8owljS2eL/bmD8NgUHZr +twIDAQAB +-----END PUBLIC KEY----- diff --git a/services/oracle/tests/private_key_formats.rs b/services/oracle/tests/private_key_formats.rs index 5bd7cad2..4539c5de 100644 --- a/services/oracle/tests/private_key_formats.rs +++ b/services/oracle/tests/private_key_formats.rs @@ -21,21 +21,23 @@ use base64::{Engine as _, engine::general_purpose::STANDARD}; use http::header::{AUTHORIZATION, DATE}; use reqsign_core::{Context, ErrorKind, FileRead, Result, SignRequest, Signer}; use reqsign_oracle::{Credential, RequestSigner, StaticCredentialProvider}; -use rsa::pkcs1::EncodeRsaPrivateKey; +use rsa::PrivateKey; use rsa::pkcs1v15::{Signature, VerifyingKey}; -use rsa::pkcs8::{EncodePrivateKey, EncodePublicKey, LineEnding}; -use rsa::rand_core::OsRng; +use rsa::pkcs8::DecodePrivateKey; use rsa::sha2::Sha256; use rsa::signature::Verifier; -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 RsaPrivateKey { - // 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") +const RSA_PKCS1_PEM: &str = include_str!("fixtures/rsa-2048-pkcs1.pem"); +const RSA_PKCS8_PEM: &str = include_str!("fixtures/rsa-2048-pkcs8.pem"); +const RSA_PUBLIC_PEM: &str = include_str!("fixtures/rsa-2048-public.pem"); +const RSA_ENCRYPTED_PEM: &str = include_str!("fixtures/rsa-2048-pkcs8-encrypted.pem"); + +fn private_key() -> &'static PrivateKey { + // All fixtures are synthetic and shared by the format tests. + static KEY: LazyLock = LazyLock::new(|| { + PrivateKey::from_pkcs8_pem(RSA_PKCS8_PEM).expect("test RSA key fixture must parse") }); &KEY } @@ -108,7 +110,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(private_key().to_public_key()); verifier.verify(signing_input.as_bytes(), &signature)?; assert!(verifier.verify(b"different request", &signature).is_err()); Ok(()) @@ -116,8 +118,10 @@ async fn verify_signed_request(pem: &str) -> anyhow::Result<()> { #[tokio::test] async fn pkcs1_private_keys_produce_valid_signatures() -> anyhow::Result<()> { - for line_ending in [LineEnding::LF, LineEnding::CRLF] { - let pem = private_key().to_pkcs1_pem(line_ending)?; + for pem in [ + RSA_PKCS1_PEM.to_string(), + RSA_PKCS1_PEM.replace('\n', "\r\n"), + ] { verify_signed_request(&pem).await?; } Ok(()) @@ -125,8 +129,10 @@ async fn pkcs1_private_keys_produce_valid_signatures() -> anyhow::Result<()> { #[tokio::test] async fn pkcs8_private_keys_produce_valid_signatures() -> anyhow::Result<()> { - for line_ending in [LineEnding::LF, LineEnding::CRLF] { - let pem = private_key().to_pkcs8_pem(line_ending)?; + for pem in [ + RSA_PKCS8_PEM.to_string(), + RSA_PKCS8_PEM.replace('\n', "\r\n"), + ] { verify_signed_request(&pem).await?; } Ok(()) @@ -156,15 +162,12 @@ 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)?; - assert_rejected_without_mutation(&pem).await + assert_rejected_without_mutation(RSA_PUBLIC_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)?; - assert_rejected_without_mutation(&pem).await + assert_rejected_without_mutation(RSA_ENCRYPTED_PEM).await } #[tokio::test] diff --git a/website/docs/getting-started.md b/website/docs/getting-started.md index 8d64c67a..4c3b667e 100644 --- a/website/docs/getting-started.md +++ b/website/docs/getting-started.md @@ -55,7 +55,7 @@ cargo add http anyhow 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+. +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..58055118 100644 --- a/website/docs/reference/versioning-and-targets.md +++ b/website/docs/reference/versioning-and-targets.md @@ -58,8 +58,9 @@ 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 +**Rust version.** The workspace declares `rust-version = "1.87.0"` — the +minimum supported Rust. The `rsa 0.10` upgrade used by the JWT helpers +requires this version. 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 From d66d84e65efe0a9588aff6cec18d7890113452eb Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Thu, 19 Nov 2026 11:52:17 +0100 Subject: [PATCH 3/6] test(google): satisfy manual_is_multiple_of clippy lint --- services/google/src/provide_credential/service_account_token.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/google/src/provide_credential/service_account_token.rs b/services/google/src/provide_credential/service_account_token.rs index 03c080e9..b793c177 100644 --- a/services/google/src/provide_credential/service_account_token.rs +++ b/services/google/src/provide_credential/service_account_token.rs @@ -488,7 +488,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")) From 6cd70b1c05579f06cba1981a7ba6fd780401918e Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Thu, 19 Nov 2026 11:54:08 +0100 Subject: [PATCH 4/6] test(google): reuse synthetic RSA fixture for cached token tests --- services/google/src/sign_request.rs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/services/google/src/sign_request.rs b/services/google/src/sign_request.rs index b0a89c6e..211bf904 100644 --- a/services/google/src/sign_request.rs +++ b/services/google/src/sign_request.rs @@ -1366,13 +1366,8 @@ mod tests { } fn test_service_account(client_email: &str) -> ServiceAccount { - let private_key = rsa::RsaPrivateKey::new(&mut OsRng, 1024) - .expect("private key must generate") - .to_pkcs8_pem(LineEnding::LF) - .expect("private key must encode") - .to_string(); ServiceAccount { - private_key, + private_key: RSA_PKCS8_PEM.to_string(), client_email: client_email.to_string(), } } From 5c1d7deee1cf5d9129f13a7ee280c9bae773e838 Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Thu, 19 Nov 2026 11:55:15 +0100 Subject: [PATCH 5/6] test(google): use distinct synthetic keys for cache partition coverage --- services/google/src/sign_request.rs | 13 +++++++-- services/google/src/test_support.rs | 1 + .../tests/fixtures/rsa-2048-pkcs8-alt.pem | 28 +++++++++++++++++++ 3 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 services/google/tests/fixtures/rsa-2048-pkcs8-alt.pem diff --git a/services/google/src/sign_request.rs b/services/google/src/sign_request.rs index 211bf904..9c88bf0a 100644 --- a/services/google/src/sign_request.rs +++ b/services/google/src/sign_request.rs @@ -876,7 +876,7 @@ mod tests { use std::sync::atomic::{AtomicUsize, Ordering}; use std::sync::{Arc, Mutex}; - use crate::test_support::RSA_PKCS8_PEM; + use crate::test_support::{RSA_PKCS8_ALT_PEM, RSA_PKCS8_PEM}; 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=&"; @@ -1366,8 +1366,12 @@ mod tests { } fn test_service_account(client_email: &str) -> ServiceAccount { + test_service_account_with_key(client_email, RSA_PKCS8_PEM) + } + + fn test_service_account_with_key(client_email: &str, private_key_pem: &str) -> ServiceAccount { ServiceAccount { - private_key: RSA_PKCS8_PEM.to_string(), + private_key: private_key_pem.to_string(), client_email: client_email.to_string(), } } @@ -1877,7 +1881,10 @@ mod tests { let ctx = Context::new().with_http_send(http.clone()); let email = "same-email@example.iam.gserviceaccount.com"; let key_1 = Credential::with_service_account(test_service_account(email)); - let key_2 = Credential::with_service_account(test_service_account(email)); + let key_2 = Credential::with_service_account(test_service_account_with_key( + email, + RSA_PKCS8_ALT_PEM, + )); let signer = RequestSigner::new("storage"); let mut parts = http::Request::get("https://storage.googleapis.com/bucket/object") diff --git a/services/google/src/test_support.rs b/services/google/src/test_support.rs index bfa0e691..bbf75ad0 100644 --- a/services/google/src/test_support.rs +++ b/services/google/src/test_support.rs @@ -18,3 +18,4 @@ //! Shared synthetic key material for unit tests. pub(crate) const RSA_PKCS8_PEM: &str = include_str!("../tests/fixtures/rsa-2048-pkcs8.pem"); +pub(crate) const RSA_PKCS8_ALT_PEM: &str = include_str!("../tests/fixtures/rsa-2048-pkcs8-alt.pem"); diff --git a/services/google/tests/fixtures/rsa-2048-pkcs8-alt.pem b/services/google/tests/fixtures/rsa-2048-pkcs8-alt.pem new file mode 100644 index 00000000..95d43686 --- /dev/null +++ b/services/google/tests/fixtures/rsa-2048-pkcs8-alt.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDQPlRKwpCL+5yX +hjMROqJ3jMxivV7/kgnaK+ezRYqZel5eHWaLMTqvrphymJBk31XZlKNWuEBQ7pkk +yrxpe1STWHdDKvG+GfRvIGQNpshPEO7V55o1OwDDWupQf3fQerTeNLXNmy0Bw4zi +Akfmc6q9VOt1/ldgKokdbSIfBd7fQh6dz7LLjOPHtCeiloW4uYaCuQTgjoqXdSml +zVrLGaSDKcWlwhz4IAIu4bePlMho3kKIXNqyh0LshaGLJzBP7bJuA16I5xo4juXE +ihEF6deMNC+GdbU7j0RST1LxGf8E/BhKQeEUE7A9QuuDZ7BLBREPSzFUv6PA6sOU +/st1SSjDAgMBAAECggEAUdE7YwggrK8V7j6uz8Ue0iPCpcTLj1Q8hLidV0UqWHTI +oOeiQ2v7J81MXjHtAYTyAQOyTT8lHecwylDRSAxJxX6LlRtJUax26jZquSZfKxl3 +DRnq76EYAqk0yJ3cYE/lwiwphffC7h97ucy1nSiy26KCxKBCiikMKECZmGDBGSv2 +09GyCf+rT4RsRvldWruc4ZbEQSQdxcHbnu7+/tGFIPyWVn2Sv6KlAb3/XxaY/NCC +q8B+JfLGfciYw6uS5/Mkvv7AxNz+3bcs6Yu/tUXBQwuG1PcrgJm3DHlYbdcJ6z+H +kvzV3XvHLGQb13aKC3KwV6U3XfjTHH+KacsdyIjZ0QKBgQDpdoDeSBq4HJBc8I1A +31ExjIAkbixJ2I628UZkMKEWxkW8LGtxtOf6f1gZF6a61P/kRV46MEdE/1Cmffpt +g+U0p3PN4sxQa4glZMjMVQfXxtV9isWjwPXCvn7aiK99yyACNcsTDUKb/RwSPHmj +CDEYv71X756rhNDPpRuzau7WqQKBgQDkWJX8xa7xmscX5vEdwXyyfEaE10Xb6fF/ +/W0+YzABpe1hH4CXtE6Fzskg1DF1v0ft0EVOfeLZgMRpDvsfwrydsEFxLQWQhGYP +efc93EkaiYU2WQtcu7LVD0MLYW6X6T6TJZceQahmOMglyTpLAHeHs+ygn6LnD743 +uqldOKWjiwKBgCNAqaTm7mHurj3adPnevrvko1Tc7gMYmDQ3qpFmZmyx88W+T1sU +HhNNN1hSofKERz+I2fmfYKOiieMaEr6GtA2HW40zOfbKxfwfg9KW5GBIveP/GGjp +sjJ94VnOWfF8wpCS3t85mV1EkwCN8TAVBJTgHw8wN51eqMkx/UTSWM5BAoGBAJ0y +swbSHI6tbBRzY1iFxE+nqHB5NtmfYycmk1dYt0rbLOEo68EEWu5ZHjNggTA7X8xD +DgNsPIhZ0l00+AK0cF7qYRMF2IfV7eEHqQLILPd85t00TdMoUIPGvvQNvjIMW4y3 +WyJ0NvcwbfE9Z8kMaD1eyy8E1wPU3bHF6iSIA9fjAoGAA8dSQhgjUD5T0v5Gkzdn +/sJVzzJG6qZBYvyYP5Gen4L/BNGjbzkkkaJLcQy2Jl3ZjrNhi1rMCZOFKW+o3vE7 +1eO0hrKiyW9XKyu8Y0goG/0gkKolHSuLgeh99PLxfVi6cBde9WcoWVBTRjz3/KYN +ZSvytjm0lxS8RN31DIf0f6U= +-----END PRIVATE KEY----- From 2ee8a71884745f4810442ae98d911831e7c6c568 Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Thu, 19 Nov 2026 13:42:36 +0100 Subject: [PATCH 6/6] test(oracle): pass fixture PEM without needless borrow --- services/oracle/tests/private_key_formats.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/oracle/tests/private_key_formats.rs b/services/oracle/tests/private_key_formats.rs index b7a20bcd..be1306b4 100644 --- a/services/oracle/tests/private_key_formats.rs +++ b/services/oracle/tests/private_key_formats.rs @@ -214,7 +214,7 @@ async fn post_signs_caller_supplied_body_metadata() -> anyhow::Result<()> { .0; let original_uri = parts.uri.clone(); - sign(&pem, &mut parts).await?; + sign(pem, &mut parts).await?; assert_eq!(parts.uri, original_uri); assert_eq!(parts.headers["x-original"], "preserved"); @@ -240,7 +240,7 @@ async fn object_storage_put_without_body_metadata_keeps_generic_headers() -> any .into_parts() .0; - sign(&pem, &mut parts).await?; + sign(pem, &mut parts).await?; assert_eq!(parts.headers["x-original"], "preserved"); assert_eq!(signed_headers(&parts)?, "date (request-target) host"); @@ -262,7 +262,7 @@ async fn object_storage_upload_part_signs_supplied_content_length_only() -> anyh .into_parts() .0; - sign(&pem, &mut parts).await?; + sign(pem, &mut parts).await?; assert_eq!(parts.headers[CONTENT_LENGTH], "10485760"); assert_eq!( @@ -293,7 +293,7 @@ async fn duplicate_signed_body_header_is_rejected_without_mutation() -> anyhow:: .0; let original = parts.clone(); - let error = sign(&pem, &mut parts) + let error = sign(pem, &mut parts) .await .expect_err("duplicate signed body headers must be rejected");