From 2a42e888c3e12926e11a9a4308529fb9f1ca8b89 Mon Sep 17 00:00:00 2001 From: Joshua Tauberer Date: Sat, 23 Mar 2024 09:00:36 -0400 Subject: [PATCH] tweaks to reading ssh config --- management/dns_update.py | 5 +++-- management/utils.py | 13 ++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/management/dns_update.py b/management/dns_update.py index eb2e6722..599f27b1 100755 --- a/management/dns_update.py +++ b/management/dns_update.py @@ -449,9 +449,10 @@ def build_sshfp_records(): # specify that port to sshkeyscan. port = get_ssh_port() - # If nothing returned, assume default + + # If nothing returned, SSH is probably not installed. if not port: - port = 22 + return keys = shell("check_output", ["ssh-keyscan", "-4", "-t", "rsa,dsa,ecdsa,ed25519", "-p", str(port), "localhost"]) keys = sorted(keys.split("\n")) diff --git a/management/utils.py b/management/utils.py index fcdece13..397f124d 100644 --- a/management/utils.py +++ b/management/utils.py @@ -181,7 +181,7 @@ def wait_for_service(port, public, env, timeout): def get_ssh_port(): port_value = get_ssh_config_value("port") - + if port_value: return int(port_value) @@ -198,12 +198,11 @@ def get_ssh_config_value(parameter_name): # error while calling shell command return None - returnNext = False - for e in output.split(): - if returnNext: - return e - if e == parameter_name: - returnNext = True + for line in output.split("\n"): + if " " not in line: continue # there's a blank line at the end + key, values = line.split(" ", 1) + if key == parameter_name: + return values # space-delimited if there are multiple values # Did not find the parameter! return None