Skip to content

ROX-34000: fix reencrypt route with custom cert #19876

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

Open
rhacs-bot wants to merge 1 commit into
base: release-4.10
Choose a base branch
from
+41 −1
Open

ROX-34000: fix reencrypt route with custom cert #19876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 changes: 1 addition & 1 deletion image/templates/helm/stackrox-central/templates/_init.tpl.htpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@
{{ end }}
{{ if and (kindIs "invalid" $reencryptConfig.tls.certificate) (kindIs "invalid" $reencryptConfig.tls.key) }}
{{ include "srox.note" (list $ "The reencrypt route will serve a certificate signed by the OpenShift certificate authority.") }}
{{ else if or $reencryptConfig.tls.certificate $reencryptConfig.tls.key }}
{{ else if ne (kindIs "invalid" $reencryptConfig.tls.certificate) (kindIs "invalid" $reencryptConfig.tls.key) }}
{{ include "srox.fail" "The reencrypt route must specify either both, certificate and key, or neither." }}
{{ end }}
{{ end }}
Expand Down
40 changes: 40 additions & 0 deletions pkg/helm/charts/tests/centralservices/testdata/helmtest/openshift-routes.test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,43 @@ tests:
assertThat(. != null),
assertThat(.spec.tls.insecureEdgeTerminationPolicy == "Redirect")
]
- name: "reencrypt route with custom certificate and key"
set:
central.exposure.route.enabled: true
central.exposure.route.reencrypt.enabled: true
central.exposure.route.reencrypt.tls.certificate: "-----BEGIN CERTIFICATE-----\ntest\n-----END CERTIFICATE-----"
central.exposure.route.reencrypt.tls.key: "-----BEGIN PRIVATE KEY-----\ntest\n-----END PRIVATE KEY-----"
expect: |
.routes["central-reencrypt"] | [
assertThat(. != null),
assertThat(.spec.tls.certificate | contains("BEGIN CERTIFICATE")),
assertThat(.spec.tls.certificate | contains("test")),
assertThat(.spec.tls.key | contains("BEGIN PRIVATE KEY")),
assertThat(.spec.tls.key | contains("test"))
]
- name: "reencrypt route with only certificate fails"
set:
central.exposure.route.enabled: true
central.exposure.route.reencrypt.enabled: true
central.exposure.route.reencrypt.tls.certificate: "-----BEGIN CERTIFICATE-----\ntest\n-----END CERTIFICATE-----"
expectError: true
expect: |
.error | assertThat(contains("certificate and key"))
- name: "reencrypt route with only key fails"
set:
central.exposure.route.enabled: true
central.exposure.route.reencrypt.enabled: true
central.exposure.route.reencrypt.tls.key: "-----BEGIN PRIVATE KEY-----\ntest\n-----END PRIVATE KEY-----"
expectError: true
expect: |
.error | assertThat(contains("certificate and key"))
- name: "reencrypt route without custom cert has empty cert fields"
set:
central.exposure.route.enabled: true
central.exposure.route.reencrypt.enabled: true
expect: |
.routes["central-reencrypt"] | [
assertThat(. != null),
assertThat(.spec.tls.certificate == null or .spec.tls.certificate == ""),
assertThat(.spec.tls.key == null or .spec.tls.key == "")
]
Loading