Use correct VM name for mimetype handling #707
Merged
Conversation
This file contains 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
We've observed inconsistent symlinking based on "grains.id", which resolve to the VM hostname in all cases. Let's instead call out to `qubesdb-read /name`, which sidesteps all Salt machinery, and polls for the VM name via the configuration API.
sssoleileraaa
approved these changes
Jun 9, 2021
conorsch
pushed a commit
that referenced
this pull request
Jun 9, 2021
Follow up to #707. Make sure we're using vm_name everywhere.
Merged
conorsch
pushed a commit
to freedomofpress/securedrop-yum-prod
that referenced
this pull request
Jun 9, 2021
Includes changes from: * freedomofpress/securedrop-workstation#707 * freedomofpress/securedrop-workstation#708 Signed with the old/current key, i.e. 22245C81E3BAEB4138B36061310F561200F4AD77
4 tasks
conorsch
pushed a commit
to freedomofpress/securedrop-yum-prod
that referenced
this pull request
Jun 9, 2021
Includes changes from: * freedomofpress/securedrop-workstation#707 * freedomofpress/securedrop-workstation#708 Signed with the old/current key, i.e. 22245C81E3BAEB4138B36061310F561200F4AD77
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
Intended to address #705.
We've observed inconsistent symlinking based on "grains.id", which resolve to the VM hostname in all cases. Let's instead call out to
qubesdb-read /name, which sidesteps all Salt machinery, and polls for the VM name via the configuration API.Testing
ln -sf /opt/sdw/mimeapps.list.sd-default ~/.local/share/applications/mimeapps.listinsidesd-viewerto break it. You should confirm inside SecureDrop Client that DispVMs fail to open submissions.make cloneto fetch these changes into dom0sudo dnf reinstall <rpm>sdw-admin --applyto do a full state run.