Skip to content

fix(services/s3): Detect region returned too early when header is empty #3187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Xuanwo merged 2 commits into from
Sep 26, 2023
Merged

fix(services/s3): Detect region returned too early when header is empty #3187

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aff2309
fix(services/s3): Detect region returned too early when header is empty
Xuanwo Sep 26, 2023
2d29a63
Merge branch 'main' into fix-detect-region
Xuanwo Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions core/src/services/s3/backend.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,6 +563,10 @@ impl S3Builder {
///
/// - [Amazon S3 HeadBucket API](https://docs.aws.amazon.com/zh_cn/AmazonS3/latest/API/API_HeadBucket.html)
pub async fn detect_region(endpoint: &str, bucket: &str) -> Option<String> {
// Remove the possible trailing `/` in endpoint.
let endpoint = endpoint.trim_end_matches('/');

// Make sure the endpoint contains the scheme.
let mut endpoint = if endpoint.starts_with("http") {
endpoint.to_string()
} else {
Expand Down Expand Up @@ -623,9 +627,10 @@ impl S3Builder {
);

// Get region from response header no matter status code.
let region = res.headers().get("x-amz-bucket-region")?;
if let Ok(regin) = region.to_str() {
return Some(regin.to_string());
if let Some(header) = res.headers().get("x-amz-bucket-region") {
if let Ok(regin) = header.to_str() {
return Some(regin.to_string());
}
}

// Status code is 403 or 200 means we already visit the correct
Expand Down