-
Notifications
You must be signed in to change notification settings - Fork 46
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
Remove v2 onion service support; fix Whonix repo list filename #694
Conversation
@@ -1,8 +1,8 @@ | |||
{ | |||
"submission_key_fpr": "65A1B5FF195B56353CC63DFFCC40EF1228271441", | |||
"hidserv": { | |||
"hostname": "avgfxawdn6c3coe3.onion", | |||
"key": "Il8Xas7uf6rjtc0LxYwhrx" | |||
"hostname": "sdolvtfhatvsysc6l34d65ymdwxcujausv7k5jk4cy5ttzhjoi6fzvyd.onion", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
securedrop.org website onion service
"hostname": "avgfxawdn6c3coe3.onion", | ||
"key": "Il8Xas7uf6rjtc0LxYwhrx" | ||
"hostname": "sdolvtfhatvsysc6l34d65ymdwxcujausv7k5jk4cy5ttzhjoi6fzvyd.onion", | ||
"key": "5U4JPYSZ34N2ZDSOUAL2YLEX2NPI5BLL2Y66QJW24KLSH7R3FEPQ" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
randomly generated key in base32
) | ||
raise |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
class SD_Whonix_Tests(SD_VM_Local_Test): | ||
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" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's what fixes #693
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
Status
Ready for review
Description of Changes
Fixes #692
Fixes #693
Testing
Estimated testing time: 30-60 minutes
make clone
this branch intodom0
andsudo dnf reinstall
(ormake staging
if you don't have a previously provisioned environment) the freshly built RPM fromrpm-build/RPMS/noarch
./usr/share/securedrop-workstation-dom0-config/config.json
with a v2 config (contents ofconfig.json.example
in currentmain
should do) and runsdw-admin --apply
hostname
andkey
options (e.g., random characters), and re-runsdw-admin --apply
sdw-admin --validate
(or--apply
if you are patient)config.json
andsd-journalist.sec
are present in yoursecuredrop-workstation
checkout directory indom0
, then runmake test
If you have made changes to the provisioning logic
make test
) pass indom0
of a Qubes install