From 3c2acc158dc7ef5e7bcd2963623104c32128bff7 Mon Sep 17 00:00:00 2001
From: PiTrem <pierre.tremouilhac@kit.edu>
Date: Thu, 28 Mar 2024 17:34:47 +0100
Subject: [PATCH] fix: import collection export zip when directory entries
 present (#1841)

* test: test import with modified zip (missing schema.json, rezipped)

* fix: skip directory entries when parsing import collection zip
---
 lib/import/import_collections.rb                 |   4 ++++
 spec/factories/attachments.rb                    |   6 ++++++
 .../import/collection_samples_edited.zip         | Bin 0 -> 6231 bytes
 spec/lib/import/import_collections_spec.rb       |   5 +++--
 4 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100755 spec/fixtures/import/collection_samples_edited.zip

diff --git a/lib/import/import_collections.rb b/lib/import/import_collections.rb
index a374b69b73..988f613b53 100644
--- a/lib/import/import_collections.rb
+++ b/lib/import/import_collections.rb
@@ -31,9 +31,13 @@ def extract
       att = Tempfile.new(encoding: 'ascii-8bit')
       att.write(@att.read_file)
       att.rewind
+
       Zip::File.open(att.path) do |zip_file|
         # Handle entries one by one
         zip_file.each do |entry|
+          # do nothing for directory entry
+          next if entry.ftype == :directory
+
           data = entry.get_input_stream.read.force_encoding('UTF-8')
           case entry.name
           when 'export.json'
diff --git a/spec/factories/attachments.rb b/spec/factories/attachments.rb
index d6c397b5b9..7d41b3c316 100644
--- a/spec/factories/attachments.rb
+++ b/spec/factories/attachments.rb
@@ -84,6 +84,12 @@
       file_path { Rails.root.join('spec/fixtures/import/collection_samples.zip') }
     end
 
+    # copy of the collection_samples.zip file but with removed schema.json file
+    # and reziped (zip contains directory entries)
+    trait :with_edited_collection_zip do
+      file_path { Rails.root.join('spec/fixtures/import/collection_samples_edited.zip') }
+    end
+
     trait :with_reaction_collection_zip do
       file_path { Rails.root.join('spec/fixtures/import/collection_reaction.zip') }
     end
diff --git a/spec/fixtures/import/collection_samples_edited.zip b/spec/fixtures/import/collection_samples_edited.zip
new file mode 100755
index 0000000000000000000000000000000000000000..9d3e68ce8bf0408680a883948bdc95ef6c7e3698
GIT binary patch
literal 6231
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

literal 0
HcmV?d00001

diff --git a/spec/lib/import/import_collections_spec.rb b/spec/lib/import/import_collections_spec.rb
index d2471c07a5..5c43644313 100644
--- a/spec/lib/import/import_collections_spec.rb
+++ b/spec/lib/import/import_collections_spec.rb
@@ -19,9 +19,10 @@
 
     let(:importer) { Import::ImportCollections.new(attachment, user.id) }
 
-    describe 'import a collection with samples' do
+    describe 'import a collection with samples, with directories in the zip structure and missing schema.json' do
       let(:import_id) { 'collection_samples' }
-      let(:attachment) { create(:attachment, :with_sample_collection_zip) }
+      # let(:attachment) { create(:attachment, :with_sample_collection_zip) }
+      let(:attachment) { create(:attachment, :with_edited_collection_zip) }
 
       it 'successfully import 2 samples' do # rubocop:disable RSpec/MultipleExpectations
         importer.execute