Merge pull request #2580 from drwetter/fix_2575

Fix json/csv output when STARTTLS problem is passed back
This commit is contained in:
Dirk Wetter 2024-10-14 17:16:09 +02:00 committed by GitHub
commit 656726eaab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -5487,7 +5487,8 @@ run_protocols() {
fileout "$jsonID" "OK" "not offered" fileout "$jsonID" "OK" "not offered"
add_proto_offered ssl2 no add_proto_offered ssl2 no
;; ;;
4) out "likely "; pr_svrty_best "not offered (OK), " 4) # STARTTLS problem
out "likely "; pr_svrty_best "not offered (OK), "
fileout "$jsonID" "OK" "likely not offered" fileout "$jsonID" "OK" "likely not offered"
add_proto_offered ssl2 no add_proto_offered ssl2 no
pr_warning "received 4xx/5xx after STARTTLS handshake"; outln "$debug_recomm" pr_warning "received 4xx/5xx after STARTTLS handshake"; outln "$debug_recomm"
@ -5665,7 +5666,7 @@ run_protocols() {
pr_warning "TLS downgraded to STARTTLS plaintext"; outln pr_warning "TLS downgraded to STARTTLS plaintext"; outln
fileout "$jsonID" "WARN" "TLS downgraded to STARTTLS plaintext" fileout "$jsonID" "WARN" "TLS downgraded to STARTTLS plaintext"
;; ;;
4) out "likely not offered, " 4) out "likely not offered, " # STARTTLS problem
fileout "$jsonID" "INFO" "likely not offered" fileout "$jsonID" "INFO" "likely not offered"
add_proto_offered tls1 no add_proto_offered tls1 no
pr_warning "received 4xx/5xx after STARTTLS handshake"; outln "$debug_recomm" pr_warning "received 4xx/5xx after STARTTLS handshake"; outln "$debug_recomm"
@ -5750,8 +5751,8 @@ run_protocols() {
pr_warning "TLS downgraded to STARTTLS plaintext"; outln pr_warning "TLS downgraded to STARTTLS plaintext"; outln
fileout "$jsonID" "WARN" "TLS downgraded to STARTTLS plaintext" fileout "$jsonID" "WARN" "TLS downgraded to STARTTLS plaintext"
;; ;;
4) out "likely not offered, " 4) out "likely not offered, " # STARTTLS problem
fileout "$jsonID" "INFO" "not offered" fileout "$jsonID" "INFO" "likely not offered"
add_proto_offered tls1_1 no add_proto_offered tls1_1 no
pr_warning "received 4xx/5xx after STARTTLS handshake"; outln "$debug_recomm" pr_warning "received 4xx/5xx after STARTTLS handshake"; outln "$debug_recomm"
fileout "$jsonID" "WARN" "received 4xx/5xx after STARTTLS handshake${debug_recomm}" fileout "$jsonID" "WARN" "received 4xx/5xx after STARTTLS handshake${debug_recomm}"
@ -6022,8 +6023,8 @@ run_protocols() {
pr_warning "TLS downgraded to STARTTLS plaintext"; outln pr_warning "TLS downgraded to STARTTLS plaintext"; outln
fileout "$jsonID" "WARN" "TLS downgraded to STARTTLS plaintext" fileout "$jsonID" "WARN" "TLS downgraded to STARTTLS plaintext"
;; ;;
4) out "likely not offered, " 4) out "likely not offered, " # STARTTLS problem
fileout "$jsonID" "INFO" "not offered" fileout "$jsonID" "INFO" "likely not offered"
add_proto_offered tls1_3 no add_proto_offered tls1_3 no
pr_warning "received 4xx/5xx after STARTTLS handshake"; outln "$debug_recomm" pr_warning "received 4xx/5xx after STARTTLS handshake"; outln "$debug_recomm"
fileout "$jsonID" "WARN" "received 4xx/5xx after STARTTLS handshake${debug_recomm}" fileout "$jsonID" "WARN" "received 4xx/5xx after STARTTLS handshake${debug_recomm}"