lib/repo: Fix multi-signature support when generating summary files #1489
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
|
Can one of the admins verify this patch?
|
jlebon
reviewed
Mar 8, 2018
src/libostree/ostree-repo.c
Outdated
| @@ -4830,10 +4829,10 @@ ostree_repo_add_gpg_signature_summary (OstreeRepo *self, | |||
| cancellable, error)) | |||
| return FALSE; | |||
|
|
|||
| new_metadata = _ostree_detached_metadata_append_gpg_sig (existing_signatures, signature_data); | |||
| metadata = _ostree_detached_metadata_append_gpg_sig (metadata, signature_data); | |||
There was a problem hiding this comment.
One subtle issue here is that we're leaking the previous value of metadata. Let's tweak it to something like this instead:
g_autoptr(GVariant) old_metadata = g_steal_pointer (&metadata);
metadata = _ostree_detached_metadata_append_gpg_sig (old_metadata, signature_data);?
Ensure that the metadata object is built up with the signatures from all keys passed to ostree_repo_add_gpg_signature_summary(). Previously only the signature from the last key would end up in the metadata. Closes: ostreedev#1488
jeremy-hiatt
force-pushed
the
summary_multisig
branch
from
52a38f4 to
5d49262
Compare
|
Hi @jlebon thanks for your feedback. I made the change as you described. Can you please take another look? |
|
Thanks for the patch! |
|
☀️ Test successful - status-atomicjenkins |
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.
Ensure that the metadata object is built up with the signatures from all keys
passed to ostree_repo_add_gpg_signature_summary(). Previously only the signature
from the last key would end up in the metadata.
Closes: #1488