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

Don't import source pubkeys we already have #749

Merged
merged 1 commit into from
Jan 30, 2020
Merged

Conversation

rmol
Copy link
Contributor

@rmol rmol commented Jan 29, 2020

Description

This improves MetadataSyncJob to only import source keys we don't yet have.

Fixes #735.

Test Plan

  • Start a SecureDrop development server with make dev
  • Start the client with LOGLEVEL=debug ./run.sh and log in.
  • Tail $SDC_HOME/logs/client.log. You should see lines like:
    Importing key with fingerprint 35A20B41C773755691BFF27110776C0CDBECCC6F
  • Wait a minute for the next metadata sync. Now in the logs you should see that we're not importing the keys we just imported:
    Skipping import of key with fingerprint 35A20B41C773755691BFF27110776C0CDBECCC6F

Checklist

If these changes modify code paths involving cryptography, the opening of files in VMs or network (via the RPC service) traffic, Qubes testing in the staging environment is required. For fine tuning of the graphical user interface, testing in any environment in Qubes is required. Please check as applicable:

  • [] I have tested these changes in the appropriate Qubes environment
  • I do not have an appropriate Qubes OS workstation set up (the reviewer will need to test these changes)
  • These changes should not need testing in Qubes

If these changes add or remove files other than client code, packaging logic (e.g., the AppArmor profile) may need to be updated. Please check as applicable:

  • I have submitted a separate PR to the packaging repo
  • No update to the packaging logic (e.g., AppArmor profile) is required for these changes
  • I don't know and would appreciate guidance

This improves MetadataSyncJob to only import source keys we don't yet
have.
Copy link
Contributor

@sssoleileraaa sssoleileraaa left a comment

Choose a reason for hiding this comment

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

lgtm! and test plan works as described!

@sssoleileraaa sssoleileraaa merged commit d123525 into master Jan 30, 2020
@sssoleileraaa sssoleileraaa deleted the skip-gpg-import branch January 30, 2020 02:56
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.

Do not re-import keys for sources that already have them
2 participants