diff --git a/artefact_enumerator.py b/artefact_enumerator.py index 4a3e0cf3..7550a385 100644 --- a/artefact_enumerator.py +++ b/artefact_enumerator.py @@ -456,8 +456,8 @@ def _process_compliance_snapshots_of_artefact( ) update_is_required |= issue_update_is_required - if scan_config.malware_config: - interval = scan_config.malware_config.virus_db_max_age_days * (24*60*60) # days to seconds + if scan_config.clamav_config: + interval = scan_config.clamav_config.virus_db_max_age_days * (24*60*60) # days to seconds compliance_snapshots, malware_update_is_required = _create_backlog_item( cfg_name=cfg_name, namespace=namespace, diff --git a/config.py b/config.py index d34a92fa..b759e0e2 100644 --- a/config.py +++ b/config.py @@ -71,7 +71,7 @@ class ArtefactEnumeratorConfig: @dataclasses.dataclass(frozen=True) -class MalwareConfig: +class ClamAVConfig: ''' :param int lookup_new_backlog_item_interval: time to wait in case no backlog item was found before searching for new backlog item again @@ -188,7 +188,7 @@ class ScanConfiguration: artefact_enumerator_config: ArtefactEnumeratorConfig bdba_config: BDBAConfig issue_replicator_config: IssueReplicatorConfig - malware_config: MalwareConfig + clamav_config: ClamAVConfig def deserialise_component_config( @@ -336,37 +336,37 @@ def deserialise_artefact_enumerator_config( ) -def deserialise_malware_config( +def deserialise_clamav_config( spec_config: dict, -) -> MalwareConfig: +) -> ClamAVConfig: default_config = spec_config.get('defaults', dict()) - malware_config = spec_config.get('malware') + clamav_config = spec_config.get('clamav') - if not malware_config: + if not clamav_config: return lookup_new_backlog_item_interval = deserialise_config_property( - config=malware_config, + config=clamav_config, property_key='lookup_new_backlog_item_interval', default_config=default_config, default_value=60, ) virus_db_max_age_days = deserialise_config_property( - config=malware_config, + config=clamav_config, property_key='virus_db_max_age_days', default_config=default_config, default_value=5, ) aws_cfg_name = deserialise_config_property( - config=malware_config, + config=clamav_config, property_key='aws_cfg_name', absent_ok=True, on_absent_message='artefacts of access type s3 will not be scanned' ) - return MalwareConfig( + return ClamAVConfig( lookup_new_backlog_item_interval=lookup_new_backlog_item_interval, virus_db_max_age_days=virus_db_max_age_days, aws_cfg_name=aws_cfg_name, @@ -684,17 +684,17 @@ def deserialise_scan_configuration( issue_replicator_config = None if Services.CLAMAV in included_services: - malware_config = deserialise_malware_config( + clamav_config = deserialise_clamav_config( spec_config=spec_config, ) else: - malware_config = None + clamav_config = None return ScanConfiguration( artefact_enumerator_config=artefact_enumerator_config, bdba_config=bdba_config, issue_replicator_config=issue_replicator_config, - malware_config=malware_config, + clamav_config=clamav_config, ) diff --git a/malware/__main__.py b/malware/__main__.py index fca5a0e9..a80df534 100644 --- a/malware/__main__.py +++ b/malware/__main__.py @@ -103,11 +103,11 @@ def parse_args(): return parsed_arguments -def deserialise_malware_configuration( +def deserialise_clamav_configuration( cfg_name: str, namespace: str, kubernetes_api: k8s.util.KubernetesApi, -) -> config.MalwareConfig: +) -> config.ClamAVConfig: scan_cfg_crd = kubernetes_api.custom_kubernetes_api.get_namespaced_custom_object( group=k8s.model.ScanConfigurationCrd.DOMAIN, version=k8s.model.ScanConfigurationCrd.VERSION, @@ -117,18 +117,18 @@ def deserialise_malware_configuration( ) if scan_cfg_crd and (spec := scan_cfg_crd.get('spec')): - malware_cfg = config.deserialise_malware_config(spec_config=spec) + clamav_cfg = config.deserialise_clamav_config(spec_config=spec) else: - malware_cfg = None + clamav_cfg = None - if not malware_cfg: + if not clamav_cfg: logger.warning( - f'no malware_cfg configuration for config elem {cfg_name} set, ' + f'no clamav_cfg configuration for config elem {cfg_name} set, ' 'job is not able to process current scan backlog and will terminate' ) sys.exit(0) - return malware_cfg + return clamav_cfg def scan_resource( @@ -232,7 +232,7 @@ def main(): kubernetes_api=kubernetes_api, ) - malware_config = deserialise_malware_configuration( + clamav_config = deserialise_clamav_configuration( cfg_name=cfg_name, namespace=namespace, kubernetes_api=kubernetes_api, @@ -247,8 +247,8 @@ def main(): oci_client = ccc.oci.oci_client(cfg_factory=cfg_factory) s3_client = None - if malware_config.aws_cfg_name: - aws_cfg: model.aws.AwsProfile = cfg_factory.aws(malware_config.aws_cfg_name) + if clamav_config.aws_cfg_name: + aws_cfg: model.aws.AwsProfile = cfg_factory.aws(clamav_config.aws_cfg_name) aws_session = boto3.Session( aws_access_key_id=aws_cfg.access_key_id(), @@ -275,7 +275,7 @@ def main(): if not backlog_crd: ready_to_terminate = True - sleep_interval = malware_config.lookup_new_backlog_item_interval + sleep_interval = clamav_config.lookup_new_backlog_item_interval logger.info(f'no open backlog item found, will sleep for {sleep_interval} sec') time.sleep(sleep_interval) continue