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.

Sign up for GitHub

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

Jump to bottom

Try harder to attach to an existing tmux session #4231

Merged
merged 3 commits into from
Mar 14, 2019
Merged

Try harder to attach to an existing tmux session #4231

merged 3 commits into from
Mar 14, 2019

Commits on Mar 13, 2019

  1. Try harder to attach to an existing tmux session 

    If in the course of an ssh/tmux session the tmux package is upgraded
and the ssh connection broken, the next ssh attempt will encounter an
error because of the tmux protocol version mismatch.

The old tmux can be used to reattach by searching for the tmux process
under /proc and using its reference to the old tmux executable. This
change attempts to do that automatically if a first "tmux attach"
attempt fails, but we can see that a previous session still exists.
    @rmol
    rmol committed Mar 13, 2019
    Configuration menu
    Copy the full SHA
    79bc089 View commit details
    Browse the repository at this point in the history

  2. Better documentation and tests 

    Comment the tmux_attach_via_proc function in
securedrop_additions.sh.

Fix version check in builder-trusty/tests/vars.yml.

Fix test_sudoers_config so that it requires explicit content in
securedrop_additions.sh, instead of just checking that the installed
file exactly matches whatever's in the current revision.
    @rmol
    rmol committed Mar 13, 2019
    Configuration menu
    Copy the full SHA
    1e77724 View commit details
    Browse the repository at this point in the history

  3. Add builder tests for securedrop-config 

    At build time, let's ensure:
- no conffiles are present so that files in /etc are properly squashed
- securedrop-config contains the expected files
    @emkll
    emkll committed Mar 13, 2019
    Configuration menu
    Copy the full SHA
    690f0e3 View commit details
    Browse the repository at this point in the history