Skip to content

Commit 87c6ea8

Browse files
authored
Merge pull request #14010 from teacup-on-rockingchair/sle16_platform
Add SLE16 platform
2 parents fb0fa44 + cd93aac commit 87c6ea8

File tree

15 files changed

+215
-4
lines changed

15 files changed

+215
-4
lines changed

CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ option(SSG_PRODUCT_RHEL10 "If enabled, the RHEL10 SCAP content will be built" ${
114114
option(SSG_PRODUCT_RHV4 "If enabled, the RHV4 SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
115115
option(SSG_PRODUCT_SLE12 "If enabled, the SLE12 SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
116116
option(SSG_PRODUCT_SLE15 "If enabled, the SLE15 SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
117+
option(SSG_PRODUCT_SLE16 "If enabled, the SLE16 SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
117118
option(SSG_PRODUCT_SLMICRO5 "If enabled, the SLE Micro 5 SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
118119
option(SSG_PRODUCT_SLMICRO6 "If enabled, the SLE Micro 6 SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
119120
option(SSG_PRODUCT_TENCENTOS4 "If enabled, the TencentOS Server 4 SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
@@ -351,6 +352,7 @@ message(STATUS "RHEL 10: ${SSG_PRODUCT_RHEL10}")
351352
message(STATUS "RHV 4: ${SSG_PRODUCT_RHV4}")
352353
message(STATUS "SUSE 12: ${SSG_PRODUCT_SLE12}")
353354
message(STATUS "SUSE 15: ${SSG_PRODUCT_SLE15}")
355+
message(STATUS "SUSE 16: ${SSG_PRODUCT_SLE16}")
354356
message(STATUS "SLE Micro 5: ${SSG_PRODUCT_SLMICRO5}")
355357
message(STATUS "SLE Micro 6: ${SSG_PRODUCT_SLMICRO6}")
356358
message(STATUS "TencentOS Server 4: ${SSG_PRODUCT_TENCENTOS4}")
@@ -471,6 +473,9 @@ endif()
471473
if(SSG_PRODUCT_SLE15)
472474
add_subdirectory("products/sle15" "sle15")
473475
endif()
476+
if(SSG_PRODUCT_SLE16)
477+
add_subdirectory("products/sle16" "sle16")
478+
endif()
474479
if(SSG_PRODUCT_SLMICRO5)
475480
add_subdirectory("products/slmicro5" "slmicro5")
476481
endif()

build_product

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,7 @@ all_cmake_products=(
357357
RHV4
358358
SLE12
359359
SLE15
360+
SLE16
360361
SLMICRO5
361362
SLMICRO6
362363
TENCENTOS4

controls/base_sle16.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
policy: DRAFT Basis System Security Profile for SUSE Linux Enterprise 16
3+
title: DRAFT Basis System Security Profile SUSE Linux Enterprise 16
4+
id: base_sle16
5+
version: '1.0'
6+
source: not_publicly_available
7+
reference_type: suse-base-sle16
8+
9+
levels:
10+
- id: high
11+
- id: medium
12+
- id: low
13+
14+
product: sle16
15+
16+
controls:
17+
- id: SLES-16-16016015
18+
levels:
19+
- high
20+
title: SLES 16 must be a vendor-supported release.
21+
rules:
22+
- installed_OS_is_vendor_supported
23+
status: automated

linux_os/guide/system/software/integrity/certified-vendor/installed_OS_is_vendor_supported/oval/shared.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<extend_definition comment="Installed OS is OL9" definition_ref="installed_OS_is_ol9" />
1414
<extend_definition comment="Installed OS is SLE12" definition_ref="installed_OS_is_sle12" />
1515
<extend_definition comment="Installed OS is SLE15" definition_ref="installed_OS_is_sle15" />
16+
<extend_definition comment="Installed OS is SLE16" definition_ref="installed_OS_is_sle16" />
1617
<extend_definition comment="Installed OS is SLE Micro 5" definition_ref="installed_OS_is_slmicro5" />
1718
<extend_definition comment="Installed OS is SLE Micro 6" definition_ref="installed_OS_is_slmicro6" />
1819
<extend_definition comment="Installed OS is Ubuntu 24.04" definition_ref="installed_OS_is_ubuntu2404" />

linux_os/guide/system/software/integrity/certified-vendor/installed_OS_is_vendor_supported/rule.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ description: |-
88
{{% if 'ol' in product %}}
99
Oracle Linux is supported by Oracle Corporation. As the Oracle
1010
Linux vendor, Oracle Corporation is responsible for providing security patches.
11-
{{% elif product in ["sle12", "sle15", "slmicro5", "slmicro6"] %}}
11+
{{% elif product in ["sle12", "sle15", "sle16", "slmicro5", "slmicro6"] %}}
1212
SUSE Linux Enterprise is supported by SUSE. As the SUSE Linux Enterprise
1313
vendor, SUSE is responsible for providing security patches.
1414
{{% elif 'almalinux' in product %}}
@@ -39,7 +39,7 @@ identifiers:
3939
cce@sle12: CCE-83001-8
4040
cce@sle15: CCE-83260-0
4141
cce@slmicro5: CCE-93601-3
42-
cce@slmicro6: CCE-95035-2
42+
cce@slmicro6: CCE-95035-2
4343

4444
references:
4545
cis-csc: 18,20,4

products/sle16/CMakeLists.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Sometimes our users will try to do: "cd sle16; cmake ." That needs to error in a nice way.
2+
if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
3+
message(FATAL_ERROR "cmake has to be used on the root CMakeLists.txt, see the Building ComplianceAsCode section in the Developer Guide!")
4+
endif()
5+
6+
set(PRODUCT "sle16")
7+
ssg_build_product("sle16")
8+
9+
10+
ssg_build_html_cce_table(${PRODUCT})

products/sle16/product.yml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
product: sle16
2+
full_name: SUSE Linux Enterprise Server 16
3+
type: platform
4+
5+
families:
6+
- suse
7+
8+
major_version_ordinal: 16
9+
10+
benchmark_id: SLE-16
11+
benchmark_root: "../../linux_os/guide"
12+
13+
profiles_root: "./profiles"
14+
15+
init_system: "systemd"
16+
17+
pkg_manager: "zypper"
18+
pkg_manager_config_file: "/etc/zypp/zypp.conf"
19+
20+
aide_bin_path: "/usr/bin/aide"
21+
22+
cpes_root: "../../shared/applicability"
23+
cpes:
24+
- sle16:
25+
name: "cpe:/o:suse:linux_enterprise_server:16"
26+
title: "SUSE Linux Enterprise Server 16"
27+
check_id: installed_OS_is_sle16
28+
29+
platform_package_overrides:
30+
login_defs: "shadow"
31+
grub2: "grub2"
32+
sssd: "sssd"
33+
crontabs: "cronie"
34+
passwd: "shadow"
35+
36+
reference_uris:
37+
suse-base-sle16: 'not_publicly_available'
38+
39+
dconf_gdm_dir: "gdm.d"
40+
41+
sysctl_remediate_drop_in_file: "true"
42+
journald_conf_dir_path: /etc/systemd/journal.d
43+
xwindows_packages:
44+
- xorg-x11-server
45+
- xorg-x11-server-extra
46+
- xorg-x11-server-Xvfb
47+
- xwayland
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
documentation_complete: true
2+
3+
metadata:
4+
version: 1.0
5+
SMEs:
6+
- svet-se
7+
- rumch-se
8+
- teacup-on-rockingchair
9+
10+
reference: not_publicly_available
11+
12+
title: 'DRAFT General System Security Profile for SUSE Linux Enterprise (SLES) 16'
13+
14+
description: |-
15+
This profile contains configuration checks that align to the
16+
General System Security Profile for SUSE Linux Enterprise (SLES) 16.
17+
18+
selections:
19+
- base_sle16:all
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
2+
3+
<xsl:include href="../../../shared/transforms/shared_constants.xslt"/>
4+
5+
<xsl:variable name="product_long_name">SUSE Linux Enterprise Server 16.0</xsl:variable>
6+
<xsl:variable name="product_short_name">SLES 16</xsl:variable>
7+
<xsl:variable name="prod_type">sle16</xsl:variable>
8+
9+
</xsl:stylesheet>
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
2+
3+
<xsl:import href="../../../shared/transforms/shared_table-style.xslt"/>
4+
5+
</xsl:stylesheet>

0 commit comments

Comments
 (0)