Skip to content

CMP 2196 update ingress operator ciphers #12220

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
rhmdnd merged 3 commits into from
Aug 30, 2024
Merged

CMP 2196 update ingress operator ciphers #12220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64cf1a6
Update TLS ciphers for ingress controller rule
rhmdnd Jul 24, 2024
cd81b94
Update ciphers in ingress controller remediation
rhmdnd Jul 26, 2024
3c24d28
Add kubelet tls ingresscontroller rule to CIS benchmarks
rhmdnd Jul 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
6 changes: 6 additions & 0 deletions ...shift/kubelet/kubelet_configure_tls_cipher_suites_ingresscontroller/kubernetes/shared.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ spec:
ciphers:
- ECDHE-ECDSA-AES128-GCM-SHA256
- ECDHE-RSA-AES128-GCM-SHA256
- ECDHE-ECDSA-CHACHA20-POLY1305
- ECDHE-RSA-AES256-GCM-SHA384
- ECDHE-RSA-CHACHA20-POLY1305
- ECDHE-ECDSA-AES256-GCM-SHA384
- TLS_AES_128_GCM_SHA256
- TLS_AES_256_GCM_SHA384
- TLS_CHACHA20_POLY1305_SHA256
minTLSVersion: VersionTLS12
type: Custom
20 changes: 16 additions & 4 deletions ...ications/openshift/kubelet/kubelet_configure_tls_cipher_suites_ingresscontroller/rule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,36 @@ severity: medium
# cce@ocp4:

references:
cis@ocp4: 4.2.13
cis@ocp4: 4.2.12

ocil_clause: "TLS cipher suite configuration is not configured"
ocil_clause: "Ingress controller TLS cipher suite configuration is incomplete or possibly insecure"

ocil: |-
Run the following command on the kubelet nodes(s):
{{% raw %}}<pre>oc -n openshift-ingress-operator patch ingresscontroller/default --type merge -p '{"spec":{"tlsSecurityProfile":{"type":"Custom","custom":{"ciphers":["ECDHE-ECDSA-AES128-GCM-SHA256","ECDHE-RSA-AES128-GCM-SHA256","ECDHE-RSA-AES256-GCM-SHA384"],"minTLSVersion":"VersionTLS12"} } } }'</pre>{{% endraw %}}
<pre>oc -n openshift-ingress-operator patch ingresscontroller/default --type merge -p '{"spec":{"tlsSecurityProfile":{"type":"Custom","custom":{"ciphers":["ECDHE-ECDSA-AES128-GCM-SHA256","ECDHE-ECDSA-CHACHA20-POLY1305","ECDHE-ECDSA-AES256-GCM-SHA384","TLS_CHACHA20_POLY1305_SHA256","TLS_AES_128_GCM_SHA256","TLS_AES_256_GCM_SHA384","ECDHE-RSA-AES128-GCM-SHA256","ECDHE-RSA-AES256-GCM-SHA384","ECDHE-RSA-CHACHA20-POLY1305"],"minTLSVersion":"VersionTLS12"} } } }'</pre>

warnings:
- general: |-
{{{ openshift_cluster_setting("/apis/operator.openshift.io/v1/namespaces/openshift-ingress-operator/ingresscontrollers/default") | indent(4) }}}

# Recommended ciphers
# ECDHE-ECDSA-AES128-GCM-SHA256
# ECDHE-ECDSA-CHACHA20-POLY1305
# ECDHE-ECDSA-AES256-GCM-SHA384
# TLS_CHACHA20_POLY1305_SHA256
# TLS_AES_128_GCM_SHA256
# TLS_AES_256_GCM_SHA384
#
# Secure ciphers
# ECDHE-RSA-AES128-GCM-SHA256
# ECDHE-RSA-AES256-GCM-SHA384
# ECDHE-RSA-CHACHA20-POLY1305
template:
name: yamlfile_value
vars:
ocp_data: "true"
filepath: '/apis/operator.openshift.io/v1/namespaces/openshift-ingress-operator/ingresscontrollers/default'
yamlpath: ".status.tlsProfile.ciphers[:]"
values:
- value: '^(ECDHE-ECDSA-AES128-GCM-SHA256|ECDHE-RSA-AES128-GCM-SHA256|ECDHE-ECDSA-CHACHA20-POLY1305|ECDHE-RSA-AES256-GCM-SHA384|ECDHE-RSA-CHACHA20-POLY1305|ECDHE-ECDSA-AES256-GCM-SHA384|AES256-GCM-SHA384|AES128-GCM-SHA256)$'
- value: '^(ECDHE-ECDSA-AES128-GCM-SHA256|ECDHE-RSA-AES128-GCM-SHA256|ECDHE-ECDSA-CHACHA20-POLY1305|ECDHE-RSA-AES256-GCM-SHA384|ECDHE-RSA-CHACHA20-POLY1305|ECDHE-ECDSA-AES256-GCM-SHA384|TLS_AES_128_GCM_SHA256|TLS_AES_256_GCM_SHA384|TLS_CHACHA20_POLY1305_SHA256)$'
operation: 'pattern match'
1 change: 1 addition & 0 deletions controls/cis_ocp_1_4_0/section-4.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,5 +157,6 @@ controls:
status: automated
rules:
- kubelet_configure_tls_cipher_suites
- kubelet_configure_tls_cipher_suites_ingresscontroller
levels: [ level_1, ]

3 changes: 3 additions & 0 deletions tests/assertions/ocp4/ocp4-cis-4.12.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ rule_results:
e2e-cis-api-server-kubelet-client-key-pre-4-9:
default_result: NOT-APPLICABLE
result_after_remediation: NOT-APPLICABLE
e2e-cis-kubelet-configure-tls-cipher-suites-ingresscontroller:
default_result: FAIL
result_after_remediation: PASS
e2e-cis-api-server-oauth-https-serving-cert:
default_result: PASS
result_after_remediation: PASS
Expand Down
3 changes: 3 additions & 0 deletions tests/assertions/ocp4/ocp4-cis-4.13.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ rule_results:
e2e-cis-api-server-kubelet-client-key-pre-4-9:
default_result: NOT-APPLICABLE
result_after_remediation: NOT-APPLICABLE
e2e-cis-kubelet-configure-tls-cipher-suites-ingresscontroller:
default_result: FAIL
result_after_remediation: PASS
e2e-cis-api-server-oauth-https-serving-cert:
default_result: PASS
result_after_remediation: PASS
Expand Down
3 changes: 3 additions & 0 deletions tests/assertions/ocp4/ocp4-cis-4.14.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ rule_results:
e2e-cis-api-server-kubelet-client-key-pre-4-9:
default_result: NOT-APPLICABLE
result_after_remediation: NOT-APPLICABLE
e2e-cis-kubelet-configure-tls-cipher-suites-ingresscontroller:
default_result: FAIL
result_after_remediation: PASS
e2e-cis-api-server-oauth-https-serving-cert:
default_result: PASS
result_after_remediation: PASS
Expand Down
3 changes: 3 additions & 0 deletions tests/assertions/ocp4/ocp4-cis-4.15.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ rule_results:
e2e-cis-api-server-kubelet-client-key-pre-4-9:
default_result: NOT-APPLICABLE
result_after_remediation: NOT-APPLICABLE
e2e-cis-kubelet-configure-tls-cipher-suites-ingresscontroller:
default_result: FAIL
result_after_remediation: PASS
e2e-cis-api-server-oauth-https-serving-cert:
default_result: PASS
result_after_remediation: PASS
Expand Down
3 changes: 3 additions & 0 deletions tests/assertions/ocp4/ocp4-cis-4.16.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,9 @@ rule_results:
e2e-cis-kubelet-disable-readonly-port:
default_result: PASS
result_after_remediation: PASS
e2e-cis-kubelet-configure-tls-cipher-suites-ingresscontroller:
default_result: FAIL
result_after_remediation: PASS
e2e-cis-ocp-allowed-registries:
default_result: FAIL
e2e-cis-ocp-allowed-registries-for-import:
Expand Down