From 1b158f0a2b60c127850867f36d3001fd49cc6bf3 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mstanclift@vmware.com>
Date: Mon, 25 May 2020 12:06:37 -0500
Subject: [PATCH] Add more SSH validation

---
 gravity-sync.sh | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/gravity-sync.sh b/gravity-sync.sh
index 7529d71..991e493 100755
--- a/gravity-sync.sh
+++ b/gravity-sync.sh
@@ -153,7 +153,7 @@ function push_gs {
 	echo -e "${INFO} ${TASKTYPE} Requested"
 	md5_compare
 	
-	echo -e "${WARN} Are you sure you want to overwrite the primary node configuration on ${REMOTE_HOST}?"
+	echo -e "${WARN} Are you sure you want to overwrite the primary PH configuration on ${REMOTE_HOST}?"
 	select yn in "Yes" "No"; do
 		case $yn in
 		Yes )
@@ -187,7 +187,6 @@ function push_gs {
 			
 			MESSAGE="Reloading FTLDNS Services"
 			echo -e "${STAT} ${MESSAGE}"	
-			
 				ssh ${REMOTE_USER}@${REMOTE_HOST} 'pihole restartdns'
 				error_validate
 			
@@ -277,11 +276,18 @@ function validate_os_sshpass {
     then
 		if test -z "$REMOTE_PASS"
 		then
-			sshpassword=''
+			SSHPASSWORD=''
 			MESSAGE="Using SSH Key-Pair Authentication"
 		else
-			sshpassword="sshpass -p ${REMOTE_PASS} "
-			MESSAGE="Using SSH Password Authentication"
+			ssh -o ConnectTimeout=5 -o BatchMode=yes -o StrictHostKeyChecking=no ${REMOTE_USER}@${REMOTE_HOST} 'exit'
+			if [ "$?" != "0" ]; then
+				SSHPASSWORD="sshpass -p ${REMOTE_PASS} "
+				MESSAGE="Using SSH Password Authentication"
+			else
+		        sshpassword=''
+				MESSAGE="Using SSH Key-Pair Authentication"
+			fi
+			
 		fi
     else
         sshpassword=''