Merge pull request #743 from alephdata/bugfix/7z-password-protection

Properly handle 7z archives with password protection

Author: stchris

ingestors/packages/__init__.py

@@ -32,6 +32,8 @@ def unpack(self, file_path, entity, temp_dir):
                 z.extractall(path=temp_dir)
         except ArchiveError as e:
             raise ProcessingException(f"Error: {e}")
+        except py7zr.PasswordRequired:
+            raise ProcessingException("Password protected 7z archive")
 
 
 class SingleFilePackageIngestor(PackageSupport, Ingestor):

tests/fixtures/7z_password.7z

@@ -89,3 +89,12 @@ def test_7zip_symlink_escape(self):
         assert len(self.manager.entities) == 1
         assert self.manager.entities[0].first("fileName") == "bad7zip.7z"
         assert self.manager.entities[0].first("processingStatus") == "failure"
+
+    def test_7zip_password(self):
+        fixture_path, entity = self.fixture("7z_password.7z")
+
+        self.manager.ingest(fixture_path, entity)
+
+        assert len(self.manager.entities) == 1
+        assert self.manager.entities[0].first("fileName") == "7z_password.7z"
+        assert self.manager.entities[0].first("processingStatus") == "failure"