OCPBUGS-24176: Ignore invalid PEM blocks #2178
Conversation
openshift-ci-robot
added
jira/severity-important
|
@kyrtapz: This pull request references Jira Issue OCPBUGS-24176, which is valid. 3 validation(s) were run on this bug
No GitHub users were found matching the public email listed for the QA contact in Jira (heli@redhat.com), skipping review request. The bug has been updated to refer to the pull request using the external bug tracker. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
Previously, the CertificateData function would error out when unable to decode the next PEM block, causing issues with files containing empty lines at the end. This commit addresses the problem by using crypto.CertsFromPEM from library-go, which returns early when it cannot decode the next PEM block without throwing an error. Signed-off-by: Patryk Diak <pdiak@redhat.com>
kyrtapz
force-pushed
the
cert_data_emptyline2
branch
from
cae1cd8
to
987f17f
Compare
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: kyrtapz, trozet The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
|
@kyrtapz: The following tests failed, say
Full PR test history. Your PR dashboard. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
openshift-merge-bot
bot
merged commit 9fdafaa
into
openshift:master
|
@kyrtapz: Jira Issue OCPBUGS-24176: All pull requests linked via external trackers have merged: Jira Issue OCPBUGS-24176 has been moved to the MODIFIED state. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
[ART PR BUILD NOTIFIER] This PR has been included in build cluster-network-operator-container-v4.16.0-202312220131.p0.g9fdafaa.assembly.stream for distgit cluster-network-operator. |
|
Fix included in accepted release 4.16.0-0.nightly-2024-01-09-085011 |
Copy of #2141 as I was unable to make the the tide happy...
@trozet please approve again.
Previously, the CertificateData function would error out when unable to decode the next PEM block, causing issues with files containing empty lines at the end.
This causes problems for HyperShift clusters with a management cluster that uses the legacyVulnerableCABundle:
https://github.com/openshift/service-ca-operator/blob/fe887613d031435fb0c76eb397764ba68fe09014/pkg/controller/cabundleinjector/starter.go#L30C5-L35
https://github.com/openshift/service-ca-operator/blob/fe887613d031435fb0c76eb397764ba68fe09014/pkg/controller/cabundleinjector/starter.go#L72
This change addresses the problem by using crypto.CertsFromPEM from library-go, which returns early when it cannot decode the next PEM block without throwing an error.