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

Ensure version of tor installed is from FPF repo #4169

Merged
merged 1 commit into from
Feb 22, 2019

Conversation

emkll
Copy link
Contributor

@emkll emkll commented Feb 21, 2019

Status

Ready for review

Description of Changes

Fixes #4162 .

Because we don't want to couple Tor versions with SecureDrop releases, and that we probably won't go back in Tor versions, specifying >= the current Tor version seems like a sensible approach, given the versions being served in Ubuntu Trusty and Xenial apt repos:

  • 0.2.4.27 (Trusty)
  • 0.2.9.14 (Xenial)

Changes proposed in this pull request:

Testing

  • The test/assertion introduced make sense, we don't want to pin specific tor versions to SecureDrop releases.
  • Using prod VMs or hardware, check out this branch and attempt installing against prod apt servers. This should fail because it will be installing Tor from Ubuntu's repos, as apt-tor.freedom.press was removed.
  • Using prod VMs or hardware, check out this branch and attempt installing against test apt server (apt-test.freedom.press). This should succeed because Tor packages are served by the test apt server.

CI/staging scenarios are not an accurate test as they also include apt-test in their source list (for kernel tests).

Deployment

This change only affects new installs, and will be provided via the Ansible install logic.

Checklist

If you made non-trivial code changes:

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

@emkll emkll changed the title [0.12.0] Ensure version of tor installed is from FPF repo Ensure version of tor installed is from FPF repo Feb 21, 2019
@emkll emkll added this to the 0.12.0 milestone Feb 21, 2019
@redshiftzero
Copy link
Contributor

✅Using prod VMs, check out this branch and attempt installing against prod apt servers. Fails as expected.
✅Using prod VMs, check out this branch and attempt installing against test apt server (apt-test.freedom.press). Succeeds as expected.

Gonna push a wee change to resolve that nit inline...

Ubuntu upstream uses older versions:
- 0.2.4.27 (Trusty)
- 0.2.9.14 (Xenial)
@redshiftzero redshiftzero force-pushed the 4162-validate-tor-version branch from 73115d5 to 2ef9dd1 Compare February 21, 2019 23:08
Copy link
Contributor

@redshiftzero redshiftzero left a comment

Choose a reason for hiding this comment

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

Test plan passed, diff lgtm

Copy link
Contributor

@conorsch conorsch left a comment

Choose a reason for hiding this comment

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

  • The test/assertion introduced make sense, we don't want to pin specific tor versions to SecureDrop releases.
  • Using prod VMs or hardware, check out this branch and attempt installing against prod apt servers. This should fail because it will be installing Tor from Ubuntu's repos, as apt-tor.freedom.press was removed.
  • Using prod VMs or hardware, check out this branch and attempt installing against test apt server (apt-test.freedom.press). This should succeed because Tor packages are served by the test apt server.

@kushaldas kushaldas merged commit 9e855bf into develop Feb 22, 2019
@emkll emkll deleted the 4162-validate-tor-version branch February 22, 2019 14:23
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.

4 participants