echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

checkremotecerts.sh: support for ports

Browse Source
This commit is contained in:
kytv
2014-06-29 11:27:57 +00:00
parent 367d68e552
commit 9827c48527
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/scripts/checkremotecerts.sh
View File

@ -4,7 +4,7 @@ set -u
BASEDIR="$(dirname $0)/../../" BASEDIR="$(dirname $0)/../../"
cd "$BASEDIR" cd "$BASEDIR"
RESEEDHOSTS=$(sed -e '/^\s\+"https:\/\/[-a-z0-9.]/!d' -e 's/.*"https:\/\/\([-a-z0-9.]\+\).*/\1/' router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java) RESEEDHOSTS=$(sed -e '/^\s\+"https:\/\/[-a-z0-9.]/!d' -e 's/.*"https:\/\/\([-a-z0-9.:]\+\).*/\1/' router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java)
CERTHOME="installer/resources/certificates" CERTHOME="installer/resources/certificates"
CACERTS=$(mktemp) CACERTS=$(mktemp)
WORK=$(mktemp -d) WORK=$(mktemp -d)
@ -81,9 +81,9 @@ normalize(){
connect() { connect() {
if [ $OPENSSL -eq 1 ]; then if [ $OPENSSL -eq 1 ]; then
$OPENSSL_BIN s_client -connect "$1:443" -CAfile $CACERTS -servername $1 < /dev/null 2> /dev/null $OPENSSL_BIN s_client -connect "$1:$2" -CAfile $CACERTS -servername $1 < /dev/null 2> /dev/null
else else
$GNUTLS_BIN --insecure --print-cert --x509cafile "$CACERTS" "$1" < /dev/null 2>/dev/null $GNUTLS_BIN --insecure --print-cert --x509cafile "$CACERTS" "$1" -p "$2" < /dev/null 2>/dev/null
fi fi
} }
@ -119,8 +119,20 @@ cleanup() {
check_hosts() { check_hosts() {
for HOST in $RESEEDHOSTS; do for HOST in $RESEEDHOSTS; do
echo -n "Checking $HOST..." if $(echo $HOST | grep -q ':'); then
if retry connect "$HOST" < /dev/null 1> "$WORK/$HOST"; then OLDIFS=$IFS
IFS=":"
set -- $HOST
HOSTNAME=$1
PORT=$2
IFS=$OLDIFS
else
HOSTNAME=$HOST
PORT=443
fi
echo -n "Checking $HOSTNAME:$PORT..."
if retry connect "$HOSTNAME" "$PORT" < /dev/null 1> "$WORK/$HOST"; then
# OpenSSL returns "return code: 0 (ok)" # OpenSSL returns "return code: 0 (ok)"
# GnuTLS returns "certificate is trusted" # GnuTLS returns "certificate is trusted"