Replace clamd with clamav-client #1991
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit replaces [clamd 1.0.2] with [clamav-client 0.6.0], a modern fork of clamd that follows current Python practices and tooling. clamav-client is tested with supported versions of Python and avoids deprecated dependencies such as `pkg_resources` (which was removed in Python 3.12). clamav-client provides its own `Scanner` interface to handle integration with both `clamd` and `clamscan`, so Archivematica doesn't need to. Both backends are tested with integration tests. [clamd 1.0.2]: https://pypi.org/project/clamd/1.0.2/ [clamav-client 0.6.0]: https://pypi.org/project/clamav-client/0.6.0/
sevein
force-pushed
the
dev/use-clamav-client-package
branch
from
64e6d6b to
5e71df3
Compare
sevein
added
the
AMAUAT
replaceafill
approved these changes
Jan 6, 2025
|
|
||
|
|
||
| # Map user-provided backend names from configuration to the corresponding | ||
| # internal values used in the clamav_client package. Default to "clamscanner" if |
There was a problem hiding this comment.
Suggested change
| # internal values used in the clamav_client package. Default to "clamscanner" if | |
| # internal values used in the clamav_client package. Default to "clamdscanner" if |
Comment on lines
+77
to
+82
| mock.patch.object( | ||
| result.__class__, | ||
| "passed", | ||
| new_callable=mock.PropertyMock, | ||
| return_value=self.passed, | ||
| ).start() |
There was a problem hiding this comment.
Is this patch stopped implicitly?
Comment on lines
+75
to
+84
| def get_parser(): | ||
| """Return a ``Namespace`` with the parsed arguments.""" | ||
| parser = argparse.ArgumentParser() | ||
| parser.add_argument("file_uuid", metavar="fileUUID") | ||
| parser.add_argument("path", metavar="PATH", help="File or directory location") | ||
| parser.add_argument("date", metavar="DATE") | ||
| parser.add_argument( | ||
| "task_uuid", metavar="taskUUID", help="Currently unused, feel free to ignore." | ||
| ) | ||
| return parser |
There was a problem hiding this comment.
Should we remove this helper function if we're not using it?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit replaces clamd 1.0.2 with clamav-client 0.6.0, a modern fork of
clamd that follows current Python practices and tooling. clamav-client is tested
with supported versions of Python and avoids deprecated dependencies such as
pkg_resources(which was removed in Python 3.12).clamav-client provides its own
Scannerinterface to handle integration withboth
clamdandclamscan, so Archivematica doesn't need to. Both backends aretested with integration tests.