Fix restore on S3 storage databases (#503)

Co-authored-by: Archmonger <16909269+Archmonger@users.noreply.github.com>

dbbackup/tests/functional/test_commands.py

@@ -102,6 +102,8 @@ def test_compressed(self, *args):
         self.instance.delete()
         # Restore
         execute_from_command_line(["", "dbrestore", "--uncompress"])
+        restored = models.CharModel.objects.all().exists()
+        self.assertTrue(restored)
 
     def test_no_backup_available(self, *args):
         with self.assertRaises(SystemExit):
@@ -131,6 +133,16 @@ def test_specify_db(self, *args):
         # Restore
         execute_from_command_line(["", "dbrestore", "--database", "default"])
 
+    @patch("dbbackup.utils.getpass", return_value=None)
+    def test_compressed_and_encrypted(self, *args):
+        # Create backup
+        execute_from_command_line(["", "dbbackup", "--compress", "--encrypt"])
+        self.instance.delete()
+        # Restore
+        execute_from_command_line(["", "dbrestore", "--uncompress", "--decrypt"])
+        restored = models.CharModel.objects.all().exists()
+        self.assertTrue(restored)
+
 
 class MediaBackupCommandTest(TestCase):
     def setUp(self):

dbbackup/utils.py

@@ -278,6 +278,7 @@ def uncompress_file(inputfile, filename):
     """
     zipfile = gzip.GzipFile(fileobj=inputfile, mode="rb")
     try:
+        inputfile.seek(0)
         outputfile = create_spooled_temporary_file(fileobj=zipfile)
     finally:
         zipfile.close()

docs/changelog.rst

@@ -4,7 +4,7 @@ Changelog
 Unreleased
 ----------
 
-* Nothing (yet)!
+* Fix restore of database from S3 storage by reintroducing inputfile.seek(0) to utils.uncompress_file
 
 4.1.0 (2024-01-14)
 ------------------