Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update CIS RHEL9 control file to v2.0.0 #12067

Merged
merged 61 commits into from
Jun 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
fd73d84
CIS RHEL9 v2.0.0 - 1.1.1 Configure Filesystem Kernel Modules
marcusburghardt Jun 11, 2024
2bde1a1
CIS RHEL9 v2.0.0 - 1.1.2.1 Configure /tmp
marcusburghardt Jun 11, 2024
58a830e
CIS RHEL9 v2.0.0 - 1.1.2.2 Configure /dev/shm
marcusburghardt Jun 11, 2024
8b56a08
CIS RHEL9 v2.0.0 - 1.1.2.3 Configure /home
marcusburghardt Jun 11, 2024
b583f31
CIS RHEL9 v2.0.0 - 1.1.2.4 Configure /var
marcusburghardt Jun 11, 2024
a9aadf3
CIS RHEL9 v2.0.0 - 1.1.2.5 Configure /var/tmp
marcusburghardt Jun 11, 2024
6ea5e04
CIS RHEL9 v2.0.0 - 1.1.2.6 Configure /var/log
marcusburghardt Jun 11, 2024
00314f7
CIS RHEL9 v2.0.0 - 1.1.2.7 Configure /var/log/audit
marcusburghardt Jun 11, 2024
2e318fe
CIS RHEL9 v2.0.0 - 1.1 Cleanup
marcusburghardt Jun 11, 2024
5a45d41
CIS RHEL9 v2.0.0 - 1.2.1 Configure Package Repositories
marcusburghardt Jun 11, 2024
51d5ad2
CIS RHEL9 v2.0.0 - 1.2.2 Configure Package Updates
marcusburghardt Jun 11, 2024
7593450
CIS RHEL9 v2.0.0 - 1.3.1 Configure SELinux
marcusburghardt Jun 11, 2024
56f9f31
CIS RHEL9 v2.0.0 - 1.4 Configure Bootloader
marcusburghardt Jun 11, 2024
2f75821
CIS RHEL9 v2.0.0 - 1.5 Configure Additional Process Hardening
marcusburghardt Jun 11, 2024
96ceda9
CIS RHEL9 v2.0.0 - 1.6 Configure system wide crypto policy
marcusburghardt Jun 11, 2024
e7958a2
CIS RHEL9 v2.0.0 - 1.7 Configure Command Line Warning Banners
marcusburghardt Jun 13, 2024
05e8b26
CIS RHEL9 v2.0.0 - 1.8 Configure GNOME Display Manager
marcusburghardt Jun 13, 2024
606ef8d
CIS RHEL9 v2.0.0 - 1 - Initial Setup - Cleanup
marcusburghardt Jun 13, 2024
7faea81
CIS RHEL9 v2.0.0 - 2.1 Configure Server Services
marcusburghardt Jun 13, 2024
1a77e1d
CIS RHEL9 v2.0.0 - 2.2 Configure Client Services
marcusburghardt Jun 13, 2024
a5dc7d1
CIS RHEL9 v2.0.0 - 2.3 Configure Time Synchronization
marcusburghardt Jun 13, 2024
bece9c0
CIS RHEL9 v2.0.0 - 2.4.1 Configure cron
marcusburghardt Jun 13, 2024
2f6b328
CIS RHEL9 v2.0.0 - 2.4.2 Configure at
marcusburghardt Jun 13, 2024
692578b
CIS RHEL9 v2.0.0 - 2 - Services - Cleanup
marcusburghardt Jun 13, 2024
6d27cdc
CIS RHEL9 v2.0.0 - 3.1 Configure Network Devices
marcusburghardt Jun 13, 2024
d176b4f
CIS RHEL9 v2.0.0 - 3.2 Configure Network Kernel Modules
marcusburghardt Jun 13, 2024
3c0d43d
CIS RHEL9 v2.0.0 - 3.3 Configure Network Kernel Parameters
marcusburghardt Jun 13, 2024
6b57fbb
CIS RHEL9 v2.0.0 - 4.1 Configure a firewall utility
marcusburghardt Jun 13, 2024
2feb1e3
CIS RHEL9 v2.0.0 - 4.2 Configure FirewallD
marcusburghardt Jun 13, 2024
a1a70dc
CIS RHEL9 v2.0.0 - 4.3 Configure NFTables
marcusburghardt Jun 13, 2024
83adb13
CIS RHEL9 v2.0.0 - 4 Host Based Firewall - Cleanup
marcusburghardt Jun 13, 2024
01c0a74
CIS RHEL9 v2.0.0 - 5.1 Configure SSH Server
marcusburghardt Jun 13, 2024
c9c0d30
CIS RHEL9 v2.0.0 - 5.2 Configure privilege escalation
marcusburghardt Jun 13, 2024
325e8b7
CIS RHEL9 v2.0.0 - 5.3.1 Configure PAM software packages
marcusburghardt Jun 13, 2024
11cce12
CIS RHEL9 v2.0.0 - 5.3.2 Configure authselect
marcusburghardt Jun 13, 2024
01d68fe
CIS RHEL9 v2.0.0 - 5.3.3.1 Configure pam_faillock module
marcusburghardt Jun 13, 2024
7469a3f
CIS RHEL9 v2.0.0 - 5.3.3.2 Configure pam_pwquality module
marcusburghardt Jun 13, 2024
833a602
CIS RHEL9 v2.0.0 - 5.3.3.3 Configure pam_pwhistory module
marcusburghardt Jun 13, 2024
ddd8759
CIS RHEL9 v2.0.0 - 5.3.3.4 Configure pam_unix module
marcusburghardt Jun 13, 2024
17e9763
CIS RHEL9 v2.0.0 - 5.4.1 Configure shadow password suite parameters
marcusburghardt Jun 14, 2024
e88c32a
CIS RHEL9 v2.0.0 - 5.4.2 Configure root and system accounts and envir…
marcusburghardt Jun 14, 2024
ef0c90f
CIS RHEL9 v2.0.0 - 5.4.3 Configure user default environment
marcusburghardt Jun 14, 2024
4d88d52
CIS RHEL9 v2.0.0 - 6.1 Configure Integrity Checking
marcusburghardt Jun 14, 2024
258eb01
CIS RHEL9 v2.0.0 - 6.2.1 Configure systemd-journald service
marcusburghardt Jun 14, 2024
c932e11
CIS RHEL9 v2.0.0 - 6.2.2.1 Configure systemd-journal-remote
marcusburghardt Jun 14, 2024
eb51b88
CIS RHEL9 v2.0.0 - 6.2.2 Configure journald
marcusburghardt Jun 14, 2024
c995a57
CIS RHEL9 v2.0.0 - 6.2.3 Configure rsyslog
marcusburghardt Jun 14, 2024
287d417
CIS RHEL9 v2.0.0 - 6.2.4 Configure Logfiles
marcusburghardt Jun 14, 2024
f55d0d3
CIS RHEL9 v2.0.0 - 6.3.1 Configure auditd Service
marcusburghardt Jun 14, 2024
25aaf52
CIS RHEL9 v2.0.0 - 6.3.2 Configure Data Retention
marcusburghardt Jun 14, 2024
5f8587f
CIS RHEL9 v2.0.0 - 6.3.3 Configure auditd Rules
marcusburghardt Jun 14, 2024
94901a7
CIS RHEL9 v2.0.0 - 6.3.4 Configure auditd File Access
marcusburghardt Jun 14, 2024
58ca799
CIS RHEL9 v2.0.0 - 7.1 System File Permissions
marcusburghardt Jun 14, 2024
e45c939
CIS RHEL9 v2.0.0 - 7.2 Local User and Group Settings
marcusburghardt Jun 14, 2024
e04b264
CIS RHEL9 v2.0.0 - Update version in control file
marcusburghardt Jun 14, 2024
b2469fe
Include CCEs in rules selected by CIS RHEL9 v2.0.0
marcusburghardt Jun 14, 2024
53b28bf
Update references for profile stability tests
marcusburghardt Jun 14, 2024
ea4e438
Update CIS profiles descriptions for RHEL9
marcusburghardt Jun 18, 2024
897a643
CIS RHEL9 v2.0.0 - Adjust conflicting requirements
marcusburghardt Jun 19, 2024
122b7f9
Update references for profile stability tests
marcusburghardt Jun 19, 2024
fc85059
Ensure rules in rhel9 datastream
marcusburghardt Jun 26, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,867 changes: 1,705 additions & 1,162 deletions controls/cis_rhel9.yml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ options:
ignore: ignore
cis_rhel7: single|halt
cis_rhel8: single|halt
cis_rhel9: single|halt
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ options:
rhel8: syslog|single|halt
cis_rhel7: syslog|single|halt
cis_rhel8: syslog|single|halt
cis_rhel9: syslog|single|halt
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@ options:
rhel8: syslog|single|halt
cis_rhel7: halt|single
cis_rhel8: syslog|single|halt
cis_rhel9: halt|single
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ options:
ignore: ignore
cis_rhel7: email|exec|single|halt
cis_rhel8: email|exec|single|halt
cis_rhel9: email|exec|single|halt
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ severity: medium

identifiers:
cce@rhel7: CCE-86531-1
cce@rhel9: CCE-86772-1
cce@sle12: CCE-92320-1
cce@sle15: CCE-92478-7

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ severity: medium
identifiers:
cce@rhel7: CCE-27295-5
cce@rhel8: CCE-81032-5
cce@rhel9: CCE-86767-1
cce@sle12: CCE-83181-8
cce@sle15: CCE-91337-6

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ severity: medium
identifiers:
cce@rhel7: CCE-86090-8
cce@rhel8: CCE-86518-8
cce@rhel9: CCE-86768-9
cce@sle12: CCE-92339-1
cce@sle15: CCE-92626-1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ severity: medium
identifiers:
cce@rhel7: CCE-82364-1
cce@rhel8: CCE-86504-8
cce@rhel9: CCE-86769-7
cce@sle12: CCE-92280-7
cce@sle15: CCE-91396-2

Expand Down
1 change: 1 addition & 0 deletions linux_os/guide/services/ssh/sshd_approved_ciphers.var
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ options:
default: aes128-ctr,aes192-ctr,aes256-ctr,aes128-cbc,3des-cbc,aes192-cbc,aes256-cbc,[email protected]
cis_rhel7: [email protected],[email protected],[email protected],aes256-ctr,aes192-ctr,aes128-ctr
cis_rhel8: -3des-cbc,aes128-cbc,aes192-cbc,aes256-cbc,[email protected]
cis_rhel9: -3des-cbc,aes128-cbc,aes192-cbc,aes256-cbc,[email protected]
cis_sle12: [email protected],[email protected],[email protected],aes256-ctr,aes192-ctr,aes128-ctr
cis_sle15: [email protected],[email protected],[email protected],aes256-ctr,aes192-ctr,aes128-ctr
cis_ubuntu: [email protected],aes128-ctr,aes192-ctr,aes256-ctr,[email protected],[email protected]
Expand Down
1 change: 1 addition & 0 deletions linux_os/guide/services/ssh/sshd_strong_kex.var
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ options:
pcidss: ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,diffie-hellman-group-exchange-sha256,diffie-hellman-group16-sha512,diffie-hellman-group18-sha512,diffie-hellman-group14-sha256
cis_rhel7: curve25519-sha256,[email protected],ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,diffie-hellman-group-exchange-sha256
cis_rhel8: -diffie-hellman-group1-sha1,diffie-hellman-group14-sha1,diffie-hellman-group-exchange-sha1
cis_rhel9: -diffie-hellman-group1-sha1,diffie-hellman-group14-sha1,diffie-hellman-group-exchange-sha1
cis_sle12: curve25519-sha256,[email protected],diffie-hellman-group14-sha256,diffie-hellman-group16-sha512,diffie-hellman-group18-sha512,ecdh-sha2-nistp521,ecdh-sha2-nistp384,ecdh-sha2-nistp256,diffie-hellman-group-exchange-sha256
cis_sle15: curve25519-sha256,[email protected],diffie-hellman-group14-sha256,diffie-hellman-group16-sha512,diffie-hellman-group18-sha512,ecdh-sha2-nistp521,ecdh-sha2-nistp384,ecdh-sha2-nistp256,diffie-hellman-group-exchange-sha256
cis_ubuntu2004: curve25519-sha256,[email protected],ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,diffie-hellman-group-exchange-sha256,diffie-hellman-group16-sha512,diffie-hellman-group18-sha512,diffie-hellman-group14-sha256
Expand Down
1 change: 1 addition & 0 deletions linux_os/guide/services/ssh/sshd_strong_macs.var
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ options:
default: [email protected],[email protected],[email protected],hmac-sha2-512,hmac-sha2-256,hmac-ripemd160
cis_rhel7: [email protected],[email protected],hmac-sha2-512,hmac-sha2-256
cis_rhel8: -hmac-md5,hmac-md5-96,hmac-ripemd160,hmac-sha1-96,[email protected],[email protected],[email protected],[email protected],[email protected],[email protected]
cis_rhel9: -hmac-md5,hmac-md5-96,hmac-ripemd160,hmac-sha1-96,[email protected],[email protected],[email protected],[email protected],[email protected],[email protected]
cis_sle12: [email protected],[email protected],[email protected],hmac-sha2-512,hmac-sha2-256,hmac-ripemd160
cis_sle15: [email protected],[email protected],[email protected],hmac-sha2-512,hmac-sha2-256
cis_ubuntu2204: [email protected],[email protected],[email protected],hmac-sha2-512,hmac-sha2-256
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ options:
30: 30
35: 35
40: 40
45: 45
60: 60
90: 90
default: 35
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ severity: medium
identifiers:
cce@rhel7: CCE-87415-6
cce@rhel8: CCE-86467-8
cce@rhel9: CCE-86760-6

references:
cis@ubuntu2204: 4.2.1.1.1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ severity: medium
identifiers:
cce@rhel7: CCE-27328-4
cce@rhel8: CCE-87231-7
cce@rhel9: CCE-86761-4

references:
cis-csc: 11,12,14,15,3,8,9
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ severity: medium
identifiers:
cce@rhel7: CCE-87198-8
cce@rhel8: CCE-86140-1
cce@rhel9: CCE-86762-2
cce@sle12: CCE-83172-7
cce@sle15: CCE-85572-6

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ identifiers:
cce@rhcos4: CCE-82713-9
cce@rhel7: CCE-80138-1
cce@rhel8: CCE-86615-2
cce@rhel9: CCE-86763-0

references:
cis-csc: 11,14,3,9
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ identifiers:
cce@rhcos4: CCE-82714-7
cce@rhel7: CCE-80140-7
cce@rhel8: CCE-86616-0
cce@rhel9: CCE-86764-8

references:
cis-csc: 11,14,3,9
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ identifiers:
cce@rhcos4: CCE-82715-4
cce@rhel7: CCE-80141-5
cce@rhel8: CCE-86617-8
cce@rhel9: CCE-86765-5

references:
cis-csc: 11,14,3,9
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ identifiers:
cce@rhcos4: CCE-82716-2
cce@rhel7: CCE-80139-9
cce@rhel8: CCE-86618-6
cce@rhel9: CCE-86766-3

references:
cis-csc: 11,14,3,9
Expand Down
6 changes: 3 additions & 3 deletions products/rhel9/profiles/cis.profile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
documentation_complete: true

metadata:
version: 1.0.0
version: 2.0.0
SMEs:
- marcusburghardt
- mab879
- vojtapolasek
- yuumasato

reference: https://www.cisecurity.org/benchmark/red_hat_linux/

Expand All @@ -14,7 +14,7 @@ title: 'CIS Red Hat Enterprise Linux 9 Benchmark for Level 2 - Server'
description: |-
This profile defines a baseline that aligns to the "Level 2 - Server"
configuration from the Center for Internet Security® Red Hat Enterprise
Linux 9 Benchmark™, v1.0.0, released 2022-11-28.
Linux 9 Benchmark™, v2.0.0, released 2024-06-20.

This profile includes Center for Internet Security®
Red Hat Enterprise Linux 9 CIS Benchmarks™ content.
Expand Down
6 changes: 3 additions & 3 deletions products/rhel9/profiles/cis_server_l1.profile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
documentation_complete: true

metadata:
version: 1.0.0
version: 2.0.0
SMEs:
- marcusburghardt
- mab879
- vojtapolasek
- yuumasato

reference: https://www.cisecurity.org/benchmark/red_hat_linux/

Expand All @@ -14,7 +14,7 @@ title: 'CIS Red Hat Enterprise Linux 9 Benchmark for Level 1 - Server'
description: |-
This profile defines a baseline that aligns to the "Level 1 - Server"
configuration from the Center for Internet Security® Red Hat Enterprise
Linux 9 Benchmark™, v1.0.0, released 2022-11-28.
Linux 9 Benchmark™, v2.0.0, released 2024-06-20.

This profile includes Center for Internet Security®
Red Hat Enterprise Linux 9 CIS Benchmarks™ content.
Expand Down
6 changes: 3 additions & 3 deletions products/rhel9/profiles/cis_workstation_l1.profile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
documentation_complete: true

metadata:
version: 1.0.0
version: 2.0.0
SMEs:
- marcusburghardt
- mab879
- vojtapolasek
- yuumasato

reference: https://www.cisecurity.org/benchmark/red_hat_linux/

Expand All @@ -14,7 +14,7 @@ title: 'CIS Red Hat Enterprise Linux 9 Benchmark for Level 1 - Workstation'
description: |-
This profile defines a baseline that aligns to the "Level 1 - Workstation"
configuration from the Center for Internet Security® Red Hat Enterprise
Linux 9 Benchmark™, v1.0.0, released 2022-11-28.
Linux 9 Benchmark™, v2.0.0, released 2024-06-20.

This profile includes Center for Internet Security®
Red Hat Enterprise Linux 9 CIS Benchmarks™ content.
Expand Down
6 changes: 3 additions & 3 deletions products/rhel9/profiles/cis_workstation_l2.profile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
documentation_complete: true

metadata:
version: 1.0.0
version: 2.0.0
SMEs:
- marcusburghardt
- mab879
- vojtapolasek
- yuumasato

reference: https://www.cisecurity.org/benchmark/red_hat_linux/

Expand All @@ -14,7 +14,7 @@ title: 'CIS Red Hat Enterprise Linux 9 Benchmark for Level 2 - Workstation'
description: |-
This profile defines a baseline that aligns to the "Level 2 - Workstation"
configuration from the Center for Internet Security® Red Hat Enterprise
Linux 9 Benchmark™, v1.0.0, released 2022-11-28.
Linux 9 Benchmark™, v2.0.0, released 2024-06-20.

This profile includes Center for Internet Security®
Red Hat Enterprise Linux 9 CIS Benchmarks™ content.
Expand Down
2 changes: 2 additions & 0 deletions products/rhel9/profiles/default.profile
Original file line number Diff line number Diff line change
Expand Up @@ -553,3 +553,5 @@ selections:
- sebool_polipo_session_users
- sebool_cluster_manage_all_files
- configure_firewalld_ports
- journald_forward_to_syslog
- rsyslog_filecreatemode
11 changes: 0 additions & 11 deletions shared/references/cce-redhat-avail.txt
Original file line number Diff line number Diff line change
Expand Up @@ -247,17 +247,6 @@ CCE-86750-7
CCE-86751-5
CCE-86752-3
CCE-86753-1
CCE-86760-6
CCE-86761-4
CCE-86762-2
CCE-86763-0
CCE-86764-8
CCE-86765-5
CCE-86766-3
CCE-86767-1
CCE-86768-9
CCE-86769-7
CCE-86772-1
CCE-86773-9
CCE-86774-7
CCE-86775-4
Expand Down
Loading
Loading