diff --git a/tests/core/antibot/test.sh b/tests/core/antibot/test.sh index a5cbf055..228acf34 100755 --- a/tests/core/antibot/test.sh +++ b/tests/core/antibot/test.sh @@ -162,8 +162,10 @@ do exit 1 fi - if ! [ -z $(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌") ] ; then + if ! [ -z "$(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌")" ] ; then echo "🤖 ⚠ Linux stack got an issue, restarting ..." + sudo journalctl --rotate + sudo journalctl --vacuum-time=1s manual=1 cleanup_stack manual=0 diff --git a/tests/core/authbasic/test.sh b/tests/core/authbasic/test.sh index b5a14800..477b0daa 100755 --- a/tests/core/authbasic/test.sh +++ b/tests/core/authbasic/test.sh @@ -189,8 +189,10 @@ do exit 1 fi - if ! [ -z $(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌") ] ; then + if ! [ -z "$(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌")" ] ; then echo "🔐 ⚠ Linux stack got an issue, restarting ..." + sudo journalctl --rotate + sudo journalctl --vacuum-time=1s manual=1 cleanup_stack manual=0 diff --git a/tests/core/badbehavior/test.sh b/tests/core/badbehavior/test.sh index 5b483b81..b74981d9 100755 --- a/tests/core/badbehavior/test.sh +++ b/tests/core/badbehavior/test.sh @@ -212,8 +212,10 @@ do exit 1 fi - if ! [ -z $(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌") ] ; then + if ! [ -z "$(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌")" ] ; then echo "📟 ⚠ Linux stack got an issue, restarting ..." + sudo journalctl --rotate + sudo journalctl --vacuum-time=1s manual=1 cleanup_stack manual=0 diff --git a/tests/core/blacklist/test.sh b/tests/core/blacklist/test.sh index 06aa44a1..4b03b9e1 100755 --- a/tests/core/blacklist/test.sh +++ b/tests/core/blacklist/test.sh @@ -518,8 +518,10 @@ do exit 1 fi - if ! [ -z $(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌") ] ; then + if ! [ -z "$(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌")" ] ; then echo "🏴 ⚠ Linux stack got an issue, restarting ..." + sudo journalctl --rotate + sudo journalctl --vacuum-time=1s manual=1 cleanup_stack manual=0 diff --git a/tests/core/brotli/test.sh b/tests/core/brotli/test.sh index 5fd0d318..eb2dd633 100755 --- a/tests/core/brotli/test.sh +++ b/tests/core/brotli/test.sh @@ -150,8 +150,10 @@ do exit 1 fi - if ! [ -z $(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌") ] ; then + if ! [ -z "$(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌")" ] ; then echo "đŸ“Ļ ⚠ Linux stack got an issue, restarting ..." + sudo journalctl --rotate + sudo journalctl --vacuum-time=1s manual=1 cleanup_stack manual=0 diff --git a/tests/core/bunkernet/test.sh b/tests/core/bunkernet/test.sh index db7a5f41..46cf5a9f 100755 --- a/tests/core/bunkernet/test.sh +++ b/tests/core/bunkernet/test.sh @@ -167,8 +167,10 @@ do exit 1 fi - if ! [ -z $(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌") ] ; then + if ! [ -z "$(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌")" ] ; then echo "🕸ī¸ ⚠ Linux stack got an issue, restarting ..." + sudo journalctl --rotate + sudo journalctl --vacuum-time=1s manual=1 cleanup_stack manual=0 diff --git a/tests/core/bwcli/test.sh b/tests/core/bwcli/test.sh index e3b4d616..48e7cf31 100755 --- a/tests/core/bwcli/test.sh +++ b/tests/core/bwcli/test.sh @@ -137,8 +137,10 @@ else exit 1 fi - if ! [ -z $(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌") ] ; then + if ! [ -z "$(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌")" ] ; then echo "⌨ī¸ ⚠ Linux stack got an issue, restarting ..." + sudo journalctl --rotate + sudo journalctl --vacuum-time=1s manual=1 cleanup_stack manual=0 diff --git a/tests/core/clientcache/test.sh b/tests/core/clientcache/test.sh index 9321778d..d20d4d94 100755 --- a/tests/core/clientcache/test.sh +++ b/tests/core/clientcache/test.sh @@ -193,8 +193,10 @@ do exit 1 fi - if ! [ -z $(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌") ] ; then + if ! [ -z "$(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌")" ] ; then echo "📝 ⚠ Linux stack got an issue, restarting ..." + sudo journalctl --rotate + sudo journalctl --vacuum-time=1s manual=1 cleanup_stack manual=0 diff --git a/tests/core/cors/test.sh b/tests/core/cors/test.sh index bc757bb9..0cffa95b 100755 --- a/tests/core/cors/test.sh +++ b/tests/core/cors/test.sh @@ -230,8 +230,10 @@ do exit 1 fi - if ! [ -z $(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌") ] ; then + if ! [ -z "$(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌")" ] ; then echo "🛰ī¸ ⚠ Linux stack got an issue, restarting ..." + sudo journalctl --rotate + sudo journalctl --vacuum-time=1s manual=1 cleanup_stack manual=0 diff --git a/tests/core/country/test.sh b/tests/core/country/test.sh index 2f39ff5d..09811e4a 100755 --- a/tests/core/country/test.sh +++ b/tests/core/country/test.sh @@ -170,8 +170,10 @@ do exit 1 fi - if ! [ -z $(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌") ] ; then + if ! [ -z "$(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌")" ] ; then echo "🌍 ⚠ Linux stack got an issue, restarting ..." + sudo journalctl --rotate + sudo journalctl --vacuum-time=1s manual=1 cleanup_stack manual=0 diff --git a/tests/core/customcert/test.sh b/tests/core/customcert/test.sh index b5de201a..204dd059 100755 --- a/tests/core/customcert/test.sh +++ b/tests/core/customcert/test.sh @@ -181,8 +181,10 @@ do exit 1 fi - if ! [ -z $(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌") ] ; then + if ! [ -z "$(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌")" ] ; then echo "🔏 ⚠ Linux stack got an issue, restarting ..." + sudo journalctl --rotate + sudo journalctl --vacuum-time=1s manual=1 cleanup_stack manual=0 diff --git a/tests/core/db/test.sh b/tests/core/db/test.sh index 08c1b825..97cb4e3a 100755 --- a/tests/core/db/test.sh +++ b/tests/core/db/test.sh @@ -405,8 +405,10 @@ do exit 1 fi - if ! [ -z $(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌") ] ; then + if ! [ -z "$(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌")" ] ; then echo "💾 ⚠ Linux stack got an issue, restarting ..." + sudo journalctl --rotate + sudo journalctl --vacuum-time=1s manual=1 cleanup_stack manual=0 diff --git a/tests/core/dnsbl/docker-compose.test.yml b/tests/core/dnsbl/docker-compose.test.yml index 9c192a91..f02c235b 100644 --- a/tests/core/dnsbl/docker-compose.test.yml +++ b/tests/core/dnsbl/docker-compose.test.yml @@ -6,7 +6,7 @@ services: environment: PYTHONUNBUFFERED: "1" USE_DNSBL: "yes" - DNSBL_LIST: "bl.blocklist.de problems.dnsbl.sorbs.net" + DNSBL_LIST: "" extra_hosts: - "www.example.com:192.168.0.2" networks: diff --git a/tests/core/dnsbl/docker-compose.yml b/tests/core/dnsbl/docker-compose.yml index 1260db95..c021711c 100644 --- a/tests/core/dnsbl/docker-compose.yml +++ b/tests/core/dnsbl/docker-compose.yml @@ -17,7 +17,7 @@ services: # ? DNSBL settings USE_DNSBL: "yes" - DNSBL_LIST: "bl.blocklist.de problems.dnsbl.sorbs.net" + DNSBL_LIST: "" networks: bw-universe: bw-services: diff --git a/tests/core/dnsbl/main.py b/tests/core/dnsbl/main.py index 13521a67..29f75b26 100644 --- a/tests/core/dnsbl/main.py +++ b/tests/core/dnsbl/main.py @@ -1,5 +1,6 @@ from contextlib import suppress -from os import getenv +from os import getenv, sep +from os.path import join from requests import get from requests.exceptions import RequestException from time import sleep @@ -31,37 +32,60 @@ try: sleep(5) use_dnsbl = getenv("USE_DNSBL", "yes") == "yes" - dnsbl_list = getenv("DNSBL_LIST", "bl.blocklist.de problems.dnsbl.sorbs.net") + dnsbl_list = getenv("DNSBL_LIST", "") + TEST_TYPE = getenv("TEST_TYPE", "docker") print( "ℹī¸ Sending a request to http://www.example.com ...", flush=True, ) + passed = False + retries = 0 - status_code = get( - f"http://www.example.com", - headers={"Host": "www.example.com"} - | ( - {"X-Forwarded-For": getenv("IP_ADDRESS", "")} - if getenv("TEST_TYPE", "docker") == "linux" - else {} - ), - ).status_code + while not passed and retries < 10: + status_code = get( + f"http://www.example.com", + headers={"Host": "www.example.com"} + | ( + {"X-Forwarded-For": getenv("IP_ADDRESS", "")} + if TEST_TYPE == "linux" + else {} + ), + ).status_code + + if status_code == 403: + if not use_dnsbl: + print("❌ The request was rejected, but DNSBL is disabled, exiting ...") + exit(1) + elif not dnsbl_list: + print( + "❌ The request was rejected, but DNSBL list is empty, exiting ..." + ) + exit(1) + elif use_dnsbl and dnsbl_list: + if retries <= 10: + found = False + with open(join(sep, "var", "log", "bunkerweb", "error.log"), "r") as f: + for line in f.readlines(): + if "error while doing A DNS query for" in line: + print( + f"⚠ Found the following error in the logs: {line}, retrying in 5s ...", + flush=True, + ) + found = True + break + + if found: + retries += 1 + sleep(5) + continue - if status_code == 403: - if not use_dnsbl: - print("❌ The request was rejected, but DNSBL is disabled, exiting ...") - exit(1) - elif dnsbl_list == "bl.blocklist.de problems.dnsbl.sorbs.net": print( - '❌ The request was rejected, but DNSBL list is equal to "bl.blocklist.de problems.dnsbl.sorbs.net", exiting ...' + f'❌ The request was not rejected, but DNSBL list is equal to "{dnsbl_list}", exiting ...' ) exit(1) - elif use_dnsbl and dnsbl_list != "bl.blocklist.de problems.dnsbl.sorbs.net": - print( - f'❌ The request was not rejected, but DNSBL list is equal to "{dnsbl_list}", exiting ...' - ) - exit(1) + + passed = True print("✅ DNSBL is working as expected ...", flush=True) except SystemExit: diff --git a/tests/core/dnsbl/test.sh b/tests/core/dnsbl/test.sh index 74173088..eeacbfcf 100755 --- a/tests/core/dnsbl/test.sh +++ b/tests/core/dnsbl/test.sh @@ -26,11 +26,12 @@ if [ "$integration" = "docker" ] ; then fi else sudo systemctl stop bunkerweb + sudo pip install -r requirements.txt echo "USE_REAL_IP=yes" | sudo tee -a /etc/bunkerweb/variables.env echo "REAL_IP_FROM=127.0.0.0/24" | sudo tee -a /etc/bunkerweb/variables.env echo "USE_DNSBL=yes" | sudo tee -a /etc/bunkerweb/variables.env - echo "DNSBL_LIST=bl.blocklist.de problems.dnsbl.sorbs.net" | sudo tee -a /etc/bunkerweb/variables.env + echo "DNSBL_LIST=" | sudo tee -a /etc/bunkerweb/variables.env sudo touch /var/www/html/index.html export TEST_TYPE="linux" fi @@ -43,13 +44,13 @@ cleanup_stack () { if [ "$integration" == "docker" ] ; then rm -rf init/output find . -type f -name 'docker-compose.*' -exec sed -i 's@USE_DNSBL: "no"@USE_DNSBL: "yes"@' {} \; - find . -type f -name 'docker-compose.*' -exec sed -i 's@DNSBL_LIST: ".*"@DNSBL_LIST: "bl.blocklist.de problems.dnsbl.sorbs.net"@' {} \; + find . -type f -name 'docker-compose.*' -exec sed -i 's@DNSBL_LIST: ".*"@DNSBL_LIST: ""@' {} \; find . -type f -name 'docker-compose.*' -exec sed -i 's@ipv4_address: [0-9][0-9]*\.0@ipv4_address: 192.168@' {} \; sed -i 's@subnet: [0-9][0-9]*\.0@subnet: 192.168@' docker-compose.yml sed -i 's@www.example.com:[0-9][0-9]*\.0@www.example.com:192.168@' docker-compose.test.yml else sudo sed -i 's@USE_DNSBL=.*$@USE_DNSBL=yes@' /etc/bunkerweb/variables.env - sudo sed -i 's@DNSBL_LIST=.*$@DNSBL_LIST=bl.blocklist.de problems.dnsbl.sorbs.net@' /etc/bunkerweb/variables.env + sudo sed -i 's@DNSBL_LIST=.*$@DNSBL_LIST=@' /etc/bunkerweb/variables.env unset USE_DNSBL unset DNSBL_LIST fi @@ -116,13 +117,13 @@ do if [ "$test" = "activated" ] ; then echo "đŸšĢ Running tests with DNSBL activated and the server $server added to the list ..." if [ "$integration" = "docker" ] ; then - find . -type f -name 'docker-compose.*' -exec sed -i 's@DNSBL_LIST: ".*"@DNSBL_LIST: "bl.blocklist.de problems.dnsbl.sorbs.net '"$server"'"@' {} \; + find . -type f -name 'docker-compose.*' -exec sed -i 's@DNSBL_LIST: ".*"@DNSBL_LIST: "'"$server"'"@' {} \; find . -type f -name 'docker-compose.*' -exec sed -i 's@ipv4_address: 192.168@ipv4_address: '"${ip%%.*}"'.0@' {} \; sed -i 's@subnet: 192.168@subnet: '"${ip%%.*}"'.0@' docker-compose.yml sed -i 's@www.example.com:192.168@www.example.com:'"${ip%%.*}"'.0@' docker-compose.test.yml else - sudo sed -i 's@DNSBL_LIST=.*$@DNSBL_LIST=bl.blocklist.de problems.dnsbl.sorbs.net '"$server"'@' /etc/bunkerweb/variables.env - export DNSBL_LIST="bl.blocklist.de problems.dnsbl.sorbs.net $server" + sudo sed -i 's@DNSBL_LIST=.*$@DNSBL_LIST='"$server"'@' /etc/bunkerweb/variables.env + export DNSBL_LIST="$server" export IP_ADDRESS="$ip" fi elif [ "$test" = "deactivated" ] ; then @@ -137,10 +138,10 @@ do echo "đŸšĢ Running tests with DNSBL activated and without the server $server added to the list ..." if [ "$integration" = "docker" ] ; then find . -type f -name 'docker-compose.*' -exec sed -i 's@USE_DNSBL: "no"@USE_DNSBL: "yes"@' {} \; - find . -type f -name 'docker-compose.*' -exec sed -i 's@DNSBL_LIST: ".*"@DNSBL_LIST: "bl.blocklist.de problems.dnsbl.sorbs.net"@' {} \; + find . -type f -name 'docker-compose.*' -exec sed -i 's@DNSBL_LIST: ".*"@DNSBL_LIST: ""@' {} \; else sudo sed -i 's@USE_DNSBL=.*$@USE_DNSBL=yes@' /etc/bunkerweb/variables.env - sudo sed -i 's@DNSBL_LIST=.*$@DNSBL_LIST=bl.blocklist.de problems.dnsbl.sorbs.net@' /etc/bunkerweb/variables.env + sudo sed -i 's@DNSBL_LIST=.*$@DNSBL_LIST=@' /etc/bunkerweb/variables.env unset USE_DNSBL unset DNSBL_LIST fi @@ -216,8 +217,10 @@ do exit 1 fi - if ! [ -z $(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌") ] ; then + if ! [ -z "$(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌")" ] ; then echo "đŸšĢ ⚠ Linux stack got an issue, restarting ..." + sudo journalctl --rotate + sudo journalctl --vacuum-time=1s manual=1 cleanup_stack manual=0 @@ -245,7 +248,7 @@ do if [ "$integration" == "docker" ] ; then docker compose -f docker-compose.test.yml up --abort-on-container-exit --exit-code-from tests else - python3 main.py + sudo -E python3 main.py fi if [ $? -ne 0 ] ; then diff --git a/tests/core/errors/test.sh b/tests/core/errors/test.sh index 73cbb9c3..3016b76a 100755 --- a/tests/core/errors/test.sh +++ b/tests/core/errors/test.sh @@ -167,8 +167,10 @@ do exit 1 fi - if ! [ -z $(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌") ] ; then + if ! [ -z "$(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌")" ] ; then echo "⭕ ⚠ Linux stack got an issue, restarting ..." + sudo journalctl --rotate + sudo journalctl --vacuum-time=1s manual=1 cleanup_stack manual=0 diff --git a/tests/core/greylist/test.sh b/tests/core/greylist/test.sh index 2feb1315..2388a039 100755 --- a/tests/core/greylist/test.sh +++ b/tests/core/greylist/test.sh @@ -358,8 +358,10 @@ do exit 1 fi - if ! [ -z $(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌") ] ; then + if ! [ -z "$(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌")" ] ; then echo "🏁 ⚠ Linux stack got an issue, restarting ..." + sudo journalctl --rotate + sudo journalctl --vacuum-time=1s manual=1 cleanup_stack manual=0 diff --git a/tests/core/gzip/test.sh b/tests/core/gzip/test.sh index 53afbaca..cf5354f1 100755 --- a/tests/core/gzip/test.sh +++ b/tests/core/gzip/test.sh @@ -150,8 +150,10 @@ do exit 1 fi - if ! [ -z $(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌") ] ; then + if ! [ -z "$(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌")" ] ; then echo "🗜ī¸ ⚠ Linux stack got an issue, restarting ..." + sudo journalctl --rotate + sudo journalctl --vacuum-time=1s manual=1 cleanup_stack manual=0 diff --git a/tests/core/headers/test.sh b/tests/core/headers/test.sh index 964a8fa1..16a9284f 100755 --- a/tests/core/headers/test.sh +++ b/tests/core/headers/test.sh @@ -314,8 +314,10 @@ do exit 1 fi - if ! [ -z $(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌") ] ; then + if ! [ -z "$(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌")" ] ; then echo "🎛ī¸ ⚠ Linux stack got an issue, restarting ..." + sudo journalctl --rotate + sudo journalctl --vacuum-time=1s manual=1 cleanup_stack manual=0 diff --git a/tests/core/inject/test.sh b/tests/core/inject/test.sh index 064d3462..2211d00e 100755 --- a/tests/core/inject/test.sh +++ b/tests/core/inject/test.sh @@ -123,8 +123,10 @@ else exit 1 fi - if ! [ -z $(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌") ] ; then + if ! [ -z "$(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌")" ] ; then echo "💉 ⚠ Linux stack got an issue, restarting ..." + sudo journalctl --rotate + sudo journalctl --vacuum-time=1s manual=1 cleanup_stack manual=0 diff --git a/tests/core/limit/test.sh b/tests/core/limit/test.sh index cac5f71a..9d3d46d1 100755 --- a/tests/core/limit/test.sh +++ b/tests/core/limit/test.sh @@ -224,8 +224,10 @@ do exit 1 fi - if ! [ -z $(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌") ] ; then + if ! [ -z "$(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌")" ] ; then echo "🎚ī¸ ⚠ Linux stack got an issue, restarting ..." + sudo journalctl --rotate + sudo journalctl --vacuum-time=1s manual=1 cleanup_stack manual=0 diff --git a/tests/core/misc/test.sh b/tests/core/misc/test.sh index 553faaad..28c569f3 100755 --- a/tests/core/misc/test.sh +++ b/tests/core/misc/test.sh @@ -232,8 +232,10 @@ do exit 1 fi - if ! [ -z $(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌") ] ; then + if ! [ -z "$(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌")" ] ; then echo "🗃ī¸ ⚠ Linux stack got an issue, restarting ..." + sudo journalctl --rotate + sudo journalctl --vacuum-time=1s manual=1 cleanup_stack manual=0 diff --git a/tests/core/modsecurity/test.sh b/tests/core/modsecurity/test.sh index 61da4e24..4ac786f5 100755 --- a/tests/core/modsecurity/test.sh +++ b/tests/core/modsecurity/test.sh @@ -168,8 +168,10 @@ do exit 1 fi - if ! [ -z $(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌") ] ; then + if ! [ -z "$(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌")" ] ; then echo "👮 ⚠ Linux stack got an issue, restarting ..." + sudo journalctl --rotate + sudo journalctl --vacuum-time=1s manual=1 cleanup_stack manual=0 diff --git a/tests/core/redirect/test.sh b/tests/core/redirect/test.sh index eea17ba3..69242cd8 100755 --- a/tests/core/redirect/test.sh +++ b/tests/core/redirect/test.sh @@ -160,8 +160,10 @@ do exit 1 fi - if ! [ -z $(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌") ] ; then + if ! [ -z "$(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌")" ] ; then echo "↩ī¸ ⚠ Linux stack got an issue, restarting ..." + sudo journalctl --rotate + sudo journalctl --vacuum-time=1s manual=1 cleanup_stack manual=0 diff --git a/tests/core/redis/test.sh b/tests/core/redis/test.sh index af388222..9b5afa6c 100755 --- a/tests/core/redis/test.sh +++ b/tests/core/redis/test.sh @@ -257,8 +257,10 @@ do exit 1 fi - if ! [ -z $(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌") ] ; then + if ! [ -z "$(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌")" ] ; then echo "🧰 ⚠ Linux stack got an issue, restarting ..." + sudo journalctl --rotate + sudo journalctl --vacuum-time=1s manual=1 cleanup_stack manual=0 diff --git a/tests/core/reversescan/test.sh b/tests/core/reversescan/test.sh index ff40e20e..f2e8df59 100755 --- a/tests/core/reversescan/test.sh +++ b/tests/core/reversescan/test.sh @@ -164,8 +164,10 @@ do exit 1 fi - if ! [ -z $(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌") ] ; then + if ! [ -z "$(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌")" ] ; then echo "đŸ•ĩī¸ ⚠ Linux stack got an issue, restarting ..." + sudo journalctl --rotate + sudo journalctl --vacuum-time=1s manual=1 cleanup_stack manual=0 diff --git a/tests/core/selfsigned/test.sh b/tests/core/selfsigned/test.sh index 86809091..8c94b77b 100755 --- a/tests/core/selfsigned/test.sh +++ b/tests/core/selfsigned/test.sh @@ -170,8 +170,10 @@ do exit 1 fi - if ! [ -z $(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌") ] ; then + if ! [ -z "$(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌")" ] ; then echo "🔑 ⚠ Linux stack got an issue, restarting ..." + sudo journalctl --rotate + sudo journalctl --vacuum-time=1s manual=1 cleanup_stack manual=0 diff --git a/tests/core/sessions/test.sh b/tests/core/sessions/test.sh index 35216298..015ada14 100755 --- a/tests/core/sessions/test.sh +++ b/tests/core/sessions/test.sh @@ -167,8 +167,10 @@ do exit 1 fi - if ! [ -z $(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌") ] ; then + if ! [ -z "$(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌")" ] ; then echo "đŸ§ŗ ⚠ Linux stack got an issue, restarting ..." + sudo journalctl --rotate + sudo journalctl --vacuum-time=1s manual=1 cleanup_stack manual=0 diff --git a/tests/core/whitelist/test.sh b/tests/core/whitelist/test.sh index df72d363..6dc2adb6 100755 --- a/tests/core/whitelist/test.sh +++ b/tests/core/whitelist/test.sh @@ -362,8 +362,10 @@ do exit 1 fi - if ! [ -z $(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌") ] ; then + if ! [ -z "$(sudo journalctl -u bunkerweb --no-pager | grep "SYSTEMCTL - ❌")" ] ; then echo "đŸŗī¸ ⚠ Linux stack got an issue, restarting ..." + sudo journalctl --rotate + sudo journalctl --vacuum-time=1s manual=1 cleanup_stack manual=0