github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2026-07-01 22:49:06 +00:00
Code Issues Projects Releases Wiki Activity

fix(accounts): support new gateway proxy layout in ssh ping (#16895)

Browse Source 
Co-authored-by: Crane.z <1481445951@qq.com>
This commit is contained in:
fit2bot
2026-06-08 11:21:48 +08:00
committed by GitHub
parent 978e37e723
commit 2af851af56
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/libs/ansible/modules_utils/remote_client.py
View File

@@ -79,6 +79,15 @@ def _strip_wrapping_quotes(value):
return value
def normalize_gateway_args_for_legacy_parser(gateway_args):
return re.sub(
r'(-W\s+%h:%p\s+-q)\s+--\s+([^@\s]+@[^\'"\s]+)([\'"]?)',
r'\2 \1\3',
gateway_args,
)
class OldSSHTransport(paramiko.transport.Transport):
_preferred_pubkeys = (
"ssh-ed25519",
@@ -268,6 +277,7 @@ class SSHClient:
def local_gateway_prepare(self):
gateway_args = self.module.params['gateway_args'] or ''
gateway_args = normalize_gateway_args_for_legacy_parser(gateway_args)
pattern = (
r"(?:sshpass -p ([^ ]+))?\s*ssh -o Port=(\d+)\s+-o StrictHostKeyChecking=no\s+"
r"([^@\s]+)@([^\s]+)\s+-W %h:%p -q(?: -i ([^']+))?'"