Git/testssl.sh
1
0
Fork 0
mirror of https://github.com/drwetter/testssl.sh.git synced 2025-01-10 18:50:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix for POP3, robustness for STARTTLS

Browse Source 
POP3 STARTTLS handshakes were often unsuccessful as
a regex wasn't properly escaped.

Furthermore if a STARTTLS handshake doesn't succeed, there's
a warning now.
This commit is contained in:
Dirk 2017-12-06 12:48:55 +01:00
parent 8ebba5593d
commit 4d7aa5df8b
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
testssl.sh
View File

@ -7137,7 +7137,7 @@ starttls_just_read(){
} }
starttls_full_read(){ starttls_full_read(){
starttls_read_data=() local starttls_read_data=()
local one_line="" local one_line=""
local ret=0 local ret=0
local cont_pattern="$1" local cont_pattern="$1"
@ -7160,6 +7160,11 @@ starttls_full_read(){
fi fi
fi fi
starttls_read_data+=("${one_line}") starttls_read_data+=("${one_line}")
if [[ $DEBUG -ge 4 ]]; then
echo "one_line: ${one_line}"
echo "end_pattern: ${end_pattern}"
echo "cont_pattern: ${cont_pattern}"
fi
if [[ ${one_line} =~ ${end_pattern} ]]; then if [[ ${one_line} =~ ${end_pattern} ]]; then
debugme echo "=== full read finished ===" debugme echo "=== full read finished ==="
IFS="${oldIFS}" IFS="${oldIFS}"
@ -7204,9 +7209,9 @@ starttls_smtp_dialog(){
starttls_pop3_dialog() { starttls_pop3_dialog() {
debugme echo "=== starting pop3 STARTTLS dialog ===" debugme echo "=== starting pop3 STARTTLS dialog ==="
starttls_full_read '$^' '^+OK' && debugme echo "received server greeting" && starttls_full_read '^\+OK' '^\+OK' && debugme echo "received server greeting" &&
starttls_just_send 'STLS' && debugme echo "initiated STARTTLS" && starttls_just_send 'STLS' && debugme echo "initiated STARTTLS" &&
starttls_full_read '$^' '^+OK' && debugme echo "received ack for STARTTLS" starttls_full_read '^\+OK' '^\+OK' && debugme echo "received ack for STARTTLS"
local ret=$? local ret=$?
debugme echo "=== finished pop3 STARTTLS dialog with ${ret} ===" debugme echo "=== finished pop3 STARTTLS dialog with ${ret} ==="
return $ret return $ret
@ -7356,8 +7361,9 @@ EOF
fatal "FIXME: STARTTLS protocol $STARTTLS_PROTOCOL is not yet supported" -4 fatal "FIXME: STARTTLS protocol $STARTTLS_PROTOCOL is not yet supported" -4
esac esac
fi fi
[[ $? -eq 0 ]] && return 0
return 0 prln_warning "STARTTLS handshake failed"
return 1
} }