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

Add securedrop-keyring package #171

Merged
merged 5 commits into from
Jun 5, 2020
Merged

Conversation

emkll
Copy link
Contributor

@emkll emkll commented May 28, 2020

Provides a securedrop-keyring package for use in all securedrop-workstation TemplateVMs/AppVMs:

  1. Create a keyring package containing the Release key for production apt servers
  2. Adds as dependencies to securedrop-config to automatically add at build-time for qubes template VMs. whonix-gw-15 will not have the securedrop-config package installed.
  3. Bumps securedrop--config to 0.1.3
  4. The keyring package will remove the key from the default salt-provisioned location (/etc/apt/trusted.gpg)

see associated core PR [1]
see securedrop-workstation PR [2]

Test Plan

  • Package builds successfully
  • make test and test plan in [2] is completed successfully.

[1] freedomofpress/securedrop#5277
[2] https://github.com/freedomofpress/securedrop-workstation/pull/563/files

emkll added 3 commits May 22, 2020 11:06
Now expires on 2021-06-30
This will provide the ability to ship updates to the securedrop release key. Also includes the latest GPG public key expiring on 30 June 2020
@conorsch
Copy link
Contributor

conorsch commented Jun 2, 2020

The approach here is sound, looks ready for final review to my eye, @emkll.

Should we provide nightlies for the securedrop-keyring package, given its infrequent update

I'd suggest we not build nightlies for the keyring backup, but let's call out in standup and see if anyone can disagrees.

emkll added 2 commits June 3, 2020 17:13
…ation-config package

This will ensure the package is automatically installed in the SecureDrop Qubes Template
Use /etc/apt/trusted.gpg.d/securedrop-keyring.gpg, provided by the securedrop-keyring package.
@emkll emkll force-pushed the 438-securedrop-keyring branch from 4045e64 to a4f12d4 Compare June 3, 2020 21:14
@emkll emkll marked this pull request as ready for review June 3, 2020 22:00
@zenmonkeykstop zenmonkeykstop self-assigned this Jun 5, 2020
Copy link
Contributor

@zenmonkeykstop zenmonkeykstop left a comment

Choose a reason for hiding this comment

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

  • Package builds successfully
  • make test and related securedrop-workstation test plan is completed successfully.

LGTM

@zenmonkeykstop zenmonkeykstop merged commit 9904cd7 into master Jun 5, 2020
@emkll emkll deleted the 438-securedrop-keyring branch July 23, 2020 14:57
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.

3 participants