Add up back when retrying to up the stack + remove useless print

tests/core/antibot/test.sh

@@ -60,6 +60,7 @@ do
         manual=1
         cleanup_stack
         manual=0
+        docker compose up -d 2>/dev/null
         if [ $? -ne 0 ] ; then
             echo "🤖 Up failed ❌"
             exit 1

tests/core/authbasic/test.sh

@@ -69,6 +69,7 @@ do
         manual=1
         cleanup_stack
         manual=0
+        docker compose up -d 2>/dev/null
         if [ $? -ne 0 ] ; then
             echo "🔐 Up failed ❌"
             exit 1

tests/core/badbehavior/test.sh

@@ -76,6 +76,7 @@ do
         manual=1
         cleanup_stack
         manual=0
+        docker compose up -d 2>/dev/null
         if [ $? -ne 0 ] ; then
             echo "📟 Up failed ❌"
             exit 1

tests/core/blacklist/test.sh

@@ -204,6 +204,7 @@ do
         manual=1
         cleanup_stack
         manual=0
+        docker compose up -d 2>/dev/null
         if [ $? -ne 0 ] ; then
             echo "🏴 Up failed ❌"
             exit 1

tests/core/brotli/test.sh

@@ -56,6 +56,7 @@ do
         manual=1
         cleanup_stack
         manual=0
+        docker compose up -d 2>/dev/null
         if [ $? -ne 0 ] ; then
             echo "📦 Up failed ❌"
             exit 1

tests/core/bunkernet/test.sh

@@ -65,6 +65,7 @@ do
         manual=1
         cleanup_stack
         manual=0
+        docker compose up -d 2>/dev/null
         if [ $? -ne 0 ] ; then
             echo "🕸️ Up failed ❌"
             exit 1

tests/core/clientcache/test.sh

@@ -70,6 +70,7 @@ do
         manual=1
         cleanup_stack
         manual=0
+        docker compose up -d 2>/dev/null
         if [ $? -ne 0 ] ; then
             echo "📝 Up failed ❌"
             exit 1

tests/core/cors/test.sh

@@ -85,6 +85,7 @@ do
         manual=1
         cleanup_stack
         manual=0
+        docker compose up -d 2>/dev/null
         if [ $? -ne 0 ] ; then
             echo "🛰️ Up failed ❌"
             exit 1

tests/core/country/test.sh

@@ -61,6 +61,7 @@ do
         manual=1
         cleanup_stack
         manual=0
+        docker compose up -d 2>/dev/null
         if [ $? -ne 0 ] ; then
             echo "🌍 Up failed ❌"
             exit 1

tests/core/customcert/test.sh

@@ -72,6 +72,7 @@ do
         manual=1
         cleanup_stack
         manual=0
+        docker compose up -d 2>/dev/null
         if [ $? -ne 0 ] ; then
             echo "🔏 Up failed ❌"
             exit 1

tests/core/db/test.sh

@@ -68,6 +68,7 @@ if [ $? -ne 0 ] ; then
     manual=1
     cleanup_stack
     manual=0
+    docker compose up -d 2>/dev/null
     if [ $? -ne 0 ] ; then
         echo "💾 Up failed ❌"
         exit 1
@@ -143,6 +144,7 @@ do
         manual=1
         cleanup_stack
         manual=0
+        docker compose up -d 2>/dev/null
         if [ $? -ne 0 ] ; then
             echo "💾 Up failed ❌"
             exit 1

tests/core/dnsbl/test.sh

@@ -88,6 +88,7 @@ do
         manual=1
         cleanup_stack
         manual=0
+        docker compose up -d 2>/dev/null
         if [ $? -ne 0 ] ; then
             echo "🚫 Up failed ❌"
             exit 1

tests/core/errors/test.sh

@@ -61,6 +61,7 @@ do
         manual=1
         cleanup_stack
         manual=0
+        docker compose up -d 2>/dev/null
         if [ $? -ne 0 ] ; then
             echo "⭕ Up failed ❌"
             exit 1

tests/core/greylist/test.sh

@@ -142,6 +142,7 @@ do
         manual=1
         cleanup_stack
         manual=0
+        docker compose up -d 2>/dev/null
         if [ $? -ne 0 ] ; then
             echo "🏁 Up failed ❌"
             exit 1

tests/core/gzip/test.sh

@@ -56,6 +56,7 @@ do
         manual=1
         cleanup_stack
         manual=0
+        docker compose up -d 2>/dev/null
         if [ $? -ne 0 ] ; then
             echo "🗜️ Up failed ❌"
             exit 1

tests/core/headers/test.sh

@@ -112,6 +112,7 @@ do
         manual=1
         cleanup_stack
         manual=0
+        docker compose up -d 2>/dev/null
         if [ $? -ne 0 ] ; then
             echo "🎛️ Up failed ❌"
             exit 1

tests/core/inject/test.sh

@@ -39,6 +39,7 @@ if [ $? -ne 0 ] ; then
     manual=1
     cleanup_stack
     manual=0
+    docker compose up -d 2>/dev/null
     if [ $? -ne 0 ] ; then
         echo "💉 Up failed ❌"
         exit 1

tests/core/limit/test.sh

@@ -90,6 +90,7 @@ do
         manual=1
         cleanup_stack
         manual=0
+        docker compose up -d 2>/dev/null
         if [ $? -ne 0 ] ; then
             echo "🎚️ Up failed ❌"
             exit 1

tests/core/modsecurity/test.sh

@@ -61,6 +61,7 @@ do
         manual=1
         cleanup_stack
         manual=0
+        docker compose up -d 2>/dev/null
         if [ $? -ne 0 ] ; then
             echo "👮 Up failed ❌"
             exit 1

tests/core/redirect/test.sh

@@ -58,6 +58,7 @@ do
         manual=1
         cleanup_stack
         manual=0
+        docker compose up -d 2>/dev/null
         if [ $? -ne 0 ] ; then
             echo "↩️ Up failed ❌"
             exit 1

tests/core/reversescan/test.sh

@@ -60,6 +60,7 @@ do
         manual=1
         cleanup_stack
         manual=0
+        docker compose up -d 2>/dev/null
         if [ $? -ne 0 ] ; then
             echo "🕵️ Up failed ❌"
             exit 1

tests/core/selfsigned/test.sh

@@ -62,6 +62,7 @@ do
         manual=1
         cleanup_stack
         manual=0
+        docker compose up -d 2>/dev/null
         if [ $? -ne 0 ] ; then
             echo "🔑 Up failed ❌"
             exit 1

tests/core/sessions/main.py

@@ -57,7 +57,6 @@ try:
             exit(0)
 
         first_cookie = driver.get_cookies()[0]
-        print(first_cookie, flush=True)
 
     print("ℹ️ Reloading BunkerWeb ...", flush=True)
 

tests/core/sessions/test.sh

@@ -61,6 +61,7 @@ do
         manual=1
         cleanup_stack
         manual=0
+        docker compose up -d 2>/dev/null
         if [ $? -ne 0 ] ; then
             echo "🧳 Up failed ❌"
             exit 1

tests/core/whitelist/test.sh

@@ -143,6 +143,7 @@ do
         manual=1
         cleanup_stack
         manual=0
+        docker compose up -d 2>/dev/null
         if [ $? -ne 0 ] ; then
             echo "🏳️ Up failed ❌"
             exit 1

tests/ui/docker-compose.dev.yml

@@ -18,7 +18,6 @@ services:
       DISABLE_DEFAULT_SERVER: "yes"
       USE_CLIENT_CACHE: "yes"
       USE_GZIP: "yes"
-      USE_MODSECURITY: "no"
       DATASTORE_MEMORY_SIZE: "384m"
       www.example.com_USE_UI: "yes"
       www.example.com_SERVE_FILES: "no"
@@ -27,7 +26,6 @@ services:
       www.example.com_REVERSE_PROXY_HOST: "http://bw-ui:7000"
       www.example.com_REVERSE_PROXY_KEEPALIVE: "yes"
       www.example.com_REVERSE_PROXY_HEADERS: "X-Script-Name /admin"
-      www.example.com_CUSTOM_CONF_MODSEC_CRS_config: 'SecRule REQUEST_FILENAME "@rx /global_config$$" "id:999,ctl:ruleRemoveByTag=platform-pgsql,nolog"'
       www.example.com_INTERCEPTED_ERROR_CODES: "400 405 413 429 500 501 502 503 504"
     labels:
       - "bunkerweb.INSTANCE"
@@ -62,7 +60,7 @@ services:
     environment:
       ABSOLUTE_URI: "http://www.example.com/admin/"
       ADMIN_USERNAME: "admin"
-      ADMIN_PASSWORD: "admin"
+      ADMIN_PASSWORD: "S$$cr3tP@ssw0rd"
       DOCKER_HOST: "tcp://docker-proxy:2375"
     networks:
       - net-docker
@@ -82,16 +80,17 @@ services:
     networks:
       bw-services:
         ipv4_address: 192.168.0.4
-  # ui-tests:
-  #   build: .
-  #   environment:
-  #     - PYTHONUNBUFFERED=1
-  #   extra_hosts:
-  #     - "www.example.com:192.168.0.2"
-  #     - "app1.example.com:192.168.0.2"
-  #   networks:
-  #     bw-services:
-  #       ipv4_address: 192.168.0.3
+
+  ui-tests:
+    build: .
+    environment:
+      - PYTHONUNBUFFERED=1
+    extra_hosts:
+      - "www.example.com:192.168.0.2"
+      - "app1.example.com:192.168.0.2"
+    networks:
+      bw-services:
+        ipv4_address: 192.168.0.3
 
 volumes:
   bw-data:

tests/ui/geckodriver.log

@@ -0,0 +1,8 @@
+1682773748597	geckodriver	INFO	Listening on 127.0.0.1:37745
+1682773748615	webdriver::server	WARN	Rejected request with Host header localhost:37745, allowed values are []
+1682773783634	geckodriver	INFO	Listening on 127.0.0.1:38451
+1682773783649	webdriver::server	WARN	Rejected request with Host header localhost:38451, allowed values are []
+1682773795117	geckodriver	INFO	Listening on 127.0.0.1:33351
+1682773795125	webdriver::server	WARN	Rejected request with Host header localhost:33351, allowed values are []
+1682834744519	geckodriver	INFO	Listening on 127.0.0.1:59403
+1682834745017	webdriver::server	WARN	Rejected request with Host header localhost:59403, allowed values are []

tests/ui/plugin.json

@@ -0,0 +1,9 @@
+{
+  "id": "discord",
+  "order": 999,
+  "name": "Discord",
+  "description": "Send alerts to a Discord channel (using webhooks).",
+  "version": "0.1",
+  "stream": "no",
+  "settings": {}
+  }