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

- typo in IPv4 header

Browse Source 
- fixed recognition of XML,HTML to separate header
- fixed -V <pattern
This commit is contained in:
Dirk 2016-01-31 21:02:18 +01:00
parent 1726d3b41c
commit 5ae9bb8c13
1 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
testssl.sh
View File

@ -187,6 +187,7 @@ PROTOS_OFFERED=""
TLS_EXTENSIONS="" TLS_EXTENSIONS=""
GOST_STATUS_PROBLEM=false GOST_STATUS_PROBLEM=false
DETECTED_TLS_VERSION="" DETECTED_TLS_VERSION=""
PATTERN2SHOW=""
SOCKREPLY="" SOCKREPLY=""
SOCK_REPLY_FILE="" SOCK_REPLY_FILE=""
HEXC="" HEXC=""
@ -666,6 +667,7 @@ run_http_header() {
local referer useragent local referer useragent
local url redirect local url redirect
HEADERFILE=$TEMPDIR/$NODEIP.http_header.txt
outln; pr_headlineln " Testing HTTP header response @ \"$URL_PATH\" " outln; pr_headlineln " Testing HTTP header response @ \"$URL_PATH\" "
outln outln
@ -695,8 +697,9 @@ run_http_header() {
debugme echo "$NOW_TIME: $HTTP_TIME" debugme echo "$NOW_TIME: $HTTP_TIME"
sed -e '/^ .<HTML/,$d' -e '/^ .<html/,$d' -e '/^ .<XML /,$d' -e '/ .<?XML /,$d' \ # delete from pattern til the end. We ignore any leading spaces (e.g. www.amazon.de)
-e '/^ .<xml /,$d' -e '/ .<?xml /,$d' -e '/^ .<\!DOCTYPE/,$d' -e '/^ .<\!doctype/,$d' $HEADERFILE >$HEADERFILE.2 sed -e '/<HTML>/,$d' -e '/<html>/,$d' -e '/<XML/,$d' -e '/<?XML/,$d' \
-e '/<xml/,$d' -e '/<?xml/,$d' -e '/<\!DOCTYPE/,$d' -e '/<\!doctype/,$d' $HEADERFILE >$HEADERFILE.2
#### ^^^ Attention: the filtering for the html body only as of now, doesn't work for other content yet #### ^^^ Attention: the filtering for the html body only as of now, doesn't work for other content yet
mv $HEADERFILE.2 $HEADERFILE # sed'ing in place doesn't work with BSD and Linux simultaneously mv $HEADERFILE.2 $HEADERFILE # sed'ing in place doesn't work with BSD and Linux simultaneously
ret=0 ret=0
@ -795,7 +798,7 @@ detect_ipv4() {
first=false first=false
fi fi
pr_litered "$result" pr_litered "$result"
outln "spaces$your_ip_msg" outln "\n$spaces$your_ip_msg"
fileout "ip_in_header_$count" "NOT OK" "IPv4 address in header $result $your_ip_msg" fileout "ip_in_header_$count" "NOT OK" "IPv4 address in header $result $your_ip_msg"
fi fi
count=$count+1 count=$count+1
@ -2949,7 +2952,6 @@ certificate_info() {
else else
cnfinding+=" NO match)" cnfinding+=" NO match)"
cnok="INFO" cnok="INFO"
:
#FIXME: we need to test also the SANs as they can contain a wild card (google.de .e.g) ==> 2.7dev #FIXME: we need to test also the SANs as they can contain a wild card (google.de .e.g) ==> 2.7dev
fi fi
fi fi
@ -5318,7 +5320,6 @@ maketempf() {
ERRFILE=$TEMPDIR/errorfile.txt || exit -6 ERRFILE=$TEMPDIR/errorfile.txt || exit -6
fi fi
HOSTCERT=$TEMPDIR/host_certificate.txt HOSTCERT=$TEMPDIR/host_certificate.txt
HEADERFILE=$TEMPDIR/http_header.txt
initialize_engine initialize_engine
if [[ $DEBUG -ne 0 ]]; then if [[ $DEBUG -ne 0 ]]; then
cat >$TEMPDIR/environment.txt << EOF cat >$TEMPDIR/environment.txt << EOF
@ -6085,7 +6086,7 @@ run_mass_testing_parallel() {
$cmdline >$LOGFILE & $cmdline >$LOGFILE &
sleep $PARALLEL_SLEEP sleep $PARALLEL_SLEEP
done < "$FNAME" done < "$FNAME"
exit $? return $?
} }
@ -6105,8 +6106,7 @@ run_mass_testing() {
outln "$cmdline" outln "$cmdline"
$cmdline $cmdline
done < "${FNAME}" done < "${FNAME}"
return $?
exit $?
} }
@ -6144,6 +6144,7 @@ initialize_globals() {
do_test_just_one=false do_test_just_one=false
do_tls_sockets=false do_tls_sockets=false
do_client_simulation=false do_client_simulation=false
do_display_only=false
} }
@ -6181,7 +6182,7 @@ query_globals() {
for gbl in do_allciphers do_vulnerabilities do_beast do_breach do_ccs_injection do_cipher_per_proto do_crime \ for gbl in do_allciphers do_vulnerabilities do_beast do_breach do_ccs_injection do_cipher_per_proto do_crime \
do_freak do_logjam do_header do_heartbleed do_mx_all_ips do_pfs do_protocols do_rc4 do_renego \ do_freak do_logjam do_header do_heartbleed do_mx_all_ips do_pfs do_protocols do_rc4 do_renego \
do_std_cipherlists do_server_defaults do_server_preference do_spdy do_http2 do_ssl_poodle do_tls_fallback_scsv \ do_std_cipherlists do_server_defaults do_server_preference do_spdy do_http2 do_ssl_poodle do_tls_fallback_scsv \
do_client_simulation do_test_just_one do_tls_sockets do_mass_testing ; do do_client_simulation do_test_just_one do_tls_sockets do_mass_testing do_display_only; do
[[ "${!gbl}" == "true" ]] && let true_nr++ [[ "${!gbl}" == "true" ]] && let true_nr++
done done
return $true_nr return $true_nr
@ -6194,17 +6195,18 @@ debug_globals() {
for gbl in do_allciphers do_vulnerabilities do_beast do_breach do_ccs_injection do_cipher_per_proto do_crime \ for gbl in do_allciphers do_vulnerabilities do_beast do_breach do_ccs_injection do_cipher_per_proto do_crime \
do_freak do_logjam do_header do_heartbleed do_rc4 do_mx_all_ips do_pfs do_protocols do_rc4 do_renego \ do_freak do_logjam do_header do_heartbleed do_rc4 do_mx_all_ips do_pfs do_protocols do_rc4 do_renego \
do_std_cipherlists do_server_defaults do_server_preference do_spdy do_http2 do_ssl_poodle do_tls_fallback_scsv \ do_std_cipherlists do_server_defaults do_server_preference do_spdy do_http2 do_ssl_poodle do_tls_fallback_scsv \
do_client_simulation do_test_just_one do_tls_sockets do_mass_testing; do do_client_simulation do_test_just_one do_tls_sockets do_mass_testing do_display_only; do
printf "%-22s = %s\n" $gbl "${!gbl}" printf "%-22s = %s\n" $gbl "${!gbl}"
done done
printf "%-22s : %s\n" URI: "$URI" printf "%-22s : %s\n" URI: "$URI"
} }
# arg1+2 are just the options # arg1: either switch+value (=) or switch
# arg2: value (if no = provided)
parse_opt_equal_sign() { parse_opt_equal_sign() {
if [[ "$1" == *=* ]]; then if [[ "$1" == *=* ]]; then
echo "$1" | awk -F'=' '{ print $2 }' echo ${1#*=}
return 1 # = means we don't need to shift args! return 1 # = means we don't need to shift args!
else else
echo $2 echo $2
@ -6244,13 +6246,15 @@ parse_cmd_line() {
CMDLINE_IP=$(parse_opt_equal_sign "$1" "$2") CMDLINE_IP=$(parse_opt_equal_sign "$1" "$2")
[[ $? -eq 0 ]] && shift [[ $? -eq 0 ]] && shift
;; ;;
-V|-V=*|--local|--local=*) # this is only displaying local ciphers, thus we don't put it in the loop -V|-V=*|--local|--local=*) # attention, this could have a value or not!
find_openssl_binary do_display_only=true
maketempf # for GOST support PATTERN2SHOW="$(parse_opt_equal_sign "$1" "$2")"
mybanner retval=$?
openssl_age if [[ "$PATTERN2SHOW" == -* ]]; then
prettyprint_local $(parse_opt_equal_sign "$1" "$2") unset PATTERN2SHOW # we hit the next command ==> not our value
exit $? else # it was ours, point to next arg
[[ $retval -eq 0 ]] && shift
fi
;; ;;
-x|-x=*|--single[-_]cipher|--single[-_]cipher=*) -x|-x=*|--single[-_]cipher|--single[-_]cipher=*)
do_test_just_one=true do_test_just_one=true
@ -6506,7 +6510,7 @@ parse_cmd_line() {
done done
# Show usage if no options were specified # Show usage if no options were specified
if [[ -z "$1" ]] && [[ -z "$FNAME" ]] ; then if [[ -z "$1" ]] && [[ -z "$FNAME" ]] && ! $do_display_only; then
help 0 help 0
else else
# left off here is the URI # left off here is the URI
@ -6625,7 +6629,15 @@ openssl_age
ret=0 ret=0
ip="" ip=""
$do_mass_testing && run_mass_testing if $do_display_only; then
prettyprint_local "$PATTERN2SHOW"
exit $?
fi
if $do_mass_testing; then
run_mass_testing
exit $?
fi
#TODO: there shouldn't be the need for a special case for --mx, only the ip adresses we would need upfront and the do-parser #TODO: there shouldn't be the need for a special case for --mx, only the ip adresses we would need upfront and the do-parser
if $do_mx_all_ips; then if $do_mx_all_ips; then
@ -6668,4 +6680,4 @@ fi
exit $? exit $?
# $Id: testssl.sh,v 1.450 2016/01/31 10:04:58 dirkw Exp $ # $Id: testssl.sh,v 1.451 2016/01/31 20:02:17 dirkw Exp $