karton-core 5.6.0__py3-none-any.whl → 5.6.1__py3-none-any.whl

karton/core/__version__.py

@@ -1 +1 @@
-__version__ = "5.6.0"
+__version__ = "5.6.1"

karton/core/backend.py

@@ -1021,21 +1021,31 @@ class KartonBackend:
             self.s3.delete_objects(Bucket=bucket, Delete={"Objects": delete_objects})
 
     def remove_object_versions(
-        self, bucket: str, object_versions: Dict[str, List[str]]
+        self,
+        bucket: str,
+        object_versions: Dict[str, List[str]],
+        explicit_version_null: bool = False,
     ) -> None:
         """
         Bulk remove resource object versions from object storage
 
         :param bucket: Bucket name
         :param object_versions: Object version identifiers
+        :param explicit_version_null: |
+            Some S3 providers (e.g. MinIO) need a reference
+            to "null" version explicitly when versioning is in suspended state. On the
+            other hand, some providers refuse to delete "null" versions when bucket
+            versioning is disabled.
+            See also: https://github.com/CERT-Polska/karton/issues/273.
         """
-        versions = iter(
-            (uid, version_id)
-            for uid, versions in object_versions.items()
-            for version_id in versions
-        )
         deletion_chunks = chunks(
-            [{"Key": uid, "VersionId": version_id} for uid, version_id in versions],
+            [
+                {"Key": uid, "VersionId": version_id}
+                if version_id != "null" or explicit_version_null
+                else {"Key": uid}
+                for uid, versions in object_versions.items()
+                for version_id in versions
+            ],
             100,
         )
         for delete_objects in deletion_chunks:

karton/system/system.py

@@ -49,6 +49,9 @@ class SystemService(KartonServiceBase):
         self.crash_started_tasks_on_timeout = self.config.getboolean(
             "system", "crash_started_tasks_on_timeout", False
         )
+        self.enable_null_version_deletion = self.config.getboolean(
+            "system", "enable_null_version_deletion", False
+        )
 
         self.last_gc_trigger = time.time()
 
@@ -61,6 +64,7 @@ class SystemService(KartonServiceBase):
             " task_crashed_timeout:\t%s\n"
             " enable_gc:\t%s\n"
             " enable_router:\t%s\n"
+            " enable_null_version_deletion:\t%s\n"
             " crash_started_tasks_on_timeout:\t%s",
             self.gc_interval,
             self.task_dispatched_timeout,
@@ -68,6 +72,7 @@ class SystemService(KartonServiceBase):
             self.task_crashed_timeout,
             self.enable_gc,
             self.enable_router,
+            self.enable_null_version_deletion,
             self.crash_started_tasks_on_timeout,
         )
 
@@ -88,7 +93,11 @@ class SystemService(KartonServiceBase):
                     del resources_to_remove[resource.uid]
         # Remove unreferenced resources
         if resources_to_remove:
-            self.backend.remove_object_versions(karton_bucket, resources_to_remove)
+            self.backend.remove_object_versions(
+                karton_bucket,
+                resources_to_remove,
+                explicit_version_null=self.enable_null_version_deletion,
+            )
 
     def gc_collect_tasks(self) -> None:
         self.log.debug("GC: gc_collect_tasks started")

{karton_core-5.6.0.dist-info → karton_core-5.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: karton-core
-Version: 5.6.0
+Version: 5.6.1
 Summary: Distributed malware analysis orchestration framework
 Home-page: https://github.com/CERT-Polska/karton
 Classifier: Programming Language :: Python :: 3

{karton_core-5.6.0.dist-info → karton_core-5.6.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
-karton_core-5.6.0-nspkg.pth,sha256=vHa-jm6pBTeInFrmnsHMg9AOeD88czzQy-6QCFbpRcM,539
+karton_core-5.6.1-nspkg.pth,sha256=vHa-jm6pBTeInFrmnsHMg9AOeD88czzQy-6QCFbpRcM,539
 karton/core/__init__.py,sha256=QuT0BWZyp799eY90tK3H1OD2hwuusqMJq8vQwpB3kG4,337
-karton/core/__version__.py,sha256=9eGec3AYz2CNznnfEwKYRiJ65G9gDWtXmb587ljDycg,22
-karton/core/backend.py,sha256=HlAolngYUTx2ajXhLf5RbWxmPOq5orLfz52iTkNxxqM,38147
+karton/core/__version__.py,sha256=-q9tSF5ofTJum4PMjvbhaE1xmTXehc_9rxMGcmfodcw,22
+karton/core/backend.py,sha256=g0BSQBsFAksRd_VY5QDjBJ8yIIyzAmwxy-kfJgAZ_lo,38628
 karton/core/base.py,sha256=C6Lco3E0XCsxvEjeVOLR9fxh_IWJ1vjC9BqUYsQyewE,8083
 karton/core/config.py,sha256=7oKchitq6pWzPuXRfjBXqVT_BgGIz2p-CDo1RGaNJQg,8118
 karton/core/exceptions.py,sha256=8i9WVzi4PinNlX10Cb-lQQC35Hl-JB5R_UKXa9AUKoQ,153
@@ -17,11 +17,11 @@ karton/core/test.py,sha256=tms-YM7sUKQDHN0vm2_W7DIvHnO_ld_VPsWHnsbKSfk,9102
 karton/core/utils.py,sha256=sEVqGdVPyYswWuVn8wYXBQmln8Az826N_2HgC__pmW8,4090
 karton/system/__init__.py,sha256=JF51OqRU_Y4c0unOulvmv1KzSHSq4ZpXU8ZsH4nefRM,63
 karton/system/__main__.py,sha256=QJkwIlSwaPRdzwKlNmCAL41HtDAa73db9MZKWmOfxGM,56
-karton/system/system.py,sha256=v2rEJYN2Vq5-hH8yUGFv6r2ZdX-TOQg0ldsEC2T6qO8,16315
-karton_core-5.6.0.dist-info/LICENSE,sha256=o8h7hYhn7BJC_-DmrfqWwLjaR_Gbe0TZOOQJuN2ca3I,1519
-karton_core-5.6.0.dist-info/METADATA,sha256=Atu4wfGAqbkw-lVDV_Wtt3fxSG7nV0QmVqjGnfNAFZ4,6818
-karton_core-5.6.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-karton_core-5.6.0.dist-info/entry_points.txt,sha256=OgLlsXy61GP6-Yob3oXqeJ2hlRU6LBLj33fr0NufKz0,98
-karton_core-5.6.0.dist-info/namespace_packages.txt,sha256=X8SslCPsqXDCnGZqrYYolzT3xPzJMq1r-ZQSc0jfAEA,7
-karton_core-5.6.0.dist-info/top_level.txt,sha256=X8SslCPsqXDCnGZqrYYolzT3xPzJMq1r-ZQSc0jfAEA,7
-karton_core-5.6.0.dist-info/RECORD,,
+karton/system/system.py,sha256=cFE4hCS0LWnwdCiIjU0ym8dHujE5ORi4REJR_y5b2gA,16671
+karton_core-5.6.1.dist-info/LICENSE,sha256=o8h7hYhn7BJC_-DmrfqWwLjaR_Gbe0TZOOQJuN2ca3I,1519
+karton_core-5.6.1.dist-info/METADATA,sha256=AJoa9O_0SOYI3IuVHXhwB6lXoUSs7S4nU6QM8_xHxVI,6818
+karton_core-5.6.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+karton_core-5.6.1.dist-info/entry_points.txt,sha256=OgLlsXy61GP6-Yob3oXqeJ2hlRU6LBLj33fr0NufKz0,98
+karton_core-5.6.1.dist-info/namespace_packages.txt,sha256=X8SslCPsqXDCnGZqrYYolzT3xPzJMq1r-ZQSc0jfAEA,7
+karton_core-5.6.1.dist-info/top_level.txt,sha256=X8SslCPsqXDCnGZqrYYolzT3xPzJMq1r-ZQSc0jfAEA,7
+karton_core-5.6.1.dist-info/RECORD,,