Merge pull request #598 from bunkerity/dev

Fix UI fetching only default values from the database
2026-05-24 09:28:37 +00:00 · 2023-08-21 11:13:53 -04:00 · 2023-08-21 11:13:53 -04:00 · 76408cf04d
commit 76408cf04d
parent 758fc13c3d f7cd7d9daf
24 changed files with 200 additions and 200 deletions
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@ -94,10 +94,10 @@ jobs:
    secrets:
      PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }}
      PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
-  
+
  # Push with dev tag
  push-dev:
-    needs: [tests-core]
+    needs: [tests-ui, tests-core]
    runs-on: ubuntu-latest
    steps:
      - name: Login to Docker Hub
--- a/.github/workflows/staging.yml
+++ b/.github/workflows/staging.yml
@ -63,115 +63,114 @@ jobs:
      PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }}
      PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}

-  # # Code security
-  # code-security:
-  #   runs-on: ubuntu-latest
-  #   permissions:
-  #     actions: read
-  #     contents: read
-  #     security-events: write
-  #   strategy:
-  #     fail-fast: false
-  #     matrix:
-  #       language: ["python"]
-  #   steps:
-  #     - name: Checkout repository
-  #       uses: actions/checkout@v3
-  #     - name: Initialize CodeQL
-  #       uses: github/codeql-action/init@v2
-  #       with:
-  #         languages: ${{ matrix.language }}
-  #         config-file: ./.github/codeql.yml
-  #     - name: Perform CodeQL Analysis
-  #       uses: github/codeql-action/analyze@v2
-  #       with:
-  #         category: "/language:${{matrix.language}}"
+  # Code security
+  code-security:
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+    strategy:
+      fail-fast: false
+      matrix:
+        language: ["python"]
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+          config-file: ./.github/codeql.yml
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
+        with:
+          category: "/language:${{matrix.language}}"

-  # # Create infrastructures
-  # create-infras:
-  #   needs: [code-security, build-containers, build-packages]
-  #   strategy:
-  #     matrix:
-  #       type: [docker, autoconf, swarm, k8s, linux]
-  #   uses: ./.github/workflows/staging-create-infra.yml
-  #   with:
-  #     TYPE: ${{ matrix.type }}
-  #   secrets:
-  #     CICD_SECRETS: ${{ secrets.CICD_SECRETS }}
+  # Create infrastructures
+  create-infras:
+    needs: [code-security, build-containers, build-packages]
+    strategy:
+      matrix:
+        type: [docker, autoconf, swarm, k8s, linux]
+    uses: ./.github/workflows/staging-create-infra.yml
+    with:
+      TYPE: ${{ matrix.type }}
+    secrets:
+      CICD_SECRETS: ${{ secrets.CICD_SECRETS }}

-  # # Perform tests
-  # staging-tests:
-  #   needs: [create-infras]
-  #   strategy:
-  #     matrix:
-  #       type: [docker, autoconf, swarm, k8s, linux]
-  #       include:
-  #         - type: docker
-  #           runs_on: "['self-hosted', 'bw-docker']"
-  #         - type: autoconf
-  #           runs_on: "['self-hosted', 'bw-autoconf']"
-  #         - type: swarm
-  #           runs_on: "['self-hosted', 'bw-swarm']"
-  #         - type: k8s
-  #           runs_on: "['ubuntu-latest']"
-  #         - type: linux
-  #           runs_on: "['self-hosted', 'bw-linux']"
-  #   uses: ./.github/workflows/staging-tests.yml
-  #   with:
-  #     TYPE: ${{ matrix.type }}
-  #     RUNS_ON: ${{ matrix.runs_on }}
-  #   secrets: inherit
-  # tests-ui:
-  #   needs: [create-infras]
-  #   uses: ./.github/workflows/tests-ui.yml
-  #   with:
-  #     RELEASE: testing
-  #   secrets:
-  #     PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }}
-  #     PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
-  # prepare-tests-core:
-  #   needs: [create-infras]
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - name: Checkout repository
-  #       uses: actions/checkout@v3
-  #     - id: set-matrix
-  #       run: |
-  #         tests=$(find ./tests/core/ -maxdepth 1 -mindepth 1 -type d -printf "%f\n" | jq -c --raw-input --slurp 'split("\n")| .[0:-1]')
-  #         echo "::set-output name=tests::$tests"
-  #   outputs:
-  #     tests: ${{ steps.set-matrix.outputs.tests }}
-  # tests-core:
-  #   needs: prepare-tests-core
-  #   strategy:
-  #     fail-fast: false
-  #     matrix:
-  #       test: ${{ fromJson(needs.prepare-tests-core.outputs.tests) }}
-  #   uses: ./.github/workflows/test-core.yml
-  #   with:
-  #     TEST: ${{ matrix.test }}
-  #     RELEASE: testing
-  #   secrets:
-  #     PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }}
-  #     PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
+  # Perform tests
+  staging-tests:
+    needs: [create-infras]
+    strategy:
+      matrix:
+        type: [docker, autoconf, swarm, k8s, linux]
+        include:
+          - type: docker
+            runs_on: "['self-hosted', 'bw-docker']"
+          - type: autoconf
+            runs_on: "['self-hosted', 'bw-autoconf']"
+          - type: swarm
+            runs_on: "['self-hosted', 'bw-swarm']"
+          - type: k8s
+            runs_on: "['ubuntu-latest']"
+          - type: linux
+            runs_on: "['self-hosted', 'bw-linux']"
+    uses: ./.github/workflows/staging-tests.yml
+    with:
+      TYPE: ${{ matrix.type }}
+      RUNS_ON: ${{ matrix.runs_on }}
+    secrets: inherit
+  tests-ui:
+    needs: [create-infras]
+    uses: ./.github/workflows/tests-ui.yml
+    with:
+      RELEASE: testing
+    secrets:
+      PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }}
+      PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
+  prepare-tests-core:
+    needs: [create-infras]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - id: set-matrix
+        run: |
+          tests=$(find ./tests/core/ -maxdepth 1 -mindepth 1 -type d -printf "%f\n" | jq -c --raw-input --slurp 'split("\n")| .[0:-1]')
+          echo "::set-output name=tests::$tests"
+    outputs:
+      tests: ${{ steps.set-matrix.outputs.tests }}
+  tests-core:
+    needs: prepare-tests-core
+    strategy:
+      fail-fast: false
+      matrix:
+        test: ${{ fromJson(needs.prepare-tests-core.outputs.tests) }}
+    uses: ./.github/workflows/test-core.yml
+    with:
+      TEST: ${{ matrix.test }}
+      RELEASE: testing
+    secrets:
+      PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }}
+      PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}

-  # # Delete infrastructures
-  # delete-infras:
-  #   if: ${{ always() }}
-  #   needs: [staging-tests]
-  #   strategy:
-  #     matrix:
-  #       type: [docker, autoconf, swarm, k8s, linux]
-  #   uses: ./.github/workflows/staging-delete-infra.yml
-  #   with:
-  #     TYPE: ${{ matrix.type }}
-  #   secrets:
-  #     CICD_SECRETS: ${{ secrets.CICD_SECRETS }}
+  # Delete infrastructures
+  delete-infras:
+    if: ${{ always() }}
+    needs: [staging-tests]
+    strategy:
+      matrix:
+        type: [docker, autoconf, swarm, k8s, linux]
+    uses: ./.github/workflows/staging-delete-infra.yml
+    with:
+      TYPE: ${{ matrix.type }}
+    secrets:
+      CICD_SECRETS: ${{ secrets.CICD_SECRETS }}

  # Push Docker images
  push-images:
-    # needs: [staging-tests, tests-ui, tests-core]
-    needs: [build-containers, build-packages]
+    needs: [staging-tests, tests-ui, tests-core]
    runs-on: ubuntu-latest
    steps:
      - name: Login to Docker Hub
@ -196,8 +195,7 @@ jobs:

  # Push Linux packages
  push-packages:
-    # needs: [staging-tests, tests-ui, tests-core]
-    needs: [build-containers, build-packages]
+    needs: [staging-tests, tests-ui, tests-core]
    strategy:
      matrix:
        linux: [ubuntu, debian, fedora, el]
--- a/src/common/db/Database.py
+++ b/src/common/db/Database.py
@ -879,7 +879,13 @@ class Database:
                if setting.context == "multisite":
                    multisite.append(setting.id)

-            if config.get("MULTISITE", "no") == "yes":
+            is_multisite = (
+                config.get("MULTISITE", {"value": "no"})["value"] == "yes"
+                if methods
+                else config.get("MULTISITE", "no") == "yes"
+            )
+
+            if is_multisite:
                for service in session.query(Services).with_entities(Services.id).all():
                    checked_settings = []
                    for key, value in deepcopy(config).items():
@ -926,7 +932,7 @@ class Database:
                                }
                            )

-            if config["MULTISITE"] == "yes":
+            if is_multisite:
                servers = " ".join(
                    service.id for service in session.query(Services).all()
                )
@ -972,19 +978,22 @@ class Database:
                for service in session.query(Services).with_entities(Services.id).all()
            ]
            for service in service_names:
+                service_settings = []
                tmp_config = deepcopy(config)

                for key, value in deepcopy(tmp_config).items():
                    if key.startswith(f"{service}_"):
-                        tmp_config[key.replace(f"{service}_", "")] = tmp_config.pop(key)
+                        setting = key.replace(f"{service}_", "")
+                        service_settings.append(setting)
+                        tmp_config[setting] = tmp_config.pop(key)
                    elif any(key.startswith(f"{s}_") for s in service_names):
                        tmp_config.pop(key)
-                    else:
+                    elif key not in service_settings:
                        tmp_config[key] = (
                            {
                                "value": value["value"],
-                                "global": True,
-                                "method": "default",
+                                "global": value["global"],
+                                "method": value["method"],
                            }
                            if methods is True
                            else value
--- a/src/common/db/requirements.in
+++ b/src/common/db/requirements.in
@ -1,4 +1,4 @@
 cryptography==41.0.3
 psycopg2-binary==2.9.7
 PyMySQL==1.1.0
-sqlalchemy==2.0.19
+sqlalchemy==2.0.20
--- a/src/common/db/requirements.txt
+++ b/src/common/db/requirements.txt
@ -227,48 +227,48 @@ pymysql==1.1.0 \
    --hash=sha256:4f13a7df8bf36a51e81dd9f3605fede45a4878fe02f9236349fd82a3f0612f96 \
    --hash=sha256:8969ec6d763c856f7073c4c64662882675702efcb114b4bcbb955aea3a069fa7
    # via -r requirements.in
-sqlalchemy==2.0.19 \
-    --hash=sha256:024d2f67fb3ec697555e48caeb7147cfe2c08065a4f1a52d93c3d44fc8e6ad1c \
-    --hash=sha256:0bf0fd65b50a330261ec7fe3d091dfc1c577483c96a9fa1e4323e932961aa1b5 \
-    --hash=sha256:16a310f5bc75a5b2ce7cb656d0e76eb13440b8354f927ff15cbaddd2523ee2d1 \
-    --hash=sha256:1d90ccc15ba1baa345796a8fb1965223ca7ded2d235ccbef80a47b85cea2d71a \
-    --hash=sha256:22bafb1da60c24514c141a7ff852b52f9f573fb933b1e6b5263f0daa28ce6db9 \
-    --hash=sha256:2c69ce70047b801d2aba3e5ff3cba32014558966109fecab0c39d16c18510f15 \
-    --hash=sha256:2e7b69d9ced4b53310a87117824b23c509c6fc1f692aa7272d47561347e133b6 \
-    --hash=sha256:314145c1389b021a9ad5aa3a18bac6f5d939f9087d7fc5443be28cba19d2c972 \
-    --hash=sha256:3afa8a21a9046917b3a12ffe016ba7ebe7a55a6fc0c7d950beb303c735c3c3ad \
-    --hash=sha256:430614f18443b58ceb9dedec323ecddc0abb2b34e79d03503b5a7579cd73a531 \
-    --hash=sha256:43699eb3f80920cc39a380c159ae21c8a8924fe071bccb68fc509e099420b148 \
-    --hash=sha256:539010665c90e60c4a1650afe4ab49ca100c74e6aef882466f1de6471d414be7 \
-    --hash=sha256:57d100a421d9ab4874f51285c059003292433c648df6abe6c9c904e5bd5b0828 \
-    --hash=sha256:5831138f0cc06b43edf5f99541c64adf0ab0d41f9a4471fd63b54ae18399e4de \
-    --hash=sha256:584f66e5e1979a7a00f4935015840be627e31ca29ad13f49a6e51e97a3fb8cae \
-    --hash=sha256:5d6afc41ca0ecf373366fd8e10aee2797128d3ae45eb8467b19da4899bcd1ee0 \
-    --hash=sha256:61ada5831db36d897e28eb95f0f81814525e0d7927fb51145526c4e63174920b \
-    --hash=sha256:6b54d1ad7a162857bb7c8ef689049c7cd9eae2f38864fc096d62ae10bc100c7d \
-    --hash=sha256:7351c05db355da112e056a7b731253cbeffab9dfdb3be1e895368513c7d70106 \
-    --hash=sha256:77a14fa20264af73ddcdb1e2b9c5a829b8cc6b8304d0f093271980e36c200a3f \
-    --hash=sha256:851a37898a8a39783aab603c7348eb5b20d83c76a14766a43f56e6ad422d1ec8 \
-    --hash=sha256:89bc2b374ebee1a02fd2eae6fd0570b5ad897ee514e0f84c5c137c942772aa0c \
-    --hash=sha256:8e712cfd2e07b801bc6b60fdf64853bc2bd0af33ca8fa46166a23fe11ce0dbb0 \
-    --hash=sha256:8f9eb4575bfa5afc4b066528302bf12083da3175f71b64a43a7c0badda2be365 \
-    --hash=sha256:8fc05b59142445a4efb9c1fd75c334b431d35c304b0e33f4fa0ff1ea4890f92e \
-    --hash=sha256:96f0463573469579d32ad0c91929548d78314ef95c210a8115346271beeeaaa2 \
-    --hash=sha256:9deaae357edc2091a9ed5d25e9ee8bba98bcfae454b3911adeaf159c2e9ca9e3 \
-    --hash=sha256:a752b7a9aceb0ba173955d4f780c64ee15a1a991f1c52d307d6215c6c73b3a4c \
-    --hash=sha256:ae7473a67cd82a41decfea58c0eac581209a0aa30f8bc9190926fbf628bb17f7 \
-    --hash=sha256:b15afbf5aa76f2241184c1d3b61af1a72ba31ce4161013d7cb5c4c2fca04fd6e \
-    --hash=sha256:c896d4e6ab2eba2afa1d56be3d0b936c56d4666e789bfc59d6ae76e9fcf46145 \
-    --hash=sha256:cb4e688f6784427e5f9479d1a13617f573de8f7d4aa713ba82813bcd16e259d1 \
-    --hash=sha256:cda283700c984e699e8ef0fcc5c61f00c9d14b6f65a4f2767c97242513fcdd84 \
-    --hash=sha256:cf7b5e3856cbf1876da4e9d9715546fa26b6e0ba1a682d5ed2fc3ca4c7c3ec5b \
-    --hash=sha256:d6894708eeb81f6d8193e996257223b6bb4041cb05a17cd5cf373ed836ef87a2 \
-    --hash=sha256:d8f2afd1aafded7362b397581772c670f20ea84d0a780b93a1a1529da7c3d369 \
-    --hash=sha256:dd4d410a76c3762511ae075d50f379ae09551d92525aa5bb307f8343bf7c2c12 \
-    --hash=sha256:eb60699de43ba1a1f77363f563bb2c652f7748127ba3a774f7cf2c7804aa0d3d \
-    --hash=sha256:f469f15068cd8351826df4080ffe4cc6377c5bf7d29b5a07b0e717dddb4c7ea2 \
-    --hash=sha256:f82c310ddf97b04e1392c33cf9a70909e0ae10a7e2ddc1d64495e3abdc5d19fb \
-    --hash=sha256:fa51ce4aea583b0c6b426f4b0563d3535c1c75986c4373a0987d84d22376585b
+sqlalchemy==2.0.20 \
+    --hash=sha256:1506e988ebeaaf316f183da601f24eedd7452e163010ea63dbe52dc91c7fc70e \
+    --hash=sha256:1a58052b5a93425f656675673ef1f7e005a3b72e3f2c91b8acca1b27ccadf5f4 \
+    --hash=sha256:1b74eeafaa11372627ce94e4dc88a6751b2b4d263015b3523e2b1e57291102f0 \
+    --hash=sha256:1be86ccea0c965a1e8cd6ccf6884b924c319fcc85765f16c69f1ae7148eba64b \
+    --hash=sha256:1d35d49a972649b5080557c603110620a86aa11db350d7a7cb0f0a3f611948a0 \
+    --hash=sha256:243d0fb261f80a26774829bc2cee71df3222587ac789b7eaf6555c5b15651eed \
+    --hash=sha256:26a3399eaf65e9ab2690c07bd5cf898b639e76903e0abad096cd609233ce5208 \
+    --hash=sha256:27d554ef5d12501898d88d255c54eef8414576f34672e02fe96d75908993cf53 \
+    --hash=sha256:3364b7066b3c7f4437dd345d47271f1251e0cfb0aba67e785343cdbdb0fff08c \
+    --hash=sha256:3423dc2a3b94125094897118b52bdf4d37daf142cbcf26d48af284b763ab90e9 \
+    --hash=sha256:3c6aceebbc47db04f2d779db03afeaa2c73ea3f8dcd3987eb9efdb987ffa09a3 \
+    --hash=sha256:3ce5e81b800a8afc870bb8e0a275d81957e16f8c4b62415a7b386f29a0cb9763 \
+    --hash=sha256:411e7f140200c02c4b953b3dbd08351c9f9818d2bd591b56d0fa0716bd014f1e \
+    --hash=sha256:4cde2e1096cbb3e62002efdb7050113aa5f01718035ba9f29f9d89c3758e7e4e \
+    --hash=sha256:5768c268df78bacbde166b48be788b83dddaa2a5974b8810af422ddfe68a9bc8 \
+    --hash=sha256:599ccd23a7146e126be1c7632d1d47847fa9f333104d03325c4e15440fc7d927 \
+    --hash=sha256:5ed61e3463021763b853628aef8bc5d469fe12d95f82c74ef605049d810f3267 \
+    --hash=sha256:63a368231c53c93e2b67d0c5556a9836fdcd383f7e3026a39602aad775b14acf \
+    --hash=sha256:63e73da7fb030ae0a46a9ffbeef7e892f5def4baf8064786d040d45c1d6d1dc5 \
+    --hash=sha256:6eb6d77c31e1bf4268b4d61b549c341cbff9842f8e115ba6904249c20cb78a61 \
+    --hash=sha256:6f8a934f9dfdf762c844e5164046a9cea25fabbc9ec865c023fe7f300f11ca4a \
+    --hash=sha256:6fe7d61dc71119e21ddb0094ee994418c12f68c61b3d263ebaae50ea8399c4d4 \
+    --hash=sha256:759b51346aa388c2e606ee206c0bc6f15a5299f6174d1e10cadbe4530d3c7a98 \
+    --hash=sha256:76fdfc0f6f5341987474ff48e7a66c3cd2b8a71ddda01fa82fedb180b961630a \
+    --hash=sha256:77d37c1b4e64c926fa3de23e8244b964aab92963d0f74d98cbc0783a9e04f501 \
+    --hash=sha256:79543f945be7a5ada9943d555cf9b1531cfea49241809dd1183701f94a748624 \
+    --hash=sha256:79fde625a0a55220d3624e64101ed68a059c1c1f126c74f08a42097a72ff66a9 \
+    --hash=sha256:7d3f175410a6db0ad96b10bfbb0a5530ecd4fcf1e2b5d83d968dd64791f810ed \
+    --hash=sha256:8dd77fd6648b677d7742d2c3cc105a66e2681cc5e5fb247b88c7a7b78351cf74 \
+    --hash=sha256:a3f0dd6d15b6dc8b28a838a5c48ced7455c3e1fb47b89da9c79cc2090b072a50 \
+    --hash=sha256:bcb04441f370cbe6e37c2b8d79e4af9e4789f626c595899d94abebe8b38f9a4d \
+    --hash=sha256:c3d99ba99007dab8233f635c32b5cd24fb1df8d64e17bc7df136cedbea427897 \
+    --hash=sha256:ca8a5ff2aa7f3ade6c498aaafce25b1eaeabe4e42b73e25519183e4566a16fc6 \
+    --hash=sha256:cb0d3e94c2a84215532d9bcf10229476ffd3b08f481c53754113b794afb62d14 \
+    --hash=sha256:d1b09ba72e4e6d341bb5bdd3564f1cea6095d4c3632e45dc69375a1dbe4e26ec \
+    --hash=sha256:d32b5ffef6c5bcb452723a496bad2d4c52b346240c59b3e6dba279f6dcc06c14 \
+    --hash=sha256:d3793dcf5bc4d74ae1e9db15121250c2da476e1af8e45a1d9a52b1513a393459 \
+    --hash=sha256:dd81466bdbc82b060c3c110b2937ab65ace41dfa7b18681fdfad2f37f27acdd7 \
+    --hash=sha256:e4e571af672e1bb710b3cc1a9794b55bce1eae5aed41a608c0401885e3491179 \
+    --hash=sha256:ea8186be85da6587456c9ddc7bf480ebad1a0e6dcbad3967c4821233a4d4df57 \
+    --hash=sha256:eefebcc5c555803065128401a1e224a64607259b5eb907021bf9b175f315d2a6
    # via -r requirements.in
 typing-extensions==4.7.1 \
    --hash=sha256:440d5dd3af93b060174bf433bccd69b0babc3b15b1a8dca43789fd7f61514b36 \
--- a/src/common/gen/requirements.in
+++ b/src/common/gen/requirements.in
@ -2,6 +2,6 @@ docker==6.1.3
 jinja2==3.1.2
 kubernetes==27.2.0
 python-dotenv==1.0.0
-redis==4.6.0
+redis==5.0.0
 requests==2.31.0
 urllib3==2.0.4
--- a/src/common/gen/requirements.txt
+++ b/src/common/gen/requirements.txt
@ -237,9 +237,9 @@ pyyaml==6.0.1 \
    --hash=sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d \
    --hash=sha256:fd66fc5d0da6d9815ba2cebeb4205f95818ff4b79c3ebe268e75d961704af52f
    # via kubernetes
-redis==4.6.0 \
-    --hash=sha256:585dc516b9eb042a619ef0a39c3d7d55fe81bdb4df09a52c9cdde0d07bf1aa7d \
-    --hash=sha256:e2b03db868160ee4591de3cb90d40ebb50a90dd302138775937f6a42b7ed183c
+redis==5.0.0 \
+    --hash=sha256:06570d0b2d84d46c21defc550afbaada381af82f5b83e5b3777600e05d8e2ed0 \
+    --hash=sha256:5cea6c0d335c9a7332a460ed8729ceabb4d0c489c7285b0a86dbbf8a017bd120
    # via -r requirements.in
 requests==2.31.0 \
    --hash=sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f \
--- a/src/scheduler/requirements.txt
+++ b/src/scheduler/requirements.txt
@ -262,9 +262,9 @@ urllib3==2.0.4 \
    # via requests

 # The following packages are considered to be unsafe in a requirements file:
-setuptools==68.0.0 \
-    --hash=sha256:11e52c67415a381d10d6b462ced9cfb97066179f0e871399e006c4ab101fc85f \
-    --hash=sha256:baf1fdb41c6da4cd2eae722e135500da913332ab3f2f5c7d33af9b492acb5235
+setuptools==68.1.2 \
+    --hash=sha256:3d4dfa6d95f1b101d695a6160a7626e15583af71a5f52176efa5d39a054d475d \
+    --hash=sha256:3d8083eed2d13afc9426f227b24fd1659489ec107c0e86cec2ffdde5c92e790b
    # via
    #   acme
    #   certbot
--- a/src/ui/requirements.txt
+++ b/src/ui/requirements.txt
@ -35,9 +35,9 @@ blinker==1.6.2 \
    --hash=sha256:4afd3de66ef3a9f8067559fb7a1cbe555c17dcbe15971b05d1b625c3e7abe213 \
    --hash=sha256:c3d739772abb7bc2860abf5f2ec284223d9ad5c76da018234f6f50d6f31ab1f0
    # via flask
-click==8.1.6 \
-    --hash=sha256:48ee849951919527a045bfe3bf7baa8a959c423134e1a5b98c05c20ba75a1cbd \
-    --hash=sha256:fa244bb30b3b5ee2cae3da8f55c9e5e0c0e86093306301fb418eb9dc40fbded5
+click==8.1.7 \
+    --hash=sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28 \
+    --hash=sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de
    # via flask
 flask==2.3.2 \
    --hash=sha256:77fd4e1249d8c9923de34907236b747ced06e5467ecac1a7bb7115ae0e9670b0 \
@ -380,9 +380,9 @@ zope-interface==6.0 \
    # via gevent

 # The following packages are considered to be unsafe in a requirements file:
-setuptools==68.0.0 \
-    --hash=sha256:11e52c67415a381d10d6b462ced9cfb97066179f0e871399e006c4ab101fc85f \
-    --hash=sha256:baf1fdb41c6da4cd2eae722e135500da913332ab3f2f5c7d33af9b492acb5235
+setuptools==68.1.2 \
+    --hash=sha256:3d4dfa6d95f1b101d695a6160a7626e15583af71a5f52176efa5d39a054d475d \
+    --hash=sha256:3d8083eed2d13afc9426f227b24fd1659489ec107c0e86cec2ffdde5c92e790b
    # via
    #   zope-event
    #   zope-interface
--- a/tests/core/antibot/Dockerfile
+++ b/tests/core/antibot/Dockerfile
@ -1,12 +1,12 @@
 FROM python:3.11.4-alpine

 # Install firefox and geckodriver
-RUN apk add --no-cache --virtual .build-deps curl grep zip && \
+RUN apk add --no-cache --virtual .build-deps curl grep zip wget && \
  apk add --no-cache firefox

 # Installing geckodriver for firefox...
 RUN GECKODRIVER_VERSION=`curl -i https://github.com/mozilla/geckodriver/releases/latest | grep -Po 'v[0-9]+.[0-9]+.[0-9]+'` && \
-  wget -O geckodriver.tar.gz https://github.com/mozilla/geckodriver/releases/download/$GECKODRIVER_VERSION/geckodriver-$GECKODRIVER_VERSION-linux64.tar.gz && \
+  wget -O geckodriver.tar.gz -t 3 -w 5 https://github.com/mozilla/geckodriver/releases/download/$GECKODRIVER_VERSION/geckodriver-$GECKODRIVER_VERSION-linux64.tar.gz && \
  tar -C /usr/local/bin -xzvf geckodriver.tar.gz && \
  chmod +x /usr/local/bin/geckodriver && \
  rm geckodriver.tar.gz
--- a/tests/core/authbasic/Dockerfile
+++ b/tests/core/authbasic/Dockerfile
@ -1,12 +1,12 @@
 FROM python:3.11.4-alpine

 # Install firefox and geckodriver
-RUN apk add --no-cache --virtual .build-deps curl grep zip && \
+RUN apk add --no-cache --virtual .build-deps curl grep zip wget && \
  apk add --no-cache firefox

 # Installing geckodriver for firefox...
 RUN GECKODRIVER_VERSION=`curl -i https://github.com/mozilla/geckodriver/releases/latest | grep -Po 'v[0-9]+.[0-9]+.[0-9]+'` && \
-  wget -O geckodriver.tar.gz https://github.com/mozilla/geckodriver/releases/download/$GECKODRIVER_VERSION/geckodriver-$GECKODRIVER_VERSION-linux64.tar.gz && \
+  wget -O geckodriver.tar.gz -t 3 -w 5 https://github.com/mozilla/geckodriver/releases/download/$GECKODRIVER_VERSION/geckodriver-$GECKODRIVER_VERSION-linux64.tar.gz && \
  tar -C /usr/local/bin -xzvf geckodriver.tar.gz && \
  chmod +x /usr/local/bin/geckodriver && \
  rm geckodriver.tar.gz
--- a/tests/core/cors/Dockerfile
+++ b/tests/core/cors/Dockerfile
@ -1,12 +1,12 @@
 FROM python:3.11.4-alpine

 # Install firefox and geckodriver
-RUN apk add --no-cache --virtual .build-deps curl grep zip && \
+RUN apk add --no-cache --virtual .build-deps curl grep zip wget && \
  apk add --no-cache firefox

 # Installing geckodriver for firefox...
 RUN GECKODRIVER_VERSION=`curl -i https://github.com/mozilla/geckodriver/releases/latest | grep -Po 'v[0-9]+.[0-9]+.[0-9]+'` && \
-  wget -O geckodriver.tar.gz https://github.com/mozilla/geckodriver/releases/download/$GECKODRIVER_VERSION/geckodriver-$GECKODRIVER_VERSION-linux64.tar.gz && \
+  wget -O geckodriver.tar.gz -t 3 -w 5 https://github.com/mozilla/geckodriver/releases/download/$GECKODRIVER_VERSION/geckodriver-$GECKODRIVER_VERSION-linux64.tar.gz && \
  tar -C /usr/local/bin -xzvf geckodriver.tar.gz && \
  chmod +x /usr/local/bin/geckodriver && \
  rm geckodriver.tar.gz
--- a/tests/core/db/requirements.txt
+++ b/tests/core/db/requirements.txt
@ -1,4 +1,4 @@
-sqlalchemy==2.0.19
+sqlalchemy==2.0.20
 psycopg2-binary==2.9.7
 PyMySQL==1.1.0
 cryptography==41.0.3
--- a/tests/core/dnsbl/init/Dockerfile
+++ b/tests/core/dnsbl/init/Dockerfile
@ -1,12 +1,12 @@
 FROM python:3.11.4-alpine

 # Install firefox and geckodriver
-RUN apk add --no-cache --virtual .build-deps curl grep zip && \
+RUN apk add --no-cache --virtual .build-deps curl grep zip wget && \
  apk add --no-cache firefox

 # Installing geckodriver for firefox...
 RUN GECKODRIVER_VERSION=`curl -i https://github.com/mozilla/geckodriver/releases/latest | grep -Po 'v[0-9]+.[0-9]+.[0-9]+'` && \
-  wget -O geckodriver.tar.gz https://github.com/mozilla/geckodriver/releases/download/$GECKODRIVER_VERSION/geckodriver-$GECKODRIVER_VERSION-linux64.tar.gz && \
+  wget -O geckodriver.tar.gz -t 3 -w 5 https://github.com/mozilla/geckodriver/releases/download/$GECKODRIVER_VERSION/geckodriver-$GECKODRIVER_VERSION-linux64.tar.gz && \
  tar -C /usr/local/bin -xzvf geckodriver.tar.gz && \
  chmod +x /usr/local/bin/geckodriver && \
  rm geckodriver.tar.gz
--- a/tests/core/errors/Dockerfile
+++ b/tests/core/errors/Dockerfile
@ -1,12 +1,12 @@
 FROM python:3.11.4-alpine

 # Install firefox and geckodriver
-RUN apk add --no-cache --virtual .build-deps curl grep zip && \
+RUN apk add --no-cache --virtual .build-deps curl grep zip wget && \
  apk add --no-cache firefox

 # Installing geckodriver for firefox...
 RUN GECKODRIVER_VERSION=`curl -i https://github.com/mozilla/geckodriver/releases/latest | grep -Po 'v[0-9]+.[0-9]+.[0-9]+'` && \
-  wget -O geckodriver.tar.gz https://github.com/mozilla/geckodriver/releases/download/$GECKODRIVER_VERSION/geckodriver-$GECKODRIVER_VERSION-linux64.tar.gz && \
+  wget -O geckodriver.tar.gz -t 3 -w 5 https://github.com/mozilla/geckodriver/releases/download/$GECKODRIVER_VERSION/geckodriver-$GECKODRIVER_VERSION-linux64.tar.gz && \
  tar -C /usr/local/bin -xzvf geckodriver.tar.gz && \
  chmod +x /usr/local/bin/geckodriver && \
  rm geckodriver.tar.gz
--- a/tests/core/redirect/Dockerfile
+++ b/tests/core/redirect/Dockerfile
@ -1,12 +1,12 @@
 FROM python:3.11.4-alpine

 # Install firefox and geckodriver
-RUN apk add --no-cache --virtual .build-deps curl grep zip && \
+RUN apk add --no-cache --virtual .build-deps curl grep zip wget && \
  apk add --no-cache firefox

 # Installing geckodriver for firefox...
 RUN GECKODRIVER_VERSION=`curl -i https://github.com/mozilla/geckodriver/releases/latest | grep -Po 'v[0-9]+.[0-9]+.[0-9]+'` && \
-  wget -O geckodriver.tar.gz https://github.com/mozilla/geckodriver/releases/download/$GECKODRIVER_VERSION/geckodriver-$GECKODRIVER_VERSION-linux64.tar.gz && \
+  wget -O geckodriver.tar.gz -t 3 -w 5 https://github.com/mozilla/geckodriver/releases/download/$GECKODRIVER_VERSION/geckodriver-$GECKODRIVER_VERSION-linux64.tar.gz && \
  tar -C /usr/local/bin -xzvf geckodriver.tar.gz && \
  chmod +x /usr/local/bin/geckodriver && \
  rm geckodriver.tar.gz
--- a/tests/core/redis/Dockerfile
+++ b/tests/core/redis/Dockerfile
@ -1,12 +1,12 @@
 FROM python:3.11.4-alpine

 # Install firefox and geckodriver
-RUN apk add --no-cache --virtual .build-deps curl grep zip && \
+RUN apk add --no-cache --virtual .build-deps curl grep zip wget && \
  apk add --no-cache firefox

 # Installing geckodriver for firefox...
 RUN GECKODRIVER_VERSION=`curl -i https://github.com/mozilla/geckodriver/releases/latest | grep -Po 'v[0-9]+.[0-9]+.[0-9]+'` && \
-  wget -O geckodriver.tar.gz https://github.com/mozilla/geckodriver/releases/download/$GECKODRIVER_VERSION/geckodriver-$GECKODRIVER_VERSION-linux64.tar.gz && \
+  wget -O geckodriver.tar.gz -t 3 -w 5 https://github.com/mozilla/geckodriver/releases/download/$GECKODRIVER_VERSION/geckodriver-$GECKODRIVER_VERSION-linux64.tar.gz && \
  tar -C /usr/local/bin -xzvf geckodriver.tar.gz && \
  chmod +x /usr/local/bin/geckodriver && \
  rm geckodriver.tar.gz
--- a/tests/core/redis/requirements.txt
+++ b/tests/core/redis/requirements.txt
@ -1,5 +1,5 @@
 requests==2.31.0
-redis==4.6.0
+redis==5.0.0
 fastapi==0.101.1
 uvicorn[standard]==0.23.2
 selenium==4.11.2
--- a/tests/core/reversescan/Dockerfile
+++ b/tests/core/reversescan/Dockerfile
@ -1,12 +1,12 @@
 FROM python:3.11.4-alpine

 # Install firefox and geckodriver
-RUN apk add --no-cache --virtual .build-deps curl grep zip && \
+RUN apk add --no-cache --virtual .build-deps curl grep zip wget && \
  apk add --no-cache firefox

 # Installing geckodriver for firefox...
 RUN GECKODRIVER_VERSION=`curl -i https://github.com/mozilla/geckodriver/releases/latest | grep -Po 'v[0-9]+.[0-9]+.[0-9]+'` && \
-  wget -O geckodriver.tar.gz https://github.com/mozilla/geckodriver/releases/download/$GECKODRIVER_VERSION/geckodriver-$GECKODRIVER_VERSION-linux64.tar.gz && \
+  wget -O geckodriver.tar.gz -t 3 -w 5 https://github.com/mozilla/geckodriver/releases/download/$GECKODRIVER_VERSION/geckodriver-$GECKODRIVER_VERSION-linux64.tar.gz && \
  tar -C /usr/local/bin -xzvf geckodriver.tar.gz && \
  chmod +x /usr/local/bin/geckodriver && \
  rm geckodriver.tar.gz
--- a/tests/core/sessions/Dockerfile
+++ b/tests/core/sessions/Dockerfile
@ -1,12 +1,12 @@
 FROM python:3.11.4-alpine

 # Install firefox and geckodriver
-RUN apk add --no-cache --virtual .build-deps curl grep zip && \
+RUN apk add --no-cache --virtual .build-deps curl grep zip wget && \
  apk add --no-cache firefox

 # Installing geckodriver for firefox...
 RUN GECKODRIVER_VERSION=`curl -i https://github.com/mozilla/geckodriver/releases/latest | grep -Po 'v[0-9]+.[0-9]+.[0-9]+'` && \
-  wget -O geckodriver.tar.gz https://github.com/mozilla/geckodriver/releases/download/$GECKODRIVER_VERSION/geckodriver-$GECKODRIVER_VERSION-linux64.tar.gz && \
+  wget -O geckodriver.tar.gz -t 3 -w 5 https://github.com/mozilla/geckodriver/releases/download/$GECKODRIVER_VERSION/geckodriver-$GECKODRIVER_VERSION-linux64.tar.gz && \
  tar -C /usr/local/bin -xzvf geckodriver.tar.gz && \
  chmod +x /usr/local/bin/geckodriver && \
  rm geckodriver.tar.gz
--- a/tests/ui/Dockerfile
+++ b/tests/ui/Dockerfile
@ -1,12 +1,12 @@
 FROM python:3.11.4-alpine

 # Install firefox and geckodriver
-RUN apk add --no-cache --virtual .build-deps curl grep zip && \
+RUN apk add --no-cache --virtual .build-deps curl grep zip wget && \
  apk add --no-cache firefox

 # Installing geckodriver for firefox...
 RUN GECKODRIVER_VERSION=`curl -i https://github.com/mozilla/geckodriver/releases/latest | grep -Po 'v[0-9]+.[0-9]+.[0-9]+'` && \
-  wget -O geckodriver.tar.gz https://github.com/mozilla/geckodriver/releases/download/$GECKODRIVER_VERSION/geckodriver-$GECKODRIVER_VERSION-linux64.tar.gz && \
+  wget -O geckodriver.tar.gz -t 3 -w 5 https://github.com/mozilla/geckodriver/releases/download/$GECKODRIVER_VERSION/geckodriver-$GECKODRIVER_VERSION-linux64.tar.gz && \
  tar -C /usr/local/bin -xzvf geckodriver.tar.gz && \
  chmod +x /usr/local/bin/geckodriver && \
  rm geckodriver.tar.gz
--- a/tests/ui/docker-compose.yml
+++ b/tests/ui/docker-compose.yml
@ -21,7 +21,7 @@ services:
      www.example.com_USE_UI: "yes"
      www.example.com_SERVE_FILES: "no"
      www.example.com_USE_REVERSE_PROXY: "yes"
-      www.example.com_REVERSE_PROXY_URL: "/admin/"
+      www.example.com_REVERSE_PROXY_URL: "/admin"
      www.example.com_REVERSE_PROXY_HOST: "http://bw-ui:7000"
      www.example.com_INTERCEPTED_ERROR_CODES: "400 405 413 429 500 501 502 503 504"
      CUSTOM_CONF_SERVER_HTTP_port-redirect: "port_in_redirect on;"
--- a/tests/ui/geckodriver.log
+++ b/tests/ui/geckodriver.log
@ -1,8 +0,0 @@
-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 []
--- a/tests/ui/tests.sh
+++ b/tests/ui/tests.sh
@ -54,6 +54,7 @@ ret=$?
 if [ $ret -ne 0 ] ; then
    docker-compose logs
    echo "❌ Up failed"
+    exit 1
 fi

 # Exit