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

Added -u flag to tmux invocations, to force the use of UTF-8 for CLI QR codes #5844

Merged
merged 2 commits into from
Mar 4, 2021

Conversation

zenmonkeykstop
Copy link
Contributor

@zenmonkeykstop zenmonkeykstop commented Mar 3, 2021

Status

Ready for review

Description of Changes

Fixes #5841

Adds the -u flag to tmux invocations in /etc/profile.d/securedrop_additions.sh - this is required for qr codes to render properly from manage.py.

Testing

on a production (1.8.0-rc1 currently) Focal system:

  • log into the application server via ssh app in an Admin Workstation
  • as the www-data user, in /var/www/securedrop, run ./manage.py add-admin and confirm that the qr code is rendered as a black square.
  • log out from the application server. check out this branch, and copy the file ~/Persistent/securedrop/install_files/securedrop-config-focal/etc/profile.d/securedrop_additions.sh to the application server
  • log back into the application server, and overwrite /etc/profile.d/securedrop_additions.sh with the file you just copied, preserving the originals permissions and ownership
  • log out of the application server and log back in again with ssh app
  • as the www-data user, in /var/www/securedrop, run ./manage.py add-admin and confirm that the qr code is rendered correctly.

Deployment

This is deployed in the securedrop-config package, and should be focal-only.

Checklist

If you made non-trivial code changes:

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

@eloquence eloquence added this to the 1.8.0 milestone Mar 3, 2021
@emkll emkll self-assigned this Mar 3, 2021
emkll
emkll previously approved these changes Mar 3, 2021
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 @zenmonkeykstop those changes resolve the issue for me, good to merge when CI passes.

@emkll emkll merged commit 5bf2d3e into develop Mar 4, 2021
@emkll emkll deleted the 5841-fix-qrcodes branch March 4, 2021 13:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

QR code issued by ./manage.py add-admin is solid black square on Focal
3 participants