From eab2b81be2a81422b829e7ef167de7b284695c28 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Thu, 7 Mar 2024 12:46:15 +0100
Subject: [unicode-headers] allow utf-8 in headers + add test for object
 metadata

---
 src/api/s3/put.rs            | 2 +-
 src/api/signature/payload.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/api')

diff --git a/src/api/s3/put.rs b/src/api/s3/put.rs
index 36523b30..685cca80 100644
--- a/src/api/s3/put.rs
+++ b/src/api/s3/put.rs
@@ -595,7 +595,7 @@ pub(crate) fn get_headers(headers: &HeaderMap<HeaderValue>) -> Result<ObjectVers
 	// Preserve x-amz-meta- headers
 	for (k, v) in headers.iter() {
 		if k.as_str().starts_with("x-amz-meta-") {
-			match v.to_str() {
+			match std::str::from_utf8(v.as_bytes()) {
 				Ok(v_str) => {
 					other.insert(k.to_string(), v_str.to_string());
 				}
diff --git a/src/api/signature/payload.rs b/src/api/signature/payload.rs
index d72736bb..d6ff62f0 100644
--- a/src/api/signature/payload.rs
+++ b/src/api/signature/payload.rs
@@ -331,8 +331,8 @@ pub fn canonical_request(
 		.map(|name| {
 			let value = headers
 				.get(name)
-				.ok_or_bad_request(format!("signed header `{}` is not present", name))?
-				.to_str()?;
+				.ok_or_bad_request(format!("signed header `{}` is not present", name))?;
+			let value = std::str::from_utf8(value.as_bytes())?;
 			Ok(format!("{}:{}", name.as_str(), value.trim()))
 		})
 		.collect::<Result<Vec<String>, Error>>()?
-- 
cgit v1.2.3