external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-03 00:07:05 +00:00
Code Issues Releases Wiki Activity

tweaks to reading ssh config

Browse Source
This commit is contained in:
Joshua Tauberer 2024-03-23 09:00:36 -04:00
parent bdda55413c
commit 2a42e888c3
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
management/dns_update.py
View File

@ -449,9 +449,10 @@ def build_sshfp_records():
# specify that port to sshkeyscan. # specify that port to sshkeyscan.
port = get_ssh_port() port = get_ssh_port()
# If nothing returned, assume default
# If nothing returned, SSH is probably not installed.
if not port: if not port:
port = 22 return
keys = shell("check_output", ["ssh-keyscan", "-4", "-t", "rsa,dsa,ecdsa,ed25519", "-p", str(port), "localhost"]) keys = shell("check_output", ["ssh-keyscan", "-4", "-t", "rsa,dsa,ecdsa,ed25519", "-p", str(port), "localhost"])
keys = sorted(keys.split("\n")) keys = sorted(keys.split("\n"))

13
management/utils.py
View File

@ -181,7 +181,7 @@ def wait_for_service(port, public, env, timeout):
def get_ssh_port(): def get_ssh_port():
port_value = get_ssh_config_value("port") port_value = get_ssh_config_value("port")
if port_value: if port_value:
return int(port_value) return int(port_value)
@ -198,12 +198,11 @@ def get_ssh_config_value(parameter_name):
# error while calling shell command # error while calling shell command
return None return None
returnNext = False for line in output.split("\n"):
for e in output.split(): if " " not in line: continue # there's a blank line at the end
if returnNext: key, values = line.split(" ", 1)
return e if key == parameter_name:
if e == parameter_name: return values # space-delimited if there are multiple values
returnNext = True
# Did not find the parameter! # Did not find the parameter!
return None return None