sdgoij/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-01-16 17:20:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: take content type from PutObjectInput instead of headers (#718)

Browse Source 
fixes #716

Co-authored-by: loverustfs <155562731+loverustfs@users.noreply.github.com>
This commit is contained in:
Ben Scholzen
2025-10-26 14:44:54 +01:00
committed by GitHub
parent 6ab7619023
commit 6f3d2885cd
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rustfs/src/storage/ecfs.rs
View File

@@ -2264,6 +2264,7 @@ impl S3 for FS {
bucket,
key,
content_length,
content_type,
tagging,
metadata,
version_id,
@@ -2336,7 +2337,11 @@ impl S3 for FS {
let mut metadata = metadata.unwrap_or_default();
extract_metadata_from_mime_with_object_name(&req.headers, &mut metadata, Some(&key));
if let Some(content_type) = content_type {
metadata.insert("content-type".to_string(), content_type.to_string());
}
extract_metadata_from_mime_with_object_name(&req.headers, &mut metadata, true, Some(&key));
if let Some(tags) = tagging {
metadata.insert(AMZ_OBJECT_TAGGING.to_owned(), tags.to_string());

13
rustfs/src/storage/options.rs
View File

@@ -288,16 +288,21 @@ pub fn extract_metadata(headers: &HeaderMap<HeaderValue>) -> HashMap<String, Str
/// Extracts metadata from headers and returns it as a HashMap.
pub fn extract_metadata_from_mime(headers: &HeaderMap<HeaderValue>, metadata: &mut HashMap<String, String>) {
extract_metadata_from_mime_with_object_name(headers, metadata, None);
extract_metadata_from_mime_with_object_name(headers, metadata, false, None);
}
/// Extracts metadata from headers and returns it as a HashMap with object name for MIME type detection.
pub fn extract_metadata_from_mime_with_object_name(
headers: &HeaderMap<HeaderValue>,
metadata: &mut HashMap<String, String>,
skip_content_type: bool,
object_name: Option<&str>,
) {
for (k, v) in headers.iter() {
if k.as_str() == "content-type" && skip_content_type {
continue;
}
if let Some(key) = k.as_str().strip_prefix("x-amz-meta-") {
if key.is_empty() {
continue;
@@ -977,7 +982,7 @@ mod tests {
let headers = HeaderMap::new();
let mut metadata = HashMap::new();
extract_metadata_from_mime_with_object_name(&headers, &mut metadata, Some("data/test.parquet"));
extract_metadata_from_mime_with_object_name(&headers, &mut metadata, false, Some("data/test.parquet"));
assert_eq!(metadata.get("content-type"), Some(&"application/vnd.apache.parquet".to_string()));
}
@@ -1001,7 +1006,7 @@ mod tests {
let headers = HeaderMap::new();
let mut metadata = HashMap::new();
extract_metadata_from_mime_with_object_name(&headers, &mut metadata, Some(filename));
extract_metadata_from_mime_with_object_name(&headers, &mut metadata, false, Some(filename));
assert_eq!(
metadata.get("content-type"),
@@ -1017,7 +1022,7 @@ mod tests {
headers.insert("content-type", HeaderValue::from_static("custom/type"));
let mut metadata = HashMap::new();
extract_metadata_from_mime_with_object_name(&headers, &mut metadata, Some("test.parquet"));
extract_metadata_from_mime_with_object_name(&headers, &mut metadata, false, Some("test.parquet"));
// Should preserve existing content-type, not overwrite
assert_eq!(metadata.get("content-type"), Some(&"custom/type".to_string()));