bug fix

git-svn-id: http://10.144.169.20/repos/um/branches/l7vsd-3.x-ramiel-epoll-cond@10406 1ed66053-1c2d-0410-8867-f7571e6e31d3

diff --git a/test/config/ultramonkey-l7/sslproxy/dh1024.pem b/test/config/ultramonkey-l7/sslproxy/dh1024.pem
new file mode 100644 (file)
index 0000000..6a17a4b
--- /dev/null
+++ b/test/config/ultramonkey-l7/sslproxy/dh1024.pem
@@ -0,0 +1,17 @@
+    PKCS#3 DH Parameters: (1024 bit)
+        prime:
+            00:af:12:dd:f4:35:c4:94:91:fc:af:e1:e3:1c:9d:
+            e6:f9:72:74:c7:ba:f2:7c:46:19:cc:23:e6:0b:a3:
+            e3:ff:6f:38:e3:62:e8:ce:84:be:3e:0a:8d:89:20:
+            ba:06:6c:ca:ac:cc:0d:68:cd:8c:29:a5:49:a3:95:
+            23:80:2a:50:a3:3d:99:b7:00:89:f2:f5:e6:fd:8e:
+            ae:b5:ad:14:3f:5d:df:89:9f:c6:ce:6f:5a:aa:bf:
+            1e:51:87:1c:29:f6:da:2f:8d:f1:f4:7b:93:bf:d1:
+            11:0a:1f:00:25:c0:1d:e6:d0:54:c8:f5:61:f0:7e:
+            d2:4f:7c:38:0c:db:2a:47:af
+        generator: 5 (0x5)
+-----BEGIN DH PARAMETERS-----
+MIGHAoGBAK8S3fQ1xJSR/K/h4xyd5vlydMe68nxGGcwj5guj4/9vOONi6M6Evj4K
+jYkgugZsyqzMDWjNjCmlSaOVI4AqUKM9mbcAifL15v2OrrWtFD9d34mfxs5vWqq/
+HlGHHCn22i+N8fR7k7/REQofACXAHebQVMj1YfB+0k98OAzbKkevAgEF
+-----END DH PARAMETERS-----

diff --git a/test/config/ultramonkey-l7/sslproxy/server.der b/test/config/ultramonkey-l7/sslproxy/server.der
new file mode 100644 (file)
index 0000000..6247036
Binary files /dev/null and b/test/config/ultramonkey-l7/sslproxy/server.der differ

diff --git a/test/script/l7vsadm/l7vsadm-13-1-24.sh b/test/script/l7vsadm/l7vsadm-13-1-24.sh
index f396226..0229283 100755 (executable)
--- a/test/script/l7vsadm/l7vsadm-13-1-24.sh
+++ b/test/script/l7vsadm/l7vsadm-13-1-24.sh
@@ -37,12 +37,13 @@ then
 fi
 
 #Connect
-GET_REQ=""
-for((I=0;I<100;I++)) do GET_REQ="${GET_REQ}GET / HTTP/1.0\r\n\r\n"; done
-POST_REQ=""
-for((I=0;I<200;I++)) do POST_REQ="${POST_REQ}POST / HTTP/1.0\r\n\r\n"; done
-echo -e -n "${GET_REQ}" | nc 127.0.0.1 40001
-echo -e -n "${POST_REQ}" | nc 127.0.0.1 40001
+for ((I=0;I<100;I++)) {
+       echo -e -n "GET / HTTP/1.0\r\n\r\n" | nc 127.0.0.1 40001
+}
+
+for ((I=0;I<200;I++)) {
+       echo -e -n "POST / HTTP/1.0\r\n\r\n" | nc 127.0.0.1 40001
+}
 
 #HTTP Total Requests check
 RET=`$L7VSADM -V -n | grep "HTTP Total Requests" | awk '{print $4}'`
@@ -78,7 +79,7 @@ then
         echo "Test failed: $L7VSADM -S -r"
         exit 1
 fi
-
+usleep 100000
 
 #HTTP Total Requests check
 RET=`$L7VSADM -V -n | grep "HTTP Total Requests" | awk '{print $4}'`

diff --git a/test/script/l7vsadm/l7vsadm-4-1-47.sh b/test/script/l7vsadm/l7vsadm-4-1-47.sh
index 2552f90..e4b5338 100755 (executable)
--- a/test/script/l7vsadm/l7vsadm-4-1-47.sh
+++ b/test/script/l7vsadm/l7vsadm-4-1-47.sh
@@ -11,12 +11,12 @@ then
 fi
 usleep 100000
 
-RET=`$L7VSADM -A -t [::2]:40001 -m sessionless 2>&1`
+RET=`$L7VSADM -A -t [::99]:40001 -m sessionless 2>&1`
 EXPECT="add vs error : Cannot assign requested address"
 
 if [ "${RET}" != "${EXPECT}" ]
 then
-        echo "Test failed: $L7VSADM -A -t [::2]:40001 -m sessionless"
+        echo "Test failed: $L7VSADM -A -t [::99]:40001 -m sessionless"
         exit 1
 fi
 

diff --git a/test/script/library-logger/logger-4.sh b/test/script/library-logger/logger-4.sh
index a7c79ee..0bee979 100755 (executable)
--- a/test/script/library-logger/logger-4.sh
+++ b/test/script/library-logger/logger-4.sh
@@ -12,6 +12,21 @@ then
 fi
 usleep 100000
 
+$L7VSADM -A -t 127.0.0.1:40001 -m sessionless
+if [ $? -ne 0 ]
+then
+        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40001 -m sessionless"
+        exit 1
+fi
+
+RET=`$L7VSADM -A -t 127.0.0.1:40001 -m sessionless 2>&1`
+EXPECT="add vs error : virtual service already exist."
+if [ "$RET" != "$EXPECT" ]
+then
+        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40001 -m sessionless"
+        exit 1
+fi
+
 RET=`cat ${L7VS_LOG_DIR}/l7vsadm.log | grep "\[WARN\]" | wc -l`
 if [ ${RET} -le 0 ]
 then

diff --git a/test/script/library-logger/logger-5.sh b/test/script/library-logger/logger-5.sh
index 886f98e..f7cc0b2 100755 (executable)
--- a/test/script/library-logger/logger-5.sh
+++ b/test/script/library-logger/logger-5.sh
@@ -12,6 +12,27 @@ then
 fi
 usleep 100000
 
+$L7VSADM -A -t 127.0.0.1:40001 -m sessionless
+if [ $? -ne 0 ]
+then
+        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40001 -m sessionless"
+        exit 1
+fi
+
+$L7VSADM -a -t 127.0.0.1:40001 -m sessionless -r 127.0.0.99:9999
+if [ $? -ne 0 ]
+then
+        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m sessionless -r 127.0.0.99:9999"
+        exit 1
+fi
+
+wget -qO- -t 1 http://127.0.0.1:40001/
+if [ $? -ne 0 ]
+then
+        echo "Test failed: $wget -qO- -t 1 http://127.0.0.1:40001/"
+        exit 1
+fi
+
 RET=`cat ${L7VS_LOG_DIR}/l7vsadm.log | grep "\[ERROR\]" | wc -l`
 if [ ${RET} -le 0 ]
 then

diff --git a/test/script/virtualservice/materials/virtualservice-100-sslproxy.target.cf b/test/script/virtualservice/materials/virtualservice-100-sslproxy.target.cf
index 6ac4ec3..8ac6dcc 100644 (file)
--- a/test/script/virtualservice/materials/virtualservice-100-sslproxy.target.cf
+++ b/test/script/virtualservice/materials/virtualservice-100-sslproxy.target.cf
@@ -11,7 +11,7 @@ ca_file = "root.pem"
 cert_chain_dir = "/etc/l7vs/sslproxy/"
 cert_chain_file = "server.pem"
 private_key_dir = "/etc/l7vs/sslproxy/"
-private_key_file = "server.pem"
+private_key_file = "server.der"
 private_key_filetype = "SSL_FILETYPE_ASN1"
 private_key_passwd_dir = "/etc/l7vs/sslproxy/"
 private_key_passwd_file = "passwd.txt"

diff --git a/test/script/virtualservice/virtualservice-100.sh b/test/script/virtualservice/virtualservice-100.sh
index b5f8964..d298537 100755 (executable)
--- a/test/script/virtualservice/virtualservice-100.sh
+++ b/test/script/virtualservice/virtualservice-100.sh
@@ -21,7 +21,8 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function:" |grep "private_key_filetype = 2"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function:" |grep "private_key_filetype = 0"`
+
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-150.sh b/test/script/virtualservice/virtualservice-150.sh
deleted file mode 100755 (executable)
index 8b66f1e..0000000
--- a/test/script/virtualservice/virtualservice-150.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-
-# set config file
-. ${SET_DEFAULT_CONF}
-\cp -f materials/virtualservice-150-l7vs.cf ${L7VSD_CONF_DIR}/l7vs.cf
-\cp -f materials/virtualservice-150-sslproxy.target.cf ${L7VSD_CONF_DIR}/sslproxy/sslproxy.target.cf
-
-#Run http server
-RealServer1=RealServer1
-RealServer1_ADDR=127.0.0.1
-RealServer1_PORT=50001
-start_lighttpd -s $RealServer1 -a $RealServer1_ADDR -p $RealServer1_PORT
-
-if [ $? -ne 0 ]
-then
-        echo "Test failed: start_lighttpd RealServer1"
-        exit 1
-fi
-
-#Add Service
-$L7VSD
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSD"
-        exit 1
-fi
-usleep 100000
-
-$L7VSADM -A -t 127.0.0.1:40001 -m sessionless -z ${L7VSD_CONF_DIR}/sslproxy/sslproxy.target.cf
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40001 -m sessionless -z ${L7VSD_CONF_DIR}/sslproxy/sslproxy.target.cf"
-        exit 1
-fi
-
-$L7VSADM -a -t 127.0.0.1:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT}
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT}"
-        exit 1
-fi
-
-for (( i = 0 ; i < 4; i++ )){
-       RET=`wget -qO- https://127.0.0.1:40001/ --no-check-certificate`
-       if [ "${RET}" != "${RealServer1}" ]
-       then
-               echo "Test failed: wget -qO- https://127.0.0.1:40001/ --no-check-certificate"
-               exit 1
-       fi
-}
-
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "SSL session cache information: Session number\[2\]"`
-if [ -z "${RET}" ]
-then
-        echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"
-        exit 1
-fi
-
-stop_lighttpd $RealServer1
-
-exit 0
-

diff --git a/test/script/virtualservice/virtualservice-151.sh b/test/script/virtualservice/virtualservice-151.sh
deleted file mode 100755 (executable)
index d5347be..0000000
--- a/test/script/virtualservice/virtualservice-151.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash
-
-# set config file
-. ${SET_DEFAULT_CONF}
-\cp -f materials/virtualservice-151-l7vs.cf ${L7VSD_CONF_DIR}/l7vs.cf
-\cp -f materials/virtualservice-151-sslproxy.target.cf ${L7VSD_CONF_DIR}/sslproxy/sslproxy.target.cf
-
-#Run http server
-RealServer1=RealServer1
-RealServer1_ADDR=127.0.0.1
-RealServer1_PORT=50001
-start_lighttpd -s $RealServer1 -a $RealServer1_ADDR -p $RealServer1_PORT
-
-if [ $? -ne 0 ]
-then
-        echo "Test failed: start_lighttpd RealServer1"
-        exit 1
-fi
-
-#Add Service
-$L7VSD
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSD"
-        exit 1
-fi
-usleep 100000
-
-$L7VSADM -A -t 127.0.0.1:40001 -m sessionless -z ${L7VSD_CONF_DIR}/sslproxy/sslproxy.target.cf
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40001 -m sessionless -z ${L7VSD_CONF_DIR}/sslproxy/sslproxy.target.cf"
-        exit 1
-fi
-
-$L7VSADM -a -t 127.0.0.1:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT}
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT}"
-        exit 1
-fi
-
-for (( i = 0 ; i < 3; i++ )){
-       RET=`wget -qO- https://127.0.0.1:40001/ --no-check-certificate`
-       if [ "${RET}" != "${RealServer1}" ]
-       then
-               echo "Test failed: wget -qO- https://127.0.0.1:40001/ --no-check-certificate"
-               exit 1
-       fi
-}
-
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "SSL session cache information: Session number\[2\]"`
-if [ -z "${RET}" ]
-then
-        echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"
-        exit 1
-fi
-
-sleep 10
-
-RET=`wget -qO- https://127.0.0.1:40001/ --no-check-certificate`
-if [ "${RET}" != "${RealServer1}" ]
-then
-        echo "Test failed: wget -qO- https://127.0.0.1:40001/ --no-check-certificate"
-        exit 1
-fi
-
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "SSL session cache information: Session number\[0\]"`
-if [ -z "${RET}" ]
-then
-        echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"
-        exit 1
-fi
-
-stop_lighttpd $RealServer1
-
-exit 0
-