fix(cli/http_utils): accept a single key-multiple values headers (#7375)

1 files changed, 121 insertions, 25 deletions

diff --git a/cli/file_fetcher.rs b/cli/file_fetcher.rs
index 2a18a9a6a..c62e3732e 100644
--- a/cli/file_fetcher.rs
+++ b/cli/file_fetcher.rs
@@ -404,7 +404,7 @@ impl SourceFileFetcher {
     };
 
     let (mut source_file, headers) = result;
-    if let Some(redirect_to) = headers.get("location") {
+    if let Some(redirect_to) = headers.get("location").and_then(|e| e.first()) {
       let redirect_url = match Url::parse(redirect_to) {
         Ok(redirect_url) => redirect_url,
         Err(url::ParseError::RelativeUrlWithoutBase) => {
@@ -427,9 +427,15 @@ impl SourceFileFetcher {
     let fake_filepath = PathBuf::from(module_url.path());
     let (media_type, charset) = map_content_type(
       &fake_filepath,
-      headers.get("content-type").map(|e| e.as_str()),
+      headers
+        .get("content-type")
+        .and_then(|e| e.first())
+        .map(|e| e.as_str()),
     );
-    let types_header = headers.get("x-typescript-types").map(|e| e.to_string());
+    let types_header = headers
+      .get("x-typescript-types")
+      .and_then(|e| e.first())
+      .map(|e| e.to_string());
     Ok(Some(SourceFile {
       url: module_url.clone(),
       filename: cache_filename,
@@ -493,7 +499,10 @@ impl SourceFileFetcher {
     let dir = self.clone();
     let module_url = module_url.clone();
     let module_etag = match self.http_cache.get(&module_url) {
-      Ok((_, headers)) => headers.get("etag").map(String::from),
+      Ok((_, headers)) => headers
+        .get("etag")
+        .and_then(|e| e.first())
+        .map(|e| e.to_string()),
       Err(_) => None,
     };
     let permissions = permissions.clone();
@@ -532,11 +541,16 @@ impl SourceFileFetcher {
           let fake_filepath = PathBuf::from(module_url.path());
           let (media_type, charset) = map_content_type(
             &fake_filepath,
-            headers.get("content-type").map(String::as_str),
+            headers
+              .get("content-type")
+              .and_then(|e| e.first())
+              .map(|e| e.as_str()),
           );
 
-          let types_header =
-            headers.get("x-typescript-types").map(String::to_string);
+          let types_header = headers
+            .get("x-typescript-types")
+            .and_then(|e| e.first())
+            .map(|e| e.to_string());
 
           let source_file = SourceFile {
             url: module_url.clone(),
@@ -811,7 +825,9 @@ mod tests {
     metadata.headers = HashMap::new();
     metadata
       .headers
-      .insert("content-type".to_string(), "text/javascript".to_string());
+      .entry("content-type".to_string())
+      .or_insert_with(Vec::new)
+      .push("text/javascript".to_string());
     metadata.write(&cache_filename).unwrap();
 
     let result2 = fetcher_1
@@ -834,13 +850,23 @@ mod tests {
     assert_eq!(&(r2.media_type), &msg::MediaType::JavaScript);
     let (_, headers) = fetcher_2.http_cache.get(&module_url_1).unwrap();
 
-    assert_eq!(headers.get("content-type").unwrap(), "text/javascript");
+    assert_eq!(
+      headers
+        .get("content-type")
+        .unwrap()
+        .first()
+        .unwrap()
+        .as_str(),
+      "text/javascript"
+    );
 
     // Modify .headers.json again, but the other way around
     metadata.headers = HashMap::new();
     metadata
       .headers
-      .insert("content-type".to_string(), "application/json".to_string());
+      .entry("content-type".to_string())
+      .or_insert_with(Vec::new)
+      .push("application/json".to_string());
     metadata.write(&cache_filename).unwrap();
 
     let result3 = fetcher_2
@@ -863,7 +889,13 @@ mod tests {
     assert_eq!(&(r3.media_type), &msg::MediaType::Json);
     let metadata = crate::http_cache::Metadata::read(&cache_filename).unwrap();
     assert_eq!(
-      metadata.headers.get("content-type").unwrap(),
+      metadata
+        .headers
+        .get("content-type")
+        .unwrap()
+        .first()
+        .unwrap()
+        .as_str(),
       "application/json"
     );
 
@@ -913,7 +945,15 @@ mod tests {
     assert_eq!(r.source_code.bytes, expected);
     assert_eq!(&(r.media_type), &msg::MediaType::JavaScript);
     let (_, headers) = fetcher.http_cache.get(&module_url).unwrap();
-    assert_eq!(headers.get("content-type").unwrap(), "text/javascript");
+    assert_eq!(
+      headers
+        .get("content-type")
+        .unwrap()
+        .first()
+        .unwrap()
+        .as_str(),
+      "text/javascript"
+    );
 
     // Modify .headers.json
     let mut metadata =
@@ -921,7 +961,9 @@ mod tests {
     metadata.headers = HashMap::new();
     metadata
       .headers
-      .insert("content-type".to_string(), "text/typescript".to_string());
+      .entry("content-type".to_string())
+      .or_insert_with(Vec::new)
+      .push("text/typescript".to_string());
     metadata.write(&cache_filename).unwrap();
 
     let result2 = fetcher
@@ -943,7 +985,13 @@ mod tests {
     assert_eq!(&(r2.media_type), &msg::MediaType::TypeScript);
     let metadata = crate::http_cache::Metadata::read(&cache_filename).unwrap();
     assert_eq!(
-      metadata.headers.get("content-type").unwrap(),
+      metadata
+        .headers
+        .get("content-type")
+        .unwrap()
+        .first()
+        .unwrap()
+        .as_str(),
       "text/typescript"
     );
 
@@ -967,7 +1015,15 @@ mod tests {
     // (due to http fetch)
     assert_eq!(&(r3.media_type), &msg::MediaType::JavaScript);
     let (_, headers) = fetcher.http_cache.get(&module_url).unwrap();
-    assert_eq!(headers.get("content-type").unwrap(), "text/javascript");
+    assert_eq!(
+      headers
+        .get("content-type")
+        .unwrap()
+        .first()
+        .unwrap()
+        .as_str(),
+      "text/javascript"
+    );
   }
 
   #[tokio::test]
@@ -1053,7 +1109,7 @@ mod tests {
     assert_eq!(fs::read_to_string(&redirect_source_filename).unwrap(), "");
     let (_, headers) = fetcher.http_cache.get(&redirect_module_url).unwrap();
     assert_eq!(
-      headers.get("location").unwrap(),
+      headers.get("location").unwrap().first().unwrap().as_str(),
       "http://localhost:4545/cli/tests/subdir/redirects/redirect1.js"
     );
     // The target of redirection is downloaded instead.
@@ -1106,10 +1162,16 @@ mod tests {
     assert_eq!(fs::read_to_string(&redirect_path).unwrap(), "");
 
     let (_, headers) = fetcher.http_cache.get(&double_redirect_url).unwrap();
-    assert_eq!(headers.get("location").unwrap(), &redirect_url.to_string());
+    assert_eq!(
+      headers.get("location").unwrap().first().unwrap(),
+      &redirect_url.to_string()
+    );
 
     let (_, headers) = fetcher.http_cache.get(&redirect_url).unwrap();
-    assert_eq!(headers.get("location").unwrap(), &target_url.to_string());
+    assert_eq!(
+      headers.get("location").unwrap().first().unwrap(),
+      &target_url.to_string()
+    );
 
     // The target of redirection is downloaded instead.
     assert_eq!(
@@ -1262,7 +1324,7 @@ mod tests {
     assert_eq!(fs::read_to_string(&redirect_source_filename).unwrap(), "");
     let (_, headers) = fetcher.http_cache.get(&redirect_module_url).unwrap();
     assert_eq!(
-      headers.get("location").unwrap(),
+      headers.get("location").unwrap().first().unwrap().as_str(),
       "/cli/tests/subdir/redirects/redirect1.js"
     );
     // The target of redirection is downloaded instead.
@@ -1376,7 +1438,9 @@ mod tests {
     metadata.headers = HashMap::new();
     metadata
       .headers
-      .insert("content-type".to_string(), "text/javascript".to_string());
+      .entry("content-type".to_string())
+      .or_insert_with(Vec::new)
+      .push("text/javascript".to_string());
     metadata.write(&cache_filename).unwrap();
 
     let result2 = fetcher.fetch_cached_remote_source(&module_url, 1);
@@ -1407,7 +1471,15 @@ mod tests {
     assert_eq!(r.source_code.bytes, b"export const loaded = true;\n");
     assert_eq!(&(r.media_type), &msg::MediaType::TypeScript);
     let (_, headers) = fetcher.http_cache.get(module_url).unwrap();
-    assert_eq!(headers.get("content-type").unwrap(), "text/typescript");
+    assert_eq!(
+      headers
+        .get("content-type")
+        .unwrap()
+        .first()
+        .unwrap()
+        .as_str(),
+      "text/typescript"
+    );
   }
 
   #[tokio::test]
@@ -1431,7 +1503,15 @@ mod tests {
     assert_eq!(r2.source_code.bytes, b"export const loaded = true;\n");
     assert_eq!(&(r2.media_type), &msg::MediaType::JavaScript);
     let (_, headers) = fetcher.http_cache.get(module_url).unwrap();
-    assert_eq!(headers.get("content-type").unwrap(), "text/javascript");
+    assert_eq!(
+      headers
+        .get("content-type")
+        .unwrap()
+        .first()
+        .unwrap()
+        .as_str(),
+      "text/javascript"
+    );
   }
 
   #[tokio::test]
@@ -1455,7 +1535,15 @@ mod tests {
     assert_eq!(r3.source_code.bytes, b"export const loaded = true;\n");
     assert_eq!(&(r3.media_type), &msg::MediaType::TypeScript);
     let (_, headers) = fetcher.http_cache.get(module_url).unwrap();
-    assert_eq!(headers.get("content-type").unwrap(), "text/typescript");
+    assert_eq!(
+      headers
+        .get("content-type")
+        .unwrap()
+        .first()
+        .unwrap()
+        .as_str(),
+      "text/typescript"
+    );
   }
 
   #[tokio::test]
@@ -1811,7 +1899,10 @@ mod tests {
     assert_eq!(&(source.media_type), &msg::MediaType::TypeScript);
 
     let (_, headers) = fetcher.http_cache.get(&module_url).unwrap();
-    assert_eq!(headers.get("etag").unwrap(), "33a64df551425fcc55e");
+    assert_eq!(
+      headers.get("etag").unwrap().first().unwrap().as_str(),
+      "33a64df551425fcc55e"
+    );
 
     let metadata_path = crate::http_cache::Metadata::filename(
       &fetcher.http_cache.get_cache_filename(&module_url),
@@ -1936,7 +2027,12 @@ mod tests {
 
     let (_, headers) = fetcher.http_cache.get(&module_url).unwrap();
     assert_eq!(
-      headers.get("content-type").unwrap(),
+      headers
+        .get("content-type")
+        .unwrap()
+        .first()
+        .unwrap()
+        .as_str(),
       &format!("application/typescript;charset={}", charset)
     );
   }