Merge branch 'dev' into ui

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -47,7 +47,7 @@ body:
       label: BunkerWeb version
       description: What version of BunkerWeb are you running?
       placeholder: Version
-      value: 1.5.5
+      value: 1.5.7
     validations:
       required: true
   - type: dropdown

.github/workflows/beta.yml

@@ -94,7 +94,7 @@ jobs:
     needs: [create-arm]
     strategy:
       matrix:
-        linux: [ubuntu, debian, fedora, rhel]
+        linux: [ubuntu, debian, fedora, rhel, rhel9]
         platforms: [linux/amd64, linux/arm64]
         include:
           - release: beta
@@ -106,6 +106,8 @@ jobs:
             package: rpm
           - linux: rhel
             package: rpm
+          - linux: rhel9
+            package: rpm
     uses: ./.github/workflows/linux-build.yml
     with:
       RELEASE: ${{ matrix.release }}
@@ -131,7 +133,7 @@ jobs:
       versionrpm: ${{ steps.getversionrpm.outputs.versionrpm }}
     steps:
       - name: Checkout source code
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
       - name: Get VERSION
         id: getversion
         run: echo "version=$(cat src/VERSION | tr -d '\n')" >> "$GITHUB_OUTPUT"
@@ -177,7 +179,7 @@ jobs:
     needs: [wait-builds]
     strategy:
       matrix:
-        linux: [ubuntu, debian, fedora, rhel]
+        linux: [ubuntu, debian, fedora, el, el9]
         arch: [amd64, arm64]
         include:
           - release: beta
@@ -202,6 +204,11 @@ jobs:
             suffix: "1."
             version: 8
             package: rpm
+          - linux: el9
+            separator: "-"
+            suffix: "1."
+            version: 9
+            package: rpm
           - linux: ubuntu
             arch: amd64
             package_arch: amd64
@@ -214,6 +221,9 @@ jobs:
           - linux: el
             arch: amd64
             package_arch: x86_64
+          - linux: el9
+            arch: amd64
+            package_arch: x86_64
           - linux: ubuntu
             arch: arm64
             package_arch: arm64
@@ -226,6 +236,9 @@ jobs:
           - linux: el
             arch: arm64
             package_arch: aarch64
+          - linux: el9
+            arch: arm64
+            package_arch: aarch64
     uses: ./.github/workflows/push-packagecloud.yml
     with:
       SEPARATOR: ${{ matrix.separator }}

.github/workflows/codeql.yml

@@ -19,9 +19,9 @@ jobs:
         language: ["python", "javascript"]
     steps:
       - name: Checkout repository
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
       - name: Set up Python 3.9
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         if: matrix.language == 'python'
         with:
           python-version: "3.9"
@@ -35,12 +35,12 @@ jobs:
           python -m pip install --no-cache-dir --require-hashes -r src/common/db/requirements.txt
           echo "CODEQL_PYTHON=$(which python)" >> $GITHUB_ENV
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
+        uses: github/codeql-action/init@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2
         with:
           languages: ${{ matrix.language }}
           config-file: ./.github/codeql.yml
           setup-python-dependencies: false
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
+        uses: github/codeql-action/analyze@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2
         with:
           category: "/language:${{matrix.language}}"

.github/workflows/container-build.yml

@@ -45,10 +45,10 @@ jobs:
     steps:
       # Prepare
       - name: Checkout source code
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
       - name: Replace VERSION
-        if: inputs.RELEASE == 'testing'
-        run: ./misc/update-version.sh testing
+        if: inputs.RELEASE == 'testing' || inputs.RELEASE == 'dev'
+        run: ./misc/update-version.sh ${{ inputs.RELEASE }}
       - name: Setup SSH for ARM node
         if: inputs.CACHE_SUFFIX == 'arm'
         run: |
@@ -63,36 +63,36 @@ jobs:
           SSH_IP: ${{ secrets.ARM_SSH_IP }}
           SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }}
       - name: Setup Buildx
-        uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
+        uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
         if: inputs.CACHE_SUFFIX != 'arm'
       - name: Setup Buildx (ARM)
-        uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
+        uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
         if: inputs.CACHE_SUFFIX == 'arm'
         with:
           endpoint: ssh://root@arm
           platforms: linux/arm64,linux/arm/v7,linux/arm/v6
       - name: Login to Docker Hub
-        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
+        uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
       - name: Login to ghcr
         if: inputs.PUSH == true
-        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
+        uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       # Compute metadata
       - name: Extract metadata
         id: meta
-        uses: docker/metadata-action@dbef88086f6cef02e264edb7dbf63250c17cef6c # v5.5.0
+        uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1
         with:
           images: bunkerity/${{ inputs.IMAGE }}
       # Build cached image
       - name: Build image
         if: inputs.CACHE == true
-        uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5.1.0
+        uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
         with:
           context: .
           file: ${{ inputs.DOCKERFILE }}
@@ -105,7 +105,7 @@ jobs:
       # Build non-cached image
       - name: Build image
         if: inputs.CACHE != true
-        uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5.1.0
+        uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
         with:
           context: .
           file: ${{ inputs.DOCKERFILE }}
@@ -117,7 +117,7 @@ jobs:
       # Check OS vulnerabilities
       - name: Check OS vulnerabilities
         if: ${{ inputs.CACHE_SUFFIX != 'arm' }}
-        uses: aquasecurity/trivy-action@d43c1f16c00cfd3978dde6c07f4bbcf9eb6993ca # v0.16.1
+        uses: aquasecurity/trivy-action@d710430a6722f083d3b36b8339ff66b32f22ee55 # v0.19.0
         with:
           vuln-type: os
           skip-dirs: /root/.cargo

.github/workflows/create-arm.yml

@@ -33,10 +33,10 @@ jobs:
     steps:
       # Prepare
       - name: Checkout source code
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
       - name: Get ARM availabilities
         id: availabilities
-        uses: scaleway/action-scw@c718eca1fcb9fec1fb1433752d61599c6a0ad2e9
+        uses: scaleway/action-scw@be2696f261325a78354eda14988c80405f33e082
         with:
           args: instance server-type get zone=fr-par-2
           export-config: true
@@ -53,7 +53,7 @@ jobs:
           JSON: ${{ steps.availabilities.outputs.json }}
       - name: Create ARM VM
         id: scw
-        uses: scaleway/action-scw@c718eca1fcb9fec1fb1433752d61599c6a0ad2e9
+        uses: scaleway/action-scw@be2696f261325a78354eda14988c80405f33e082
         with:
           args: instance server create zone=fr-par-2 type=${{ env.TYPE }} root-volume=block:50GB
       - name: Get info
@@ -62,11 +62,11 @@ jobs:
           echo "id=${{ fromJson(steps.scw.outputs.json).id }}" >> "$GITHUB_OUTPUT"
           echo "ip=${{ fromJson(steps.scw.outputs.json).public_ip.address }}" >> "$GITHUB_OUTPUT"
       - name: Wait for VM
-        uses: scaleway/action-scw@c718eca1fcb9fec1fb1433752d61599c6a0ad2e9
+        uses: scaleway/action-scw@be2696f261325a78354eda14988c80405f33e082
         with:
           args: instance server wait ${{ fromJson(steps.scw.outputs.json).ID }} zone=fr-par-2
       - name: Wait for SSH
-        uses: iFaxity/wait-on-action@628831cec646e6dacca502f34a6c6b46e131e51d
+        uses: iFaxity/wait-on-action@df89d0cf8089bb0c38e25279c74848ef313da53b
         with:
           resource: tcp:${{ fromJson(steps.scw.outputs.json).public_ip.address }}:22
           timeout: 300000

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

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source code
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
         with:
           fetch-depth: 0
           token: ${{ secrets.BUNKERBOT_TOKEN }}
@@ -52,7 +52,7 @@ jobs:
           rm -f asn.mmdb country.mmdb
           gunzip asn.mmdb.gz country.mmdb.gz
       - name: Commit and push changes
-        uses: stefanzweifel/git-auto-commit-action@8756aa072ef5b4a080af5dc8fef36c5d586e521d # v5.0.0
+        uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842 # v5.0.1
         with:
           branch: dev
           commit_message: "Monthly mmdb update"

.github/workflows/dev.yml

@@ -43,7 +43,7 @@ jobs:
       packages: write
     strategy:
       matrix:
-        linux: [ubuntu, debian, fedora, rhel]
+        linux: [ubuntu, debian, fedora, rhel, rhel9]
         include:
           - linux: ubuntu
             package: deb
@@ -53,6 +53,8 @@ jobs:
             package: rpm
           - linux: rhel
             package: rpm
+          - linux: rhel9
+            package: rpm
     uses: ./.github/workflows/linux-build.yml
     with:
       RELEASE: dev
@@ -72,23 +74,44 @@ jobs:
       security-events: write
 
   # UI tests
+  prepare-tests-ui:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+      - id: set-matrix
+        run: |
+          tests=$(find ./tests/ui/ -name "*_page.py" -type f -printf "%f\n" | jq -c --raw-input --slurp 'split("\n")| .[0:-1]')
+          echo "tests=$tests" >> $GITHUB_OUTPUT
+    outputs:
+      tests: ${{ steps.set-matrix.outputs.tests }}
   tests-ui:
-    needs: [build-containers]
+    needs: [prepare-tests-ui, build-containers]
+    strategy:
+      fail-fast: false
+      matrix:
+        test: ${{ fromJson(needs.prepare-tests-ui.outputs.tests) }}
     uses: ./.github/workflows/tests-ui.yml
     with:
+      TEST: ${{ matrix.test }}
       RELEASE: dev
   tests-ui-linux:
-    needs: [build-packages]
+    needs: [prepare-tests-ui, build-packages]
+    strategy:
+      fail-fast: false
+      matrix:
+        test: ${{ fromJson(needs.prepare-tests-ui.outputs.tests) }}
     uses: ./.github/workflows/tests-ui-linux.yml
     with:
+      TEST: ${{ matrix.test }}
       RELEASE: dev
 
   # Core tests
   prepare-tests-core:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
       - 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]')
@@ -126,12 +149,12 @@ jobs:
       packages: write
     steps:
       - name: Login to Docker Hub
-        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
+        uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
       - name: Login to ghcr
-        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
+        uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -162,43 +185,41 @@ jobs:
     needs: [tests-ui-linux, tests-core-linux]
     strategy:
       matrix:
-        linux: [ubuntu, debian, fedora, el]
+        linux: [ubuntu, debian, fedora, el, el9]
         arch: [amd64]
         include:
           - release: dev
             repo: bunkerweb
           - linux: ubuntu
+            package_arch: amd64
             separator: _
             suffix: ""
             version: jammy
             package: deb
           - linux: debian
+            package_arch: amd64
             separator: _
             suffix: ""
             version: bookworm
             package: deb
           - linux: fedora
+            package_arch: x86_64
             separator: "-"
             suffix: "1."
             version: 39
             package: rpm
           - linux: el
+            package_arch: x86_64
             separator: "-"
             suffix: "1."
             version: 8
             package: rpm
-          - linux: ubuntu
-            arch: amd64
-            package_arch: amd64
-          - linux: debian
-            arch: amd64
-            package_arch: amd64
-          - linux: fedora
-            arch: amd64
-            package_arch: x86_64
-          - linux: el
-            arch: amd64
+          - linux: el9
             package_arch: x86_64
+            separator: "-"
+            suffix: "1."
+            version: 9
+            package: rpm
     uses: ./.github/workflows/push-packagecloud.yml
     with:
       SEPARATOR: ${{ matrix.separator }}

.github/workflows/doc-to-pdf.yml

@@ -13,17 +13,17 @@ jobs:
     steps:
       # Prepare
       - name: Checkout source code
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
       - name: Install Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: "3.10"
       - name: Install doc dependencies
         run: pip install --no-cache-dir --require-hashes -r docs/requirements.txt && sudo apt install -y libcairo2-dev libfreetype6-dev libffi-dev libjpeg-dev libpng-dev libz-dev
       - name: Install chromium
         run: sudo apt install chromium-browser
       - name: Install node
-        uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
+        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
         with:
           node-version: 18
       - name: Install puppeteer
@@ -32,7 +32,7 @@ jobs:
         run: mkdocs serve & sleep 10
       - name: Run pdf script
         run: node docs/misc/pdf.js http://localhost:8000/print_page/ BunkerWeb_documentation_v${{ inputs.VERSION }}.pdf 'BunkerWeb documentation v${{ inputs.VERSION }}'
-      - uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6 # v4.2.0
+      - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
         with:
           name: BunkerWeb_documentation_v${{ inputs.VERSION }}.pdf
           path: BunkerWeb_documentation_v${{ inputs.VERSION }}.pdf