Some build updates and test changes

Author: mrinc

test/config/fail.yml

@@ -3,4 +3,4 @@ http:
     cloudflarewarp:
       plugin:
         cloudflarewarp:
-          disableDefault: false
+          disableDefault: true

test/config/success.yml

@@ -3,6 +3,7 @@ http:
     cloudflarewarp:
       plugin:
         cloudflarewarp:
+          disableDefault: false
           trustip:
             - 10.0.0.0/8
             - 172.0.0.0/8

test/test-base.sh

@@ -22,6 +22,8 @@ cp "./config/${1}.${2}" "./tempconfig/config.${2}"
 chmod -R 7777 ./logs;
 chmod -R 7777 ./tempconfig;
 
+sleep 2s;
+
 if [ "${3}" = "stack" ]; then
   docker stack deploy -c docker-stack.yml test-instance;
   sleep 1s;
@@ -52,6 +54,7 @@ while ! grep -q "Propagating new UP status" "./logs/debug.log" && [ $iterations
 done
 
 curl -H "CF-Connecting-IP:${4}" -H "CF-Visitor:{\"scheme\":\"https\"}" http://localhost:4008/ >> ./logs/output.log;
+echo "Headers:\nCF-Connecting-IP:${4}\nCF-Visitor:{\"scheme\":\"https\"}" >> ./logs/request.log
 cat ./logs/output.log;
 
 if [ "${3}" = "stack" ] ; then

test/test-verify.sh

@@ -1,27 +1,31 @@
 SUCCESS_CONFIG_FILE="./logs-success-${1}/output.log"
 FAIL_CONFIG_FILE="./logs-fail-${1}/output.log"
 
-echo "RUNNING TESTS FOR ${1}";
+echo "RUNNING TESTS FOR ${1}"
+echo " - Succ $SUCCESS_CONFIG_FILE"
+echo " - Fail $FAIL_CONFIG_FILE"
+
+sleep 1s
 
 if ! grep -q "X-Is-Trusted: yes" $SUCCESS_CONFIG_FILE; then
-  echo "X-Is-Trusted header was not added and parsed"
+  echo "'X-Is-Trusted: yes' header was not added and parsed ($SUCCESS_CONFIG_FILE)"
   exit 5
 fi
 if ! grep -q "X-Forwarded-For: ${2}" $SUCCESS_CONFIG_FILE; then
-  echo "IP header not defined"
+  echo "'X-Forwarded-For: ${2}' header not defined ($SUCCESS_CONFIG_FILE)"
   exit 5
 fi
 #if ! grep -q "X-Real-Ip: 10.0.0.2" $SUCCESS_CONFIG_FILE; then
 #  echo "IP real not defined"
 #  exit 5
 #fi
 if ! grep -q "Cf-Visitor: {\"scheme\":\"https\"}" $SUCCESS_CONFIG_FILE; then
-  echo "Schema header not defined"
+  echo "'Cf-Visitor: {\"scheme\":\"https\"}' header not defined ($SUCCESS_CONFIG_FILE)"
   exit 5
 fi
 
 if ! grep -q "X-Is-Trusted: no" $FAIL_CONFIG_FILE; then
-  echo "X-Is-Trusted header was not added to the invalid request"
+  echo "'X-Is-Trusted: no' header was not added to the invalid request ($FAIL_CONFIG_FILE)"
   exit 5
 fi
 #if ! grep -q "X-Forwarded-For: 10.0.0.2" $FAIL_CONFIG_FILE; then