-
Notifications
You must be signed in to change notification settings - Fork 1.4k
fix(metricsservice): rebuild CA pool on rotation instead of appending #7713
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.
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
alliasgher
wants to merge
3
commits into
kedacore:main
Choose a base branch
from
alliasgher:fix-certpool-monotonic-growth
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+79
−7
Open
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
dc4e540
fix(metricsservice): rebuild CA pool on rotation instead of appending
alliasgher c54fd62
fix: use VerifyConnection instead of InsecureSkipVerify on client side
alliasgher 208097f
address review: fix pool ordering, nil error log, client handshake
alliasgher File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -73,6 +73,9 @@ | |
| } | ||
|
|
||
| certMutex := sync.RWMutex{} | ||
| // currentPool holds the live CA pool and is replaced (never appended to) | ||
| // on every rotation so the pool does not grow unboundedly. | ||
| currentPool := certPool | ||
| go func() { | ||
| log.V(1).Info("starting mTLS certificates monitoring") | ||
| for { | ||
|
|
@@ -97,10 +100,18 @@ | |
| log.Error(err, "error reading grpc ca certificate") | ||
| continue | ||
| } | ||
| if !certPool.AppendCertsFromPEM(pemClientCA) { | ||
| // Rebuild the pool from scratch to prevent monotonic growth. | ||
| newPool, _ := x509.SystemCertPool() | ||
| if newPool == nil { | ||
| newPool = x509.NewCertPool() | ||
| } | ||
| if !newPool.AppendCertsFromPEM(pemClientCA) { | ||
| log.Error(err, "failed to add client CA's certificate") | ||
| continue | ||
| } | ||
| certMutex.Lock() | ||
| currentPool = newPool | ||
| certMutex.Unlock() | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done in 208097f. |
||
| log.V(1).Info("grpc ca certificate has been updated") | ||
|
|
||
| // Load certificate of the CA who signed client's certificate | ||
|
|
@@ -144,9 +155,44 @@ | |
| } | ||
| if server { | ||
| config.ClientAuth = tls.RequireAndVerifyClientCert | ||
| config.ClientCAs = certPool | ||
| // GetConfigForClient is called per-connection; injecting currentPool | ||
| // here ensures every new handshake picks up the latest CA pool. | ||
| config.GetConfigForClient = func(_ *tls.ClientHelloInfo) (*tls.Config, error) { | ||
| certMutex.RLock() | ||
| defer certMutex.RUnlock() | ||
| clone := config.Clone() | ||
| clone.ClientCAs = currentPool | ||
| // GetConfigForClient overrides GetCertificate; restore it. | ||
| clone.GetCertificate = config.GetCertificate | ||
| return clone, nil | ||
| } | ||
| } else { | ||
| config.RootCAs = certPool | ||
| // For the client side, VerifyPeerCertificate is used to check against | ||
| // the latest pool on every connection. | ||
| config.InsecureSkipVerify = true //nolint:gosec // verification done in VerifyPeerCertificate | ||
Check failureCode scanning / CodeQL Disabled TLS certificate check High
InsecureSkipVerify should not be used in production code.
|
||
|
github-advanced-security[bot] marked this conversation as resolved.
Fixed
|
||
| config.VerifyPeerCertificate = func(rawCerts [][]byte, _ [][]*x509.Certificate) error { | ||
| certMutex.RLock() | ||
| pool := currentPool | ||
| certMutex.RUnlock() | ||
| certs := make([]*x509.Certificate, 0, len(rawCerts)) | ||
| for _, rawCert := range rawCerts { | ||
| c, err := x509.ParseCertificate(rawCert) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| certs = append(certs, c) | ||
| } | ||
| opts := x509.VerifyOptions{ | ||
| Roots: pool, | ||
| Intermediates: x509.NewCertPool(), | ||
| } | ||
| for _, c := range certs[1:] { | ||
| opts.Intermediates.AddCert(c) | ||
| } | ||
| _, err := certs[0].Verify(opts) | ||
| return err | ||
| } | ||
| } | ||
|
|
||
| return credentials.NewTLS(config), nil | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done in 208097f.