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

Adds new workstation template with keyring package #15

Merged
merged 3 commits into from
Jul 7, 2020

Conversation

conorsch
Copy link
Contributor

@conorsch conorsch commented Jul 7, 2020

Name of package: qubes-template-securedrop-workstation

Rebuilds the template with securedrop-keyring package preinstalled.

Test plan

Build process

VM sanity check

I have not yet performed these simple tests to verify VM functionality, please do so as part of review:

  • Template installs successfully in dom0
  • Set VM to HVM and kernel to ''
  • Template boots in grsecurity kernel
  • apt-key finger shows the release key in its own keyring
  • the old key is not present
  • securedrop-keyring package is installed
  • sudo echo hello does not prompt for sudo password

See freedomofpress/qubes-template-securedrop-workstation#12 for reference

@emkll emkll marked this pull request as ready for review July 7, 2020 13:18
Copy link
Contributor

@emkll emkll left a comment

Choose a reason for hiding this comment

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

Thanks @conorsch test plan (other than signing of the RPM which you have committed, which is unsigned) looks good to me, tested the template locally. I have pushed a commit that signs the RPM with the test key by running the following command:
rpm --resign qubes-template-securedrop-workstation-buster-4.0.1-202007062239.noarch.rpm

CI is now passing, but one can check manually if the rpm is signed:

$ rpm -qpi qubes-template-securedrop-workstation-buster-4.0.1-202007062239.noarch.rpm
Name        : qubes-template-securedrop-workstation-buster
Version     : 4.0.1
Release     : 202007062239
Architecture: noarch
Install Date: (not installed)
Group       : Unspecified
Size        : 3788902608
License     : GPL
Signature   : RSA/SHA512, Tue 07 Jul 2020 08:16:11 AM EDT, Key ID 4a3be4a92211b03c
Source RPM  : qubes-template-securedrop-workstation-buster-4.0.1-202007062239.src.rpm
Build Date  : Mon 06 Jul 2020 06:45:49 PM EDT
Build Host  : localhost
Relocations : (not relocatable)
URL         : http://www.qubes-os.org
Summary     : Qubes template for securedrop-workstation-buster
Description :
Qubes template for securedrop-workstation-buster

Approving since CI is passing, but before merging, one can verify that removing the signature matched the initial RPM committed to this branch (using rpm --delsign qubes-template-securedrop-workstation-buster-4.0.1-202007062239.noarch.rpm)

Given the size of the RPMs (800+ MB), what do you think of deleting the old templates? They should be preserved in GitLFS history

@conorsch
Copy link
Contributor Author

conorsch commented Jul 7, 2020

Thanks for the assist, @emkll, I'll verify the --delsign behavior locally.

Given the size of the RPMs (800+ MB), what do you think of deleting the old templates?

Also wise. I'll snip out all but the current and one previous version, so a total of two.

Preserving 2 recent template RPMs, for a modicum of rollback capability.
Practically speaking, the older template that's preserved here isn't
functional, given that it contains an expired apt pubkey, but we'll soon
by updating the template again with new kernels, so the pragma of 2
template RPMs is useful to enforce now.
@conorsch
Copy link
Contributor Author

conorsch commented Jul 7, 2020

Confirmed, running --delsign on the new RPM shows the expected checksum from the build logs. CI is passing given the test sig, so merging.

@conorsch conorsch merged commit 9b1ff1e into master Jul 7, 2020
@conorsch
Copy link
Contributor Author

conorsch commented Jul 7, 2020

Template is live in testing: https://yum-test.securedrop.org/workstation/dom0/f25/

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.

2 participants