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

Fixes #4627 Adds v2 and v3 onion service variables #4648

Merged
merged 1 commit into from
Jul 30, 2019
Merged

Conversation

kushaldas
Copy link
Contributor

Status

Ready for review

Description of Changes

Fixes #4627

Adds the two new variables on the site-specific file, these variables
will be used in the future code changes.
Also adds 3 test cases for the same.

Testing

cd admin
make test

Deployment

Any special considerations for deployment? Consider both:

  1. Upgrading existing production instances.
  2. New installs.

Checklist

If you made changes to the server application code:

  • Linting (make lint) and tests (make -C securedrop test) pass in the development container

If you made changes to securedrop-admin:

  • Linting and tests (make -C admin test) pass in the admin development container

If you made changes to the system configuration:

If you made non-trivial code changes:

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

If you made changes to documentation:

  • Doc linting (make docs-lint) passed locally

Also adds 3 test cases for the same.
@codecov-io
Copy link

Codecov Report

Merging #4648 into develop will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##           develop    #4648   +/-   ##
========================================
  Coverage    82.72%   82.72%           
========================================
  Files           45       45           
  Lines         3120     3120           
  Branches       337      337           
========================================
  Hits          2581     2581           
  Misses         453      453           
  Partials        86       86

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 37347bb...f795092. Read the comment docs.

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 @kushaldas LGTM. Local testing in a Tails VM confirms the behavior is as described in #4627 :

  • if there's an app-source-ths with a v2 onion url, v2_onion_services and v3_onion_services are True.
  • if there's an app-source-ths with a v3 onion url, v2_onion_services is False and v3_onion_services is set to True.
  • No app-source-ths results in v2_onion_services is False and v3_onion_services is set to True

@emkll emkll merged commit 5eaad3b into develop Jul 30, 2019
@emkll emkll deleted the the_future_is_v3 branch July 30, 2019 15:10
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.

[v3 onion migration] securedrop-admin sdconfig should set v2_onion_services and v3_onion_services variables
3 participants