Handle duplicate keys on GPG key ring (#17242) #17284
Merged
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
Backport go-gitea#17242 It is possible that a keyring can contain duplicate keys on a keyring due to jpegs or other layers. This currently leads to a confusing error for the user - where we report a duplicate key insertion. This PR simply coalesces keys into one key if there are duplicates. Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: 6543 <6543@obermui.de>
techknowlogick
approved these changes
Oct 10, 2021
GiteaBot
added
the
lgtm/need 1
lafriks
approved these changes
Oct 11, 2021
GiteaBot
added
lgtm/done
zeripath
added a commit
to zeripath/gitea
that referenced
this pull request
Oct 21, 2021
* SECURITY * Upgrade Bluemonday to v1.0.16 (go-gitea#17372) (go-gitea#17374) * Ensure correct SSH permissions check for private and restricted users (go-gitea#17370) (go-gitea#17373) * BUGFIXES * Prevent NPE in CSV diff rendering when column removed (go-gitea#17018) (go-gitea#17377) * Offer rsa-sha2-512 and rsa-sha2-256 algorithms in internal SSH (go-gitea#17281) (go-gitea#17376) * Don't panic if we fail to parse U2FRegistration data (go-gitea#17304) (go-gitea#17371) * Ensure popup text is aligned left (backport for 1.15) (go-gitea#17343) * Ensure that git daemon export ok is created for mirrors (go-gitea#17243) (go-gitea#17306) * Disable core.protectNTFS (go-gitea#17300) (go-gitea#17302) * Use pointer for wrappedConn methods (go-gitea#17295) (go-gitea#17296) * AutoRegistration is supposed to be working with disabled registration (backport) (go-gitea#17292) * Handle duplicate keys on GPG key ring (go-gitea#17242) (go-gitea#17284) * Fix SVG side by side comparison link (go-gitea#17375) (go-gitea#17391) Signed-off-by: Andrew Thornton <art27@cantab.net>
Merged
6543
pushed a commit
that referenced
this pull request
Oct 21, 2021
* SECURITY * Upgrade Bluemonday to v1.0.16 (#17372) (#17374) * Ensure correct SSH permissions check for private and restricted users (#17370) (#17373) * BUGFIXES * Prevent NPE in CSV diff rendering when column removed (#17018) (#17377) * Offer rsa-sha2-512 and rsa-sha2-256 algorithms in internal SSH (#17281) (#17376) * Don't panic if we fail to parse U2FRegistration data (#17304) (#17371) * Ensure popup text is aligned left (backport for 1.15) (#17343) * Ensure that git daemon export ok is created for mirrors (#17243) (#17306) * Disable core.protectNTFS (#17300) (#17302) * Use pointer for wrappedConn methods (#17295) (#17296) * AutoRegistration is supposed to be working with disabled registration (backport) (#17292) * Handle duplicate keys on GPG key ring (#17242) (#17284) * Fix SVG side by side comparison link (#17375) (#17391) Signed-off-by: Andrew Thornton <art27@cantab.net>
zeripath
added a commit
to zeripath/gitea
that referenced
this pull request
Oct 22, 2021
Frontport go-gitea#17392 * SECURITY * Upgrade Bluemonday to v1.0.16 (go-gitea#17372) (go-gitea#17374) * Ensure correct SSH permissions check for private and restricted users (go-gitea#17370) (go-gitea#17373) * BUGFIXES * Prevent NPE in CSV diff rendering when column removed (go-gitea#17018) (go-gitea#17377) * Offer rsa-sha2-512 and rsa-sha2-256 algorithms in internal SSH (go-gitea#17281) (go-gitea#17376) * Don't panic if we fail to parse U2FRegistration data (go-gitea#17304) (go-gitea#17371) * Ensure popup text is aligned left (backport for 1.15) (go-gitea#17343) * Ensure that git daemon export ok is created for mirrors (go-gitea#17243) (go-gitea#17306) * Disable core.protectNTFS (go-gitea#17300) (go-gitea#17302) * Use pointer for wrappedConn methods (go-gitea#17295) (go-gitea#17296) * AutoRegistration is supposed to be working with disabled registration (backport) (go-gitea#17292) * Handle duplicate keys on GPG key ring (go-gitea#17242) (go-gitea#17284) * Fix SVG side by side comparison link (go-gitea#17375) (go-gitea#17391) Signed-off-by: Andrew Thornton <art27@cantab.net>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Backport #17242
It is possible that a keyring can contain duplicate keys on a keyring due to jpegs or
other layers. This currently leads to a confusing error for the user - where we report
a duplicate key insertion.
This PR simply coalesces keys into one key if there are duplicates.
Signed-off-by: Andrew Thornton art27@cantab.net
Co-authored-by: 6543 6543@obermui.de