Merge pull request #257 from ducaale/emtpy-gzip-head-response

Handle empty gzip responses with content-length > 0
ducaale · May 14, 2022 · 898dc2e · 898dc2e
2 parents 13185bd + 580ae5d
commit 898dc2e
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 31 deletions.
diff --git a/src/decoder.rs b/src/decoder.rs
@@ -51,13 +51,15 @@ pub fn get_compression_type(headers: &HeaderMap) -> Option<CompressionType> {
 
 struct InnerReader<R: Read> {
     reader: R,
+    has_read_data: bool,
     has_errored: bool,
 }
 
 impl<R: Read> InnerReader<R> {
     fn new(reader: R) -> Self {
         InnerReader {
             reader,
+            has_read_data: false,
             has_errored: false,
         }
     }
@@ -66,7 +68,11 @@ impl<R: Read> InnerReader<R> {
 impl<R: Read> Read for InnerReader<R> {
     fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
         match self.reader.read(buf) {
-            Ok(len) => Ok(len),
+            Ok(0) => Ok(0),
+            Ok(len) => {
+                self.has_read_data = true;
+                Ok(len)
+            }
             Err(e) => {
                 self.has_errored = true;
                 Err(e)
@@ -86,36 +92,33 @@ impl<R: Read> Read for Decoder<R> {
     fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
         match self {
             Decoder::PlainText(decoder) => decoder.read(buf),
-            Decoder::Gzip(decoder) => decoder.read(buf).map_err(|e| {
-                if decoder.get_ref().has_errored {
-                    e
-                } else {
-                    io::Error::new(
-                        e.kind(),
-                        format!("error decoding gzip response body: {}", e),
-                    )
-                }
-            }),
-            Decoder::Deflate(decoder) => decoder.read(buf).map_err(|e| {
-                if decoder.get_ref().has_errored {
-                    e
-                } else {
-                    io::Error::new(
-                        e.kind(),
-                        format!("error decoding deflate response body: {}", e),
-                    )
-                }
-            }),
-            Decoder::Brotli(decoder) => decoder.read(buf).map_err(|e| {
-                if decoder.get_ref().has_errored {
-                    e
-                } else {
-                    io::Error::new(
-                        e.kind(),
-                        format!("error decoding brotli response body: {}", e),
-                    )
-                }
-            }),
+            Decoder::Gzip(decoder) => match decoder.read(buf) {
+                Ok(n) => Ok(n),
+                Err(e) if decoder.get_ref().has_errored => Err(e),
+                Err(_) if !decoder.get_ref().has_read_data => Ok(0),
+                Err(e) => Err(io::Error::new(
+                    e.kind(),
+                    format!("error decoding gzip response body: {}", e),
+                )),
+            },
+            Decoder::Deflate(decoder) => match decoder.read(buf) {
+                Ok(n) => Ok(n),
+                Err(e) if decoder.get_ref().has_errored => Err(e),
+                Err(_) if !decoder.get_ref().has_read_data => Ok(0),
+                Err(e) => Err(io::Error::new(
+                    e.kind(),
+                    format!("error decoding deflate response body: {}", e),
+                )),
+            },
+            Decoder::Brotli(decoder) => match decoder.read(buf) {
+                Ok(n) => Ok(n),
+                Err(e) if decoder.get_ref().has_errored => Err(e),
+                Err(_) if !decoder.get_ref().has_read_data => Ok(0),
+                Err(e) => Err(io::Error::new(
+                    e.kind(),
+                    format!("error decoding brotli response body: {}", e),
+                )),
+            },
         }
     }
 }

diff --git a/tests/cli.rs b/tests/cli.rs
@@ -2869,3 +2869,28 @@ fn empty_response_with_content_encoding() {
 
         "#});
 }
+
+#[test]
+fn empty_response_with_content_encoding_and_content_length() {
+    let server = server::http(|_req| async move {
+        hyper::Response::builder()
+            .header("date", "N/A")
+            .header("content-encoding", "gzip")
+            .header("content-length", "100")
+            .body("".into())
+            .unwrap()
+    });
+
+    get_command()
+        .arg("head")
+        .arg(server.base_url())
+        .assert()
+        .stdout(indoc! {r#"
+            HTTP/1.1 200 OK
+            Content-Encoding: gzip
+            Content-Length: 100
+            Date: N/A
+
+
+        "#});
+}