Merge pull request #11432 from evgenyz/fix-mcafee-hbss-shared-oval

Move install_mcafee_hbss shared OVAL to the install_hids rule
ComplianceAsCode · Jan 9, 2024 · 5ccb2bd · 5ccb2bd
2 parents 25bbd9a + 990a7f5
commit 5ccb2bd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 28 deletions.
diff --git a/...s/guide/system/software/integrity/endpoint_security_software/install_hids/oval/shared.xml b/...s/guide/system/software/integrity/endpoint_security_software/install_hids/oval/shared.xml
@@ -1,4 +1,16 @@
 <def-group>
+
+  <definition class="compliance" id="install_mcafee_hbss"
+  version="1">
+    {{{ oval_metadata("Install McAfee Host-Based Intrusion Detection Software (HBSS)") }}}
+    <criteria operator="AND">
+      <extend_definition comment="McAfee HBSS" definition_ref="install_mcafee_cma_rt" />
+      <extend_definition comment="McAfee HBSS" definition_ref="install_mcafee_hbss_accm" />
+      <extend_definition comment="McAfee HBSS" definition_ref="package_MFEhiplsm_installed" />
+      <extend_definition comment="McAfee HBSS" definition_ref="install_mcafee_hbss_pa" />
+    </criteria>
+  </definition>
+
   <definition class="compliance" id="install_hids"
   version="1">
     {{{ oval_metadata("Intrusion detection software or SELinux should be installed and enabled.") }}}

diff --git a/shared/checks/oval/install_mcafee_hbss.xml b/shared/checks/oval/install_mcafee_hbss.xml