From 42760305009c8a18d593721eac1946a1284f49f4 Mon Sep 17 00:00:00 2001 From: Dirk Date: Sun, 30 Jul 2017 22:46:17 +0200 Subject: [PATCH] STARTTLS improvements and no protocol detections - add forgotten servive FTP and XMPP - polish other services - after TLS 1.2 run is finished run a check whether no protocol has been detected and ask the user for confirmation to proceed --- testssl.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/testssl.sh b/testssl.sh index 1e7a88a..2afec72 100755 --- a/testssl.sh +++ b/testssl.sh @@ -1293,9 +1293,11 @@ service_detection() { wait_kill $! $HEADER_MAXSLEEP was_killed=$? head $TMPFILE | grep -aq '^HTTP\/' && SERVICE=HTTP - [[ -z "$SERVICE" ]] && head $TMPFILE | grep -aq SMTP && SERVICE=SMTP - [[ -z "$SERVICE" ]] && head $TMPFILE | grep -aq POP && SERVICE=POP - [[ -z "$SERVICE" ]] && head $TMPFILE | grep -aq IMAP && SERVICE=IMAP + [[ -z "$SERVICE" ]] && head $TMPFILE | grep -waq "SMTP|ESMTP|Exim|IdeaSmtpServer|Kerio Connect|Postfix" && SERVICE=SMTP # I know some overlap here + [[ -z "$SERVICE" ]] && head $TMPFILE | egrep -waq "POP|Gpop|MailEnable POP3 Server|OK Dovecot|Cyrus POP3" && SERVICE=POP # I know some overlap here + [[ -z "$SERVICE" ]] && head $TMPFILE | egrep -waq "IMAP|IMAP4|Cyrus IMAP4IMAP4rev1|IMAP4REV1|Gimap" && SERVICE=IMAP # I know some overlap here + [[ -z "$SERVICE" ]] && head $TMPFILE | grep -aq FTP && SERVICE=FTP + [[ -z "$SERVICE" ]] && head $TMPFILE | egrep -aqi "jabber|xmpp" && SERVICE=XMPP [[ -z "$SERVICE" ]] && head $TMPFILE | egrep -aqw "Jive News|InterNetNews|NNRP|INN" && SERVICE=NNTP debugme head -50 $TMPFILE | sed -e '//,$d' -e '//,$d' -e '/