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

Added JSON/CSV output to http and client_simulation as well

Browse Source
This commit is contained in:
Frank Breedijk 2016-01-18 11:28:28 +01:00
parent 08f27986aa
commit 581c9faa27
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
testssl.sh
View File

@ -1977,6 +1977,7 @@ run_client_simulation() {
sclient_success=$? sclient_success=$?
if [[ $sclient_success -ne 0 ]]; then if [[ $sclient_success -ne 0 ]]; then
outln "No connection" outln "No connection"
output_finding "client_${short[i]}" "$NODEIP" "$PORT" "INFO" "${names[i]} client simulation:\nNo connection"
else else
proto=$(grep -aw "Protocol" $TMPFILE | sed -e 's/^.*Protocol.*://' -e 's/ //g') proto=$(grep -aw "Protocol" $TMPFILE | sed -e 's/^.*Protocol.*://' -e 's/ //g')
if [[ "$proto" == "TLSv1.2" ]]; then if [[ "$proto" == "TLSv1.2" ]]; then
@ -2009,6 +2010,8 @@ run_client_simulation() {
out " " out " "
outln "${warning[i]}" outln "${warning[i]}"
fi fi
output_finding "client_${short[i]}" "$NODEIP" "$PORT" "INFO" \
"${names[i]} client simulation:\n$proto $cipher\n${warning[i]}"
debugme cat $TMPFILE debugme cat $TMPFILE
fi fi
i=$((i+1)) i=$((i+1))
@ -3297,15 +3300,18 @@ http2_pre(){
if [[ -n "$STARTTLS" ]]; then if [[ -n "$STARTTLS" ]]; then
[[ -n "$1" ]] && out "$1" [[ -n "$1" ]] && out "$1"
outln "(HTTP/2 is a HTTP protocol and thus not tested here)" outln "(HTTP/2 is a HTTP protocol and thus not tested here)"
output_finding "https_alpn" "$NODEIP" "$PORT" "INFO" "HTTP2/ALPN : HTTP/2 is and HTTP protocol and thus not tested"
return 1 return 1
fi fi
if [[ -n "$PROXY" ]]; then if [[ -n "$PROXY" ]]; then
[[ -n "$1" ]] && pr_litemagenta " $1 " [[ -n "$1" ]] && pr_litemagenta " $1 "
pr_litemagenta "not tested as proxies do not support proxying it" pr_litemagenta "not tested as proxies do not support proxying it"
output_finding "https_alpn" "$NODEIP" "$PORT" "INFO" "HTTP2/ALPN : HTTP/2 was not tested as proxies do not support proxying it"
return 1 return 1
fi fi
if ! $HAS_ALPN; then if ! $HAS_ALPN; then
local_problem "$OPENSSL doesn't support HTTP2/ALPN"; local_problem "$OPENSSL doesn't support HTTP2/ALPN";
output_finding "https_alpn" "$NODEIP" "$PORT" "WARN" "HTTP2/ALPN : HTTP/2 was not tested as $OPENSSL does not support it"
return 7 return 7
fi fi
return 0 return 0
@ -3351,6 +3357,7 @@ run_http2() {
local tmpstr local tmpstr
local -i ret=0 local -i ret=0
local had_alpn_proto=false local had_alpn_proto=false
local alpn_finding=""
pr_bold " HTTP2/ALPN " pr_bold " HTTP2/ALPN "
if ! http2_pre ; then if ! http2_pre ; then
@ -3366,17 +3373,21 @@ run_http2() {
if [[ "$tmpstr" == *"$proto" ]]; then if [[ "$tmpstr" == *"$proto" ]]; then
if ! $had_alpn_proto; then if ! $had_alpn_proto; then
out "$proto" out "$proto"
alpn_finding+="$proto"
had_alpn_proto=true had_alpn_proto=true
else else
out ", $proto" out ", $proto"
alpn_finding+=", $proto"
fi fi
fi fi
done done
if $had_alpn_proto; then if $had_alpn_proto; then
outln " (offered)" outln " (offered)"
output_finding "https_alpn" "$NODEIP" "$PORT" "INFO" "HTTP2/ALPN : offered\nProtocols: $alpn_finding"
ret=0 ret=0
else else
outln "not offered" outln "not offered"
output_finding "https_alpn" "$NODEIP" "$PORT" "INFO" "HTTP2/ALPN : not offered"
ret=1 ret=1
fi fi
tmpfile_handle $FUNCNAME.txt tmpfile_handle $FUNCNAME.txt