Test ClamAV db before importing

kam193 · Feb 25, 2024 · 1e3cec2 · 1e3cec2
1 parent 27204a5
commit 1e3cec2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/clamav-service/VERSION b/clamav-service/VERSION
@@ -1 +1 @@
-55
+56
diff --git a/clamav-service/service/updater.py b/clamav-service/service/updater.py
@@ -157,10 +157,25 @@ def do_source_update(self, service: Service) -> None:
         super().do_source_update(service)
         self._clean_up_old_sources(service, self.latest_updates_dir)
 
+    def _test_database_file(self, file: str) -> bool:
+        result = subprocess.run(
+            ["clamscan", "-d", file, "README.md"], capture_output=True, text=True
+        )
+
+        if result.returncode != 2:
+            return
+
+        self.log.warning(
+            "Database file %s is not a valid ClamAV database file, reason: %s", file, result.stderr
+        )
+
+        raise ValueError(result.stderr)
+
     def import_update(self, files_sha256, source, default_classification=None) -> None:
         output_dir = os.path.join(self.latest_updates_dir, source)
         os.makedirs(os.path.join(self.latest_updates_dir, source), exist_ok=True)
         for file, _ in files_sha256:
+            self._test_database_file(file)
             self.log.debug("Copying %s to %s", file, output_dir)
             shutil.copy(file, output_dir)