Use clamav-client instead of clamd

artefactual-labs · Sep 13, 2024 · a449106 · a449106
1 parent eb6f89b
commit a449106
Show file tree

Hide file tree

Showing 10 changed files with 351 additions and 724 deletions.
diff --git a/internal/workflow/assets/workflow.json b/internal/workflow/assets/workflow.json
@@ -2426,7 +2426,7 @@
       "config": {
         "@manager": "linkTaskManagerFiles",
         "@model": "StandardTaskConfig",
-        "arguments": "\"%fileUUID%\" \"%relativeLocation%\" \"%date%\" \"%taskUUID%\"",
+        "arguments": "\"%fileUUID%\" \"%relativeLocation%\" \"%date%\"",
         "execute": "archivematicaClamscan_v0.0",
         "filter_subdir": "objects/submissionDocumentation",
         "stderr_file": "%SIPLogsDirectory%clamAVScan.txt"
@@ -2457,7 +2457,7 @@
       "config": {
         "@manager": "linkTaskManagerFiles",
         "@model": "StandardTaskConfig",
-        "arguments": "\"%fileUUID%\" \"%relativeLocation%\" \"%date%\" \"%taskUUID%\"",
+        "arguments": "\"%fileUUID%\" \"%relativeLocation%\" \"%date%\"",
         "execute": "archivematicaClamscan_v0.0",
         "stderr_file": "%SIPLogsDirectory%clamAVScan.txt"
       },
@@ -2757,7 +2757,7 @@
       "config": {
         "@manager": "linkTaskManagerFiles",
         "@model": "StandardTaskConfig",
-        "arguments": "\"%fileUUID%\" \"%relativeLocation%\" \"%date%\" \"%taskUUID%\"",
+        "arguments": "\"%fileUUID%\" \"%relativeLocation%\" \"%date%\"",
         "execute": "archivematicaClamscan_v0.0",
         "stderr_file": "%SIPLogsDirectory%clamAVScan.txt"
       },
@@ -6335,7 +6335,7 @@
       "config": {
         "@manager": "linkTaskManagerFiles",
         "@model": "StandardTaskConfig",
-        "arguments": "\"%fileUUID%\" \"%relativeLocation%\" \"%date%\" \"%taskUUID%\"",
+        "arguments": "\"%fileUUID%\" \"%relativeLocation%\" \"%date%\"",
         "execute": "archivematicaClamscan_v0.0",
         "filter_subdir": "objects/"
       },
@@ -6882,7 +6882,7 @@
       "config": {
         "@manager": "linkTaskManagerFiles",
         "@model": "StandardTaskConfig",
-        "arguments": "\"%fileUUID%\" \"%relativeLocation%\" \"%date%\" \"%taskUUID%\"",
+        "arguments": "\"%fileUUID%\" \"%relativeLocation%\" \"%date%\"",
         "execute": "archivematicaClamscan_v0.0",
         "filter_subdir": "objects/metadata",
         "stderr_file": "%SIPLogsDirectory%clamAVScan.txt"

diff --git a/worker/pyproject.toml b/worker/pyproject.toml
@@ -7,7 +7,7 @@ dependencies = [
     "agentarchives>=0.9.0",
     "ammcpc>=0.2.0",
     "bagit",
-    "clamd>=1.0.2",
+    "clamav-client>=0.5.1",
     "django-autoslug>=1.9.9",
     "django-tastypie>=0.14.7",
     "gearman3",
@@ -89,6 +89,7 @@ warn_unused_configs = true
 [[tool.mypy.overrides]]
 module = [
     "worker.client.*",
+    "worker.clientScripts.archivematica_clamscan",
     "worker.clientScripts.characterize_file",
     "worker.clientScripts.has_packages",
     "worker.clientScripts.identify_file_format",
@@ -98,6 +99,7 @@ module = [
     "worker.clientScripts.validate_file",
     "worker.utils.executeOrRunSubProcess",
     "worker.tests.conftest",
+    "worker.tests.test_antivirus",
     "worker.tests.test_characterize_file",
     "worker.tests.test_has_packages",
     "worker.tests.test_identify_file_format",

diff --git a/worker/settings/common.py b/worker/settings/common.py
@@ -172,7 +172,7 @@ def workers(config, section):
 server = /var/run/clamav/clamd.ctl
 pass_by_stream = True
 client_timeout = 86400
-client_backend = clamdscanner    ; Options: clamdscanner or clamscanner
+client_backend = clamscanner     ; Options: clamdscanner or clamscanner
 client_max_file_size = 42        ; MB
 client_max_scan_size = 42        ; MB