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

Fixes trailing dot error in URL handling

Browse Source 
For DNS queries a trailing dot in the variable $NODE is always fine. For
HTTP queries it is not. and causes the https request to fail.

Backport from 4f1da9b192

Also: removal of ancient CVS_REL relict in $TEMPDIR/environment.txt
This commit is contained in:
Dirk Wetter 2021-01-13 11:35:31 +01:00
parent 666a2c4edb
commit b8e76a3861
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
testssl.sh
View File

@ -17322,11 +17322,10 @@ prepare_debug() {
cat >$TEMPDIR/environment.txt << EOF cat >$TEMPDIR/environment.txt << EOF
CVS_REL: $CVS_REL
GIT_REL: $GIT_REL GIT_REL: $GIT_REL
PID: $$ PID: $$
commandline: "$CMDLINE" commandline: "${CMDLINE[@]}"
bash version: ${BASH_VERSINFO[0]}.${BASH_VERSINFO[1]}.${BASH_VERSINFO[2]} bash version: ${BASH_VERSINFO[0]}.${BASH_VERSINFO[1]}.${BASH_VERSINFO[2]}
status: ${BASH_VERSINFO[4]} status: ${BASH_VERSINFO[4]}
machine: ${BASH_VERSINFO[5]} machine: ${BASH_VERSINFO[5]}
@ -17696,7 +17695,6 @@ parse_hn_port() {
NODE="$1" NODE="$1"
NODE="${NODE/https\:\/\//}" # strip "https" NODE="${NODE/https\:\/\//}" # strip "https"
NODE="${NODE%%/*}" # strip trailing urlpath NODE="${NODE%%/*}" # strip trailing urlpath
NODE="${NODE%%.}" # strip trailing "." if supplied
if grep -q ':$' <<< "$NODE"; then if grep -q ':$' <<< "$NODE"; then
if grep -wq http <<< "$NODE"; then if grep -wq http <<< "$NODE"; then
fatal "\"http\" is not what you meant probably" $ERR_CMDLINE fatal "\"http\" is not what you meant probably" $ERR_CMDLINE
@ -17718,6 +17716,7 @@ parse_hn_port() {
grep -q ':' <<< "$NODE" && \ grep -q ':' <<< "$NODE" && \
PORT=$(sed 's/^.*\://' <<< "$NODE") && NODE=$(sed 's/\:.*$//' <<< "$NODE") PORT=$(sed 's/^.*\://' <<< "$NODE") && NODE=$(sed 's/\:.*$//' <<< "$NODE")
fi fi
NODE="${NODE%%.}" # strip trailing "." if supplied
# We check for non-ASCII chars now. If there are some we'll try to convert it if IDN/IDN2 is installed # We check for non-ASCII chars now. If there are some we'll try to convert it if IDN/IDN2 is installed
# If not, we'll continue. Hoping later that dig can use it. If not the error handler will tell # If not, we'll continue. Hoping later that dig can use it. If not the error handler will tell