From 1027aa07eab309b702ce063a4ba55a131be0d0bc Mon Sep 17 00:00:00 2001
From: Keith Irwin <git@ki9.us>
Date: Sun, 11 Sep 2022 18:00:00 -0600
Subject: [PATCH] Fixed hostname not set, make unset vars fail earlier

---
 back/lib/peer_add | 4 ++--
 back/lib/peer_del | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/back/lib/peer_add b/back/lib/peer_add
index 922835e..8ef23a9 100755
--- a/back/lib/peer_add
+++ b/back/lib/peer_add
@@ -135,13 +135,13 @@ for_server_do() {
 }
 
 # Update nameserver
-if "${LIB_DIR}/ns_update_add" "${domain}" "${ipv4}" "${ipv6}"
+if "${LIB_DIR}/ns_update_add" "${domain:?}" "${ipv4:?}" "${ipv6:?}"
 	then printf 'Successfully added %s to DNS server.\n' "${domain}" >>"${LOGFILE}"
 	else printf 'ERROR! Failed to add %s %s %s to DNS server!\n' "${domain}" "${ipv4}" "${ipv6}" >>"${LOGFILE}"
 fi &
 
 # Create SSL cert
-if "${LIB_DIR}/ssl_peer_add" "${hostname}" "${username}" "IP:${ipv4},IP:${ipv6}"
+if "${LIB_DIR}/ssl_peer_add" "${hostname:?}" "${username:?}" "IP:${ipv4},IP:${ipv6}"
 	then printf 'Successfully signed SSL certs for %s\n' "${domain}" >>"${LOGFILE}"
 	else printf 'ERROR! Failed to create certs for %s with IPS: %s %s!\n' "${domain}" "${ipv4}" "${ipv6}" >>"${LOGFILE}"
 fi &
diff --git a/back/lib/peer_del b/back/lib/peer_del
index a7d2515..e718d91 100755
--- a/back/lib/peer_del
+++ b/back/lib/peer_del
@@ -61,7 +61,8 @@ if ! printf 'Delete request was for %s %s %s\n' "${domain:?}" "${ipv4:?}" "${ipv
 	printf 'Failed to collect peer data\n' | "${LIB_DIR}/http_res" 500
 	exit 6
 fi
-hostname="$(<<<"${domain}" cut -d'.' -f1)" & username="$(<<<"${domain}" cut -d'.' -f2)"
+hostname="$(<<<"${domain}" cut -d'.' -f1)"
+username="$(<<<"${domain}" cut -d'.' -f2)"
 
 # Wireguard
 # Run this function in parallel in the while loop below
@@ -97,13 +98,13 @@ for_server_do() {
 done <"${SERVERS_FILE}" &
 
 # Update nameserver
-if "${LIB_DIR}/ns_update_del" "${domain}" "${ipv4}" "${ipv6}"
+if "${LIB_DIR}/ns_update_del" "${domain:?}" "${ipv4:?}" "${ipv6:?}"
 	then printf 'Successfully deleted %s from DNS server.\n' "${domain}" >>"${LOGFILE}"
 	else printf 'ERROR! Failed to delete %s %s %s from DNS server!\n' "${domain}" "${ipv4}" "${ipv6}" >>"${LOGFILE}"
 fi &
 
 # Create SSL cert
-if "${LIB_DIR}/ssl_peer_del" "${hostname}" "${username}"
+if "${LIB_DIR}/ssl_peer_del" "${hostname:?}" "${username:?}"
 	then printf 'Successfully deleted SSL certs for %s\n' "${domain}" >>"${LOGFILE}"
 	else printf 'ERROR! Failed to delete certs for %s!\n' "${domain}" >>"${LOGFILE}"
 fi