improve

Author: lcian

objectstore-server/src/endpoints/objects.rs

@@ -110,13 +110,11 @@ async fn object_get(
     let mut response = (status, metadata_headers, Body::from_stream(stream)).into_response();
     let resp_headers = response.headers_mut();
     resp_headers.insert(http::header::ACCEPT_RANGES, "bytes".parse().unwrap());
-    if content_range.total > 0 {
+    if !content_range.is_full() {
         resp_headers.insert(
             http::header::CONTENT_LENGTH,
             content_range.len().to_string().parse().unwrap(),
         );
-    }
-    if !content_range.is_full() {
         resp_headers.insert(
             http::header::CONTENT_RANGE,
             content_range.to_header_value().parse().unwrap(),

objectstore-service/src/backend/gcs.rs

@@ -700,9 +700,10 @@ impl Backend for GcsBackend {
                 .get(header::CONTENT_RANGE)
                 .and_then(|v| v.to_str().ok())
                 .and_then(ContentRange::parse)
-                .unwrap_or_else(|| {
-                    ContentRange::full(payload_response.content_length().unwrap_or(0))
-                })
+                .ok_or_else(|| Error::Generic {
+                    context: "GCS: 206 response missing valid Content-Range header".to_owned(),
+                    cause: None,
+                })?
         } else {
             ContentRange::full(metadata.size.unwrap_or(0) as u64)
         };

objectstore-service/src/backend/s3_compatible.rs

@@ -326,7 +326,10 @@ impl<T: TokenProvider> Backend for S3CompatibleBackend<T> {
                 .get(reqwest::header::CONTENT_RANGE)
                 .and_then(|v| v.to_str().ok())
                 .and_then(ContentRange::parse)
-                .unwrap_or_else(|| ContentRange::full(response.content_length().unwrap_or(0)))
+                .ok_or_else(|| Error::Generic {
+                    context: "S3: 206 response missing valid Content-Range header".to_owned(),
+                    cause: None,
+                })?
         } else {
             ContentRange::full(metadata.size.unwrap_or(0) as u64)
         };