From 0b161b76dac289f4b7100916bac27961aed88120 Mon Sep 17 00:00:00 2001
From: Timo Weingärtner <timo@tiwe.de>
Date: Mon, 19 Jul 2021 13:24:53 +0200
Subject: make config variables readonly

---
 update-openssh-known-hosts | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'update-openssh-known-hosts')

diff --git a/update-openssh-known-hosts b/update-openssh-known-hosts
index 6d72663..ef897aa 100755
--- a/update-openssh-known-hosts
+++ b/update-openssh-known-hosts
@@ -25,6 +25,8 @@ CACHEDIR=${CACHEDIR:-/var/cache/openssh-known-hosts}
 LOCK=${LOCK:-/var/lock/openssh-known-hosts}
 OUTFILE=${OUTFILE:-/var/lib/openssh-known-hosts/ssh_known_hosts}
 
+readonly CONFDIR PLUGIN_PATH CACHEDIR LOCK OUTFILE
+
 path_search () {
 	search="$1"
 	shift
-- 
cgit v1.2.3


From 265011411069c0c26dd693f714a43a6c7e6ad9ea Mon Sep 17 00:00:00 2001
From: Timo Weingärtner <timo@tiwe.de>
Date: Mon, 19 Jul 2021 13:33:32 +0200
Subject: use bash arrays in path_search()

---
 update-openssh-known-hosts | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'update-openssh-known-hosts')

diff --git a/update-openssh-known-hosts b/update-openssh-known-hosts
index ef897aa..c8f7e39 100755
--- a/update-openssh-known-hosts
+++ b/update-openssh-known-hosts
@@ -28,22 +28,21 @@ OUTFILE=${OUTFILE:-/var/lib/openssh-known-hosts/ssh_known_hosts}
 readonly CONFDIR PLUGIN_PATH CACHEDIR LOCK OUTFILE
 
 path_search () {
-	search="$1"
-	shift
-	local IFS
-	IFS=:
-	set -- $@
+	local search=$1
+	local -a pathlist
+	IFS=: read -ra pathlist <<< "$2"
+
 	if [[ ${search} =~ / ]]; then
 		echo "${search}"
 		return 0
 	fi
-	for path; do
+	for path in "${pathlist[@]}"; do
 		if [ -f "${path}/${search}" ]; then
 			echo "${path}/${search}"
 			return 0
 		fi
 	done
-	echo "'${search}' not found in '$*'!" >&2
+	echo "'${search}' not found in '$2'!" >&2
 	exit 127
 }
 
-- 
cgit v1.2.3


From 53614d19826293d753aad599f2b2900d8d6303ed Mon Sep 17 00:00:00 2001
From: Timo Weingärtner <timo@tiwe.de>
Date: Mon, 19 Jul 2021 13:35:16 +0200
Subject: factor out download_source()

---
 update-openssh-known-hosts | 55 ++++++++++++++++++++++++++--------------------
 1 file changed, 31 insertions(+), 24 deletions(-)

(limited to 'update-openssh-known-hosts')

diff --git a/update-openssh-known-hosts b/update-openssh-known-hosts
index c8f7e39..325a997 100755
--- a/update-openssh-known-hosts
+++ b/update-openssh-known-hosts
@@ -52,6 +52,36 @@ cleanup () {
 	lockfile-remove "${LOCK}"
 }
 
+download_source () (
+	local sourcename=$1
+	local sourcefile=$2
+
+	cd "${CACHEDIR}/${sourcename}"
+	set -a
+	. "${sourcefile}"
+	set +a
+	# shellcheck disable=SC2091
+	$(path_search "$PLUGIN" "$PLUGIN_PATH") >| log 2>&1 || {
+		exitcode=$?
+		rm -f new
+		ignore=''
+		for e in ${EXIT_IGNORE:-0}; do
+			if [[ $e = "$exitcode" ]]; then
+				ignore=1
+				break
+			fi
+		done
+		if [ -z "$ignore" ] || [ "$fail" ]; then
+			echo "${source} exited with code ${exitcode}, log follows:"
+			cat log
+			echo
+		fi
+		if [ "$fail" ]; then
+			exit 1
+		fi
+	} >&2
+)
+
 if [ $# -eq 1 ] && [ "$1" = "-f" ]; then
 	fail=1
 else
@@ -72,30 +102,7 @@ find -mindepth 2 -maxdepth 2 -type f -name new -delete
 run-parts --list "${CONFDIR}/sources/" | while read sourcefile; do
 	source=${sourcefile##*/}
 	mkdir -p "${source}"
-	(
-		set -a
-		cd "${source}"
-		. "${sourcefile}"
-		$(path_search "$PLUGIN" "$PLUGIN_PATH") >| log 2>&1 || {
-			exitcode=$?
-			rm -f new
-			ignore=''
-			for e in ${EXIT_IGNORE:-0}; do
-				if [[ $e = "$exitcode" ]]; then
-					ignore=1
-					break
-				fi
-			done
-			if [ -z "$ignore" -o "$fail" ]; then
-				echo "${source} exited with code ${exitcode}, log follows:"
-				cat log
-				echo
-			fi
-			if [ "$fail" ]; then
-				exit 1
-			fi
-		} >&2
-	) || exit 1
+	download_source "${source}" "${sourcefile}"
 	if [ -e "${source}/new" ]; then
 		mv "${source}/new" "${source}/current"
 	fi
-- 
cgit v1.2.3


From f855dc5ac98432ef4b126446c50a9737d98f0fb8 Mon Sep 17 00:00:00 2001
From: Timo Weingärtner <timo@tiwe.de>
Date: Mon, 19 Jul 2021 13:36:58 +0200
Subject: always use read with -r

---
 update-openssh-known-hosts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'update-openssh-known-hosts')

diff --git a/update-openssh-known-hosts b/update-openssh-known-hosts
index 325a997..9eee3ec 100755
--- a/update-openssh-known-hosts
+++ b/update-openssh-known-hosts
@@ -99,7 +99,7 @@ cd "${CACHEDIR}"
 
 find -mindepth 2 -maxdepth 2 -type f -name new -delete
 
-run-parts --list "${CONFDIR}/sources/" | while read sourcefile; do
+run-parts --list "${CONFDIR}/sources/" | while read -r sourcefile; do
 	source=${sourcefile##*/}
 	mkdir -p "${source}"
 	download_source "${source}" "${sourcefile}"
@@ -115,8 +115,8 @@ run-parts --list "${CONFDIR}/sources/" | while read sourcefile; do
 						unset filter[$i]
 					fi
 				done
-				while read hostlist rest; do
-					IFS=, read -a hostarray <<<"$hostlist"
+				while read -r hostlist rest; do
+					IFS=, read -ra hostarray <<<"$hostlist"
 					new_hostlist=''
 					for host in "${hostarray[@]}"; do
 						for rule in "${filter[@]}"; do
-- 
cgit v1.2.3