-
Notifications
You must be signed in to change notification settings - Fork 6
Conversation
438c04a
to
fdbd2b5
Compare
Updates the config filepath in the rpc spec. Related PRs: * freedomofpress/securedrop-proxy#79 * freedomofpress/securedrop-builder#198
Updates the RPC file in the code repo, then rebuilds based on new version. See related PR in: freedomofpress/securedrop-proxy#79
Updates the config filepath in the rpc spec. Related PRs: * freedomofpress/securedrop-proxy#79 * freedomofpress/securedrop-builder#198
fdbd2b5
to
6ed71bc
Compare
@@ -1 +1 @@ | |||
/usr/bin/sd-proxy /etc/sd-proxy.yaml | |||
/usr/bin/sd-proxy /home/user/.securedrop_proxy/sd-proxy.yaml |
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.
If I understand correctly, this path will only exist after running the template consolidation logic [1]. if we do not configure both the existing path and the new path here, the proxy will only work in either the non-consolidated or the consolidated template approach. In other words, this proxy change will break existing installs, until the dom0 logic is run again.
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.
In other words, this proxy change will break existing installs, until the dom0 logic is run again.
A critical assumption of the template consolidation plan in freedomofpress/securedrop-workstation#619 is that the SecureDrop Workstation components are updated only via the SDW GUI updater. As long as we accept that limitation, then the new updater logic will ensure that the config file is handled appropriately.
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.
Rebased on latest main
to get CI passing.
This PR is now "ready for review". I'm still leaving it in draft state, however, in order to block merge. As @emkll pointed out above, merging by itself without also merging the other template-consolidation PRs would cause the nightly builds to ship breaking changes. |
Updates the RPC file in the code repo, then rebuilds based on new version. See related PR in: freedomofpress/securedrop-proxy#79
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.
Changes here look good to me.
After building a local package on this branch and comparing to the one on apt-test, observed some differences since this PR was rebased on top of #76 and at the time the package was merged to the apt-test server in https://github.com/freedomofpress/securedrop-dev-packages-lfs/pull/65/files .
We will need to either:
- Update the package on apt-test with these dependencies updated, in order to test pip / requests changes in dev/staging environments
- Build a new package for prod due to the updates to pip and requests, without testing these changes
Option 1 seems best to me, happy to build/upload the package if you agree @conorsch
Good call! I'll rebuild and re-upload for your review. I won't change versions, since the "template-consolidation" channel already uses a bumped version for priority. |
Incorporated newer build dependencies, see discussion in freedomofpress/securedrop-proxy#79 (review)
Rebuilt and submitted new package: freedomofpress/securedrop-apt-test#68 |
The Qubes RPC file hardcodes the filepath to the YAML config file, which contains site-specific information such as the Onion URL for the Journalist Interface. As part of template consolidation [0], we're moving the config file out of the system/root partition and into the private (i.e. /home/) volume, so that the `sd-proxy` AppVM has the config information it needs while sharing a TemplateVM with other components. [0] https://github.com/freedomofpress/securedrop-workstation#471
Removed the version changes, since we'll follow up with changelog additions prior to release. Diff was diff of removed files
Ready for final review. |
6ed71bc
to
85e3241
Compare
Updates the RPC file in the code repo, then rebuilds based on new version. See related PR in: freedomofpress/securedrop-proxy#79
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.
Changes look good to me here, and ci is passing. We will have to independently open a PR to bump versions and changelog in preparation for release, however nighlies should cover the dev/staging envs in the interim
The Qubes RPC file hardcodes the filepath to the YAML config file, which contains site-specific information such as the Onion URL for the Journalist Interface. As part of template consolidation [0], we're moving the config file out of the system/root partition and into the private (i.e. /home/) volume, so that the
sd-proxy
AppVM has the config information it needs while sharing a TemplateVM with other components.[0] freedomofpress/securedrop-workstation#471
Closes #147.
Testing
A new package has been built based on this change and uploaded to apt-test via freedomofpress/securedrop-apt-test#65. You can check out the Workstation branch for freedomofpress/securedrop-workstation#619 to evaluate how the new package operates in tandem with the modified salt logic to ensure that the proxy config exists only in the private volume for
sd-proxy
.