From c40935e79f6a404e053b1c5908d8acf557cfaa91 Mon Sep 17 00:00:00 2001
From: Marcel Schneider <marcelschneider5@outlook.de>
Date: Sat, 9 Nov 2019 18:33:37 +0100
Subject: [PATCH] LibCore: Add Content-Encoding handling to CHttpJob

---
 Libraries/LibCore/CHttpJob.cpp | 35 +++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/Libraries/LibCore/CHttpJob.cpp b/Libraries/LibCore/CHttpJob.cpp
index d75cdbd0bc..ace3fe26df 100644
--- a/Libraries/LibCore/CHttpJob.cpp
+++ b/Libraries/LibCore/CHttpJob.cpp
@@ -4,8 +4,37 @@
 #include <stdio.h>
 #include <unistd.h>
 
+#include <CGzip.h>
+
 #define CHTTPJOB_DEBUG
 
+static ByteBuffer handle_content_encoding(const ByteBuffer& buf, const String& content_encoding)
+{
+    dbg() << "CHttpJob::handle_content_encoding: buf has content_encoding = " << content_encoding;
+
+    if (content_encoding == "gzip") {
+        if (!Gzip::is_compressed(buf)) {
+            dbg() << "CHttpJob::handle_content_encoding: buf is not gzip compressed!";
+        }
+
+        dbg() << "CHttpJob::handle_content_encoding: buf is gzip compressed!";
+
+        auto uncompressed = Gzip::decompress(buf);
+        if (!uncompressed.has_value()) {
+            dbg() << "CHttpJob::handle_content_encoding: Gzip::decompress() failed. Returning original buffer.";
+            return buf;
+        }
+
+        dbg() << "CHttpJob::handle_content_encoding: Gzip::decompress() successful.\n"
+              << "  Input size = " << buf.size() << "\n"
+              << "  Output size = " << uncompressed.value().size();
+
+        return uncompressed.value();
+    }
+
+    return buf;
+}
+
 CHttpJob::CHttpJob(const CHttpRequest& request)
     : m_request(request)
 {
@@ -113,6 +142,11 @@ void CHttpJob::finish_up()
     }
     m_received_buffers.clear();
 
+    auto content_encoding = m_headers.get("Content-Encoding");
+    if (content_encoding.has_value()) {
+        flattened_buffer = handle_content_encoding(flattened_buffer, content_encoding.value());
+    }
+
     auto response = CHttpResponse::create(m_code, move(m_headers), move(flattened_buffer));
     deferred_invoke([this, response](auto&) {
         did_finish(move(response));
@@ -146,4 +180,3 @@ void CHttpJob::shutdown()
     remove_child(*m_socket);
     m_socket = nullptr;
 }
-