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.

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

Jump to bottom

Backport of https://github.com/knative-sandbox/control-protocol/commi… #390

Merged
merged 1 commit into from
Jul 21, 2023
Merged

Backport of https://github.com/knative-sandbox/control-protocol/commi… #390

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
62 changes: 62 additions & 0 deletions openshift/patches/011-backport-control-protocol-fix.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
diff --git a/vendor/knative.dev/control-protocol/pkg/certificates/reconciler/certificates.go b/vendor/knative.dev/control-protocol/pkg/certificates/reconciler/certificates.go
--- a/vendor/knative.dev/control-protocol/pkg/certificates/reconciler/certificates.go (revision 6cb6874ffcb27d8030025cd9a965cf942d105a86)
+++ b/vendor/knative.dev/control-protocol/pkg/certificates/reconciler/certificates.go (date 1689835003162)
@@ -17,6 +17,7 @@
package sample

import (
+ "bytes"
"context"
"crypto/rsa"
"crypto/x509"
@@ -89,7 +90,7 @@
r.logger.Errorf("Error accessing CA certificate secret %q %q: %v", system.Namespace(), r.caSecretName, err)
return err
}
- caCert, caPk, err := parseAndValidateSecret(caSecret, false)
+ caCert, caPk, err := parseAndValidateSecret(caSecret, nil)
if err != nil {
r.logger.Infof("CA cert invalid: %v", err)

@@ -118,7 +119,7 @@
return fmt.Errorf("unknown cert type: %v", r.secretTypeLabelName)
}

- cert, _, err := parseAndValidateSecret(secret, true, sans...)
+ cert, _, err := parseAndValidateSecret(secret, caSecret.Data[certificates.SecretCertKey], sans...)
if err != nil {
r.logger.Infof("Secret invalid: %v", err)
// Check the secret to reconcile type
@@ -144,7 +145,7 @@
}

// All sans provided are required to be lower case
-func parseAndValidateSecret(secret *corev1.Secret, shouldContainCaCert bool, sans ...string) (*x509.Certificate, *rsa.PrivateKey, error) {
+func parseAndValidateSecret(secret *corev1.Secret, caCert []byte, sans ...string) (*x509.Certificate, *rsa.PrivateKey, error) {
certBytes, ok := secret.Data[certificates.SecretCertKey]
if !ok {
return nil, nil, fmt.Errorf("missing cert bytes")
@@ -153,10 +154,14 @@
if !ok {
return nil, nil, fmt.Errorf("missing pk bytes")
}
- if shouldContainCaCert {
- if _, ok := secret.Data[certificates.SecretCaCertKey]; !ok {
+ if caCert != nil {
+ ca, ok := secret.Data[certificates.SecretCaCertKey]
+ if !ok {
return nil, nil, fmt.Errorf("missing ca cert bytes")
}
+ if !bytes.Equal(ca, caCert) {
+ return nil, nil, fmt.Errorf("ca cert bytes changed")
+ }
}

cert, caPk, err := certificates.ParseCert(certBytes, pkBytes)
@@ -210,4 +215,4 @@

_, hasLabel := secret.Labels[r.secretTypeLabelName]
return hasLabel
-}
+}
\ No newline at end of file
17 changes: 11 additions & 6 deletions vendor/knative.dev/control-protocol/pkg/certificates/reconciler/certificates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package sample

import (
"bytes"
"context"
"crypto/rsa"
"crypto/x509"
Expand Down Expand Up @@ -89,7 +90,7 @@ func (r *reconciler) ReconcileKind(ctx context.Context, secret *corev1.Secret) p
r.logger.Errorf("Error accessing CA certificate secret %q %q: %v", system.Namespace(), r.caSecretName, err)
return err
}
caCert, caPk, err := parseAndValidateSecret(caSecret, false)
caCert, caPk, err := parseAndValidateSecret(caSecret, nil)
if err != nil {
r.logger.Infof("CA cert invalid: %v", err)

Expand Down Expand Up @@ -118,7 +119,7 @@ func (r *reconciler) ReconcileKind(ctx context.Context, secret *corev1.Secret) p
return fmt.Errorf("unknown cert type: %v", r.secretTypeLabelName)
}

cert, _, err := parseAndValidateSecret(secret, true, sans...)
cert, _, err := parseAndValidateSecret(secret, caSecret.Data[certificates.SecretCertKey], sans...)
if err != nil {
r.logger.Infof("Secret invalid: %v", err)
// Check the secret to reconcile type
Expand All @@ -144,7 +145,7 @@ func (r *reconciler) ReconcileKind(ctx context.Context, secret *corev1.Secret) p
}

// All sans provided are required to be lower case
func parseAndValidateSecret(secret *corev1.Secret, shouldContainCaCert bool, sans ...string) (*x509.Certificate, *rsa.PrivateKey, error) {
func parseAndValidateSecret(secret *corev1.Secret, caCert []byte, sans ...string) (*x509.Certificate, *rsa.PrivateKey, error) {
certBytes, ok := secret.Data[certificates.SecretCertKey]
if !ok {
return nil, nil, fmt.Errorf("missing cert bytes")
Expand All @@ -153,10 +154,14 @@ func parseAndValidateSecret(secret *corev1.Secret, shouldContainCaCert bool, san
if !ok {
return nil, nil, fmt.Errorf("missing pk bytes")
}
if shouldContainCaCert {
if _, ok := secret.Data[certificates.SecretCaCertKey]; !ok {
if caCert != nil {
ca, ok := secret.Data[certificates.SecretCaCertKey]
if !ok {
return nil, nil, fmt.Errorf("missing ca cert bytes")
}
if !bytes.Equal(ca, caCert) {
return nil, nil, fmt.Errorf("ca cert bytes changed")
}
}

cert, caPk, err := certificates.ParseCert(certBytes, pkBytes)
Expand Down Expand Up @@ -210,4 +215,4 @@ func (r *reconciler) shouldReconcile(secret *corev1.Secret) bool {

_, hasLabel := secret.Labels[r.secretTypeLabelName]
return hasLabel
}
}
Loading