yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'clan-cli: Fix too long path for socket issue #3756' (#3757) from Qubasa/clan-core:fix_path_to_long into main

Browse Source 
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3757
This commit is contained in:
Luis Hebendanz
2025-05-25 20:28:46 +00:00
parent 6b5bfb8274 b85aead33c
commit 5cc757f620
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/clan-cli/clan_lib/ssh/remote.py
View File

@@ -126,9 +126,7 @@ class Remote:
"/var/folders/" "/var/folders/"
): ):
directory = "/tmp/" directory = "/tmp/"
# Use more specific prefix for the temp dir to avoid potential collisions if multiple hosts used temp_dir = TemporaryDirectory(prefix="clan-ssh", dir=directory)
prefix = f"clan-ssh-{self.address}-{self.port or 22}-{self.user}-"
temp_dir = TemporaryDirectory(prefix=prefix, dir=directory)
yield Remote( yield Remote(
address=self.address, address=self.address,
user=self.user, user=self.user,
@@ -245,10 +243,7 @@ class Remote:
ssh_opts.extend(["-i", str(self.private_key)]) ssh_opts.extend(["-i", str(self.private_key)])
if effective_control_path_dir: if effective_control_path_dir:
socket_path = ( socket_path = effective_control_path_dir / "socket"
effective_control_path_dir
/ f"clan-{self.address}-{self.port or 22}-{self.user}"
)
ssh_opts.extend(["-o", "ControlPersist=30m"]) ssh_opts.extend(["-o", "ControlPersist=30m"])
ssh_opts.extend(["-o", f"ControlPath={socket_path}"]) ssh_opts.extend(["-o", f"ControlPath={socket_path}"])
ssh_opts.extend(["-o", "ControlMaster=auto"]) ssh_opts.extend(["-o", "ControlMaster=auto"])