fix(storages): use ssec storage at correct times

fix document clone storage usage

Author: Yelinz

alexandria/core/models.py

@@ -9,6 +9,7 @@
 from django.contrib.postgres.search import SearchVectorField
 from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist
 from django.core.files import File as DjangoFile
+from django.core.files.storage import storages
 from django.core.validators import RegexValidator
 from django.db import models, transaction
 from django.dispatch import receiver
@@ -172,7 +173,10 @@ def clone(self):
         self.pk = None
         self.save()
 
-        storage = File.content.field.storage
+        storage_backend = settings.ALEXANDRIA_FILE_STORAGE
+        if settings.ALEXANDRIA_ENABLE_AT_REST_ENCRYPTION:
+            storage_backend = "alexandria.storages.backends.s3.SsecGlobalS3Storage"
+        storage = storages.create_storage({"BACKEND": storage_backend})
         latest_original.pk = None
         latest_original.document = self
         if isinstance(storage, S3Storage):

alexandria/core/tests/test_models.py

@@ -54,9 +54,7 @@ def test_document_no_files(
 
 
 def test_clone_document_s3(db, mocker, settings, file_factory):
-    settings.ALEXANDRIA_FILE_STORAGE = (
-        "alexandria.storages.backends.s3.SsecGlobalS3Storage"
-    )
+    settings.ALEXANDRIA_FILE_STORAGE = "alexandria.storages.backends.s3.S3Storage"
     settings.ALEXANDRIA_ENABLE_AT_REST_ENCRYPTION = True
     name = "name-of-the-file"
     mocker.patch("storages.backends.s3.S3Storage.save", return_value=name)

alexandria/storages/fields.py

@@ -4,20 +4,17 @@
 from django.db.models.fields.files import FieldFile
 from storages.backends.s3 import S3Storage
 
-from alexandria.storages.backends.s3 import SsecGlobalS3Storage
-
 
 class DynamicStorageFieldFile(FieldFile):
     def __init__(self, instance, field, name):
         super().__init__(instance, field, name)
-        self.storage = storages.create_storage(
-            {"BACKEND": settings.ALEXANDRIA_FILE_STORAGE}
-        )
+        storage_backend = settings.ALEXANDRIA_FILE_STORAGE
         if settings.ALEXANDRIA_ENABLE_AT_REST_ENCRYPTION:
             from alexandria.core.models import File
 
             if instance.encryption_status == File.EncryptionStatus.SSEC_GLOBAL_KEY:
-                self.storage = SsecGlobalS3Storage()
+                storage_backend = "alexandria.storages.backends.s3.SsecGlobalS3Storage"
+        self.storage = storages.create_storage({"BACKEND": storage_backend})
 
 
 class DynamicStorageFileField(models.FileField):
@@ -56,8 +53,9 @@ def pre_save(self, instance, add):
                     "Set `ALEXANDRIA_FILE_STORAGE` to `alexandria.storages.s3.S3Storage`."
                 )
                 raise ImproperlyConfigured(msg)
-            storage = SsecGlobalS3Storage()
             if instance.encryption_status == File.EncryptionStatus.SSEC_GLOBAL_KEY:
-                self.storage = storage
+                self.storage = storages.create_storage(
+                    {"BACKEND": "alexandria.storages.backends.s3.SsecGlobalS3Storage"}
+                )
         _file = super().pre_save(instance, add)
         return _file

alexandria/storages/tests/test_dynamic_field.py

@@ -27,7 +27,7 @@ def test_dynamic_storage_select_global_ssec(
     mocker.patch("alexandria.core.tasks.create_thumbnail.delay", side_effect=None)
     if raises is not None:
         with pytest.raises(raises):
-            file_factory()
+            file_factory(encryption_status=settings.ALEXANDRIA_ENCRYPTION_METHOD)
         return
     file_factory(encryption_status=settings.ALEXANDRIA_ENCRYPTION_METHOD)
     assert SsecGlobalS3Storage.save.called_once()