More reliable gzip detection

AllYourBot · Jan 26, 2025 · 68eef6a · 68eef6a
1 parent e0f9ad7
commit 68eef6a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/app/services/sdk/verb.rb b/app/services/sdk/verb.rb
@@ -134,7 +134,13 @@ def possible_test_warning(verb)
   end
 
   def decompress_body(response)
-    return response.body unless response.headers["content-encoding"] == "gzip"
-    Zlib::GzipReader.new(StringIO.new(response.body)).read
+    return response.body unless response.respond_to?(:headers) &&
+                               response.headers["content-encoding"] == "gzip" &&
+                               response.body.bytes[0..1] == [0x1f, 0x8b]
+    begin
+      Zlib::GzipReader.new(StringIO.new(response.body)).read
+    rescue Zlib::GzipFile::Error
+      response.body
+    end
   end
 end
diff --git a/app/services/toolbox/google_tasks/api_helpers.rb b/app/services/toolbox/google_tasks/api_helpers.rb
@@ -12,7 +12,7 @@ def get_lists
   end
 
   def get_list(title)
-    list = get_lists.find { |l| l.title == title }
+    list = get_lists&.find { |l| l.title == title }
     raise "Could not find a task list named '#{title}'" if list.nil?
     list
   end