From 3e219a3d851d92475eec1e8ae4a5fa0fe12e46ac Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Fri, 18 Nov 2011 19:39:06 +0000 Subject: [PATCH] Use wget instead of curl on systems with NSS flavour of curl (SL6). But still prefer curl over wget otherwise (problems with long URLs in wget on SL5). --- org.glite.testsuites.ctb/LB/tests/lb-test-https.sh | 32 ++++++++++++++++++---- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/org.glite.testsuites.ctb/LB/tests/lb-test-https.sh b/org.glite.testsuites.ctb/LB/tests/lb-test-https.sh index 6ad68c9..a41e7c7 100755 --- a/org.glite.testsuites.ctb/LB/tests/lb-test-https.sh +++ b/org.glite.testsuites.ctb/LB/tests/lb-test-https.sh @@ -106,6 +106,19 @@ if [ $? != 0 ]; then exit 2 fi X509_USER_PROXY=`${GRIDPROXYINFO} | ${SYS_GREP} -E "^path" | ${SYS_SED} "s/path\s*:\s//"` + +printf "Using SSL client: " +$SYS_CURL --version | head -n 1 | grep -i NSS/ >/dev/null 2>&1 +if [ $? -eq 0 ]; then + SSL_CMD="wget --no-check-certificate --secure-protocol=SSLv3 --quiet --private-key $X509_USER_PROXY --certificate $X509_USER_PROXY --ca-directory /etc/grid-security/certificates --ca-certificate $X509_USER_PROXY --output-document https.$$.tmp" + SSL_CLIENT=wget +else + SSL_CMD="$SYS_CURL --insecure -3 --silent --key $X509_USER_PROXY --cert $X509_USER_PROXY --capath /etc/grid-security/certificates --output https.$$.tmp" + SSL_CLIENT=curl +fi +printf "$SSL_CLIENT" +test_done + # Register job: printf "Registering testing job " jobid=`${LBJOBREG} -m ${GLITE_WMS_QUERY_SERVER} -s application | $SYS_GREP "new jobid" | ${SYS_AWK} '{ print $3 }'` @@ -119,7 +132,7 @@ X509_USER_PROXY=`${GRIDPROXYINFO} | ${SYS_GREP} -E "^path" | ${SYS_SED} "s/path\ # Get list of jobs printf "Evaluating job list... " - $SYS_CURL --insecure -3 --silent --key $X509_USER_PROXY --cert $X509_USER_PROXY --capath /etc/grid-security/certificates --output https.$$.tmp https://${GLITE_WMS_QUERY_SERVER}/ + $SSL_CMD https://${GLITE_WMS_QUERY_SERVER}/ if [ "$?" != "0" ]; then test_failed @@ -145,7 +158,7 @@ X509_USER_PROXY=`${GRIDPROXYINFO} | ${SYS_GREP} -E "^path" | ${SYS_SED} "s/path\ # Get job status printf "Evaluating job status listing... " - $SYS_CURL --insecure -3 --silent --key $X509_USER_PROXY --cert $X509_USER_PROXY --capath /etc/grid-security/certificates --output https.$$.tmp "${jobid}" + $SSL_CMD "${jobid}" if [ "$?" != "0" ]; then test_failed @@ -191,7 +204,7 @@ X509_USER_PROXY=`${GRIDPROXYINFO} | ${SYS_GREP} -E "^path" | ${SYS_SED} "s/path\ # Get notification status printf "Evaluating notification status listing... " - $SYS_CURL --insecure -3 --silent --key $X509_USER_PROXY --cert $X509_USER_PROXY --capath /etc/grid-security/certificates --output https.$$.tmp "${notifid}" + $SSL_CMD "${notifid}" if [ "$?" != "0" ]; then test_failed @@ -242,7 +255,11 @@ X509_USER_PROXY=`${GRIDPROXYINFO} | ${SYS_GREP} -E "^path" | ${SYS_SED} "s/path\ done printf "${#URL} characters" - $SYS_CURL --insecure -3 --silent --key $X509_USER_PROXY --cert $X509_USER_PROXY --capath /etc/grid-security/certificates --output https.$$.tmp -D http.header.dump.$$ $URL + if [ "$SSL_CLIENT" = "curl" ]; then + $SSL_CMD -D http.header.dump.$$ $URL + else + $SSL_CMD --server-response $URL 2> http.header.dump.$$ + fi $SYS_GREP -E "400.*Bad.*Request" http.header.dump.$$ > /dev/null if [ "$?" != "0" ]; then test_failed @@ -255,7 +272,11 @@ X509_USER_PROXY=`${GRIDPROXYINFO} | ${SYS_GREP} -E "^path" | ${SYS_SED} "s/path\ printf "Trying request with normal length..." URL="https://${GLITE_WMS_QUERY_SERVER}/$RANDOM" - $SYS_CURL --insecure -3 --silent --key $X509_USER_PROXY --cert $X509_USER_PROXY --capath /etc/grid-security/certificates --output https.$$.tmp -D http.header.dump.$$ $URL + if [ "$SSL_CLIENT" = "curl" ]; then + $SSL_CMD -D http.header.dump.$$ $URL + else + $SSL_CMD --server-response $URL 2> http.header.dump.$$ + fi $SYS_GREP -E "404.*Not.*Found" http.header.dump.$$ > /dev/null if [ "$?" != "0" ]; then test_failed @@ -266,6 +287,7 @@ X509_USER_PROXY=`${GRIDPROXYINFO} | ${SYS_GREP} -E "^path" | ${SYS_SED} "s/path\ fi $SYS_RM http.header.dump.$$ + $SYS_RM https.$$.tmp test_end } -- 1.8.2.3