GenarrativeAI/Genarrative
5
0
Fork 0
Code Issues Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

fix oss object key guidance
Some checks failed
CI / verify (pull_request) Has been cancelled
Details

Browse Source
This commit is contained in:
历冰郁-hermes版
2026-05-08 14:28:04 +08:00
parent 20d5121c6c
commit 7e8cc22859
3 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
server-rs/crates/platform-oss/src/lib.rs
View File

@@ -468,7 +468,7 @@ impl OssClient {
));
}
let object_key = normalize_object_key_for_bucket(&self.config.bucket, &request.object_key)?;
let object_key = normalize_object_key(&request.object_key)?;
let expires_at = OffsetDateTime::now_utc()
.checked_add(Duration::seconds(i64::try_from(expire_seconds).map_err(
|_| OssError::InvalidRequest("expireSeconds 超出可支持范围".to_string()),
@@ -541,7 +541,7 @@ impl OssClient {
client: &reqwest::Client,
request: OssHeadObjectRequest,
) -> Result<OssHeadObjectResponse, OssError> {
let object_key = normalize_object_key_for_bucket(&self.config.bucket, &request.object_key)?;
let object_key = normalize_object_key(&request.object_key)?;
let target_url = build_object_url(&self.config.bucket, &self.config.endpoint, &object_key)
.map_err(|error| OssError::Request(format!("构造 OSS 对象 URL 失败：{error}")))?;
let response = send_signed_request(
@@ -764,17 +764,6 @@ fn build_object_key(
parts.join("/")
}
fn normalize_object_key_for_bucket(bucket: &str, raw: &str) -> Result<String, OssError> {
let normalized = raw.trim().trim_start_matches('/').trim().to_string();
let bucket_prefix = format!("{}/", bucket.trim().trim_matches('/'));
let object_key = normalized
.strip_prefix(&bucket_prefix)
.unwrap_or(normalized.as_str())
.to_string();
normalize_object_key(&object_key)
}
fn normalize_object_key(raw: &str) -> Result<String, OssError> {
let normalized = raw.trim().trim_start_matches('/').trim().to_string();
if normalized.is_empty() {
@@ -1470,7 +1459,7 @@ mod tests {
}
#[test]
fn sign_get_object_url_accepts_bucket_prefixed_square_hole_key() {
fn sign_get_object_url_uses_square_hole_object_key_without_bucket_prefix() {
let client = OssClient::new(
OssConfig::new(
"xushi-dev".to_string(),
@@ -1487,10 +1476,10 @@ mod tests {
let response = client
.sign_get_object_url(OssSignedGetObjectUrlRequest {
object_key: "xushi-dev/generated-square-hole-assets/square-hole-session-546d881972684be2980a2a882cd0cc71/square-hole-profile-134411276ce1469cbe398f946a25d7f8/square-hole-shape-image/rabbit-option/asset-1777979289912039/image.png".to_string(),
object_key: "generated-square-hole-assets/square-hole-session-546d881972684be2980a2a882cd0cc71/square-hole-profile-134411276ce1469cbe398f946a25d7f8/square-hole-shape-image/rabbit-option/asset-1777979289912039/image.png".to_string(),
expire_seconds: Some(300),
})
.expect("bucket-prefixed square hole key should build signed url");
.expect("square hole object key should build signed url");
assert_eq!(response.bucket, "xushi-dev".to_string());
assert_eq!(