Merge pull request #2848 from lann/remove-non-ascii-headers

Remove non-ascii header values instead of failing
fermyon · Sep 19, 2024 · 8752dff · 8752dff
2 parents 31aa7ec + 32f2ffd
commit 8752dff
Showing 1 changed file with 19 additions and 30 deletions.
diff --git a/crates/factor-outbound-http/src/spin.rs b/crates/factor-outbound-http/src/spin.rs
@@ -148,21 +148,7 @@ fn hyper_method(m: Method) -> http::Method {
 async fn response_from_hyper(mut resp: crate::Response) -> Result<Response, HttpError> {
     let status = resp.status().as_u16();
 
-    let headers = resp
-        .headers()
-        .into_iter()
-        .map(|(key, val)| {
-            Ok((
-                key.to_string(),
-                val.to_str()
-                    .map_err(|_| {
-                        tracing::error!("Non-ascii response header {key} = {val:?}");
-                        HttpError::RuntimeError
-                    })?
-                    .to_string(),
-            ))
-        })
-        .collect::<Result<Vec<_>, _>>()?;
+    let headers = headers_from_map(resp.headers());
 
     let body = resp
         .body_mut()
@@ -205,21 +191,7 @@ fn log_reqwest_error(err: reqwest::Error) -> HttpError {
 async fn response_from_reqwest(res: reqwest::Response) -> Result<Response, HttpError> {
     let status = res.status().as_u16();
 
-    let headers = res
-        .headers()
-        .into_iter()
-        .map(|(key, val)| {
-            Ok((
-                key.to_string(),
-                val.to_str()
-                    .map_err(|_| {
-                        tracing::error!("Non-ascii response header {key} = {val:?}");
-                        HttpError::RuntimeError
-                    })?
-                    .to_string(),
-            ))
-        })
-        .collect::<Result<Vec<_>, _>>()?;
+    let headers = headers_from_map(res.headers());
 
     let body = res
         .bytes()
@@ -233,3 +205,20 @@ async fn response_from_reqwest(res: reqwest::Response) -> Result<Response, HttpE
         body: Some(body),
     })
 }
+
+fn headers_from_map(map: &http::HeaderMap) -> Vec<(String, String)> {
+    map.iter()
+        .filter_map(|(key, val)| {
+            Some((
+                key.to_string(),
+                val.to_str()
+                    .ok()
+                    .or_else(|| {
+                        tracing::warn!("Non-ascii response header value for {key}");
+                        None
+                    })?
+                    .to_string(),
+            ))
+        })
+        .collect()
+}