github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2026-03-18 11:02:09 +00:00
Code Issues Projects Releases Wiki Activity

perf: Processing gateway password keys

Browse Source
This commit is contained in:
feng
2026-02-03 17:05:10 +08:00
committed by 老广
parent 7473573a00
commit 5c09ce2a2f
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
apps/libs/ansible/modules_utils/custom_common.py
View File

@@ -5,6 +5,11 @@ import paramiko
from sshtunnel import SSHTunnelForwarder
def _strip_wrapping_quotes(value):
if value and len(value) >= 2 and value[0] == value[-1] and value[0] in ("'", '"'):
return value[1:-1]
return value
class OldSSHTransport(paramiko.transport.Transport):
_preferred_pubkeys = (
"ssh-ed25519",
@@ -121,16 +126,17 @@ class SSHClient:
def local_gateway_prepare(self):
gateway_args = self.module.params['gateway_args'] or ''
pattern = r"(?:sshpass -p ([^ ]+))?\s*ssh -o Port=(\d+)\s+-o StrictHostKeyChecking=no\s+([\w@]+)@([" \
r"\d.]+)\s+-W %h:%p -q(?: -i (.+))?'"
pattern = (
r"(?:sshpass -p ([^ ]+))?\s*ssh -o Port=(\d+)\s+-o StrictHostKeyChecking=no\s+"
r"([^@\s]+)@([^\s]+)\s+-W %h:%p -q(?: -i ([^']+))?'"
)
match = re.search(pattern, gateway_args)
if not match:
return
password, port, username, address, private_key_path = match.groups()
password = password if password else None
private_key_path = private_key_path if private_key_path else None
password, port, username, address, key_path = match.groups()
password = _strip_wrapping_quotes(password) or None
key_path = _strip_wrapping_quotes(key_path) or None
remote_hostname = self.module.params['login_host']
remote_port = self.module.params['login_port']
@@ -138,7 +144,7 @@ class SSHClient:
(address, int(port)),
ssh_username=username,
ssh_password=password,
ssh_pkey=private_key_path,
ssh_pkey=key_path,
remote_bind_address=(remote_hostname, remote_port)
)