Merge pull request #12180 from Mab879/fix_12168

Fix package_dnf-plugin-subscription-manager_installed in RHEL 10
ComplianceAsCode · Jul 19, 2024 · 65f70bf · 65f70bf
2 parents a0cfe0c + 064a604
commit 65f70bf
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 5 deletions.
diff --git a/components/dnf.yml b/components/dnf.yml
@@ -3,10 +3,12 @@ packages:
 - dnf
 - dnf-automatic
 - dnf-plugin-subscription-manager
+- libdnf-plugin-subscription-manager
 rules:
 - clean_components_post_updating
 - ensure_gpgcheck_globally_activated
 - ensure_gpgcheck_local_packages
 - ensure_gpgcheck_repo_metadata
 - package_dnf-automatic_installed
 - package_dnf-plugin-subscription-manager_installed
+- package_libdnf-plugin-subscription-manager_installed
diff --git a/controls/ism_o.yml b/controls/ism_o.yml
@@ -439,7 +439,7 @@ use of device access control software or by disabling external communication int
             - base
         rules:
             - dnf-automatic_apply_updates
-            - package_dnf-plugin-subscription-manager_installed
+            - package_libdnf-plugin-subscription-manager_installed
             - package_subscription-manager_installed
         status: automated
 
@@ -449,7 +449,7 @@ use of device access control software or by disabling external communication int
             - base
         rules:
             - dnf-automatic_apply_updates
-            - package_dnf-plugin-subscription-manager_installed
+            - package_libdnf-plugin-subscription-manager_installed
             - package_subscription-manager_installed
         status: automated
 
@@ -467,7 +467,7 @@ use of device access control software or by disabling external communication int
             - base
         rules:
             - dnf-automatic_apply_updates
-            - package_dnf-plugin-subscription-manager_installed
+            - package_libdnf-plugin-subscription-manager_installed
             - package_subscription-manager_installed
         status: automated
 

diff --git a/...e/system/software/system-tools/package_dnf-plugin-subscription-manager_installed/rule.yml b/...e/system/software/system-tools/package_dnf-plugin-subscription-manager_installed/rule.yml
@@ -16,7 +16,6 @@ severity: medium
 
 identifiers:
     cce@rhel8: CCE-82315-3
-    cce@rhel10: CCE-89216-6
 
 references:
     ism: 0940,1144,1467,1472,1483,1493,1494,1495

diff --git a/...ystem/software/system-tools/package_libdnf-plugin-subscription-manager_installed/rule.yml b/...ystem/software/system-tools/package_libdnf-plugin-subscription-manager_installed/rule.yml
@@ -0,0 +1,32 @@
+documentation_complete: true
+
+
+title: 'Install libdnf-plugin-subscription-manager Package'
+
+description: |-
+    {{{ describe_package_install(package="libdnf-plugin-subscription-manager") }}}
+
+rationale: |-
+    This package provides plugins to interact with repositories and subscriptions
+    from the Red Hat entitlement platform; contains subscription-manager and
+    product-id plugins.
+
+
+severity: medium
+
+identifiers:
+    cce@rhel10: CCE-88703-4
+
+references:
+    ism: 0940,1144,1467,1472,1483,1493,1494,1495
+    ospp: FPT_TUD_EXT.1,FPT_TUD_EXT.2
+    srg: SRG-OS-000366-GPOS-00153
+
+ocil_clause: 'the package is not installed'
+
+ocil: '{{{ ocil_package(package="libdnf-plugin-subscription-manager") }}}'
+
+template:
+    name: package_installed
+    vars:
+        pkgname: libdnf-plugin-subscription-manager
diff --git a/products/rhel10/profiles/ospp.profile b/products/rhel10/profiles/ospp.profile
@@ -22,3 +22,4 @@ description: |-
 selections:
     - ospp:all
     - '!package_screen_installed'
+    - '!package_dnf-plugin-subscription-manager_installed'
diff --git a/shared/references/cce-redhat-avail.txt b/shared/references/cce-redhat-avail.txt
@@ -1334,7 +1334,6 @@ CCE-88698-6
 CCE-88699-4
 CCE-88701-8
 CCE-88702-6
-CCE-88703-4
 CCE-88704-2
 CCE-88706-7
 CCE-88707-5