per spec content disposition & cache-control

n0-computer · Oct 11, 2022 · 931bece · 931bece
1 parent a3ab39b
commit 931bece
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/iroh-gateway/src/config.rs b/iroh-gateway/src/config.rs
@@ -99,7 +99,6 @@ fn default_headers() -> HeaderMap {
         .collect::<AccessControlAllowHeaders>(),
     );
     // todo(arqu): remove these once propperly implmented
-    headers.insert(CACHE_CONTROL, VALUE_NO_CACHE_NO_TRANSFORM.clone());
     headers.insert(ACCEPT_RANGES, VALUE_NONE.clone());
     headers
 }

diff --git a/iroh-gateway/src/constants.rs b/iroh-gateway/src/constants.rs
@@ -14,8 +14,6 @@ pub static HEADER_CACHE_CONTROL: HeaderName = HeaderName::from_static("cache-con
 // Common Header Values
 pub static VALUE_XCTO_NOSNIFF: HeaderValue = HeaderValue::from_static("nosniff");
 pub static VALUE_NONE: HeaderValue = HeaderValue::from_static("none");
-pub static VALUE_NO_CACHE_NO_TRANSFORM: HeaderValue =
-    HeaderValue::from_static("no-cache, no-transform");
 pub static VAL_IMMUTABLE_MAX_AGE: HeaderValue =
     HeaderValue::from_static("public, max-age=31536000, immutable");
 

diff --git a/iroh-gateway/src/handlers.rs b/iroh-gateway/src/handlers.rs
@@ -393,11 +393,12 @@ async fn serve_raw<T: ContentLoader + std::marker::Unpin>(
 
     match body {
         FileResult::File(body) => {
-            set_content_disposition_headers(
-                &mut headers,
-                format!("{}.bin", req.cid).as_str(),
-                DISPOSITION_ATTACHMENT,
-            );
+            let file_name = match req.query_file_name.is_empty() {
+                true => format!("{}.bin", req.cid),
+                false => req.query_file_name.clone(),
+            };
+
+            set_content_disposition_headers(&mut headers, &file_name, DISPOSITION_ATTACHMENT);
             set_etag_headers(&mut headers, get_etag(&req.cid, Some(req.format.clone())));
             add_cache_control_headers(&mut headers, metadata.clone());
             add_ipfs_roots_headers(&mut headers, metadata);
@@ -428,16 +429,17 @@ async fn serve_car<T: ContentLoader + std::marker::Unpin>(
 
     match body {
         FileResult::File(body) => {
-            set_content_disposition_headers(
-                &mut headers,
-                format!("{}.car", req.cid).as_str(),
-                DISPOSITION_ATTACHMENT,
-            );
+            let file_name = match req.query_file_name.is_empty() {
+                true => format!("{}.car", req.cid),
+                false => req.query_file_name.clone(),
+            };
 
-            // todo(arqu): this should be root cid
+            set_content_disposition_headers(&mut headers, &file_name, DISPOSITION_ATTACHMENT);
+
+            add_cache_control_headers(&mut headers, metadata.clone());
             let etag = format!("W/{}", get_etag(&req.cid, Some(req.format.clone())));
             set_etag_headers(&mut headers, etag);
-            // todo(arqu): check if etag matches for root cid
+            // todo(arqu): handle if none match
             add_ipfs_roots_headers(&mut headers, metadata);
             response(StatusCode::OK, body, headers)
         }
@@ -463,16 +465,18 @@ async fn serve_car_recursive<T: ContentLoader + std::marker::Unpin>(
         .await
         .map_err(|e| error(StatusCode::INTERNAL_SERVER_ERROR, &e, &state))?;
 
-    set_content_disposition_headers(
-        &mut headers,
-        format!("{}.car", req.cid).as_str(),
-        DISPOSITION_ATTACHMENT,
-    );
+    let file_name = match req.query_file_name.is_empty() {
+        true => format!("{}.car", req.cid),
+        false => req.query_file_name.clone(),
+    };
 
-    // todo(arqu): this should be root cid
+    set_content_disposition_headers(&mut headers, &file_name, DISPOSITION_ATTACHMENT);
+
+    // add_cache_control_headers(&mut headers, metadata.clone());
     let etag = format!("W/{}", get_etag(&req.cid, Some(req.format.clone())));
     set_etag_headers(&mut headers, etag);
-    // todo(arqu): check if etag matches for root cid
+
+    // todo(arqu): handle if none match
     // add_ipfs_roots_headers(&mut headers, metadata);
     response(StatusCode::OK, body, headers)
 }

diff --git a/iroh-gateway/src/response.rs b/iroh-gateway/src/response.rs
@@ -45,7 +45,6 @@ impl ResponseFormat {
                 headers.insert(CONTENT_TYPE, CONTENT_TYPE_IPLD_CAR.clone());
                 headers.insert(&HEADER_X_CONTENT_TYPE_OPTIONS, VALUE_XCTO_NOSNIFF.clone());
                 headers.insert(ACCEPT_RANGES, VALUE_NONE.clone());
-                headers.insert(CACHE_CONTROL, VALUE_NO_CACHE_NO_TRANSFORM.clone());
             }
             ResponseFormat::Fs(_) => {
                 // Don't send application/octet-stream in that case, let the