Package: monitoring-plugins-contrib
Version: 35.20210512
Severity: normal
Tags: patch
Hi!
Using check_ssl_cert with an ipv6 address host does not work as
expected:
| weasel@sarek:~/ssl$ ./check_ssl_cert.0 --ignore-ocsp -H
2001:858:10f:100::19:1 -p 443 --cn www.palfrader.org --sni www.palfrader.org
| SSL_CERT UNKNOWN: Cannot resolve 2001:858:10f:100::19:1
| weasel@sarek:~/ssl$ ./check_ssl_cert.0 --ignore-ocsp -H www.palfrader.org
--resolve 2001:858:10f:100::19:1 -p 443 --cn www.palfrader.org --sni
www.palfrader.org
| SSL_CERT CRITICAL www.palfrader.org: 2001:858:10f:100::19:1 is not a valid
hostname
The attached patch makes it work. As a side effect, it does require
giving a --cn if host is an ipv4 or ipv6 literal. If you disagree about
that chnge, feel free to drop that part.
--
| .''`. ** Debian **
Peter Palfrader | : :' : The universal
https://www.palfrader.org/ | `. `' Operating System
| `- https://www.debian.org/
--- check_ssl_cert.0 2021-09-30 13:08:32.000000000 +0000
+++ check_ssl_cert.1.1 2021-09-30 13:22:51.765139931 +0000
@@ -489,6 +489,14 @@
}
+optional_brackets_for_ipv6() {
+ if echo "$1" | grep -q -E '^[a-fA-F0-9:]*$' ; then
+ echo "[$1]"
+ else
+ echo "$1"
+ fi
+}
+
################################################################################
# Exits with a critical message
# Params
@@ -1330,56 +1338,58 @@
IGN_EOF='-ign_eof'
fi
+ HOST_ADDR_SCLIENT="$(optional_brackets_for_ipv6 ${HOST_ADDR})"
+ debuglog "Made host addr for openssl purposes '${HOST_ADDR_SCLIENT}'"
+
# Check if a protocol was specified (if not HTTP switch to TLS)
if [ -n "${PROTOCOL}" ] && [ "${PROTOCOL}" != 'http' ] && [ "${PROTOCOL}"
!= 'https' ] && [ "${PROTOCOL}" != 'h2' ] ; then
-
case "${PROTOCOL}" in
pop3|ftp)
- exec_with_timeout "printf 'QUIT\\n' | ${OPENSSL} s_client
${INETPROTO} ${CLIENT} ${CLIENTPASS} -crlf ${IGN_EOF} -starttls ${PROTOCOL}
-connect ${HOST_ADDR}:${PORT} ${SERVERNAME} ${SCLIENT_PROXY}
${SCLIENT_PROXY_ARGUMENT} -verify 6 ${ROOT_CA} ${SSL_VERSION}
${SSL_VERSION_DISABLED} ${SSL_AU} ${STATUS} ${DANE} 2> ${ERROR} 1> ${CERT}"
+ exec_with_timeout "printf 'QUIT\\n' | ${OPENSSL} s_client
${INETPROTO} ${CLIENT} ${CLIENTPASS} -crlf ${IGN_EOF} -starttls ${PROTOCOL}
-connect ${HOST_ADDR_SCLIENT}:${PORT} ${SERVERNAME} ${SCLIENT_PROXY}
${SCLIENT_PROXY_ARGUMENT} -verify 6 ${ROOT_CA} ${SSL_VERSION}
${SSL_VERSION_DISABLED} ${SSL_AU} ${STATUS} ${DANE} 2> ${ERROR} 1> ${CERT}"
RET=$?
;;
pop3s|ftps)
- exec_with_timeout "printf 'QUIT\\n' | ${OPENSSL} s_client
${INETPROTO} ${CLIENT} ${CLIENTPASS} -crlf ${IGN_EOF} -connect
${HOST_ADDR}:${PORT} ${SERVERNAME} ${SCLIENT_PROXY} ${SCLIENT_PROXY_ARGUMENT}
-verify 6 ${ROOT_CA} ${SSL_VERSION} ${SSL_VERSION_DISABLED} ${SSL_AU} ${STATUS}
${DANE} 2> ${ERROR} 1> ${CERT}"
+ exec_with_timeout "printf 'QUIT\\n' | ${OPENSSL} s_client
${INETPROTO} ${CLIENT} ${CLIENTPASS} -crlf ${IGN_EOF} -connect
${HOST_ADDR_SCLIENT}:${PORT} ${SERVERNAME} ${SCLIENT_PROXY}
${SCLIENT_PROXY_ARGUMENT} -verify 6 ${ROOT_CA} ${SSL_VERSION}
${SSL_VERSION_DISABLED} ${SSL_AU} ${STATUS} ${DANE} 2> ${ERROR} 1> ${CERT}"
RET=$?
;;
smtp)
- exec_with_timeout "printf 'QUIT\\n' | ${OPENSSL} s_client
${INETPROTO} ${CLIENT} ${CLIENTPASS} -crlf ${IGN_EOF} -starttls ${PROTOCOL}
-connect ${HOST_ADDR}:${PORT} ${SERVERNAME} ${SCLIENT_PROXY}
${SCLIENT_PROXY_ARGUMENT} -verify 6 ${ROOT_CA} ${SSL_VERSION}
${SSL_VERSION_DISABLED} ${SSL_AU} ${STATUS} ${DANE} ${S_CLIENT_NAME} 2>
${ERROR} 1> ${CERT}"
+ exec_with_timeout "printf 'QUIT\\n' | ${OPENSSL} s_client
${INETPROTO} ${CLIENT} ${CLIENTPASS} -crlf ${IGN_EOF} -starttls ${PROTOCOL}
-connect ${HOST_ADDR_SCLIENT}:${PORT} ${SERVERNAME} ${SCLIENT_PROXY}
${SCLIENT_PROXY_ARGUMENT} -verify 6 ${ROOT_CA} ${SSL_VERSION}
${SSL_VERSION_DISABLED} ${SSL_AU} ${STATUS} ${DANE} ${S_CLIENT_NAME} 2>
${ERROR} 1> ${CERT}"
RET=$?
;;
smtps)
- exec_with_timeout "printf 'QUIT\\n' | ${OPENSSL} s_client
${INETPROTO} ${CLIENT} ${CLIENTPASS} -crlf ${IGN_EOF} -connect
${HOST_ADDR}:${PORT} ${SERVERNAME} ${SCLIENT_PROXY} ${SCLIENT_PROXY_ARGUMENT}
-verify 6 ${ROOT_CA} ${SSL_VERSION} ${SSL_VERSION_DISABLED} ${SSL_AU} ${STATUS}
${DANE} ${S_CLIENT_NAME} 2> ${ERROR} 1> ${CERT}"
+ exec_with_timeout "printf 'QUIT\\n' | ${OPENSSL} s_client
${INETPROTO} ${CLIENT} ${CLIENTPASS} -crlf ${IGN_EOF} -connect
${HOST_ADDR_SCLIENT}:${PORT} ${SERVERNAME} ${SCLIENT_PROXY}
${SCLIENT_PROXY_ARGUMENT} -verify 6 ${ROOT_CA} ${SSL_VERSION}
${SSL_VERSION_DISABLED} ${SSL_AU} ${STATUS} ${DANE} ${S_CLIENT_NAME} 2>
${ERROR} 1> ${CERT}"
RET=$?
;;
irc|ldap)
- exec_with_timeout "echo | ${OPENSSL} s_client ${INETPROTO}
${CLIENT} ${CLIENTPASS} -starttls ${PROTOCOL} -connect ${HOST_ADDR}:${PORT}
${SERVERNAME} ${SCLIENT_PROXY} ${SCLIENT_PROXY_ARGUMENT} -verify 6 ${ROOT_CA}
${SSL_VERSION} ${SSL_VERSION_DISABLED} ${SSL_AU} ${STATUS} ${DANE} 2> ${ERROR}
1> ${CERT}"
+ exec_with_timeout "echo | ${OPENSSL} s_client ${INETPROTO}
${CLIENT} ${CLIENTPASS} -starttls ${PROTOCOL} -connect
${HOST_ADDR_SCLIENT}:${PORT} ${SERVERNAME} ${SCLIENT_PROXY}
${SCLIENT_PROXY_ARGUMENT} -verify 6 ${ROOT_CA} ${SSL_VERSION}
${SSL_VERSION_DISABLED} ${SSL_AU} ${STATUS} ${DANE} 2> ${ERROR} 1> ${CERT}"
RET=$?
;;
ircs|ldaps)
- exec_with_timeout "echo | ${OPENSSL} s_client ${INETPROTO}
${CLIENT} ${CLIENTPASS} -connect ${HOST_ADDR}:${PORT} ${SERVERNAME}
${SCLIENT_PROXY} ${SCLIENT_PROXY_ARGUMENT} -verify 6 ${ROOT_CA} ${SSL_VERSION}
${SSL_VERSION_DISABLED} ${SSL_AU} ${STATUS} ${DANE} 2> ${ERROR} 1> ${CERT}"
+ exec_with_timeout "echo | ${OPENSSL} s_client ${INETPROTO}
${CLIENT} ${CLIENTPASS} -connect ${HOST_ADDR_SCLIENT}:${PORT} ${SERVERNAME}
${SCLIENT_PROXY} ${SCLIENT_PROXY_ARGUMENT} -verify 6 ${ROOT_CA} ${SSL_VERSION}
${SSL_VERSION_DISABLED} ${SSL_AU} ${STATUS} ${DANE} 2> ${ERROR} 1> ${CERT}"
RET=$?
;;
imap)
- exec_with_timeout "printf 'A01 LOGOUT\\n' | ${OPENSSL}
s_client ${INETPROTO} ${CLIENT} ${CLIENTPASS} -crlf ${IGN_EOF} -starttls
${PROTOCOL} -connect ${HOST_ADDR}:${PORT} ${SERVERNAME} ${SCLIENT_PROXY}
${SCLIENT_PROXY_ARGUMENT} -verify 6 ${ROOT_CA} ${SSL_VERSION}
${SSL_VERSION_DISABLED} ${SSL_AU} ${STATUS} ${DANE} 2> ${ERROR} 1> ${CERT}"
+ exec_with_timeout "printf 'A01 LOGOUT\\n' | ${OPENSSL}
s_client ${INETPROTO} ${CLIENT} ${CLIENTPASS} -crlf ${IGN_EOF} -starttls
${PROTOCOL} -connect ${HOST_ADDR_SCLIENT}:${PORT} ${SERVERNAME}
${SCLIENT_PROXY} ${SCLIENT_PROXY_ARGUMENT} -verify 6 ${ROOT_CA} ${SSL_VERSION}
${SSL_VERSION_DISABLED} ${SSL_AU} ${STATUS} ${DANE} 2> ${ERROR} 1> ${CERT}"
RET=$?
;;
imaps)
- exec_with_timeout "printf 'A01 LOGOUT\\n' | ${OPENSSL}
s_client ${INETPROTO} ${CLIENT} ${CLIENTPASS} -crlf ${IGN_EOF} -connect
${HOST_ADDR}:${PORT} ${SERVERNAME} ${SCLIENT_PROXY} ${SCLIENT_PROXY_ARGUMENT}
-verify 6 ${ROOT_CA} ${SSL_VERSION} ${SSL_VERSION_DISABLED} ${SSL_AU} ${STATUS}
${DANE} 2> ${ERROR} 1> ${CERT}"
+ exec_with_timeout "printf 'A01 LOGOUT\\n' | ${OPENSSL}
s_client ${INETPROTO} ${CLIENT} ${CLIENTPASS} -crlf ${IGN_EOF} -connect
${HOST_ADDR_SCLIENT}:${PORT} ${SERVERNAME} ${SCLIENT_PROXY}
${SCLIENT_PROXY_ARGUMENT} -verify 6 ${ROOT_CA} ${SSL_VERSION}
${SSL_VERSION_DISABLED} ${SSL_AU} ${STATUS} ${DANE} 2> ${ERROR} 1> ${CERT}"
RET=$?
;;
postgres)
- exec_with_timeout "printf 'X\\0\\0\\0\\4' | ${OPENSSL}
s_client ${INETPROTO} ${CLIENT} ${CLIENTPASS} -starttls ${PROTOCOL} -connect
${HOST_ADDR}:${PORT} ${SERVERNAME} ${SCLIENT_PROXY} ${SCLIENT_PROXY_ARGUMENT}
-verify 6 ${ROOT_CA} ${SSL_VERSION} ${SSL_VERSION_DISABLED} ${SSL_AU} ${STATUS}
${DANE} 2> ${ERROR} 1> ${CERT}"
+ exec_with_timeout "printf 'X\\0\\0\\0\\4' | ${OPENSSL}
s_client ${INETPROTO} ${CLIENT} ${CLIENTPASS} -starttls ${PROTOCOL} -connect
${HOST_ADDR_SCLIENT}:${PORT} ${SERVERNAME} ${SCLIENT_PROXY}
${SCLIENT_PROXY_ARGUMENT} -verify 6 ${ROOT_CA} ${SSL_VERSION}
${SSL_VERSION_DISABLED} ${SSL_AU} ${STATUS} ${DANE} 2> ${ERROR} 1> ${CERT}"
RET=$?
;;
sieve)
- exec_with_timeout "echo 'LOGOUT' | ${OPENSSL} s_client
${INETPROTO} ${CLIENT} ${CLIENTPASS} -starttls ${PROTOCOL} -connect
${HOST_ADDR}:${PORT} ${SERVERNAME} ${SCLIENT_PROXY} ${SCLIENT_PROXY_ARGUMENT}
-verify 6 ${ROOT_CA} ${SSL_VERSION} ${SSL_VERSION_DISABLED} ${SSL_AU} ${STATUS}
${DANE} 2> ${ERROR} 1> ${CERT}"
+ exec_with_timeout "echo 'LOGOUT' | ${OPENSSL} s_client
${INETPROTO} ${CLIENT} ${CLIENTPASS} -starttls ${PROTOCOL} -connect
${HOST_ADDR_SCLIENT}:${PORT} ${SERVERNAME} ${SCLIENT_PROXY}
${SCLIENT_PROXY_ARGUMENT} -verify 6 ${ROOT_CA} ${SSL_VERSION}
${SSL_VERSION_DISABLED} ${SSL_AU} ${STATUS} ${DANE} 2> ${ERROR} 1> ${CERT}"
RET=$?
;;
xmpp|xmpp-server)
- exec_with_timeout "echo 'Q' | ${OPENSSL} s_client ${INETPROTO}
${CLIENT} ${CLIENTPASS} -starttls ${PROTOCOL} -connect ${HOST_ADDR}:${XMPPPORT}
${XMPPHOST} -verify 6 ${ROOT_CA} ${SSL_VERSION} ${SSL_VERSION_DISABLED}
${SSL_AU} ${STATUS} ${DANE} 2> ${ERROR} 1> ${CERT}"
+ exec_with_timeout "echo 'Q' | ${OPENSSL} s_client ${INETPROTO}
${CLIENT} ${CLIENTPASS} -starttls ${PROTOCOL} -connect
${HOST_ADDR_SCLIENT}:${XMPPPORT} ${XMPPHOST} -verify 6 ${ROOT_CA}
${SSL_VERSION} ${SSL_VERSION_DISABLED} ${SSL_AU} ${STATUS} ${DANE} 2> ${ERROR}
1> ${CERT}"
RET=$?
;;
mysql)
- exec_with_timeout "echo | ${OPENSSL} s_client ${INETPROTO}
${CLIENT} ${CLIENTPASS} -starttls ${PROTOCOL} -connect ${HOST_ADDR}:${PORT}
${SERVERNAME} ${SCLIENT_PROXY} ${SCLIENT_PROXY_ARGUMENT} -verify 6 ${ROOT_CA}
${SSL_VERSION} ${SSL_VERSION_DISABLED} ${SSL_AU} ${STATUS} ${DANE} 2> ${ERROR}
1> ${CERT}"
+ exec_with_timeout "echo | ${OPENSSL} s_client ${INETPROTO}
${CLIENT} ${CLIENTPASS} -starttls ${PROTOCOL} -connect
${HOST_ADDR_SCLIENT}:${PORT} ${SERVERNAME} ${SCLIENT_PROXY}
${SCLIENT_PROXY_ARGUMENT} -verify 6 ${ROOT_CA} ${SSL_VERSION}
${SSL_VERSION_DISABLED} ${SSL_AU} ${STATUS} ${DANE} 2> ${ERROR} 1> ${CERT}"
RET=$?
;;
*)
@@ -1438,7 +1448,7 @@
ALPN='-alpn h2'
fi
- exec_with_timeout "printf '${HTTP_REQUEST}' | ${OPENSSL} s_client
${INETPROTO} ${CLIENT} ${CLIENTPASS} -crlf ${IGN_EOF} ${ALPN} -connect
${HOST_ADDR}:${PORT} ${SERVERNAME} ${SCLIENT_PROXY} ${SCLIENT_PROXY_ARGUMENT}
-showcerts -verify 6 ${ROOT_CA} ${SSL_VERSION} ${SSL_VERSION_DISABLED}
${SSL_AU} ${STATUS} ${DANE} 2> ${ERROR} 1> ${CERT}"
+ exec_with_timeout "printf '${HTTP_REQUEST}' | ${OPENSSL} s_client
${INETPROTO} ${CLIENT} ${CLIENTPASS} -crlf ${IGN_EOF} ${ALPN} -connect
${HOST_ADDR_SCLIENT}:${PORT} ${SERVERNAME} ${SCLIENT_PROXY}
${SCLIENT_PROXY_ARGUMENT} -showcerts -verify 6 ${ROOT_CA} ${SSL_VERSION}
${SSL_VERSION_DISABLED} ${SSL_AU} ${STATUS} ${DANE} 2> ${ERROR} 1> ${CERT}"
RET=$?
fi
@@ -2284,7 +2294,17 @@
fi
# we need the FQDN of an host to check the CN
- if ! echo "${HOST}" | grep -q '[.]' && [ -z "${FILE}" ] && [ "${HOST}" !=
'localhost' ] ; then
+ if echo "${HOST}" | grep -q -E '^[0-9.]*$' ; then
+ debuglog "Host ${HOST} is an ipv4 address, maybe."
+ if [ "${COMMON_NAME:-}" = "" ] || [ "${COMMON_NAME:-}" = "__HOST__" ];
then
+ unknown "Host ${HOST} is an ipv4 address but no --cn given."
+ fi
+ elif echo "${HOST}" | grep -q -E '^[a-fA-F0-9:]*$' ; then
+ debuglog "Host ${HOST} is an ipv6 address, maybe."
+ if [ "${COMMON_NAME:-}" = "" ] || [ "${COMMON_NAME:-}" = "__HOST__" ];
then
+ unknown "Host ${HOST} is an ipv6 address but no --cn given."
+ fi
+ elif ! echo "${HOST}" | grep -q '[.]' && [ -z "${FILE}" ] && [ "${HOST}"
!= 'localhost' ] ; then
debuglog "Domain for ${HOST} missing"
DOMAIN=$( nslookup "${HOST}" | grep ^Name: | head -n 1 | cut -d. -f2- )
if [ -z "${DOMAIN}" ] ; then
@@ -3051,11 +3071,11 @@
case "${PROTOCOL}" in
pop3|ftp|smtp|irc|ldap|imap|postgres|sieve|xmpp|xmpp-server|mysql)
- exec_with_timeout "printf 'R\\n' | openssl s_client -connect
${HOST_ADDR}:${PORT} -starttls ${PROTOCOL} 2>&1 | grep -F -q err"
+ exec_with_timeout "printf 'R\\n' | openssl s_client -connect
${HOST_ADDR_SCLIENT}:${PORT} -starttls ${PROTOCOL} 2>&1 | grep -F -q err"
RET=$?
;;
*)
- exec_with_timeout "printf 'R\\n' | openssl s_client -connect
${HOST_ADDR}:${PORT} 2>&1 | grep -F -q err"
+ exec_with_timeout "printf 'R\\n' | openssl s_client -connect
${HOST_ADDR_SCLIENT}:${PORT} 2>&1 | grep -F -q err"
RET=$?
;;
esac
