Skip to content

fix(ssh): prevent tar from overwriting remote home dir permissions (#17767) #17898

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

Merged
teknium1 merged 2 commits into from
Apr 30, 2026
+9 −3
Merged

fix(ssh): prevent tar from overwriting remote home dir permissions (#17767) #17898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f724f17
fix(ssh): prevent tar from overwriting remote home dir permissions
vominh1919 Apr 30, 2026
cee73cc
test(ssh): update tar pipe assertion for --no-overwrite-dir
teknium1 Apr 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions tests/tools/test_ssh_bulk_upload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,12 @@ def capture_popen(cmd, **kwargs):
assert "-" in tar_cmd # stdout
assert "-C" in tar_cmd

# ssh: extract from stdin at /
# ssh: extract from stdin at /, preserving existing dir modes (#17767)
ssh_str = " ".join(ssh_cmd)
assert "ssh" in ssh_str
assert "tar xf - -C /" in ssh_str
assert "tar xf -" in ssh_str
assert "--no-overwrite-dir" in ssh_str
assert "-C /" in ssh_str
assert "testuser@example.com" in ssh_str

def test_mkdir_failure_raises(self, mock_env, tmp_path):
Expand Down
6 changes: 5 additions & 1 deletion tools/environments/ssh.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,11 @@ def _ssh_bulk_upload(self, files: list[tuple[str, str]]) -> None:

tar_cmd = ["tar", "-chf", "-", "-C", staging, "."]
ssh_cmd = self._build_ssh_command()
ssh_cmd.append("tar xf - -C /")
# --no-overwrite-dir prevents tar from overwriting the mode of
# existing directories (e.g. /home/<user>) with the staging
# directory's mode. Without this, a umask 002 produces 0775
# dirs which breaks sshd StrictModes (refuses authorized_keys).
ssh_cmd.append("tar xf - --no-overwrite-dir -C /")

tar_proc = subprocess.Popen(
tar_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE
Expand Down
Loading