From fa7535856d2dc1a60b62c587bfd53809d059bccd Mon Sep 17 00:00:00 2001 From: Mitchell Krog Date: Mon, 5 Jul 2021 08:48:47 +0200 Subject: [PATCH] GHA workflow - Fix Tests 3+ [skip travis] --- dev-tools/test-blocker-badwords.sh | 10 +- dev-tools/test-blocker-rate-limiting.sh | 176 ++++++++++---------- dev-tools/test-blocker-whitelist-domains.sh | 10 +- dev-tools/test-blocker-whitelist-ips.sh | 40 ++--- dev-tools/test-blocker-whitelist.sh | 64 +++---- 5 files changed, 155 insertions(+), 145 deletions(-) diff --git a/dev-tools/test-blocker-badwords.sh b/dev-tools/test-blocker-badwords.sh index 251f39cb3..5e9ff8f64 100755 --- a/dev-tools/test-blocker-badwords.sh +++ b/dev-tools/test-blocker-badwords.sh @@ -16,6 +16,8 @@ # # ############################################################################## +export TERM=xterm + # ------------------------------------------------------------------------------ # MIT License # ------------------------------------------------------------------------------ @@ -64,7 +66,7 @@ printf "\n" echo "${bold}${green}---------------" echo "${bold}${green}Reloading Nginx" echo "${bold}${green}---------------" -sudo nginx -t && sudo nginx -s reload +sudo nginx -t && sudo systemctl reload nginx } waitforReload () { @@ -80,11 +82,11 @@ echo "${bold}${green}----------------------------------------" echo "${bold}${green}Activating Users bad-referrer-words.conf" echo "${bold}${green}----------------------------------------" printf "\n" -sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/bad-referrer-words.conf /etc/nginx/bots.d/bad-referrer-words.conf +sudo cp ./dev-tools/test_units/bad-referrer-words.conf /etc/nginx/bots.d/bad-referrer-words.conf } run_curltest1 () { -if curl -I http://localhost:9000 -e "thisisabadword" 2>&1 | grep -i '(52)'; then +if curl -I http://localhost:80 -e "thisisabadword" 2>&1 | grep -i '(52)'; then echo "${bold}${green}PASSED - User bad-referrer-words.conf working" else echo "${bold}${red}FAILED - User bad-referrer-words.conf NOT working" @@ -93,7 +95,7 @@ fi } run_curltest2 () { -if curl -I http://localhost:9000 -e "thisisanotherbadword" 2>&1 | grep -i '(52)'; then +if curl -I http://localhost:80 -e "thisisanotherbadword" 2>&1 | grep -i '(52)'; then echo "${bold}${green}PASSED - User bad-referrer-words.conf working" else echo "${bold}${red}FAILED - User bad-referrer-words.conf NOT working" diff --git a/dev-tools/test-blocker-rate-limiting.sh b/dev-tools/test-blocker-rate-limiting.sh index 7260900de..5353d085e 100755 --- a/dev-tools/test-blocker-rate-limiting.sh +++ b/dev-tools/test-blocker-rate-limiting.sh @@ -16,6 +16,8 @@ # # ############################################################################## +export TERM=xterm + # ------------------------------------------------------------------------------ # MIT License # ------------------------------------------------------------------------------ @@ -64,7 +66,7 @@ printf "\n" echo "${bold}${green}---------------" echo "${bold}${green}Reloading Nginx" echo "${bold}${green}---------------" -sudo nginx -t && sudo nginx -s reload +sudo nginx -t && sudo systemctl reload nginx } waitforReload () { @@ -80,92 +82,92 @@ echo "${bold}${yellow}-----------------------------" echo "${bold}${yellow}Making GoogleBot ${yellow}RATE LIMITED" echo "${bold}${yellow}-----------------------------" printf "\n" -sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/rate-limiting-user-agents.conf /etc/nginx/bots.d/blacklist-user-agents.conf +sudo cp ./dev-tools/test_units/rate-limiting-user-agents.conf /etc/nginx/bots.d/blacklist-user-agents.conf } testRateLimiting () { -ratelimittestfile=${TRAVIS_BUILD_DIR}/.dev-tools/test_units/ratelimittest-master.txt +ratelimittestfile=./dev-tools/test_units/ratelimittest-master.txt truncate -s 0 ${ratelimittestfile} -curl -A "GoogleBot" http://localhost:9000 2>&1 > ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & -curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} +curl -A "GoogleBot" http://localhost:80 2>&1 > ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:80 2>&1 >> ${ratelimittestfile} if grep -i 'Unavailable' < ${ratelimittestfile}; then echo "${bold}${green}PASSED - ${red}GoogleBot was ${bold}${red}RATE LIMITED" @@ -181,10 +183,10 @@ echo "${bold}${green}-------------------------------------------------------" echo "${bold}${green}Backup all conf files and folders used during this test" echo "${bold}${green}-------------------------------------------------------" printf "\n" -sudo cp /etc/nginx/bots.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/test1_conf_files_ratelimiting/bots.d/ -sudo cp /etc/nginx/conf.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/test1_conf_files_ratelimiting/conf.d/ -sudo cp /etc/nginx/sites-available/default.vhost ${TRAVIS_BUILD_DIR}/.dev-tools/test1_conf_files_ratelimiting/default.vhost -sudo cp /etc/nginx/nginx.conf ${TRAVIS_BUILD_DIR}/.dev-tools/test1_conf_files_ratelimiting/nginx.conf +sudo cp /etc/nginx/bots.d/* ./dev-tools/test1_conf_files_ratelimiting/bots.d/ +sudo cp /etc/nginx/conf.d/* ./dev-tools/test1_conf_files_ratelimiting/conf.d/ +sudo cp /etc/nginx/sites-available/default.vhost ./dev-tools/test1_conf_files_ratelimiting/default.vhost +sudo cp /etc/nginx/nginx.conf ./dev-tools/test1_conf_files_ratelimiting/nginx.conf } # ----------- diff --git a/dev-tools/test-blocker-whitelist-domains.sh b/dev-tools/test-blocker-whitelist-domains.sh index 907ecc241..0505f485d 100755 --- a/dev-tools/test-blocker-whitelist-domains.sh +++ b/dev-tools/test-blocker-whitelist-domains.sh @@ -16,6 +16,8 @@ # # ############################################################################## +export TERM=xterm + # ------------------------------------------------------------------------------ # MIT License # ------------------------------------------------------------------------------ @@ -64,7 +66,7 @@ printf "\n" echo "${bold}${green}---------------" echo "${bold}${green}Reloading Nginx" echo "${bold}${green}---------------" -sudo nginx -t && sudo nginx -s reload +sudo nginx -t && sudo systemctl reload nginx } waitforReload () { @@ -80,11 +82,11 @@ echo "${bold}${green}---------------------------------------" echo "${bold}${green}Activating Users whitelist-domains.conf" echo "${bold}${green}---------------------------------------" printf "\n" -sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/whitelist-domains.conf /etc/nginx/bots.d/whitelist-domains.conf +sudo cp ./dev-tools/test_units/whitelist-domains.conf /etc/nginx/bots.d/whitelist-domains.conf } run_curltest1 () { -if curl http://localhost:9000 -e http://www.myowndomain.com 2>&1 | grep -i 'Welcome'; then +if curl http://localhost:80 -e http://www.myowndomain.com 2>&1 | grep -i 'Welcome'; then echo "${bold}${green}PASSED - User whitelist-domains.conf working" else echo "${bold}${red}FAILED - User whitelist-domains.conf NOT working" @@ -93,7 +95,7 @@ fi } run_curltest2 () { -if curl http://localhost:9000 -e http://www.myotherdomain.com 2>&1 | grep -i 'Welcome'; then +if curl http://localhost:80 -e http://www.myotherdomain.com 2>&1 | grep -i 'Welcome'; then echo "${bold}${green}PASSED - User whitelist-domains.conf working" else echo "${bold}${red}FAILED - User whitelist-domains.conf NOT working" diff --git a/dev-tools/test-blocker-whitelist-ips.sh b/dev-tools/test-blocker-whitelist-ips.sh index 0a44181aa..2210e755d 100755 --- a/dev-tools/test-blocker-whitelist-ips.sh +++ b/dev-tools/test-blocker-whitelist-ips.sh @@ -16,6 +16,8 @@ # # ############################################################################## +export TERM=xterm + # ------------------------------------------------------------------------------ # MIT License # ------------------------------------------------------------------------------ @@ -64,7 +66,7 @@ reloadNginX () { echo "${bold}${green}---------------" echo "${bold}${green}Reloading Nginx" echo "${bold}${green}---------------" -sudo nginx -t && sudo nginx -s reload +sudo nginx -t && sudo systemctl reload nginx } waitforReload () { @@ -76,7 +78,7 @@ sleep 10s } run_curltest1 () { -if curl http://localhost:9000 2>&1 | grep -i '(52)'; then +if curl http://localhost:80 2>&1 | grep -i '(52)'; then echo "${bold}${green}PASSED - ${bold}${red}blacklist own ip is WORKING" else echo "${bold}${red}FAILED - blacklist own ip is NOT working" @@ -85,11 +87,11 @@ fi } run_curltest2 () { -if curl http://localhost:9000 2>&1 | grep -i 'Welcome'; then +if curl http://localhost:80 2>&1 | grep -i 'Welcome'; then echo "${bold}${green}PASSED - whitelist own ip is WORKING" else echo "${bold}${red}FAILED - whitelist own ip is NOT working" - curl http://localhost:9000 + curl http://localhost:80 exit 1 fi } @@ -100,28 +102,28 @@ echo "${bold}${green}----------------------------------------------------------- echo "${bold}${green}Make Backup all conf files and folders used during this test" echo "${bold}${green}------------------------------------------------------------" printf "\n" -sudo cp /etc/nginx/bots.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/test1_conf_files_ip_whitelist/bots.d/ -sudo cp /etc/nginx/conf.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/test1_conf_files_ip_whitelist/conf.d/ -sudo cp /etc/nginx/sites-available/default.vhost ${TRAVIS_BUILD_DIR}/.dev-tools/test1_conf_files_ip_whitelist/default.vhost -sudo cp /etc/nginx/nginx.conf ${TRAVIS_BUILD_DIR}/.dev-tools/test1_conf_files_ip_whitelist/nginx.conf +sudo cp /etc/nginx/bots.d/* ./dev-tools/test1_conf_files_ip_whitelist/bots.d/ +sudo cp /etc/nginx/conf.d/* ./dev-tools/test1_conf_files_ip_whitelist/conf.d/ +sudo cp /etc/nginx/sites-available/default.vhost ./dev-tools/test1_conf_files_ip_whitelist/default.vhost +sudo cp /etc/nginx/nginx.conf ./dev-tools/test1_conf_files_ip_whitelist/nginx.conf } blacklistOwnIP () { -sudo truncate -s 0 ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/blacklist-ips.conf -printf '%s\t%s\n' "${thisip}" "1;" > ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/blacklist-ips.conf -printf '%s\t%s\n' "127.0.0.1" "1;" >> ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/blacklist-ips.conf -sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/blacklist-ips.conf /etc/nginx/bots.d/blacklist-ips.conf -sudo truncate -s 0 ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/whitelist-ips.conf -sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/whitelist-ips.conf /etc/nginx/bots.d/whitelist-ips.conf +sudo truncate -s 0 ./dev-tools/test_units/blacklist-ips.conf +printf '%s\t%s\n' "${thisip}" "1;" > ./dev-tools/test_units/blacklist-ips.conf +printf '%s\t%s\n' "127.0.0.1" "1;" >> ./dev-tools/test_units/blacklist-ips.conf +sudo cp ./dev-tools/test_units/blacklist-ips.conf /etc/nginx/bots.d/blacklist-ips.conf +sudo truncate -s 0 ./dev-tools/test_units/whitelist-ips.conf +sudo cp ./dev-tools/test_units/whitelist-ips.conf /etc/nginx/bots.d/whitelist-ips.conf } whitelistOwnIP () { -sudo truncate -s 0 ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/whitelist-ips.conf -printf '%s\t%s\n' "${thisip}" "0;" > ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/whitelist-ips.conf -printf '%s\t%s\n' "127.0.0.1" "0;" >> ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/whitelist-ips.conf -sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/whitelist-ips.conf /etc/nginx/bots.d/whitelist-ips.conf +sudo truncate -s 0 ./dev-tools/test_units/whitelist-ips.conf +printf '%s\t%s\n' "${thisip}" "0;" > ./dev-tools/test_units/whitelist-ips.conf +printf '%s\t%s\n' "127.0.0.1" "0;" >> ./dev-tools/test_units/whitelist-ips.conf +sudo cp ./dev-tools/test_units/whitelist-ips.conf /etc/nginx/bots.d/whitelist-ips.conf # TEST ANY CHANGES TO botblocker-nginx-settings.conf -sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/botblocker-nginx-settings.conf /etc/nginx/conf.d/botblocker-nginx-settings.conf +sudo cp ./dev-tools/test_units/botblocker-nginx-settings.conf /etc/nginx/conf.d/botblocker-nginx-settings.conf } # ----------- diff --git a/dev-tools/test-blocker-whitelist.sh b/dev-tools/test-blocker-whitelist.sh index 0fc7a797c..b32271783 100755 --- a/dev-tools/test-blocker-whitelist.sh +++ b/dev-tools/test-blocker-whitelist.sh @@ -16,6 +16,8 @@ # # ############################################################################## +export TERM=xterm + # ------------------------------------------------------------------------------ # MIT License # ------------------------------------------------------------------------------ @@ -64,7 +66,7 @@ printf "\n" echo "${bold}${green}---------------" echo "${bold}${green}Reloading Nginx" echo "${bold}${green}---------------" -sudo nginx -t && sudo nginx -s reload +sudo nginx -t && sudo systemctl reload nginx } waitforReload () { @@ -76,22 +78,22 @@ sleep 10s } run_curltest1 () { -if curl -v -A "Nutch" http://localhost:9000 2>&1 | grep -i 'Welcome'; then +if curl -v -A "Nutch" http://localhost:80 2>&1 | grep -i 'Welcome'; then echo "${bold}${green}PASSED - WHITELISTING OF BAD BOT Nutch ALLOWED" else echo "${bold}${red}FAILED - WHITELISTING of BAD BOT Nutch FAILED" #exit 1 - curl -v -A "Nutch" http://localhost:9000 2>&1 + curl -v -A "Nutch" http://localhost:80 2>&1 fi } run_curltest2 () { -if curl http://localhost:9000 -e http://zx6.ru 2>&1 | grep -i 'Welcome'; then +if curl http://localhost:80 -e http://zx6.ru 2>&1 | grep -i 'Welcome'; then echo "${bold}${green}PASSED - WHITELISTING OF REFERRER zx6.ru ALLOWED" else echo "${bold}${red}FAILED - WHITELISTING OF REFERRER zx6.ru FAILED" #exit 1 - curl http://localhost:9000 -e http://zx6.ru 2>&1 + curl http://localhost:80 -e http://zx6.ru 2>&1 fi } @@ -103,10 +105,10 @@ printf "\n" # -------------------------------------------------------------------------- # Generate our custom test units turning all good to bad and all bad to good # -------------------------------------------------------------------------- -_input1=${TRAVIS_BUILD_DIR}/_generator_lists/bad-user-agents.list -_input2=${TRAVIS_BUILD_DIR}/.dev-tools/referrers-regex-format-whitelist-test.txt -_inputdb1=${TRAVIS_BUILD_DIR}/.dev-tools/good-bad-user-agents.db -_inputdb2=${TRAVIS_BUILD_DIR}/.dev-tools/good-bad-referrers.db +_input1=./_generator_lists/bad-user-agents.list +_input2=./dev-tools/referrers-regex-format-whitelist-test.txt +_inputdb1=./dev-tools/good-bad-user-agents.db +_inputdb2=./dev-tools/good-bad-referrers.db _tmpnginx1=_tmpnginx1 _tmpnginx2=_tmpnginx2 _start1="# START MAKE BAD BOTS GOOD ### DO NOT EDIT THIS LINE AT ALL ###" @@ -135,11 +137,11 @@ ed -s ${_inputdb1}<<\IN 1,/# START MAKE BAD BOTS GOOD ### DO NOT EDIT THIS LINE AT ALL ###/d /# END MAKE BAD BOTS GOOD ### DO NOT EDIT THIS LINE AT ALL ###/,$d ,d -.r /home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/.dev-tools/test_units/blacklist-user-agents.conf +.r ./dev-tools/test_units/blacklist-user-agents.conf /# START MAKE BAD BOTS GOOD ### DO NOT EDIT THIS LINE AT ALL ###/x .t. .,/# END MAKE BAD BOTS GOOD ### DO NOT EDIT THIS LINE AT ALL ###/-d -w /home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/.dev-tools/test_units/blacklist-user-agents.conf +w ./dev-tools/test_units/blacklist-user-agents.conf q IN rm ${_inputdb1} @@ -165,11 +167,11 @@ ed -s ${_inputdb2}<<\IN 1,/# START MAKE BAD REFERRERS GOOD ### DO NOT EDIT THIS LINE AT ALL ###/d /# END MAKE BAD REFERRERS GOOD ### DO NOT EDIT THIS LINE AT ALL ###/,$d ,d -.r /home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/.dev-tools/test_units/custom-bad-referrers.conf +.r ./dev-tools/test_units/custom-bad-referrers.conf /# START MAKE BAD REFERRERS GOOD ### DO NOT EDIT THIS LINE AT ALL ###/x .t. .,/# END MAKE BAD REFERRERS GOOD ### DO NOT EDIT THIS LINE AT ALL ###/-d -w /home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/.dev-tools/test_units/custom-bad-referrers.conf +w ./dev-tools/test_units/custom-bad-referrers.conf q IN rm ${_inputdb2} @@ -180,29 +182,29 @@ echo "${bold}${green}------------------------------------------------" echo "${bold}${green}Activating Users User-Agents Whitelist/Blacklist" echo "${bold}${green}------------------------------------------------" printf "\n" -sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/blacklist-user-agents.conf /etc/nginx/bots.d/blacklist-user-agents.conf +sudo cp ./dev-tools/test_units/blacklist-user-agents.conf /etc/nginx/bots.d/blacklist-user-agents.conf echo "${bold}${green}----------------------------------------------" echo "${bold}${green}Activating Users Referrers Whitelist/Blacklist" echo "${bold}${green}----------------------------------------------" printf "\n" -sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/custom-bad-referrers.conf /etc/nginx/bots.d/custom-bad-referrers.conf +sudo cp ./dev-tools/test_units/custom-bad-referrers.conf /etc/nginx/bots.d/custom-bad-referrers.conf } testBadUserAgents () { -shuf -n 100 ${TRAVIS_BUILD_DIR}/_generator_lists/bad-user-agents.list > ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/random-bots-for-whitelist-test.tmp -sed 's/\\//g' ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/random-bots-for-whitelist-test.tmp > ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/random-bots-for-whitelist-test.list -sudo rm ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/random-bots-for-whitelist-test.tmp -sort -u ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/random-bots-for-whitelist-test.list -o ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/random-bots-for-whitelist-test.list +shuf -n 100 ./_generator_lists/bad-user-agents.list > ./dev-tools/test_units/random-bots-for-whitelist-test.tmp +sed 's/\\//g' ./dev-tools/test_units/random-bots-for-whitelist-test.tmp > ./dev-tools/test_units/random-bots-for-whitelist-test.list +sudo rm ./dev-tools/test_units/random-bots-for-whitelist-test.tmp +sort -u ./dev-tools/test_units/random-bots-for-whitelist-test.list -o ./dev-tools/test_units/random-bots-for-whitelist-test.list printf "\n" echo "${bold}${magenta}---------------------------" echo "${bold}${magenta}Testing 100 Random Bad Bots" echo "${bold}${magenta}---------------------------" IFS=$'\n' -file=${TRAVIS_BUILD_DIR}/.dev-tools/test_units/random-bots-for-whitelist-test.list +file=./dev-tools/test_units/random-bots-for-whitelist-test.list lines=$(cat ${file}) for line in ${lines}; do if - curl -v -A "${line}" http://localhost:9000 2>&1 | grep -i 'Welcome'; then + curl -v -A "${line}" http://localhost:80 2>&1 | grep -i 'Welcome'; then echo "${bold}${green}PASSED - ${red}${line} was ${bold}${green}ALLOWED" else echo "${bold}${red}FAILED - ${red}${line} was ${bold}${red}NOT ALLOWED" @@ -213,20 +215,20 @@ IFS="" } testBadReferrers () { -shuf -n 100 ${TRAVIS_BUILD_DIR}/_generator_lists/bad-referrers.list > ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/random-referrers-for-whitelist-test.tmp -sed 's/\\//g' ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/random-referrers-for-whitelist-test.tmp > ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/random-referrers-for-whitelist-test.list -sudo rm ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/random-referrers-for-whitelist-test.tmp -sort -u ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/random-referrers-for-whitelist-test.list -o ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/random-referrers-for-whitelist-test.list +shuf -n 100 ./_generator_lists/bad-referrers.list > ./dev-tools/test_units/random-referrers-for-whitelist-test.tmp +sed 's/\\//g' ./dev-tools/test_units/random-referrers-for-whitelist-test.tmp > ./dev-tools/test_units/random-referrers-for-whitelist-test.list +sudo rm ./dev-tools/test_units/random-referrers-for-whitelist-test.tmp +sort -u ./dev-tools/test_units/random-referrers-for-whitelist-test.list -o ./dev-tools/test_units/random-referrers-for-whitelist-test.list printf "\n" echo "${bold}${magenta}----------------------------" echo "${bold}${magenta}Testing 100 Random Referrers" echo "${bold}${magenta}----------------------------" IFS=$'\n' -file=${TRAVIS_BUILD_DIR}/.dev-tools/test_units/random-referrers-for-whitelist-test.list +file=./dev-tools/test_units/random-referrers-for-whitelist-test.list lines=$(cat ${file}) for line in ${lines}; do if - curl http://localhost:9000 -e "http://${line}" 2>&1 | grep -i 'Welcome'; then + curl http://localhost:80 -e "http://${line}" 2>&1 | grep -i 'Welcome'; then echo "${bold}${green}PASSED - ${red}${line} was ${bold}${green}ALLOWED" else echo "${bold}${red}FAILED - ${red}${line} was ${bold}${red}NOT ALLOWED" @@ -242,10 +244,10 @@ echo "${bold}${green}----------------------------------------------------------- echo "${bold}${green}Make Backup all conf files and folders used during this test" echo "${bold}${green}------------------------------------------------------------" printf "\n" -sudo cp /etc/nginx/bots.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/test1_conf_files_whitelist/bots.d/ -sudo cp /etc/nginx/conf.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/test1_conf_files_whitelist/conf.d/ -sudo cp /etc/nginx/sites-available/default.vhost ${TRAVIS_BUILD_DIR}/.dev-tools/test1_conf_files_whitelist/default.vhost -sudo cp /etc/nginx/nginx.conf ${TRAVIS_BUILD_DIR}/.dev-tools/test1_conf_files_whitelist/nginx.conf +sudo cp /etc/nginx/bots.d/* ./dev-tools/test1_conf_files_whitelist/bots.d/ +sudo cp /etc/nginx/conf.d/* ./dev-tools/test1_conf_files_whitelist/conf.d/ +sudo cp /etc/nginx/sites-available/default.vhost ./dev-tools/test1_conf_files_whitelist/default.vhost +sudo cp /etc/nginx/nginx.conf ./dev-tools/test1_conf_files_whitelist/nginx.conf } # -----------