Merge branch 'backup-memory' into 'main'

Backup: Fix high memory usage

See merge request reportcreator/reportcreator!877

Author: MWedl

api/src/reportcreator_api/utils/crypto/base.py

@@ -344,7 +344,7 @@ def _verify_auth_tag(self):
 
         try:
             # Read everything to update the internal auth tag calculation
-            while _ := self.read():
+            while _ := self.read(size=settings.FILE_UPLOAD_MAX_MEMORY_SIZE):
                 pass
 
             self.cipher.verify(self.auth_tag_buffer)
@@ -353,9 +353,12 @@ def _verify_auth_tag(self):
             raise CryptoError('Cannot decrypt data: Auth tag verification failed') from ex
 
     def close(self):
+        if self.closed:
+            return
         try:
             self._verify_auth_tag()
         finally:
+            self.fileobj.close()
             super().close()
 
 

api/src/reportcreator_api/utils/storages.py

@@ -1,5 +1,6 @@
 from pathlib import Path
 
+from django.conf import settings
 from django.core.files.storage import FileSystemStorage, InMemoryStorage
 from storages.backends.s3 import S3Storage
 
@@ -36,6 +37,8 @@ class EncryptedFileSystemStorage(EncryptedStorageMixin, UnencryptedFileSystemSto
 
 
 class UnencryptedS3Storage(S3Storage):
+    max_memory_size = settings.FILE_UPLOAD_MAX_MEMORY_SIZE
+
     def __init__(self, access_key=None, secret_key=None, security_token=None, bucket_name=None, endpoint_url=None, location=None, **kwargs) -> None:
         super().__init__(
             access_key=access_key,