Remove v2 onion service support; fix Whonix repo list filename#694
Merged
Conversation
eloquence
commented
May 6, 2021
| "hidserv": { | ||
| "hostname": "avgfxawdn6c3coe3.onion", | ||
| "key": "Il8Xas7uf6rjtc0LxYwhrx" | ||
| "hostname": "sdolvtfhatvsysc6l34d65ymdwxcujausv7k5jk4cy5ttzhjoi6fzvyd.onion", |
Contributor
Author
There was a problem hiding this comment.
securedrop.org website onion service
eloquence
commented
May 6, 2021
| "hostname": "avgfxawdn6c3coe3.onion", | ||
| "key": "Il8Xas7uf6rjtc0LxYwhrx" | ||
| "hostname": "sdolvtfhatvsysc6l34d65ymdwxcujausv7k5jk4cy5ttzhjoi6fzvyd.onion", | ||
| "key": "5U4JPYSZ34N2ZDSOUAL2YLEX2NPI5BLL2Y66QJW24KLSH7R3FEPQ" |
Contributor
Author
There was a problem hiding this comment.
randomly generated key in base32
eloquence
commented
May 6, 2021
| "ERROR: Onion service configuration missing or does not match expected format.\n" | ||
| "Please note that only v3 onion services are supported.\n" | ||
| ) | ||
| raise |
Contributor
Author
There was a problem hiding this comment.
IMO this script shouldn't display tracebacks during expected validation errors, but that's the current pattern. See #683 as well for suggested refactoring of this whole logic.
eloquence
commented
May 6, 2021
| def setUp(self): | ||
| self.vm_name = "sd-whonix" | ||
| self.whonix_apt_list = "/etc/apt/sources.list.d/whonix.list" | ||
| self.whonix_apt_list = "/etc/apt/sources.list.d/derivative.list" |
Contributor
|
Looks great. I found one more place in the tests where updating the repo filepath makes sense: diff --git a/tests/test_proxy_vm.py b/tests/test_proxy_vm.py
index 37e84c8..989c620 100644
--- a/tests/test_proxy_vm.py
+++ b/tests/test_proxy_vm.py
@@ -63,7 +63,9 @@ class SD_Proxy_Tests(SD_VM_Local_Test):
Guard against regressions by ensuring the old Whonix apt list
is missing.
"""
+ # Whonix project changed the repo filename ~2021-05, so check both.
assert not self._fileExists("/etc/apt/sources.list.d/whonix.list")
+ assert not self._fileExists("/etc/apt/sources.list.d/derivative.list")
def test_logging_configured(self):
self.logging_configured()Will amend as part of review. |
420213f to
bc87a69
Compare
conorsch
approved these changes
May 7, 2021
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Status
Ready for review
Description of Changes
Fixes #692
Fixes #693
Testing
Estimated testing time: 30-60 minutes
make clonethis branch intodom0andsudo dnf reinstall(ormake stagingif you don't have a previously provisioned environment) the freshly built RPM fromrpm-build/RPMS/noarch./usr/share/securedrop-workstation-dom0-config/config.jsonwith a v2 config (contents ofconfig.json.examplein currentmainshould do) and runsdw-admin --applyhostnameandkeyoptions (e.g., random characters), and re-runsdw-admin --applysdw-admin --validate(or--applyif you are patient)config.jsonandsd-journalist.secare present in yoursecuredrop-workstationcheckout directory indom0, then runmake testIf you have made changes to the provisioning logic
make test) pass indom0of a Qubes install