From 8c969157d2ec12d9fa004e910bab96da6f868b18 Mon Sep 17 00:00:00 2001 From: svet-se Date: Wed, 10 Jul 2024 10:56:32 +0300 Subject: [PATCH 1/7] Update SLE Micro 5 product name --- CMakeLists.txt | 4 ++-- .../installed_OS_is_vendor_supported/oval/shared.xml | 2 +- products/slmicro5/product.yml | 2 +- products/slmicro5/transforms/constants.xslt | 8 ++++---- ssg/constants.py | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 90ea12278de..0cb15cb9b52 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -110,7 +110,7 @@ option(SSG_PRODUCT_RHEL10 "If enabled, the RHEL10 SCAP content will be built" ${ option(SSG_PRODUCT_RHV4 "If enabled, the RHV4 SCAP content will be built" ${SSG_PRODUCT_DEFAULT}) option(SSG_PRODUCT_SLE12 "If enabled, the SLE12 SCAP content will be built" ${SSG_PRODUCT_DEFAULT}) option(SSG_PRODUCT_SLE15 "If enabled, the SLE15 SCAP content will be built" ${SSG_PRODUCT_DEFAULT}) -option(SSG_PRODUCT_SLMICRO5 "If enabled, the SLE MicroOS 5.x SCAP content will be built" ${SSG_PRODUCT_DEFAULT}) +option(SSG_PRODUCT_SLMICRO5 "If enabled, the SLE Micro 5.x SCAP content will be built" ${SSG_PRODUCT_DEFAULT}) option(SSG_PRODUCT_UBUNTU1604 "If enabled, the Ubuntu 16.04 SCAP content will be built" ${SSG_PRODUCT_DEFAULT}) option(SSG_PRODUCT_UBUNTU1804 "If enabled, the Ubuntu 18.04 SCAP content will be built" ${SSG_PRODUCT_DEFAULT}) option(SSG_PRODUCT_UBUNTU2004 "If enabled, the Ubuntu 20.04 SCAP content will be built" ${SSG_PRODUCT_DEFAULT}) @@ -338,7 +338,7 @@ message(STATUS "RHEL 10: ${SSG_PRODUCT_RHEL10}") message(STATUS "RHV 4: ${SSG_PRODUCT_RHV4}") message(STATUS "SUSE 12: ${SSG_PRODUCT_SLE12}") message(STATUS "SUSE 15: ${SSG_PRODUCT_SLE15}") -message(STATUS "SLE MicroOS 5: ${SSG_PRODUCT_SLMICRO5}") +message(STATUS "SLE Micro 5: ${SSG_PRODUCT_SLMICRO5}") message(STATUS "Ubuntu 16.04: ${SSG_PRODUCT_UBUNTU1604}") message(STATUS "Ubuntu 18.04: ${SSG_PRODUCT_UBUNTU1804}") message(STATUS "Ubuntu 20.04: ${SSG_PRODUCT_UBUNTU2004}") diff --git a/linux_os/guide/system/software/integrity/certified-vendor/installed_OS_is_vendor_supported/oval/shared.xml b/linux_os/guide/system/software/integrity/certified-vendor/installed_OS_is_vendor_supported/oval/shared.xml index 3aaa2a337df..a534dca8e37 100644 --- a/linux_os/guide/system/software/integrity/certified-vendor/installed_OS_is_vendor_supported/oval/shared.xml +++ b/linux_os/guide/system/software/integrity/certified-vendor/installed_OS_is_vendor_supported/oval/shared.xml @@ -10,7 +10,7 @@ - + diff --git a/products/slmicro5/product.yml b/products/slmicro5/product.yml index 1b30f81ea42..112021fda02 100644 --- a/products/slmicro5/product.yml +++ b/products/slmicro5/product.yml @@ -1,5 +1,5 @@ product: slmicro5 -full_name: SUSE Linux Enterprise Micro OS 5.x +full_name: SUSE Linux Enterprise Micro 5.x type: platform major_version_ordinal: 5 diff --git a/products/slmicro5/transforms/constants.xslt b/products/slmicro5/transforms/constants.xslt index 7b0ae16abbf..7e5bc846414 100644 --- a/products/slmicro5/transforms/constants.xslt +++ b/products/slmicro5/transforms/constants.xslt @@ -2,12 +2,12 @@ -SUSE Linux Enterprise Micro OS 5.x -SLE Micro OS 5 -SUSE_Linux_Enterprise_Micro_OS_5_STIG +SUSE Linux Enterprise Micro 5.x +SLE Micro 5 +SUSE_Linux_Enterprise_Micro_5_STIG slmicro5 - + https://www.cisecurity.org/benchmark/suse_linux/ diff --git a/ssg/constants.py b/ssg/constants.py index a4c811fa788..d8731b51b6c 100644 --- a/ssg/constants.py +++ b/ssg/constants.py @@ -224,7 +224,7 @@ "Red Hat Virtualization 4": "rhv4", "SUSE Linux Enterprise 12": "sle12", "SUSE Linux Enterprise 15": "sle15", - "SUSE Linux Enterprise Micro OS 5.x": "slmicro5", + "SUSE Linux Enterprise Micro 5.x": "slmicro5", "Ubuntu 16.04": "ubuntu1604", "Ubuntu 18.04": "ubuntu1804", "Ubuntu 20.04": "ubuntu2004", @@ -427,7 +427,7 @@ 'openeuler': 'openEuler', 'opensuse': 'openSUSE', 'sle': 'SUSE Linux Enterprise', - 'slmicro': 'SUSE Linux Enterprise Micro OS', + 'slmicro': 'SUSE Linux Enterprise Micro', 'example': 'Example', 'ol': 'Oracle Linux', 'ocp': 'Red Hat OpenShift Container Platform', From 26cda40860000f6df5b33d25e5beddc936680f61 Mon Sep 17 00:00:00 2001 From: svet-se Date: Wed, 10 Jul 2024 11:02:30 +0300 Subject: [PATCH 2/7] Update SLE Micro 5 product cpes --- products/slmicro5/product.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/products/slmicro5/product.yml b/products/slmicro5/product.yml index 112021fda02..070da6f7712 100644 --- a/products/slmicro5/product.yml +++ b/products/slmicro5/product.yml @@ -25,17 +25,17 @@ cpes: check_id: installed_OS_is_slmicro5 - slmicro-5.3: - name: "cpe:/o:suse:sle-microos:5.3" - title: "SLE MicroOS 5.3" + name: "cpe:/o:suse:sle-micro:5.3" + title: "SLE Micro 5.3" check_id: installed_OS_is_slmicro5 - slmicro-5.4: - name: "cpe:/o:suse:sle-microos:5.4" - title: "SLE Micro 5.5" + name: "cpe:/o:suse:sle-micro:5.4" + title: "SLE Micro 5.4" check_id: installed_OS_is_slmicro5 - slmicro-5.5: - name: "cpe:/o:suse:sle-microos:5.5" + name: "cpe:/o:suse:sle-micro:5.5" title: "SLE Micro 5.5" check_id: installed_OS_is_slmicro5 From a4c82640c3a33505b43fb3e48a9e7ef8bd2b1691 Mon Sep 17 00:00:00 2001 From: svet-se Date: Wed, 10 Jul 2024 11:12:02 +0300 Subject: [PATCH 3/7] Fix installed_OS_is_slmicro5 check --- .../checks/oval/installed_OS_is_slmicro5.xml | 106 ++++++++++-------- 1 file changed, 59 insertions(+), 47 deletions(-) diff --git a/shared/checks/oval/installed_OS_is_slmicro5.xml b/shared/checks/oval/installed_OS_is_slmicro5.xml index 9da99c56124..61d523c9a4b 100644 --- a/shared/checks/oval/installed_OS_is_slmicro5.xml +++ b/shared/checks/oval/installed_OS_is_slmicro5.xml @@ -1,49 +1,61 @@ - - - SUSE Linux Enterprise MicroOS - - multi_platform_all - - - - - - The operating system installed on the system is - SUSE Linux Enterprise MicroOS. - - - - - - - - + + + SUSE Linux Enterprise Micro + + multi_platform_all + + + + + + The operating system installed on the system is + SUSE Linux Enterprise Micro. + + + + + + + + + + + + + + + + unix + + + + + + + + + ^5.*$ + + + SUSE-MicroOS-release + - - - - - - unix - - - - - - - - - ^5.*$ - - - SUSE-MicroOS-release - - - + + + + + + ^5.*$ + + + SLE-Micro-release + + + \ No newline at end of file From 721fe0d1d10e4fb727dce2e57370a6cca04710fe Mon Sep 17 00:00:00 2001 From: svet-se Date: Wed, 10 Jul 2024 11:18:20 +0300 Subject: [PATCH 4/7] Update SLE Micro 5 stig.profile SMEs --- products/slmicro5/profiles/stig.profile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/products/slmicro5/profiles/stig.profile b/products/slmicro5/profiles/stig.profile index dd8e0a8a2a1..c488b99e013 100644 --- a/products/slmicro5/profiles/stig.profile +++ b/products/slmicro5/profiles/stig.profile @@ -3,6 +3,8 @@ documentation_complete: true metadata: version: V1R1 SMEs: + - svet-se + - rumch-se - teacup-on-rockingchair reference: https://public.cyber.mil/stigs/downloads/?_dl_facet_stigs=operating-systems%2Cunix-linux From b2602bbdb0e8070c6276baff041ded07845e1e13 Mon Sep 17 00:00:00 2001 From: svet-se Date: Wed, 10 Jul 2024 11:25:13 +0300 Subject: [PATCH 5/7] Fix Kernel Runtime Parameter IPv6 Check for SLE Micro 5 --- shared/checks/oval/sysctl_kernel_ipv6_disable.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/shared/checks/oval/sysctl_kernel_ipv6_disable.xml b/shared/checks/oval/sysctl_kernel_ipv6_disable.xml index e5cf1ffba13..f13f7c7ed58 100644 --- a/shared/checks/oval/sysctl_kernel_ipv6_disable.xml +++ b/shared/checks/oval/sysctl_kernel_ipv6_disable.xml @@ -16,6 +16,7 @@ multi_platform_rhel multi_platform_rhv multi_platform_sle + multi_platform_slmicro multi_platform_ubuntu multi_platform_uos From 737f9e9e85a91caeffb23d90a7f89fdf1a0a3829 Mon Sep 17 00:00:00 2001 From: svet-se Date: Wed, 10 Jul 2024 12:00:48 +0300 Subject: [PATCH 6/7] Fix installed_OS_is_slmicro5.xml ending --- shared/checks/oval/installed_OS_is_slmicro5.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shared/checks/oval/installed_OS_is_slmicro5.xml b/shared/checks/oval/installed_OS_is_slmicro5.xml index 61d523c9a4b..dfb69939520 100644 --- a/shared/checks/oval/installed_OS_is_slmicro5.xml +++ b/shared/checks/oval/installed_OS_is_slmicro5.xml @@ -58,4 +58,5 @@ SLE-Micro-release - \ No newline at end of file + + \ No newline at end of file From 5b9885114ad69305b0e3ed7dde49af2dd2a8cabe Mon Sep 17 00:00:00 2001 From: svet-se Date: Wed, 10 Jul 2024 12:31:26 +0300 Subject: [PATCH 7/7] Fix installed_OS_is_slmicro5.xml ending --- .../checks/oval/installed_OS_is_slmicro5.xml | 88 ++++++++++--------- 1 file changed, 45 insertions(+), 43 deletions(-) diff --git a/shared/checks/oval/installed_OS_is_slmicro5.xml b/shared/checks/oval/installed_OS_is_slmicro5.xml index dfb69939520..a59c6b971a8 100644 --- a/shared/checks/oval/installed_OS_is_slmicro5.xml +++ b/shared/checks/oval/installed_OS_is_slmicro5.xml @@ -1,62 +1,64 @@ - - SUSE Linux Enterprise Micro - - multi_platform_all - - - - - - The operating system installed on the system is - SUSE Linux Enterprise Micro. - - - - - - + id="installed_OS_is_slmicro5" version="1"> + + SUSE Linux Enterprise Micro + + multi_platform_all + + + + + + The operating system installed on the system is + SUSE Linux Enterprise Micro. + + + + + + + - - - - - + + + + - unix + unix - - - - + + + + - ^5.*$ + ^5.*$ - SUSE-MicroOS-release + SUSE-MicroOS-release - + - - + + ^5.*$ - - + + SLE-Micro-release - - - \ No newline at end of file + +