fi
# set the host URI
-URI="ssh://${HOST}"
if [ "$PORT" != '22' ] ; then
- URI="${URI}:${PORT}"
+ HOSTP="${HOST}:${PORT}"
+else
+ HOSTP="${HOST}"
fi
+URI="ssh://${HOSTP}"
# if the host is in the gpg keyring...
if gpg --list-key ="${URI}" 2>&1 >/dev/null ; then
# do not check the keyserver
- CHECK_KEYSERVER=${CHECK_KEYSERVER:-"false"}
+ CHECK_KEYSERVER="false"
# if the host is NOT in the keyring...
else
# if the host key is found in the known_hosts file...
# FIXME: this only works for default known_hosts location
hostKey=$(ssh-keygen -F "$HOST")
+
if [ "$hostKey" ] ; then
# do not check the keyserver
# FIXME: more nuanced checking should be done here to properly
# take into consideration hosts that join monkeysphere by
# converting an existing and known ssh key
- CHECK_KEYSERVER=${CHECK_KEYSERVER:-"false"}
+ CHECK_KEYSERVER="false"
# if the host key is not found in the known_hosts file...
else
# check the keyserver
- CHECK_KEYSERVER=${CHECK_KEYSERVER:-"true"}
+ CHECK_KEYSERVER="true"
fi
fi
-export CHECK_KEYSERVER
+
+MONKEYSPHERE_CHECK_KEYSERVER=${MONKEYSPHERE_CHECK_KEYSERVER:="$CHECK_KEYSERVER"}
+export MONKEYSPHERE_CHECK_KEYSERVER
# update the known_hosts file for the host
-monkeysphere update-known_hosts "$HOST"
+monkeysphere update-known_hosts "$HOSTP"
# exec a netcat passthrough to host for the ssh connection
if [ -z "$NO_CONNECT" ] ; then