From 886dfcf831c60d480bb8b6ba535525293ef820d4 Mon Sep 17 00:00:00 2001 From: tison Date: Thu, 19 Nov 2026 21:41:10 +0800 Subject: [PATCH 1/3] fix(google): preserve request signer unwind safety --- services/google/src/sign_request.rs | 55 ++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 16 deletions(-) diff --git a/services/google/src/sign_request.rs b/services/google/src/sign_request.rs index 35cbfb7d..164883a5 100644 --- a/services/google/src/sign_request.rs +++ b/services/google/src/sign_request.rs @@ -138,7 +138,8 @@ impl TokenCache { #[derive(Default)] struct TokenState { - cache: Mutex, + // Cache operations never await; a synchronous mutex preserves unwind safety. + cache: SyncMutex, refresh_locks: RefreshLockRegistry, } @@ -285,8 +286,12 @@ impl RequestSigner { } #[cfg(test)] - async fn cache_len(&self) -> usize { - self.token_state.cache.lock().await.len() + fn cache_len(&self) -> usize { + self.token_state + .cache + .lock() + .unwrap_or_else(std::sync::PoisonError::into_inner) + .len() } #[cfg(test)] @@ -304,13 +309,25 @@ impl RequestSigner { scope: scope.clone(), }; - if let Some(token) = self.token_state.cache.lock().await.find(&key) { + if let Some(token) = self + .token_state + .cache + .lock() + .unwrap_or_else(std::sync::PoisonError::into_inner) + .find(&key) + { return Ok(token); } let refresh_lock = self.token_state.refresh_lock(&key); let _refresh_guard = refresh_lock.lock.lock().await; - if let Some(token) = self.token_state.cache.lock().await.find(&key) { + if let Some(token) = self + .token_state + .cache + .lock() + .unwrap_or_else(std::sync::PoisonError::into_inner) + .find(&key) + { return Ok(token); } @@ -324,7 +341,7 @@ impl RequestSigner { self.token_state .cache .lock() - .await + .unwrap_or_else(std::sync::PoisonError::into_inner) .insert(key, token.clone()); } Ok(token) @@ -877,6 +894,12 @@ mod tests { use std::sync::atomic::{AtomicUsize, Ordering}; use std::sync::{Arc, Mutex}; + // Preserve compatibility with callers that capture a signer across catch_unwind. + const _: fn() = || { + fn assert_unwind_safe() {} + assert_unwind_safe::(); + }; + 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)] @@ -1609,7 +1632,7 @@ mod tests { .sign_request(&ctx, &mut parts, Some(&credential), None) .await?; assert_eq!(parts.headers[header::AUTHORIZATION], expected); - assert_eq!(signer.cache_len().await, 0); + assert_eq!(signer.cache_len(), 0); } assert_eq!(http.calls.load(Ordering::SeqCst), 2); @@ -1635,7 +1658,7 @@ mod tests { .sign_request(&ctx, &mut parts, Some(&credential), None) .await?; assert_eq!(parts.headers[header::AUTHORIZATION], "Bearer short-lived"); - assert_eq!(signer.cache_len().await, 0); + assert_eq!(signer.cache_len(), 0); assert_eq!(http.calls.load(Ordering::SeqCst), 1); Ok(()) } @@ -1661,7 +1684,7 @@ mod tests { .await .expect_err("token shorter than operation headroom must be rejected"); assert_eq!(err.kind(), ErrorKind::CredentialInvalid); - assert_eq!(signer.cache_len().await, 0); + assert_eq!(signer.cache_len(), 0); assert_eq!(http.calls.load(Ordering::SeqCst), 1); Ok(()) } @@ -1744,7 +1767,7 @@ mod tests { first.await.expect("first task must not panic")?; second.await.expect("second task must not panic")?; assert_eq!(http.calls.load(Ordering::SeqCst), 2); - assert_eq!(signer.cache_len().await, 2); + assert_eq!(signer.cache_len(), 2); assert_eq!(signer.refresh_lock_len(), 0); Ok(()) } @@ -1777,7 +1800,7 @@ mod tests { assert_eq!(err.kind(), ErrorKind::Unexpected); assert!(err.is_retryable()); assert!(!format!("{err:?}").contains("sensitive-body")); - assert_eq!(signer.cache_len().await, 0); + assert_eq!(signer.cache_len(), 0); assert_eq!(signer.refresh_lock_len(), 0); signer @@ -1787,7 +1810,7 @@ mod tests { parts.headers[header::AUTHORIZATION], "Bearer recovered-token" ); - assert_eq!(signer.cache_len().await, 1); + assert_eq!(signer.cache_len(), 1); assert_eq!(http.calls.load(Ordering::SeqCst), 2); Ok(()) } @@ -1847,7 +1870,7 @@ mod tests { .expect_err("task must be cancelled") .is_cancelled() ); - assert_eq!(signer.cache_len().await, 0); + assert_eq!(signer.cache_len(), 0); assert_eq!(signer.refresh_lock_len(), 0); http.release.release(1); @@ -1865,7 +1888,7 @@ mod tests { parts.headers[header::AUTHORIZATION], "Bearer after-cancel-token" ); - assert_eq!(signer.cache_len().await, 1); + assert_eq!(signer.cache_len(), 1); assert_eq!(signer.refresh_lock_len(), 0); Ok(()) } @@ -1957,7 +1980,7 @@ mod tests { } assert_eq!(http.calls.load(Ordering::SeqCst), 1); - assert_eq!(signer.cache_len().await, 1); + assert_eq!(signer.cache_len(), 1); Ok(()) } @@ -1992,7 +2015,7 @@ mod tests { .contains("X-Goog-Signature=") ); assert_eq!(http.calls.load(Ordering::SeqCst), 0); - assert_eq!(signer.cache_len().await, 0); + assert_eq!(signer.cache_len(), 0); Ok(()) } From 6b65e505e1ef004f16a9f9d3ec199552241dc13b Mon Sep 17 00:00:00 2001 From: tison Date: Thu, 19 Nov 2026 21:41:10 +0800 Subject: [PATCH 2/3] chore: align v0.20.9 crate versions with new capabilities --- Cargo.toml | 12 ++++++------ services/aws-core/Cargo.toml | 2 +- services/aws-v4/Cargo.toml | 2 +- services/aws-v4a/Cargo.toml | 2 +- services/google/Cargo.toml | 2 +- services/oracle/Cargo.toml | 2 +- services/tencent-cos/Cargo.toml | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 94ccb168..44d5936b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,19 +28,19 @@ rust-version = "1.86.0" [workspace.dependencies] # Workspace dependencies reqsign-aliyun-oss = { version = "3.2.2", path = "services/aliyun-oss" } -reqsign-aws-core = { version = "3.3.1", path = "services/aws-core" } -reqsign-aws-v4 = { version = "3.4.1", path = "services/aws-v4" } -reqsign-aws-v4a = { version = "3.1.1", path = "services/aws-v4a" } +reqsign-aws-core = { version = "3.4.0", path = "services/aws-core" } +reqsign-aws-v4 = { version = "3.5.0", path = "services/aws-v4" } +reqsign-aws-v4a = { version = "3.2.0", path = "services/aws-v4a" } reqsign-azure-storage = { version = "3.3.2", path = "services/azure-storage" } reqsign-command-execute-tokio = { version = "3.0.9", path = "context/command-execute-tokio" } reqsign-core = { version = "3.3.4", path = "core" } reqsign-file-read-tokio = { version = "3.0.9", path = "context/file-read-tokio" } -reqsign-google = { version = "3.3.1", path = "services/google" } +reqsign-google = { version = "3.4.0", path = "services/google" } reqsign-http-send-reqwest = { version = "4.0.9", path = "context/http-send-reqwest" } reqsign-huaweicloud-obs = { version = "3.0.9", path = "services/huaweicloud-obs" } reqsign-openstack-keystone = { version = "3.0.1", path = "services/openstack-keystone" } -reqsign-oracle = { version = "3.0.9", path = "services/oracle" } -reqsign-tencent-cos = { version = "3.0.9", path = "services/tencent-cos" } +reqsign-oracle = { version = "3.1.0", path = "services/oracle" } +reqsign-tencent-cos = { version = "3.1.0", path = "services/tencent-cos" } reqsign-volcengine-tos = { version = "3.1.5", path = "services/volcengine-tos" } # Crates.io dependencies diff --git a/services/aws-core/Cargo.toml b/services/aws-core/Cargo.toml index 77b85e31..e560109a 100644 --- a/services/aws-core/Cargo.toml +++ b/services/aws-core/Cargo.toml @@ -17,7 +17,7 @@ [package] name = "reqsign-aws-core" -version = "3.3.1" +version = "3.4.0" description = "Shared AWS credential and request canonicalization support for reqsign." diff --git a/services/aws-v4/Cargo.toml b/services/aws-v4/Cargo.toml index 000f90b0..fcd79a51 100644 --- a/services/aws-v4/Cargo.toml +++ b/services/aws-v4/Cargo.toml @@ -17,7 +17,7 @@ [package] name = "reqsign-aws-v4" -version = "3.4.1" +version = "3.5.0" description = "AWS SigV4 signing implementation for reqsign." diff --git a/services/aws-v4a/Cargo.toml b/services/aws-v4a/Cargo.toml index 08e49f4a..fa138e1d 100644 --- a/services/aws-v4a/Cargo.toml +++ b/services/aws-v4a/Cargo.toml @@ -17,7 +17,7 @@ [package] name = "reqsign-aws-v4a" -version = "3.1.1" +version = "3.2.0" description = "AWS SigV4a signing implementation for reqsign." diff --git a/services/google/Cargo.toml b/services/google/Cargo.toml index f0c7f458..4d6fcce4 100644 --- a/services/google/Cargo.toml +++ b/services/google/Cargo.toml @@ -17,7 +17,7 @@ [package] name = "reqsign-google" -version = "3.3.1" +version = "3.4.0" description = "Google Cloud Platform signing implementation for reqsign." diff --git a/services/oracle/Cargo.toml b/services/oracle/Cargo.toml index 88ce3198..fe5e6684 100644 --- a/services/oracle/Cargo.toml +++ b/services/oracle/Cargo.toml @@ -17,7 +17,7 @@ [package] name = "reqsign-oracle" -version = "3.0.9" +version = "3.1.0" description = "Oracle Cloud signing implementation for reqsign." diff --git a/services/tencent-cos/Cargo.toml b/services/tencent-cos/Cargo.toml index a7a41819..33fec1a1 100644 --- a/services/tencent-cos/Cargo.toml +++ b/services/tencent-cos/Cargo.toml @@ -17,7 +17,7 @@ [package] name = "reqsign-tencent-cos" -version = "3.0.9" +version = "3.1.0" description = "Tencent Cloud COS signing implementation for reqsign." From beff802c9da7989757961baf85af3549ecc8665f Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Fri, 20 Nov 2026 03:20:24 +0100 Subject: [PATCH 3/3] chore: assign minor versions to Volcengine TOS and Huawei OBS granters --- Cargo.toml | 4 ++-- services/huaweicloud-obs/Cargo.toml | 2 +- services/volcengine-tos/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 44d5936b..4098fb3e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,11 +37,11 @@ reqsign-core = { version = "3.3.4", path = "core" } reqsign-file-read-tokio = { version = "3.0.9", path = "context/file-read-tokio" } reqsign-google = { version = "3.4.0", path = "services/google" } reqsign-http-send-reqwest = { version = "4.0.9", path = "context/http-send-reqwest" } -reqsign-huaweicloud-obs = { version = "3.0.9", path = "services/huaweicloud-obs" } +reqsign-huaweicloud-obs = { version = "3.1.0", path = "services/huaweicloud-obs" } reqsign-openstack-keystone = { version = "3.0.1", path = "services/openstack-keystone" } reqsign-oracle = { version = "3.1.0", path = "services/oracle" } reqsign-tencent-cos = { version = "3.1.0", path = "services/tencent-cos" } -reqsign-volcengine-tos = { version = "3.1.5", path = "services/volcengine-tos" } +reqsign-volcengine-tos = { version = "3.2.0", path = "services/volcengine-tos" } # Crates.io dependencies aes-gcm = "0.11" diff --git a/services/huaweicloud-obs/Cargo.toml b/services/huaweicloud-obs/Cargo.toml index 61c2a59d..15c5cbdc 100644 --- a/services/huaweicloud-obs/Cargo.toml +++ b/services/huaweicloud-obs/Cargo.toml @@ -17,7 +17,7 @@ [package] name = "reqsign-huaweicloud-obs" -version = "3.0.9" +version = "3.1.0" description = "Huawei Cloud OBS signing implementation for reqsign." diff --git a/services/volcengine-tos/Cargo.toml b/services/volcengine-tos/Cargo.toml index fa5816cb..5097be9e 100644 --- a/services/volcengine-tos/Cargo.toml +++ b/services/volcengine-tos/Cargo.toml @@ -17,7 +17,7 @@ [package] name = "reqsign-volcengine-tos" -version = "3.1.5" +version = "3.2.0" description = "Volcengine TOS signing implementation for reqsign."