From 57fbca4cbf7703d61c952e4854950cf1fc194703 Mon Sep 17 00:00:00 2001 From: teacup-on-rockingchair <315160+teacup-on-rockingchair@users.noreply.github.com> Date: Tue, 2 Jul 2024 15:11:35 +0300 Subject: [PATCH] Product name changed from susemicro5 to slmicro5 --- CMakeLists.txt | 8 +++--- ...{stig_susemicro5.yml => stig_slmicro5.yml} | 4 +-- .../oval/shared.xml | 2 +- .../installed_OS_is_vendor_supported/rule.yml | 6 ++--- .../{susemicro5 => slmicro5}/CMakeLists.txt | 6 ++--- products/{susemicro5 => slmicro5}/product.yml | 20 +++++++------- .../profiles/stig.profile | 2 +- .../transforms/constants.xslt | 2 +- .../transforms/table-style.xslt | 0 .../transforms/xccdf-apply-overlay-stig.xslt | 0 .../transforms/xccdf2table-cce.xslt | 0 .../xccdf2table-profileccirefs.xslt | 0 ...icro5.xml => installed_OS_is_slmicro5.xml} | 26 +++++++++---------- ... disa-stig-slmicro5-v1r1-xccdf-manual.xml} | 0 ssg/constants.py | 10 +++---- 15 files changed, 43 insertions(+), 43 deletions(-) rename controls/{stig_susemicro5.yml => stig_slmicro5.yml} (99%) rename products/{susemicro5 => slmicro5}/CMakeLists.txt (69%) rename products/{susemicro5 => slmicro5}/product.yml (73%) rename products/{susemicro5 => slmicro5}/profiles/stig.profile (94%) rename products/{susemicro5 => slmicro5}/transforms/constants.xslt (91%) rename products/{susemicro5 => slmicro5}/transforms/table-style.xslt (100%) rename products/{susemicro5 => slmicro5}/transforms/xccdf-apply-overlay-stig.xslt (100%) rename products/{susemicro5 => slmicro5}/transforms/xccdf2table-cce.xslt (100%) rename products/{susemicro5 => slmicro5}/transforms/xccdf2table-profileccirefs.xslt (100%) rename shared/checks/oval/{installed_OS_is_susemicro5.xml => installed_OS_is_slmicro5.xml} (63%) rename shared/references/{disa-stig-susemicro5-v1r1-xccdf-manual.xml => disa-stig-slmicro5-v1r1-xccdf-manual.xml} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e0f4d3ca09..90ea12278de 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_SUSEMICRO5 "If enabled, the SUSEMICRO5 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_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_SUSEMICRO5}") +message(STATUS "SLE MicroOS 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}") @@ -452,8 +452,8 @@ endif() if(SSG_PRODUCT_SLE15) add_subdirectory("products/sle15" "sle15") endif() -if(SSG_PRODUCT_SUSEMICRO5) - add_subdirectory("products/susemicro5" "susemicro5") +if(SSG_PRODUCT_SLMICRO5) + add_subdirectory("products/slmicro5" "slmicro5") endif() if(SSG_PRODUCT_UBUNTU1604) add_subdirectory("products/ubuntu1604" "ubuntu1604") diff --git a/controls/stig_susemicro5.yml b/controls/stig_slmicro5.yml similarity index 99% rename from controls/stig_susemicro5.yml rename to controls/stig_slmicro5.yml index bb5a8a22e4c..50dc4a6a18f 100644 --- a/controls/stig_susemicro5.yml +++ b/controls/stig_slmicro5.yml @@ -1,10 +1,10 @@ policy: SUSE Linux Enterprise Micro (SLEM) 5 Security Technical Implementation Guide title: SUSE Linux Enterprise Micro (SLEM) 5 Security Technical Implementation Guide -id: stig_susemicro5 +id: stig_slmicro5 version: V1R1 source: https://public.cyber.mil/stigs/downloads/ reference_type: stigid -product: susemicro5 +product: slmicro5 levels: - id: high - id: medium 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 6a8240fff15..3aaa2a337df 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/linux_os/guide/system/software/integrity/certified-vendor/installed_OS_is_vendor_supported/rule.yml b/linux_os/guide/system/software/integrity/certified-vendor/installed_OS_is_vendor_supported/rule.yml index d0eb4a4ccb2..9c9f57da358 100644 --- a/linux_os/guide/system/software/integrity/certified-vendor/installed_OS_is_vendor_supported/rule.yml +++ b/linux_os/guide/system/software/integrity/certified-vendor/installed_OS_is_vendor_supported/rule.yml @@ -8,7 +8,7 @@ description: |- {{% if 'ol' in product %}} Oracle Linux is supported by Oracle Corporation. As the Oracle Linux vendor, Oracle Corporation is responsible for providing security patches. -{{% elif product in ["sle12", "sle15", "susemicro5"] %}} +{{% elif product in ["sle12", "sle15", "slmicro5"] %}} SUSE Linux Enterprise is supported by SUSE. As the SUSE Linux Enterprise vendor, SUSE is responsible for providing security patches. {{% else %}} @@ -34,7 +34,7 @@ identifiers: cce@rhel9: CCE-83453-1 cce@sle12: CCE-83001-8 cce@sle15: CCE-83260-0 - cce@susemicro5: CCE-93601-3 + cce@slmicro5: CCE-93601-3 references: cis-csc: 18,20,4 @@ -60,7 +60,7 @@ ocil: |- 
$ grep -i "red hat" /etc/redhat-release
{{% elif 'ol' in product %}} 
$ grep -i "oracle" /etc/oracle-release
-{{% elif product in ["sle12", "sle15", "susemicro5"] %}} +{{% elif product in ["sle12", "sle15", "slmicro5"] %}} 
$ grep -i "suse" /etc/os-release
{{% endif %}} 
{{{ full_name }}}
diff --git a/products/susemicro5/CMakeLists.txt b/products/slmicro5/CMakeLists.txt similarity index 69% rename from products/susemicro5/CMakeLists.txt rename to products/slmicro5/CMakeLists.txt index 92397b9d811..1050546b9ed 100644 --- a/products/susemicro5/CMakeLists.txt +++ b/products/slmicro5/CMakeLists.txt @@ -1,10 +1,10 @@ -# Sometimes our users will try to do: "cd susemicro5; cmake ." That needs to error in a nice way. +# Sometimes our users will try to do: "cd slmicro5; cmake ." That needs to error in a nice way. if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") message(FATAL_ERROR "cmake has to be used on the root CMakeLists.txt, see the Building ComplianceAsCode section in the Developer Guide!") endif() -set(PRODUCT "susemicro5") -ssg_build_product("susemicro5") +set(PRODUCT "slmicro5") +ssg_build_product("slmicro5") ssg_build_html_cce_table(${PRODUCT}) diff --git a/products/susemicro5/product.yml b/products/slmicro5/product.yml similarity index 73% rename from products/susemicro5/product.yml rename to products/slmicro5/product.yml index ce822169f40..1b30f81ea42 100644 --- a/products/susemicro5/product.yml +++ b/products/slmicro5/product.yml @@ -1,10 +1,10 @@ -product: susemicro5 +product: slmicro5 full_name: SUSE Linux Enterprise Micro OS 5.x type: platform major_version_ordinal: 5 -benchmark_id: SUSEMICRO5 +benchmark_id: SLMICRO5 benchmark_root: "../../linux_os/guide" profiles_root: "./profiles" @@ -19,25 +19,25 @@ aide_bin_path: "/usr/bin/aide" cpes_root: "../../shared/applicability" cpes: - - susemicro-5.2: + - slmicro-5.2: name: "cpe:/o:suse:sle-microos:5.2" title: "SLE MicroOS 5.2" - check_id: installed_OS_is_susemicro5 + check_id: installed_OS_is_slmicro5 - - susemicro-5.3: + - slmicro-5.3: name: "cpe:/o:suse:sle-microos:5.3" title: "SLE MicroOS 5.3" - check_id: installed_OS_is_susemicro5 + check_id: installed_OS_is_slmicro5 - - susemicro-5.4: + - slmicro-5.4: name: "cpe:/o:suse:sle-microos:5.4" title: "SLE Micro 5.5" - check_id: installed_OS_is_susemicro5 + check_id: installed_OS_is_slmicro5 - - susemicro-5.5: + - slmicro-5.5: name: "cpe:/o:suse:sle-microos:5.5" title: "SLE Micro 5.5" - check_id: installed_OS_is_susemicro5 + check_id: installed_OS_is_slmicro5 platform_package_overrides: login_defs: "shadow" diff --git a/products/susemicro5/profiles/stig.profile b/products/slmicro5/profiles/stig.profile similarity index 94% rename from products/susemicro5/profiles/stig.profile rename to products/slmicro5/profiles/stig.profile index 4f0011af5c6..0f7f2f96c55 100644 --- a/products/susemicro5/profiles/stig.profile +++ b/products/slmicro5/profiles/stig.profile @@ -14,4 +14,4 @@ description: |- DISA STIG for SUSE Linux Enterprise Micro (SLEM) 5. selections: - - stig_susemicro5:all + - stig_slmicro5:all diff --git a/products/susemicro5/transforms/constants.xslt b/products/slmicro5/transforms/constants.xslt similarity index 91% rename from products/susemicro5/transforms/constants.xslt rename to products/slmicro5/transforms/constants.xslt index 12b64837fad..7b0ae16abbf 100644 --- a/products/susemicro5/transforms/constants.xslt +++ b/products/slmicro5/transforms/constants.xslt @@ -5,7 +5,7 @@ SUSE Linux Enterprise Micro OS 5.x SLE Micro OS 5 SUSE_Linux_Enterprise_Micro_OS_5_STIG -susemicro5 +slmicro5 https://www.cisecurity.org/benchmark/suse_linux/ diff --git a/products/susemicro5/transforms/table-style.xslt b/products/slmicro5/transforms/table-style.xslt similarity index 100% rename from products/susemicro5/transforms/table-style.xslt rename to products/slmicro5/transforms/table-style.xslt diff --git a/products/susemicro5/transforms/xccdf-apply-overlay-stig.xslt b/products/slmicro5/transforms/xccdf-apply-overlay-stig.xslt similarity index 100% rename from products/susemicro5/transforms/xccdf-apply-overlay-stig.xslt rename to products/slmicro5/transforms/xccdf-apply-overlay-stig.xslt diff --git a/products/susemicro5/transforms/xccdf2table-cce.xslt b/products/slmicro5/transforms/xccdf2table-cce.xslt similarity index 100% rename from products/susemicro5/transforms/xccdf2table-cce.xslt rename to products/slmicro5/transforms/xccdf2table-cce.xslt diff --git a/products/susemicro5/transforms/xccdf2table-profileccirefs.xslt b/products/slmicro5/transforms/xccdf2table-profileccirefs.xslt similarity index 100% rename from products/susemicro5/transforms/xccdf2table-profileccirefs.xslt rename to products/slmicro5/transforms/xccdf2table-profileccirefs.xslt diff --git a/shared/checks/oval/installed_OS_is_susemicro5.xml b/shared/checks/oval/installed_OS_is_slmicro5.xml similarity index 63% rename from shared/checks/oval/installed_OS_is_susemicro5.xml rename to shared/checks/oval/installed_OS_is_slmicro5.xml index c3005e197fa..9da99c56124 100644 --- a/shared/checks/oval/installed_OS_is_susemicro5.xml +++ b/shared/checks/oval/installed_OS_is_slmicro5.xml @@ -1,6 +1,6 @@ + id="installed_OS_is_slmicro5" version="1"> SUSE Linux Enterprise MicroOS @@ -19,30 +19,30 @@ + test_ref="test_slmicro5_unix_family" /> - + - - - + + + - + unix - + - - - + + + - + ^5.*$ - + SUSE-MicroOS-release diff --git a/shared/references/disa-stig-susemicro5-v1r1-xccdf-manual.xml b/shared/references/disa-stig-slmicro5-v1r1-xccdf-manual.xml similarity index 100% rename from shared/references/disa-stig-susemicro5-v1r1-xccdf-manual.xml rename to shared/references/disa-stig-slmicro5-v1r1-xccdf-manual.xml diff --git a/ssg/constants.py b/ssg/constants.py index b54b185f459..b222519306f 100644 --- a/ssg/constants.py +++ b/ssg/constants.py @@ -58,7 +58,7 @@ 'openembedded', 'rhel8', 'rhel9', 'rhel10', 'rhv4', - 'sle12', 'sle15', 'susemicro5', + 'sle12', 'sle15', 'slmicro5', 'ubuntu1604', 'ubuntu1804', 'ubuntu2004', 'ubuntu2204', 'uos20', ] @@ -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": "susemicro5", + "SUSE Linux Enterprise Micro OS 5.x": "slmicro5", "Ubuntu 16.04": "ubuntu1604", "Ubuntu 18.04": "ubuntu1804", "Ubuntu 20.04": "ubuntu2004", @@ -283,7 +283,7 @@ MULTI_PLATFORM_LIST = ["rhel", "fedora", "rhv", "debian", "ubuntu", "openeuler", "opensuse", "sle", "ol", "ocp", "rhcos", - "example", "eks", "alinux", "uos", "anolis", "openembedded", "al", "susemicro"] + "example", "eks", "alinux", "uos", "anolis", "openembedded", "al", "slmicro"] MULTI_PLATFORM_MAPPING = { "multi_platform_alinux": ["alinux2", "alinux3"], @@ -300,7 +300,7 @@ "multi_platform_rhel": ["rhel8", "rhel9", "rhel10"], "multi_platform_rhv": ["rhv4"], "multi_platform_sle": ["sle12", "sle15"], - "multi_platform_susemicro": ["susemicro5"], + "multi_platform_slmicro": ["slmicro5"], "multi_platform_ubuntu": ["ubuntu1604", "ubuntu1804", "ubuntu2004", "ubuntu2204"], "multi_platform_uos": ["uos20"], "multi_platform_openembedded": ["openembedded"], @@ -426,7 +426,7 @@ 'openeuler': 'openEuler', 'opensuse': 'openSUSE', 'sle': 'SUSE Linux Enterprise', - 'susemicro': 'SUSE Linux Enterprise Micro OS', + 'slmicro': 'SUSE Linux Enterprise Micro OS', 'example': 'Example', 'ol': 'Oracle Linux', 'ocp': 'Red Hat OpenShift Container Platform',