Requirements pinning for app code build #4435

emkll · 2019-05-13T23:42:01Z

Status

Ready for review

Description of Changes

Towards #3270, #1617 : Pin hashes for securedrop-app-code python requirements. Until now, we were blocked by Trusty tooling (see #3477)

This should be a stopgap until we implement a more complete solution that will also offer .deb reproducibility, described in freedomofpress/securedrop-builder#34.

Testing

Test plan:

Changes to the app code build logic make sense
All tests pass when running make build-debs
.deb build successful and application/infra tests pass (CI should pass)
Local upgrade testing is successful
Changing hashes for the source tarballs in securedrop-app-code-requirements.txt should make the build fail.
Modify securedrop-app-code-requirements.txt file for a source tarball should result in build failure.

Since the build process is automated, proper verification requires adding a wait_for: timout=3600s at the end of install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/tasks/build_securedrop_app_code_deb.yml and using diffoscope to look at build wheels in the wheelhouse vs wheels in the deb package

Inside the container, /tmp/w.out contains build information of the wheels (confirm that we actually built the wheels)
Wheels in /tmp/securedrop-app-code_0.13.0~rc1+xenial_amd64/var/securedrop/wheelhouse/ are nearly identical to those in the deb package while using diffoscope, the difference is in the zip files and metadata within.

You can unzip the wheels and diff the folder contents, eg:

$diffoscope cryptography-2.6.1.dist-info/ ../../cryptography-2.6.1.dist-info/
 |#################################################################|  100%                             Time: 0:00:00 
--- cryptography-2.6.1.dist-info/
+++ ../../cryptography-2.6.1.dist-info/
├── stat {}
│ @@ -1,8 +1,8 @@
│  
│    Size: 4096      	Blocks: 8          IO Block: 4096   directory
│  Links: 2
│  Access: (0755/drwxr-xr-x)  Uid: ( 1000/       m)   Gid: ( 1000/       m)
│  
│ -Modify: 2019-05-15 18:59:21.382879799 +0000
│ +Modify: 2019-05-15 18:57:38.587575536 +0000
│  
[...]

and

$ diffoscope cryptography/ ../../cryptography/
 |#################################################################|  100%                             Time: 0:00:03 
--- cryptography/
+++ ../../cryptography/
├── stat {}
│ @@ -1,8 +1,8 @@
│  
│    Size: 4096      	Blocks: 8          IO Block: 4096   directory
│  Links: 4
│  Access: (0755/drwxr-xr-x)  Uid: ( 1000/       m)   Gid: ( 1000/       m)
│  
│ -Modify: 2019-05-15 18:59:21.438879419 +0000
│ +Modify: 2019-05-15 18:57:38.583575562 +0000
│  
│   Birth: -
│   --- cryptography/__about__.py
├── +++ ../../cryptography/__about__.py
├── stat {}
│ │ @@ -1,8 +1,8 @@
│ │  
│ │    Size: 816       	Blocks: 8          IO Block: 4096   regular file
│ │  Links: 1
│ │  Access: (0644/-rw-r--r--)  Uid: ( 1000/       m)   Gid: ( 1000/       m)
│ │  
│ │ -Modify: 2019-02-27 16:02:06.000000000 +0000
│ │ +Modify: 2019-02-28 04:27:52.000000000 +0000
│ │  
│ │   Birth: -
│   --- cryptography/__init__.py
├── +++ ../../cryptography/__init__.py
├── stat {}
│ │ @@ -1,8 +1,8 @@
│ │  
│ │    Size: 527       	Blocks: 8          IO Block: 4096   regular file
│ │  Links: 1
│ │  Access: (0644/-rw-r--r--)  Uid: ( 1000/       m)   Gid: ( 1000/       m)
│ │  
│ │ -Modify: 2019-02-27 16:02:06.000000000 +0000
│ │ +Modify: 2019-02-28 04:27:52.000000000 +0000
│ │

Deployment

Mostly a dev/build environment change, but all changes to prod instances will be delivered via the securedrop-app-code package.

Checklist

If you made changes to the server application code:

If you made non-trivial code changes:

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

securedrop/requirements/securedrop-app-code-requirements.txt

emkll · 2019-05-15T22:22:07Z

This should be ready for re-review, I've updated the test plan and all tests pass locally.

redshiftzero · 2019-05-15T22:52:20Z

my testing thus far:

Changes to the app code build logic make sense
All tests pass when running make build-debs - yes modulo known issue test_deb_package_contains_expected_conffiles fails on macOS #4191
.deb build successful and application/infra tests pass (CI should pass) - waiting on CI
Local upgrade testing is successful - not doing, @conorsch kicking this off
Changing hashes for the source tarballs in securedrop-app-code-requirements.txt should make the build fail:

    TASK [build-securedrop-app-code-deb-pkg : Ensure source hash sums matched at wheel build-time] ***
    fatal: [xenial-sd-app]: FAILED! => {"changed": false, "failed_when_result": true, "msg": "Source hash sum mismatch, build cannot continue."}

Inside the container, /tmp/w.out contains build information of the wheels (confirm that we actually built the wheels)
Wheels in /tmp/securedrop-app-code_0.13.0~rc1+xenial_amd64/var/securedrop/wheelhouse/ are nearly identical to those in the deb package while using diffoscope, the difference is in the zip files and metadata within.

redshiftzero · 2019-05-15T22:54:17Z

staging build failure due to too long with no output, gonna restart once..

redshiftzero · 2019-05-15T23:33:34Z

this time another timeout but later in the provisioning process:

    RUNNING HANDLER [common : Wait for server to come back.] ***********************
    ok: [mon-staging -> localhost]
    fatal: [app-staging -> localhost]: FAILED! => {"changed": false, "elapsed": 300, "msg": "Timeout when waiting for search string OpenSSH in 192.168.121.127:22"}

conorsch · 2019-05-16T00:58:46Z

Local upgrade testing is successful

Performed interactive testing post-upgrade, including:

submitting documents and messages
replying to submissions
viewing replies via source account

LGTM. We're blocked here by recurring CI failures, opened #4440 to track.

Use no-binary and require hashes option at wheel build time, and generate new requirements file (without hashes) for securedrop-app-code deb package. This is because dpkg-buildpackage modifies the zip data of the built wheel files, making it difficult to require hashes at install-time server-side. The deb package is signed and as such would be difficult to tamper with wheel contents in transit

emkll · 2019-05-16T14:19:27Z

rebased on latest develop

redshiftzero

based on testing performed yesterday, approving for merge provided the staging CI job passes

emkll · 2019-05-16T15:03:41Z

@redshiftzero apologies, this will need another stamp: I had to force push another change to resolve lint failure: the develop-requirements were using bandit 1.6.0, i reverted to 1.4.0 (see #4424) .

This will make the build process marginally faster and provide better integrity

Adds python-wheel and latest security patches

Before, build would fail due to absence of wheels in the /var/securedrop/wheelhouse, at a later step.

emkll · 2019-05-16T16:36:15Z

Due to some issues with linting in ci [1,2], I've dropped the commits that would contain the develop-requirements hashes. Let's open a follow-up task to track this to unblock merge of the app code requirements hashes.

[1] : https://circleci.com/gh/freedomofpress/securedrop/27948
[2] : https://circleci.com/gh/freedomofpress/securedrop/27927

redshiftzero

re-approving after removing the dev requirements

emkll requested review from conorsch, heartsucker, kushaldas, msheiny, redshiftzero and zenmonkeykstop as code owners May 13, 2019 23:42

redshiftzero added this to the 0.13.0 milestone May 13, 2019

redshiftzero mentioned this pull request May 13, 2019

Ensure python tooling requires hashes, bump builders trusty->xenial #3477

Closed

redshiftzero reviewed May 13, 2019

View reviewed changes

securedrop/requirements/securedrop-app-code-requirements.txt Show resolved Hide resolved

conorsch added the PR: Pending additional work label May 14, 2019

emkll force-pushed the pin-hashes branch from b7b748a to f988710 Compare May 15, 2019 18:47

emkll removed the PR: Pending additional work label May 15, 2019

emkll requested a review from redshiftzero May 15, 2019 22:24

conorsch mentioned this pull request May 16, 2019

CI staging runs are timing out while waiting for VM reboot #4440

Closed

emkll added 2 commits May 16, 2019 10:04

Require hashes in admin Dockerfile

78cfd00

emkll force-pushed the pin-hashes branch from 75dfbd3 to e82534c Compare May 16, 2019 14:17

redshiftzero previously approved these changes May 16, 2019

View reviewed changes

emkll dismissed redshiftzero’s stale review via 27e3fab May 16, 2019 15:01

emkll force-pushed the pin-hashes branch from e82534c to 27e3fab Compare May 16, 2019 15:01

emkll force-pushed the pin-hashes branch from 36b112c to dfea06d Compare May 16, 2019 16:07

Use system package for python-wheel

3936aec

This will make the build process marginally faster and provide better integrity

emkll added 2 commits May 16, 2019 12:32

Update builder image

6cf4392

Adds python-wheel and latest security patches

Fail explicitly on hash mismatch at build-time

bd2f1cb

Before, build would fail due to absence of wheels in the /var/securedrop/wheelhouse, at a later step.

emkll force-pushed the pin-hashes branch from dfea06d to bd2f1cb Compare May 16, 2019 16:33

redshiftzero approved these changes May 16, 2019

View reviewed changes

eloquence changed the title ~~Requirements pinning for app code build and install~~ Requirements pinning for app code build May 16, 2019

emkll mentioned this pull request May 16, 2019

[0.13.0] Backport 4435 to 0.13.0 #4443

Merged

2 tasks

zenmonkeykstop merged commit 7394fd5 into develop May 16, 2019

redshiftzero deleted the pin-hashes branch June 25, 2019 23:08

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Requirements pinning for app code build #4435

Requirements pinning for app code build #4435

emkll commented May 13, 2019 •

edited

Loading

emkll commented May 15, 2019

redshiftzero commented May 15, 2019 •

edited

Loading

redshiftzero commented May 15, 2019

redshiftzero commented May 15, 2019

conorsch commented May 16, 2019

emkll commented May 16, 2019

redshiftzero left a comment

emkll commented May 16, 2019

emkll commented May 16, 2019 •

edited

Loading

redshiftzero left a comment

Requirements pinning for app code build #4435

Requirements pinning for app code build #4435

Conversation

emkll commented May 13, 2019 • edited Loading

Status

Description of Changes

Testing

Deployment

Checklist

If you made changes to the server application code:

If you made non-trivial code changes:

emkll commented May 15, 2019

redshiftzero commented May 15, 2019 • edited Loading

redshiftzero commented May 15, 2019

redshiftzero commented May 15, 2019

conorsch commented May 16, 2019

emkll commented May 16, 2019

redshiftzero left a comment

Choose a reason for hiding this comment

emkll commented May 16, 2019

emkll commented May 16, 2019 • edited Loading

redshiftzero left a comment

Choose a reason for hiding this comment

emkll commented May 13, 2019 •

edited

Loading

redshiftzero commented May 15, 2019 •

edited

Loading

emkll commented May 16, 2019 •

edited

Loading