x-pack/filebeat/input/{cel,httpjson}: fix PEM key validation #38405
Conversation
This file contains 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
efd6
added
Filebeat
botelastic
bot
added
needs_team
|
Pinging @elastic/security-service-integrations (Team:Security-Service Integrations) |
Previously the validation was attempting to parse the PEM text as a key and was also attempting to parse the data as the wrong kind of key.
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
💚 Flaky test reportTests succeeded. 🤖 GitHub commentsExpand to view the GitHub comments
To re-run your PR in the CI, just comment with:
|
andrewkroh
reviewed
Mar 19, 2024
| _, err := x509.ParsePKCS1PrivateKey([]byte(o.OktaJWKPEM)) | ||
| blk, rest := pem.Decode([]byte(o.OktaJWKPEM)) | ||
| if rest := bytes.TrimSpace(rest); len(rest) != 0 { | ||
| return fmt.Errorf("PEM text has trailing data: %s", rest) |
There was a problem hiding this comment.
I think a check for blk == nil is warranted if it is going to check for extra data in rest.
And to be safe against logging key material, I would omit rest from the error.
There was a problem hiding this comment.
The data in rest is partially orthogonal to the nilness of blk because of the bytes.TrimSpace call, but I have guarded against a nil deref.
andrewkroh
approved these changes
Mar 19, 2024
💚 Build Succeeded
History
cc @efd6 |
💚 Build Succeeded
History
cc @efd6 |
💚 Build Succeeded
History
cc @efd6 |
💚 Build Succeeded
History
cc @efd6 |
💚 Build Succeeded
History
cc @efd6 |
💚 Build Succeeded
History
cc @efd6 |
💚 Build Succeeded
History
cc @efd6 |
💚 Build Succeeded
History
cc @efd6 |
💔 Build Failed
Failed CI StepsHistory
cc @efd6 |
💔 Build Failed
Failed CI StepsHistory
cc @efd6 |
|
@efd6 Should the windows build failure be a cause of concern here ? |
|
/test |
mergify bot
pushed a commit
that referenced
this pull request
Mar 19, 2024
Previously the validation was attempting to parse the PEM text as a key and was also attempting to parse the data as the wrong kind of key. (cherry picked from commit c29075e)
6 tasks
efd6
added a commit
that referenced
this pull request
Mar 19, 2024
Previously the validation was attempting to parse the PEM text as a key and was also attempting to parse the data as the wrong kind of key. (cherry picked from commit c29075e)
efd6
added a commit
that referenced
this pull request
Mar 19, 2024
… key validation (#38406) * x-pack/filebeat/input/{cel,httpjson}: fix PEM key validation (#38405) Previously the validation was attempting to parse the PEM text as a key and was also attempting to parse the data as the wrong kind of key. (cherry picked from commit c29075e) * remove irrelevant changelog entries --------- Co-authored-by: Dan Kortschak <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Proposed commit message
Previously the validation was attempting to parse the PEM text as a key and was also attempting to parse the data as the wrong kind of key.
Checklist
CHANGELOG.next.asciidocorCHANGELOG-developer.next.asciidoc.Author's Checklist
How to test this PR locally
Related issues
Use cases
Screenshots
Logs