[Fleet] Prefer sha256 for reading GPG package verification key #167149
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
kpollich
added
the
Team:Fleet
|
Pinging @elastic/fleet (Team:Fleet) |
kpollich
added
the
release_note:skip
🤖 GitHub commentsExpand to view the GitHub comments
Just comment with:
|
juliaElastic
approved these changes
Sep 25, 2023
juliaElastic
added
the
backport:prev-minor
|
@elasticmachine merge upstream |
|
I've stepped through the verification process with the sha256 key downloaded locally and I see everything working as expected, so I'm going to continue trying to figure out what's going wrong in CI here. |
|
@elasticmachine merge upstream |
|
I found this comment deep in the openpgp.js source: Seems like providing this flag when we verify package signatures should fix the issue. I've got Cypress tests passing locally with this change. |
|
@elastic/kibana-operations - I've fixed Fleet's issues with the new sha256 GPG key here. Just need a codeowner review to sign off on this whenever you're able 🙏 |
|
@elasticmachine merge upstream |
jbudz
reviewed
Oct 2, 2023
| @@ -128,6 +130,13 @@ async function _verifyPackageSignature({ | |||
| verificationKeys: verificationKey, | |||
| signature, | |||
| message, | |||
| config: { | |||
| // See https://github.com/openpgpjs/openpgpjs/blob/d6145ac73eebcf66bdeb0873aa60fc49361e1aeb/src/message.js#L800-L809 | |||
There was a problem hiding this comment.
@elastic/kibana-security can you take a look?
There was a problem hiding this comment.
Thanks for the tag @jbudz! Using this config option is alright with us given the context. LGTM!
💛 Build succeeded, but was flaky
Failed CI StepsTest Failures
Metrics [docs]
History
To update your PR or re-run it, just comment with: cc @kpollich |
jbudz
approved these changes
Oct 2, 2023
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Oct 2, 2023
…ic#167149) ## Summary Ref elastic/elasticsearch#85876 Fixes elastic#167153 The public Elastic GPG key has been updated to use sha256 instead of sha1 for its hashing algorithm. This PR updates Fleet's reading of that key for package verification to support that hashing algorithm change. --------- Co-authored-by: Kibana Machine <[email protected]> (cherry picked from commit b2a7b55)
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation |
kibanamachine
added a commit
that referenced
this pull request
Oct 3, 2023
…#167149) (#167823) # Backport This will backport the following commits from `main` to `8.10`: - [[Fleet] Prefer sha256 for reading GPG package verification key (#167149)](#167149) <!--- Backport version: 8.9.7 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Kyle Pollich","email":"[email protected]"},"sourceCommit":{"committedDate":"2023-10-02T18:48:12Z","message":"[Fleet] Prefer sha256 for reading GPG package verification key (#167149)\n\n## Summary\n\nRef https://github.com/elastic/elasticsearch/issues/85876\nFixes https://github.com/elastic/kibana/issues/167153\n\nThe public Elastic GPG key has been updated to use sha256 instead of\nsha1 for its hashing algorithm. This PR updates Fleet's reading of that\nkey for package verification to support that hashing algorithm change.\n\n---------\n\nCo-authored-by: Kibana Machine <[email protected]>","sha":"b2a7b55f0e753656225a1c7215a08676a9c04819","branchLabelMapping":{"^v8.11.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","backport:prev-minor","v8.11.0"],"number":167149,"url":"https://github.com/elastic/kibana/pull/167149","mergeCommit":{"message":"[Fleet] Prefer sha256 for reading GPG package verification key (#167149)\n\n## Summary\n\nRef https://github.com/elastic/elasticsearch/issues/85876\nFixes https://github.com/elastic/kibana/issues/167153\n\nThe public Elastic GPG key has been updated to use sha256 instead of\nsha1 for its hashing algorithm. This PR updates Fleet's reading of that\nkey for package verification to support that hashing algorithm change.\n\n---------\n\nCo-authored-by: Kibana Machine <[email protected]>","sha":"b2a7b55f0e753656225a1c7215a08676a9c04819"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.11.0","labelRegex":"^v8.11.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/167149","number":167149,"mergeCommit":{"message":"[Fleet] Prefer sha256 for reading GPG package verification key (#167149)\n\n## Summary\n\nRef https://github.com/elastic/elasticsearch/issues/85876\nFixes https://github.com/elastic/kibana/issues/167153\n\nThe public Elastic GPG key has been updated to use sha256 instead of\nsha1 for its hashing algorithm. This PR updates Fleet's reading of that\nkey for package verification to support that hashing algorithm change.\n\n---------\n\nCo-authored-by: Kibana Machine <[email protected]>","sha":"b2a7b55f0e753656225a1c7215a08676a9c04819"}}]}] BACKPORT--> Co-authored-by: Kyle Pollich <[email protected]> Co-authored-by: Julia Bardi <[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.
Summary
Ref elastic/elasticsearch#85876
Fixes #167153
The public Elastic GPG key has been updated to use sha256 instead of sha1 for its hashing algorithm. This PR updates Fleet's reading of that key for package verification to support that hashing algorithm change.