Merge branch 'dev' of github.com:bunkerity/bunkerweb into dev

.github/workflows/dev-update-mmdb.yml

@@ -0,0 +1,60 @@
+name: Update cached mmdb files
+
+permissions:
+  contents: write
+
+on:
+  schedule:
+    - cron: "0 1 5 * *"
+
+jobs:
+  mmdb-update:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.BUNKERBOT_TOKEN }}
+      - name: Download mmdb files
+        run: |
+          mkdir -p src/bw/misc/
+          cd src/bw/misc/
+          CURL_RETURN_CODE=0
+          CURL_OUTPUT=`curl -w httpcode=%{http_code} -s -o asn.mmdb.gz https://download.db-ip.com/free/dbip-asn-lite-$(date +%Y-%m).mmdb.gz 2> /dev/null` || CURL_RETURN_CODE=$?
+          if [ ${CURL_RETURN_CODE} -ne 0 ]; then  
+            echo "Curl connection failed when downloading asn-lite mmdb file with return code - ${CURL_RETURN_CODE}"
+            exit 1
+          else
+              echo "Curl connection success"
+              # Check http code for curl operation/response in  CURL_OUTPUT
+              httpCode=$(echo "${CURL_OUTPUT}" | sed -e 's/.*\httpcode=//')
+              if [ ${httpCode} -ne 200 ]; then
+                  echo "Curl operation/command failed due to server return code - ${httpCode}"
+                  exit 1
+              fi
+          fi
+          CURL_RETURN_CODE=0
+          CURL_OUTPUT=`curl -w httpcode=%{http_code} -s -o country.mmdb.gz https://download.db-ip.com/free/dbip-country-lite-$(date +%Y-%m).mmdb.gz 2> /dev/null` || CURL_RETURN_CODE=$?
+          if [ ${CURL_RETURN_CODE} -ne 0 ]; then  
+            echo "Curl connection failed when downloading country-lite mmdb file with return code - ${CURL_RETURN_CODE}"
+            exit 1
+          else
+              echo "Curl connection success"
+              # Check http code for curl operation/response in  CURL_OUTPUT
+              httpCode=$(echo "${CURL_OUTPUT}" | sed -e 's/.*\httpcode=//')
+              if [ ${httpCode} -ne 200 ]; then
+                  echo "Curl operation/command failed due to server return code - ${httpCode}"
+                  exit 1
+              fi
+          fi
+          rm -f asn.mmdb country.mmdb
+          gunzip asn.mmdb.gz country.mmdb.gz
+      - name: Commit and push changes
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          branch: dev
+          commit_message: "Monthly mmdb update"
+          commit_options: "--no-verify"
+          commit_user_name: "BunkerBot"
+          commit_user_email: "bunkerbot@bunkerity.com"

docs/json2md.py

@@ -22,6 +22,7 @@ def print_md_table(settings) -> MarkdownTableWriter:
     )
     return writer
 
+
 def stream_support(support) -> str:
     md = "STREAM support "
     if support == "no":
@@ -32,6 +33,7 @@ def stream_support(support) -> str:
         md += ":warning:"
     return md
 
+
 doc = StringIO()
 
 print("# Settings\n", file=doc)
@@ -72,7 +74,7 @@ for name, data in dict(sorted(core_settings.items())).items():
     print(f"### {data['name']}\n", file=doc)
     print(f"{stream_support(data['stream'])}\n", file=doc)
     print(f"{data['description']}\n", file=doc)
-    print(print_md_table(data['settings']), file=doc)
+    print(print_md_table(data["settings"]), file=doc)
 
 doc.seek(0)
 content = doc.read()

src/common/core/customcert/jobs/custom-cert.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 
-from os import getenv, makedirs
+from os import getenv
 from pathlib import Path
 from shutil import copy
 from sys import exit as sys_exit, path as sys_path
@@ -120,7 +120,7 @@ def check_cert(cert_path, key_path, first_server: Optional[str] = None) -> bool:
 status = 0
 
 try:
-    makedirs("/var/cache/bunkerweb/customcert/", exist_ok=True)
+    Path("/var/cache/bunkerweb/customcert/").mkdir(parents=True, exist_ok=True)
 
     # Multisite case
     if getenv("MULTISITE") == "yes":

src/common/core/jobs/jobs/download-plugins.py

@@ -2,7 +2,7 @@
 
 from hashlib import sha256
 from io import BytesIO
-from os import getenv, listdir, chmod, stat, _exit
+from os import getenv, listdir, chmod, _exit
 from os.path import basename, dirname
 from pathlib import Path
 from stat import S_IEXEC
@@ -49,7 +49,7 @@ def install_plugin(plugin_dir) -> bool:
     copytree(plugin_dir, f"/etc/bunkerweb/plugins/{metadata['id']}")
     # Add u+x permissions to jobs files
     for job_file in glob(f"{plugin_dir}/jobs/*"):
-        st = stat(job_file)
+        st = Path(job_file).stat()
         chmod(job_file, st.st_mode | S_IEXEC)
     logger.info(f"Plugin {metadata['id']} installed")
     return True

src/common/core/letsencrypt/jobs/certbot-auth.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 
-from os import getenv, makedirs
+from os import getenv
 from pathlib import Path
 from sys import exit as sys_exit, path as sys_path
 from threading import Lock
@@ -75,7 +75,7 @@ try:
     # Linux case
     else:
         root_dir = "/var/tmp/bunkerweb/lets-encrypt/.well-known/acme-challenge/"
-        makedirs(root_dir, exist_ok=True)
+        Path(root_dir).mkdir(parents=True, exist_ok=True)
         Path(f"{root_dir}{token}").write_text(validation)
 except:
     status = 1

src/common/core/letsencrypt/jobs/certbot-cleanup.py

@@ -1,7 +1,6 @@
 #!/usr/bin/python3
 
 from os import getenv
-from os.path import isfile
 from pathlib import Path
 from sys import exit as sys_exit, path as sys_path
 from threading import Lock
@@ -73,7 +72,7 @@ try:
         challenge_path = (
             f"/var/tmp/bunkerweb/lets-encrypt/.well-known/acme-challenge/{token}"
         )
-        if isfile(challenge_path):
+        if Path(challenge_path).exists():
             Path(challenge_path).unlink()
 except:
     status = 1

src/common/core/misc/jobs/default-server-cert.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 
-from os import getenv, makedirs
-from os.path import isfile
+from os import getenv
+from pathlib import Path
 from subprocess import DEVNULL, run
 from sys import exit as sys_exit, path as sys_path
 from traceback import format_exc
@@ -48,8 +48,10 @@ try:
 
     # Generate the self-signed certificate
     if need_default_cert:
-        makedirs("/var/cache/bunkerweb/default-server-cert", exist_ok=True)
-        if not isfile("/var/cache/bunkerweb/default-server-cert/cert.pem"):
+        Path("/var/cache/bunkerweb/default-server-cert").mkdir(
+            parents=True, exist_ok=True
+        )
+        if not Path("/var/cache/bunkerweb/default-server-cert/cert.pem").is_file():
             logger.info("Generating self-signed certificate for default server")
 
             cmd = "openssl req -nodes -x509 -newkey rsa:4096 -keyout /var/cache/bunkerweb/default-server-cert/cert.key -out /var/cache/bunkerweb/default-server-cert/cert.pem -days 3650".split(

src/common/db/requirements.in

@@ -1,4 +1,4 @@
-sqlalchemy==2.0.10
+sqlalchemy==2.0.12
 psycopg2-binary==2.9.6
 PyMySQL==1.0.3
 cryptography==40.0.2

src/common/db/requirements.txt

@@ -225,48 +225,48 @@ pymysql==1.0.3 \
     --hash=sha256:3dda943ef3694068a75d69d071755dbecacee1adf9a1fc5b206830d2b67d25e8 \
     --hash=sha256:89fc6ae41c0aeb6e1f7710cdd623702ea2c54d040565767a78b00a5ebb12f4e5
     # via -r requirements.in
-sqlalchemy==2.0.10 \
-    --hash=sha256:04020aba2c0266ec521095ddd5cb760fc0067b0088828ccbf6b323c900a62e59 \
-    --hash=sha256:06401013dad015e6f6f72c946f66d750fe4c5ef852ed2f15537d572cb92d7a75 \
-    --hash=sha256:096d9f72882035b4c6906172bf5c5afe4caefbfe0e028ab0c83dfdaa670cc193 \
-    --hash=sha256:1f5638aac94c8f3fe04ca030e2b3e84d52d70f15d67f35f794fd2057284abced \
-    --hash=sha256:1fa90ed075ebc5fefc504c0e35b84fde1880d7c095473c5aa0c01f63eb37beae \
-    --hash=sha256:207c2cc9b946f832fd45fbdd6276c28e3e80b206909a028cd163e87f4080a333 \
-    --hash=sha256:23e3e1cc3634a70bba2ab10c144d4f11cf0ddeca239bbdaf646770873030c600 \
-    --hash=sha256:28c79289b4bf21cf09fb770b124cfae2432bbafb2ffd6758ac280bc1cacabfac \
-    --hash=sha256:2bd944dc701be15a91ec965c6634ab90998ca2d14e4f1f568545547a3a3adc16 \
-    --hash=sha256:2fdccadc9359784ae12ae9199849b724c7165220ae93c6066e841b66c6823742 \
-    --hash=sha256:300e8165bc78a0a917b39617730caf2c08c399302137c562e5ce7a37780ad10f \
-    --hash=sha256:39869cf2cfe73c8ad9a6f15712a2ed8c13c1f87646611882efb6a8ec80d180e8 \
-    --hash=sha256:3e77ed2e6d911aafc931c92033262d2979a44317294328b071a53aa10e2a9614 \
-    --hash=sha256:4a1ec8fcbe7e6a6ec28e161c6030d8cf5077e31efc3d08708d8de5aa8314b345 \
-    --hash=sha256:5892afc393ecd5f20910ff5a6b90d56620ec2ef3e36e3358eaedbae2aa36816d \
-    --hash=sha256:5e8abd2ce0745a2819f3e41a17570c9d74b634a5b5ab5a04de5919e55d5d8601 \
-    --hash=sha256:61ea1af2d01e709dcd4edc0d994db42bac6b2673c093cc35df3875e54cad9cef \
-    --hash=sha256:631ea4d1a8d78b43126773fa2de5472d97eb54dc4b9fbae4d8bd910f72f31f25 \
-    --hash=sha256:6b15cadba33d77e6fcee4f4f7706913d143d20e48ce26e9b6578b5cd07d4a353 \
-    --hash=sha256:70aed8f508f6c2f4da63ee6fa853534bb97d47bc82e28d56442f62a0b6ad2660 \
-    --hash=sha256:736e92fa4d6e020fc780b915bcdd69749ad32c79bc6b031e85dcd2b8069f8de1 \
-    --hash=sha256:7a8ca39fbc2dfe357f03e398bf5c1421b9b6614a8cf69ccada9ab3ef7e036073 \
-    --hash=sha256:7da5bf86746ddbf8d68f1a3f9d1efee1d95e07d5ad63f47b839f4db799e12566 \
-    --hash=sha256:88df3327c32468716a52c10e7991268afb552a0a7ef36130925864f28873d2e0 \
-    --hash=sha256:89e7a05639b3ae4fd17062a37b0ee336ea50ac9751e98e3330a6ed95daa4880c \
-    --hash=sha256:8a3e3f34468a512b3886ac5584384aed8bef388297c710509a842fb1468476f3 \
-    --hash=sha256:8c3366be42bca5c066703af54b856e00f23b8fbef9ab0346a58d34245af695a5 \
-    --hash=sha256:9a77e29a96779f373eb144040e5fae1e3944916c13360715e74f73b186f0d8d2 \
-    --hash=sha256:a4cdac392547dec07d69c5e8b05374b0357359ebc58ab2bbcb9fa0370ecb715f \
-    --hash=sha256:a9aa445201754a49b7ddb0b99fbe5ccf98f6900548fc60a0a07dde2253dd541e \
-    --hash=sha256:af525e9fbcf7da7404fc4b91ca4ce6172457d3f4390b93941fb97bfe29afb7dc \
-    --hash=sha256:b608ad640ac70e2901d111a69ad975e6b0ca39947e08cc28691b0de00831a787 \
-    --hash=sha256:d46edd508123413595a17bb64655db7c4bfefa83e721a3064f66e046e9a6a103 \
-    --hash=sha256:d975ac2bc513f530fa2574eb58e0ca731357d4686de2fb644af3036fca4f3fd6 \
-    --hash=sha256:dcd5793b98eb043703895443cc399fb8e2ce21c9b09757e954e425c8415c541b \
-    --hash=sha256:dd40fbf4f916a41b4afe50665e2d029a1c9f74967fd3b7422475529641d31ef5 \
-    --hash=sha256:dddbe2c012d712873fb9f203512db57d3cbdd20803f0792aa01bc513da8a2380 \
-    --hash=sha256:e9d7e65c2c4f313524399f6b8ec14bfa8f4e9fccd999ff585e10e073cfd21429 \
-    --hash=sha256:ec910449c70b0359dbe08a5e8c63678c7ef0113ab61cd0bb2e80ed09ea8ce6ab \
-    --hash=sha256:ed368ee7b1c119d5f6321cc9a3ea806adacf522bb4c2e9e398cbfc2e2cc68a2a \
-    --hash=sha256:faa6d2e6d6d46d2d58c5a4713148300b44fcfc911341ec82d8731488d0757f96
+sqlalchemy==2.0.12 \
+    --hash=sha256:03206576ca53f55b9de6e890273e498f4b2e6e687a9db9859bdcd21df5a63e53 \
+    --hash=sha256:09205893a84b6bedae0453d3f384f5d2a6499b6e45ad977549894cdcd85d8f1c \
+    --hash=sha256:0e5501c78b5ab917f0f0f75ce7f0018f683a0a76e95f30e6561bf61c9ff69d43 \
+    --hash=sha256:10f1ff0ebe21d2cea89ead231ba3ecf75678463ab85f19ce2ce91207620737f3 \
+    --hash=sha256:1fac17c866111283cbcdb7024d646abb71fdd95f3ce975cf3710258bc55742fd \
+    --hash=sha256:297b752d4f30350b64175bbbd57dc94c061a35f5d1dba088d0a367dbbebabc94 \
+    --hash=sha256:2a3101252f3de9a18561c1fb0a68b1ee465485990aba458d4510f214bd5a582c \
+    --hash=sha256:32762dba51b663609757f861584a722093487f53737e76474cc6e190904dc31b \
+    --hash=sha256:369f6564e68a9c60f0b9dde121def491e651a4ba8dcdd652a93f1cd5977cd85c \
+    --hash=sha256:3745dee26a7ee012598577ad3b8f6e6cd50a49b2afa0cde9db668da6bf2c2319 \
+    --hash=sha256:3c053c3f4c4e45d4c8b27977647566c140d6de3f61a4e2acb92ea24cf9911c7f \
+    --hash=sha256:4ad525b9dd17b478a2ed8580d7f2bc46b0f5889153c6b1c099729583e395b4b9 \
+    --hash=sha256:53b2c8adbcbb59732fb21a024aaa261983655845d86e3fc26a5676cec0ebaa09 \
+    --hash=sha256:5d709f43caee115b03b707b8cbbcb8b303045dd7cdc825b6d29857d71f3425ae \
+    --hash=sha256:5e9d390727c11b9a7e583bf6770de36895c0936bddb98ae93ae99282e6428d5f \
+    --hash=sha256:6b1fa0ffc378a7061c452cb4a1f804fad1b3b8aa8d0552725531d27941b2e3ed \
+    --hash=sha256:6e1d50592cb24d1947c374c666add65ded7c181ec98a89ed17abbe9b8b2e2ff4 \
+    --hash=sha256:77a06b0983faf9aa48ee6219d41ade39dee16ce90857cc181dbcf6918acd234d \
+    --hash=sha256:7eb25b981cbc9e7df9f56ad7ec4c6d77323090ca4b7147fcdc09d66535377759 \
+    --hash=sha256:85b0efe1c71459ba435a6593f54a0e39334b16ba383e8010fdb9d0127ca51ba8 \
+    --hash=sha256:87b2c2d13c3d1384859b60eabb3139e169ce68ada1d2963dbd0c7af797f16efe \
+    --hash=sha256:8aad66215a3817a7a1d535769773333250de2653c89b53f7e2d42b677d398027 \
+    --hash=sha256:91f4b1bdc987ef85fe3a0ce5d26ac72ff8f60207b08272aa2a65494836391d69 \
+    --hash=sha256:978bee4ecbcdadf087220618409fb9be9509458df479528b70308f0599c7c519 \
+    --hash=sha256:9fe98e9d26778d7711ceee2c671741b4f54c74677668481d733d6f70747d7690 \
+    --hash=sha256:a022c588c0f413f8cddf9fcc597dbf317efeac4186d8bff9aa7f3219258348b0 \
+    --hash=sha256:a4709457f1c317e347051498b91fa2b86c4bcdebf93c84e6d121a4fc8a397307 \
+    --hash=sha256:aec5fb36b53125554ecc2285526eb5cc31b21f6cb059993c1c5ca831959de052 \
+    --hash=sha256:b6ceca432ce88ad12aab5b5896c343a1993c90b325d9193dcd055e73e18a0439 \
+    --hash=sha256:b76c2fde827522e21922418325c1b95c2d795cdecfb4bc261e4d37965199ee7f \
+    --hash=sha256:bddfc5bd1dee5db0fddc9dab26f800c283f3243e7281bbf107200fed30125f9c \
+    --hash=sha256:bf83700faa9642388fbd3167db3f6cbb2e88cc8367b8c22204f3f408ee782d25 \
+    --hash=sha256:c5268ec05c21e2ecf5bca09314bcaadfec01f02163088cd602db4379862958dd \
+    --hash=sha256:d9796d5c13b2b7f05084d0ce52528cf919f9bde9e0f10672a6393a4490415695 \
+    --hash=sha256:dc67efd00ce7f428a446ce012673c03c63c5abb5dec3f33750087b8bdc173bf0 \
+    --hash=sha256:dfd6385b662aea83e63dd4db5fe116eb11914022deb1745f0b57fa8470c18ffe \
+    --hash=sha256:e495ad05a13171fbb5d72fe5993469c8bceac42bcf6b8f9f117a518ee7fbc353 \
+    --hash=sha256:e752c34f7a2057ebe82c856698b9f277c633d4aad006bddf7af74598567c8931 \
+    --hash=sha256:f0843132168b44ca33c5e5a2046c954775dde8c580ce27f5cf2e134d0d9919e4 \
+    --hash=sha256:f30c5608c64fc9c1fa9a16277eb4784f782362566fe40ff8d283358c8f2c5fe0 \
+    --hash=sha256:f6ebadefc4331dda83c22519e1ea1e61104df6eb38abbb80ab91b0a8527a5c19
     # via -r requirements.in
 typing-extensions==4.5.0 \
     --hash=sha256:5cb5f4a79139d699607b3ef622a1dedafa84e115ab0024e0d9c044a9479ca7cb \

src/common/gen/requirements.in

@@ -2,5 +2,5 @@ docker==6.0.1
 kubernetes==26.1.0
 jinja2==3.1.2
 python-dotenv==1.0.0
-requests==2.28.2
+requests==2.29.0
 redis==4.5.4

src/common/gen/requirements.txt

@@ -239,9 +239,9 @@ redis==4.5.4 \
     --hash=sha256:2c19e6767c474f2e85167909061d525ed65bea9301c0770bb151e041b7ac89a2 \
     --hash=sha256:73ec35da4da267d6847e47f68730fdd5f62e2ca69e3ef5885c6a78a9374c3893
     # via -r requirements.in
-requests==2.28.2 \
-    --hash=sha256:64299f4909223da747622c030b781c0d7811e359c37124b4bd368fb8c6518baa \
-    --hash=sha256:98b1b2782e3c6c4904938b84c0eb932721069dfdb9134313beff7c83c2df24bf
+requests==2.29.0 \
+    --hash=sha256:e8f3c9be120d3333921d213eef078af392fba3933ab7ed2d1cba3b56f2568c3b \
+    --hash=sha256:f2e34a75f4749019bb0e3effb66683630e4ffeaf75819fb51bebef1bf5aef059
     # via
     #   -r requirements.in
     #   docker

src/common/utils/ApiCaller.py

@@ -153,7 +153,7 @@ class ApiCaller:
         ret = True
         with BytesIO() as tgz:
             with taropen(
-                mode="w:gz", fileobj=tgz, dereference=True, compresslevel=5
+                mode="w:gz", fileobj=tgz, dereference=True, compresslevel=3
             ) as tf:
                 tf.add(path, arcname=".")
             tgz.seek(0, 0)

src/scheduler/JobScheduler.py

@@ -172,9 +172,13 @@ class JobScheduler(ApiCaller):
                     self.__logger.info("Sending /var/cache/bunkerweb folder ...")
                     if not self._send_files("/var/cache/bunkerweb", "/cache"):
                         success = False
-                        self.__logger.error("Error while sending /var/cache/bunkerweb folder")
+                        self.__logger.error(
+                            "Error while sending /var/cache/bunkerweb folder"
+                        )
                     else:
-                        self.__logger.info("Successfully sent /var/cache/bunkerweb folder")
+                        self.__logger.info(
+                            "Successfully sent /var/cache/bunkerweb folder"
+                        )
                 if not self.__reload():
                     success = False
             except:

src/scheduler/main.py

@@ -10,7 +10,6 @@ from os import (
     getenv,
     getpid,
     listdir,
-    stat,
     walk,
 )
 from os.path import dirname, join
@@ -134,7 +133,7 @@ def generate_external_plugins(
         Path(tmp_path).unlink()
 
         for job_file in glob(f"{plugin_dir}/jobs/*"):
-            st = stat(job_file)
+            st = Path(job_file).stat()
             chmod(job_file, st.st_mode | S_IEXEC)
 
     if integration in ("Autoconf", "Swarm", "Kubernetes", "Docker"):

src/scheduler/requirements.txt

@@ -236,9 +236,9 @@ pytz==2023.3 \
     #   acme
     #   certbot
     #   pyrfc3339
-requests==2.28.2 \
-    --hash=sha256:64299f4909223da747622c030b781c0d7811e359c37124b4bd368fb8c6518baa \
-    --hash=sha256:98b1b2782e3c6c4904938b84c0eb932721069dfdb9134313beff7c83c2df24bf
+requests==2.29.0 \
+    --hash=sha256:e8f3c9be120d3333921d213eef078af392fba3933ab7ed2d1cba3b56f2568c3b \
+    --hash=sha256:f2e34a75f4749019bb0e3effb66683630e4ffeaf75819fb51bebef1bf5aef059
     # via acme
 schedule==1.2.0 \
     --hash=sha256:415908febaba0bc9a7c727a32efb407d646fe994367ef9157d123aabbe539ea8 \

src/ui/main.py

@@ -1487,7 +1487,7 @@ def logs_container(container_id):
     tmp_logs = []
     if docker_client:
         try:
-            if integration == "Swarm":
+            if integration != "Swarm":
                 docker_logs = docker_client.containers.get(container_id).logs(
                     stdout=True,
                     stderr=True,

src/ui/requirements.in

@@ -1,4 +1,4 @@
-Flask==2.2.3
+Flask==2.3.1
 Flask_Login==0.6.2
 Flask_WTF==1.1.1
 beautifulsoup4==4.12.2

src/ui/requirements.txt

@@ -31,13 +31,17 @@ beautifulsoup4==4.12.2 \
     --hash=sha256:492bbc69dca35d12daac71c4db1bfff0c876c00ef4a2ffacce226d4638eb72da \
     --hash=sha256:bd2520ca0d9d7d12694a53d44ac482d181b4ec1888909b035a3dbf40d0f57d4a
     # via -r requirements.in
+blinker==1.6.2 \
+    --hash=sha256:4afd3de66ef3a9f8067559fb7a1cbe555c17dcbe15971b05d1b625c3e7abe213 \
+    --hash=sha256:c3d739772abb7bc2860abf5f2ec284223d9ad5c76da018234f6f50d6f31ab1f0
+    # via flask
 click==8.1.3 \
     --hash=sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e \
     --hash=sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48
     # via flask
-flask==2.2.3 \
-    --hash=sha256:7eb373984bf1c770023fce9db164ed0c3353cd0b53f130f4693da0ca756a2e6d \
-    --hash=sha256:c0bec9477df1cb867e5a67c9e1ab758de9cb4a3e52dd70681f59fa40a62b3f2d
+flask==2.3.1 \
+    --hash=sha256:8ba2a854608fdd603b67dccd4514a46450132227fb9df40127a8d0c1de8769ec \
+    --hash=sha256:a6059db4297106e5a64b3215fa16ae641822c1cb97ecb498573549b2478602cb
     # via
     #   -r requirements.in
     #   flask-login
@@ -251,9 +255,9 @@ soupsieve==2.4.1 \
     --hash=sha256:1c1bfee6819544a3447586c889157365a27e10d88cde3ad3da0cf0ddf646feb8 \
     --hash=sha256:89d12b2d5dfcd2c9e8c22326da9d9aa9cb3dfab0a83a024f05704076ee8d35ea
     # via beautifulsoup4
-werkzeug==2.2.3 \
-    --hash=sha256:2e1ccc9417d4da358b9de6f174e3ac094391ea1d4fbef2d667865d819dfd0afe \
-    --hash=sha256:56433961bc1f12533306c624f3be5e744389ac61d722175d543e1751285da612
+werkzeug==2.3.2 \
+    --hash=sha256:2f3278e9ef61511cdf82cc28fc5da0f5b501dd8f01ecf5ef6a5d810048f68702 \
+    --hash=sha256:b7b8bc1609f35ae8e45d48a9b58d7a4eb1e41eec148d37e977e5df6ebf3398b2
     # via
     #   flask
     #   flask-login

src/ui/templates/logs.html

@@ -132,18 +132,11 @@ url_for(request.endpoint)[1:].split("/")[-1].strip().replace('_', '-') %}
           name="live-update"
           data-default-method="default"
           data-default-value="no"
-          class="relative cursor-pointer disabled:cursor-default disabled:pointer-events-none dark:border-slate-600 dark:bg-slate-700 z-10 checked:z-0 w-5 h-5 ease text-base rounded-1.4 checked:bg-primary checked:border-primary dark:checked:bg-primary dark:checked:border-primary duration-250 float-left mt-1 appearance-none border border-gray-300 bg-white bg-contain bg-center bg-no-repeat align-top transition-all disabled:bg-gray-400 disabled:border-gray-400 dark:disabled:bg-gray-800 dark:disabled:border-gray-800 disabled:text-gray-700 dark:disabled:text-gray-300"
+          class="checkbox"
           type="checkbox"
           data-pattern="^(yes|no)$"
           value="no"
         />
-        <input
-          type="hidden"
-          name="live-update"
-          data-default-method="default"
-          data-default-value="no"
-          value="no"
-        />
         <svg
           data-checkbox-handler="live-update"
           class="pointer-events-none absolute fill-white dark:fill-gray-300 left-0 top-0 translate-x-1 translate-y-2 h-3 w-3"

tests/DockerTest.py

@@ -19,9 +19,15 @@ class DockerTest(Test):
         self._domains = {
             r"www\.example\.com": Test.random_string(6) + "." + getenv("TEST_DOMAIN1"),
             r"auth\.example\.com": Test.random_string(6) + "." + getenv("TEST_DOMAIN1"),
-            r"app1\.example\.com": Test.random_string(6) + "." + getenv("TEST_DOMAIN1_1"),
-            r"app2\.example\.com": Test.random_string(6) + "." + getenv("TEST_DOMAIN1_2"),
-            r"app3\.example\.com": Test.random_string(6) + "." + getenv("TEST_DOMAIN1_3")
+            r"app1\.example\.com": Test.random_string(6)
+            + "."
+            + getenv("TEST_DOMAIN1_1"),
+            r"app2\.example\.com": Test.random_string(6)
+            + "."
+            + getenv("TEST_DOMAIN1_2"),
+            r"app3\.example\.com": Test.random_string(6)
+            + "."
+            + getenv("TEST_DOMAIN1_3"),
         }
         self._check_domains()
 

tests/ui/Dockerfile

@@ -11,11 +11,19 @@ RUN GECKODRIVER_VERSION=`curl -i https://github.com/mozilla/geckodriver/releases
   chmod +x /usr/local/bin/geckodriver && \
   rm geckodriver.tar.gz
 
-RUN wget https://github.com/bunkerity/bunkerweb-plugins/archive/refs/heads/main.zip && \
-  unzip main.zip && \
-  mv bunkerweb-plugins-main/discord . && \
-  zip -r discord.zip discord && \
-  rm -rf bunkerweb-plugins-main main.zip discord
+WORKDIR /opt/tests_ui
+
+RUN echo '{ \
+  "id": "discord", \
+  "order": 999, \
+  "name": "Discord", \
+  "description": "Send alerts to a Discord channel (using webhooks).", \
+  "version": "0.1", \
+  "stream": "no", \
+  "settings": {} \
+  }' > plugin.json && \
+  zip -r discord.zip plugin.json && \
+  rm plugin.json
 
 # Clean up
 RUN apk del .build-deps && \
@@ -23,8 +31,6 @@ RUN apk del .build-deps && \
 
 ENV PYTHONUNBUFFERED=1
 
-WORKDIR /$APP_HOME
-
 COPY requirements.txt .
 
 RUN pip install -r requirements.txt

tests/ui/main.py

@@ -254,7 +254,7 @@ try:
             "home",
         )
 
-        ## HOME PAGE
+        ### HOME PAGE
 
         print("Trying instances page ...", flush=True)
 
@@ -933,7 +933,7 @@ try:
         external_plugins = safe_get_element(
             driver,
             By.XPATH,
-            "//div[@data-plugins-external='external']",
+            "//div[@data-plugins-external=' external ']",
             multiple=True,
         )
 
@@ -1055,7 +1055,9 @@ try:
         print("Logs found, trying auto refresh ...", flush=True)
 
         assert_button_click(driver, safe_get_element(driver, By.ID, "live-update"))
-        assert_button_click(driver, safe_get_element(driver, By.ID, "submit-settings"))
+        assert_button_click(
+            driver, "//button[@id='submit-settings' and contains(text(), 'Go Live')]"
+        )
 
         sleep(3)
 

tests/ui/requirements.txt

@@ -1,2 +1,2 @@
 selenium==4.9.0
-requests==2.28.2
+requests==2.29.0