Skip to content

E8 ocp revisions #6587

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.

Sign up for GitHub

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

Merged
JAORMX merged 4 commits into from
Feb 4, 2021
Merged

E8 ocp revisions #6587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
495afe3
Remove unnecessary rules from RHCOS e8 profile
shaneboulden Jan 22, 2021
940a8c1
Add additional RBAC/SCC controls to OCP e8 profile
shaneboulden Jan 22, 2021
54d91b9
Use NOSHA1 crypto policy for e8/rhcos
shaneboulden Feb 2, 2021
89b46f4
Update ASD crypto guidelines refs
shaneboulden Feb 3, 2021
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
9 changes: 9 additions & 0 deletions ocp4/profiles/e8.profile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,12 @@ selections:
- ocp_idp_no_htpasswd
- ocp_allowed_registries_for_import
- ocp_allowed_registries
- scc_limit_privileged_containers
- scc_limit_privilege_escalation
- scc_limit_root_containers
- scc_limit_container_allowed_capabilities
- rbac_pod_creation_access
- rbac_wildcard_use
- rbac_limit_cluster_admin
- api_server_tls_cipher_suites
- api_server_encryption_provider_cipher
65 changes: 3 additions & 62 deletions rhcos4/profiles/e8.profile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,37 +19,10 @@ description: |-

selections:

### Remove obsolete packages
#- package_talk_removed
#- package_talk-server_removed
#- package_xinetd_removed
#- service_xinetd_disabled
#- package_ypbind_removed
#- package_telnet_removed
#- service_telnet_disabled
#- package_telnet-server_removed
#- package_rsh_removed
#- package_rsh-server_removed
#- service_zebra_disabled
#- package_quagga_removed
#- service_avahi-daemon_disabled
#- package_squid_removed
#- service_squid_disabled

### Software update
#- ensure_redhat_gpgkey_installed
#- ensure_gpgcheck_never_disabled
#- ensure_gpgcheck_local_packages
#- ensure_gpgcheck_globally_activated
#- security_patches_up_to_date
#- dnf-automatic_security_updates_only

### System security settings
- sysctl_kernel_randomize_va_space
# - sysctl_kernel_exec_shield
- sysctl_kernel_kptr_restrict
- sysctl_kernel_dmesg_restrict
- sysctl_kernel_kexec_load_disabled
- sysctl_kernel_yama_ptrace_scope
- sysctl_kernel_unprivileged_bpf_disabled
- sysctl_net_core_bpf_jit_harden
Expand All @@ -60,41 +33,13 @@ selections:
- var_selinux_policy_name=targeted
- selinux_policytype

### Filesystem integrity
#- rpm_verify_hashes
#- rpm_verify_permissions
#- rpm_verify_ownership
#- file_permissions_unauthorized_sgid
#- file_permissions_unauthorized_suid
#- file_permissions_unauthorized_world_writable
#- dir_perms_world_writable_sticky_bits
#- file_permissions_library_dirs
#- file_ownership_binary_dirs
#- file_permissions_binary_dirs
#- file_ownership_library_dirs

### Passwords
- no_empty_passwords

### Partitioning
#- mount_option_dev_shm_nodev
#- mount_option_dev_shm_nosuid
#- mount_option_dev_shm_noexec

### Network
#- package_firewalld_installed
#- service_firewalld_enabled
#- network_sniffer_disabled

### Admin privileges
- accounts_no_uid_except_zero
#- sudo_remove_nopasswd
#- sudo_remove_no_authenticate
#- sudo_require_authentication


### Audit
#- package_rsyslog_installed
#- service_rsyslog_enabled
- service_auditd_enabled
- var_auditd_flush=incremental_async
- auditd_data_retention_flush
Expand Down Expand Up @@ -136,11 +81,7 @@ selections:
- sshd_disable_user_known_hosts
- sshd_enable_strictmodes

# See also: https://www.cyber.gov.au/ism/guidelines-using-cryptography
- var_system_crypto_policy=future
# See also: https://www.cyber.gov.au/acsc/view-all-content/guidance/asd-approved-cryptographic-algorithms
- var_system_crypto_policy=default_nosha1
Copy link
Copy Markdown
Collaborator

@jhrozek jhrozek Feb 3, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only one question: Why was the crypto policy changed from future to default and then default minus sha1?
btw also the link about the rules no longer works

Copy link
Copy Markdown
Contributor Author

@shaneboulden shaneboulden Feb 3, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @jhrozek for taking a look at this, I've updated the refs.

The ASD crypto guidelines only allow for SHA-2. When we first created the e8 profile for RHEL, the only available policy that prevented SHA-1 being used was 'future'. #5024

The 'NO-SHA1' policy module was subsequently added, and the e8 profile was revised. 9aa23b0

RHCOS followed a similar pattern - 'NO-SHA1' wasn't available initially, and 'future' was used instead. Now that 'default+NO-SHA1' is available, it's a better fit.

'default' was an oversight - it should have been 'future' -> 'default:NO-SHA1'. I initially pushed this, and then rebased over the top.

Copy link
Copy Markdown
Collaborator

@jhrozek jhrozek Feb 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the detailed reply and fixing the reference.

- configure_crypto_policy
- configure_ssh_crypto_policy

### Application whitelisting
#- package_fapolicyd_installed
#- service_fapolicyd_enabled
2 changes: 1 addition & 1 deletion rhel8/profiles/e8.profile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ selections:
- sshd_disable_user_known_hosts
- sshd_enable_strictmodes

# See also: https://www.cyber.gov.au/ism/guidelines-using-cryptography
# See also: https://www.cyber.gov.au/acsc/view-all-content/guidance/asd-approved-cryptographic-algorithms
- var_system_crypto_policy=default_nosha1
- configure_crypto_policy
- configure_ssh_crypto_policy
Expand Down