Skip to content
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

Fix Focal source key deletion #5581

Merged
merged 1 commit into from
Oct 19, 2020
Merged

Conversation

rmol
Copy link
Contributor

@rmol rmol commented Oct 14, 2020

Status

Ready for review

Description of Changes

Fixes #5579.

Adds --yes to gnupg options when deleting source keypairs.

This is the smallest fix, but I also experimented with adding --yes to the options of CryptoUtil.gpg and dispensing with the special GPG instance used in delete_keys, and that works too -- on Focal. On Xenial, with gpg 2.1.11, --pinentry-mode loopback still breaks key deletion.

I read through the mailing list thread linked in the comment in delete_keys and I'm not sure it's still relevant as of gpg 2.2.19, which is what we have on Focal.

So when we drop Xenial, we should be able to drop the extra GPG object too.

Testing

Follow STR from #5579. The source keys should be deleted.

Checklist

If you made changes to the server application code:

  • Linting (make lint) and tests (make test) pass in the development container

If you made non-trivial code changes:

  • I have written a test plan and validated it for this PR

@kushaldas
Copy link
Contributor

@rmol because dev_focal needs to totally redone, can you please redo the branch against develop by cherry picking the commit? That should fix the lint error.

@rmol rmol force-pushed the 5579-fix-focal-source-key-deletion branch from 5fde141 to 0ef5f3d Compare October 16, 2020 12:40
@rmol rmol requested review from conorsch and emkll as code owners October 16, 2020 12:40
@rmol rmol changed the base branch from dev_focal to develop October 16, 2020 12:40
@kushaldas kushaldas self-assigned this Oct 19, 2020
Copy link
Contributor

@kushaldas kushaldas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works as expected, all gpg related tests are now passing on the dev_focal branch.

@kushaldas kushaldas merged commit 55df6ab into develop Oct 19, 2020
@kushaldas kushaldas deleted the 5579-fix-focal-source-key-deletion branch October 19, 2020 12:55
@eloquence eloquence added this to the 1.7.0 milestone Jan 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Can not delete source keys in Focal
3 participants