Merge pull request #1750 from bunkerity/1.5

Merge branch "1.5" into branch "staging"
bunkerity · Nov 26, 2024 · f3d2a2e · f3d2a2e
2 parents 1cb66f6 + 7fe7fdb
commit f3d2a2e
Show file tree

Hide file tree

Showing 157 changed files with 2,410 additions and 2,688 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.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.11
+      value: 1.5.12
     validations:
       required: true
   - type: dropdown

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -198,202 +198,3 @@ updates:
     commit-message:
       prefix: "deps/terraform"
     target-branch: "dev"
-
-  # 1.5 branch
-  # GHA
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "daily"
-      time: "09:00"
-      timezone: "Europe/Paris"
-    assignees:
-      - "TheophileDiot"
-    reviewers:
-      - "TheophileDiot"
-    commit-message:
-      prefix: "deps/gha"
-    target-branch: "1.5"
-
-  # Linux
-  - package-ecosystem: "docker"
-    directory: "/src/linux"
-    schedule:
-      interval: "daily"
-      time: "09:00"
-      timezone: "Europe/Paris"
-    assignees:
-      - "TheophileDiot"
-    reviewers:
-      - "TheophileDiot"
-    commit-message:
-      prefix: "deps/linux"
-    target-branch: "1.5"
-  - package-ecosystem: "docker"
-    directory: "/tests/linux"
-    schedule:
-      interval: "daily"
-      time: "09:00"
-      timezone: "Europe/Paris"
-    assignees:
-      - "TheophileDiot"
-    reviewers:
-      - "TheophileDiot"
-    commit-message:
-      prefix: "deps/tests/linux"
-    target-branch: "1.5"
-
-  # BW
-  - package-ecosystem: "docker"
-    directory: "/src/bw"
-    schedule:
-      interval: "daily"
-      time: "09:00"
-      timezone: "Europe/Paris"
-    assignees:
-      - "TheophileDiot"
-    reviewers:
-      - "TheophileDiot"
-    commit-message:
-      prefix: "deps/bw"
-    target-branch: "1.5"
-
-  # Scheduler
-  - package-ecosystem: "docker"
-    directory: "/src/scheduler"
-    schedule:
-      interval: "daily"
-      time: "09:00"
-      timezone: "Europe/Paris"
-    assignees:
-      - "TheophileDiot"
-    reviewers:
-      - "TheophileDiot"
-    commit-message:
-      prefix: "deps/scheduler"
-    target-branch: "1.5"
-  - package-ecosystem: "pip"
-    directory: "/src/scheduler"
-    schedule:
-      interval: "daily"
-      time: "09:00"
-      timezone: "Europe/Paris"
-    assignees:
-      - "TheophileDiot"
-    reviewers:
-      - "TheophileDiot"
-    commit-message:
-      prefix: "deps/scheduler"
-    target-branch: "1.5"
-
-  # Autoconf
-  - package-ecosystem: "docker"
-    directory: "/src/autoconf"
-    schedule:
-      interval: "daily"
-      time: "09:00"
-      timezone: "Europe/Paris"
-    assignees:
-      - "TheophileDiot"
-    reviewers:
-      - "TheophileDiot"
-    commit-message:
-      prefix: "deps/autoconf"
-    target-branch: "1.5"
-  - package-ecosystem: "pip"
-    directory: "/src/autoconf"
-    schedule:
-      interval: "daily"
-      time: "09:00"
-      timezone: "Europe/Paris"
-    assignees:
-      - "TheophileDiot"
-    reviewers:
-      - "TheophileDiot"
-    commit-message:
-      prefix: "deps/autoconf"
-    target-branch: "1.5"
-
-  # UI
-  - package-ecosystem: "docker"
-    directory: "/src/ui"
-    schedule:
-      interval: "daily"
-      time: "09:00"
-      timezone: "Europe/Paris"
-    assignees:
-      - "TheophileDiot"
-    reviewers:
-      - "TheophileDiot"
-    commit-message:
-      prefix: "deps/ui"
-    target-branch: "1.5"
-  - package-ecosystem: "pip"
-    directory: "/src/ui"
-    schedule:
-      interval: "daily"
-      time: "09:00"
-      timezone: "Europe/Paris"
-    assignees:
-      - "TheophileDiot"
-    reviewers:
-      - "TheophileDiot"
-    commit-message:
-      prefix: "deps/ui"
-    target-branch: "1.5"
-
-  # Misc
-  - package-ecosystem: "pip"
-    directory: "/src/deps"
-    schedule:
-      interval: "daily"
-      time: "09:00"
-      timezone: "Europe/Paris"
-    assignees:
-      - "TheophileDiot"
-    reviewers:
-      - "TheophileDiot"
-    commit-message:
-      prefix: "deps/deps"
-    target-branch: "1.5"
-  - package-ecosystem: "pip"
-    directory: "/src/common/gen"
-    schedule:
-      interval: "daily"
-      time: "09:00"
-      timezone: "Europe/Paris"
-    assignees:
-      - "TheophileDiot"
-    reviewers:
-      - "TheophileDiot"
-    commit-message:
-      prefix: "deps/common/gen"
-    target-branch: "1.5"
-  - package-ecosystem: "pip"
-    directory: "/src/common/db"
-    schedule:
-      interval: "daily"
-      time: "09:00"
-      timezone: "Europe/Paris"
-    assignees:
-      - "TheophileDiot"
-    reviewers:
-      - "TheophileDiot"
-    commit-message:
-      prefix: "deps/common/db"
-    target-branch: "1.5"
-
-  # Terraform
-  - package-ecosystem: "terraform"
-    directory: "/tests/terraform"
-    schedule:
-      interval: "daily"
-      time: "09:00"
-      timezone: "Europe/Paris"
-    assignees:
-      - "fl0ppy-d1sk"
-    reviewers:
-      - "fl0ppy-d1sk"
-    commit-message:
-      prefix: "deps/terraform"
-    target-branch: "1.5"
diff --git a/.github/workflows/1.5.yml b/.github/workflows/1.5.yml
@@ -27,7 +27,7 @@ jobs:
             dockerfile: src/ui/Dockerfile
     uses: ./.github/workflows/container-build.yml
     with:
-      RELEASE: 1.5
+      RELEASE: 1.5-dev
       ARCH: linux/amd64
       CACHE: true
       IMAGE: ${{ matrix.image }}
@@ -59,7 +59,7 @@ jobs:
             package: rpm
     uses: ./.github/workflows/linux-build.yml
     with:
-      RELEASE: 1.5
+      RELEASE: 1.5-dev
       LINUX: ${{ matrix.linux }}
       PACKAGE: ${{ matrix.package }}
       TEST: true
@@ -96,7 +96,7 @@ jobs:
     uses: ./.github/workflows/tests-ui.yml
     with:
       TEST: ${{ matrix.test }}
-      RELEASE: 1.5
+      RELEASE: 1.5-dev
   tests-ui-linux:
     needs: [prepare-tests-ui, build-packages]
     strategy:
@@ -106,7 +106,7 @@ jobs:
     uses: ./.github/workflows/tests-ui-linux.yml
     with:
       TEST: ${{ matrix.test }}
-      RELEASE: 1.5
+      RELEASE: 1.5-dev
 
   # Core tests
   prepare-tests-core:
@@ -129,7 +129,7 @@ jobs:
     uses: ./.github/workflows/test-core.yml
     with:
       TEST: ${{ matrix.test }}
-      RELEASE: 1.5
+      RELEASE: 1.5-dev
   tests-core-linux:
     needs: [build-packages, prepare-tests-core]
     strategy:
@@ -139,10 +139,10 @@ jobs:
     uses: ./.github/workflows/test-core-linux.yml
     with:
       TEST: ${{ matrix.test }}
-      RELEASE: 1.5
+      RELEASE: 1.5-dev
     secrets: inherit
 
-  # Push with 1.5 tag
+  # Push with 1.5-dev tag
   push-1_5:
     needs: [tests-ui, tests-core]
     runs-on: ubuntu-latest
@@ -162,22 +162,22 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Push BW image
-        run: docker pull ghcr.io/bunkerity/$FROM-tests:1.5 && docker tag ghcr.io/bunkerity/$FROM-tests:1.5 bunkerity/$TO:1.5 && docker tag ghcr.io/bunkerity/$FROM-tests:1.5 ghcr.io/bunkerity/$TO:1.5 && docker push bunkerity/$TO:1.5 && docker push ghcr.io/bunkerity/$TO:1.5
+        run: docker pull ghcr.io/bunkerity/$FROM-tests:1.5-dev && docker tag ghcr.io/bunkerity/$FROM-tests:1.5-dev bunkerity/$TO:1.5-dev && docker tag ghcr.io/bunkerity/$FROM-tests:1.5-dev ghcr.io/bunkerity/$TO:1.5-dev && docker push bunkerity/$TO:1.5-dev && docker push ghcr.io/bunkerity/$TO:1.5-dev
         env:
           FROM: "bunkerweb"
           TO: "bunkerweb"
       - name: Push scheduler image
-        run: docker pull ghcr.io/bunkerity/$FROM-tests:1.5 && docker tag ghcr.io/bunkerity/$FROM-tests:1.5 bunkerity/$TO:1.5 && docker tag ghcr.io/bunkerity/$FROM-tests:1.5 ghcr.io/bunkerity/$TO:1.5 && docker push bunkerity/$TO:1.5 && docker push ghcr.io/bunkerity/$TO:1.5
+        run: docker pull ghcr.io/bunkerity/$FROM-tests:1.5-dev && docker tag ghcr.io/bunkerity/$FROM-tests:1.5-dev bunkerity/$TO:1.5-dev && docker tag ghcr.io/bunkerity/$FROM-tests:1.5-dev ghcr.io/bunkerity/$TO:1.5-dev && docker push bunkerity/$TO:1.5-dev && docker push ghcr.io/bunkerity/$TO:1.5-dev
         env:
           FROM: "scheduler"
           TO: "bunkerweb-scheduler"
       - name: Push UI image
-        run: docker pull ghcr.io/bunkerity/$FROM-tests:1.5 && docker tag ghcr.io/bunkerity/$FROM-tests:1.5 bunkerity/$TO:1.5 && docker tag ghcr.io/bunkerity/$FROM-tests:1.5 ghcr.io/bunkerity/$TO:1.5 && docker push bunkerity/$TO:1.5 && docker push ghcr.io/bunkerity/$TO:1.5
+        run: docker pull ghcr.io/bunkerity/$FROM-tests:1.5-dev && docker tag ghcr.io/bunkerity/$FROM-tests:1.5-dev bunkerity/$TO:1.5-dev && docker tag ghcr.io/bunkerity/$FROM-tests:1.5-dev ghcr.io/bunkerity/$TO:1.5-dev && docker push bunkerity/$TO:1.5-dev && docker push ghcr.io/bunkerity/$TO:1.5-dev
         env:
           FROM: "ui"
           TO: "bunkerweb-ui"
       - name: Push autoconf image
-        run: docker pull ghcr.io/bunkerity/$FROM-tests:1.5 && docker tag ghcr.io/bunkerity/$FROM-tests:1.5 bunkerity/$TO:1.5 && docker tag ghcr.io/bunkerity/$FROM-tests:1.5 ghcr.io/bunkerity/$TO:1.5 && docker push bunkerity/$TO:1.5 && docker push ghcr.io/bunkerity/$TO:1.5
+        run: docker pull ghcr.io/bunkerity/$FROM-tests:1.5-dev && docker tag ghcr.io/bunkerity/$FROM-tests:1.5-dev bunkerity/$TO:1.5-dev && docker tag ghcr.io/bunkerity/$FROM-tests:1.5-dev ghcr.io/bunkerity/$TO:1.5-dev && docker push bunkerity/$TO:1.5-dev && docker push ghcr.io/bunkerity/$TO:1.5-dev
         env:
           FROM: "autoconf"
           TO: "bunkerweb-autoconf"
@@ -190,7 +190,7 @@ jobs:
         linux: [ubuntu, debian, fedora, el, el9, ubuntu-jammy]
         arch: [amd64]
         include:
-          - release: 1.5
+          - release: 1.5-dev
             repo: bunkerweb
           - linux: ubuntu
             package_arch: amd64

diff --git a/.github/workflows/container-build.yml b/.github/workflows/container-build.yml
@@ -49,9 +49,9 @@ jobs:
       - name: Replace VERSION
         if: inputs.RELEASE == 'testing' || inputs.RELEASE == 'dev'
         run: chmod +x ./misc/update-version.sh && ./misc/update-version.sh ${{ inputs.RELEASE }}
-      - name: Replace VERSION 1.5
-        if: inputs.RELEASE == '1.5'
-        run: chmod +x ./misc/update-version.sh && ./misc/update-version.sh dev
+      - name: Replace VERSION 1.5-dev
+        if: inputs.RELEASE == '1.5-dev'
+        run: chmod +x ./misc/update-version.sh && ./misc/update-version.sh 1.5-dev
       - name: Setup SSH for ARM node
         if: inputs.CACHE_SUFFIX == 'arm'
         run: |

diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
@@ -41,8 +41,8 @@ jobs:
       - name: Replace VERSION
         if: inputs.RELEASE == 'testing' || inputs.RELEASE == 'dev' || inputs.RELEASE == 'ui'
         run: chmod +x ./misc/update-version.sh && ./misc/update-version.sh ${{ inputs.RELEASE }}
-      - name: Replace VERSION 1.5
-        if: inputs.RELEASE == '1.5'
+      - name: Replace VERSION 1.5-dev
+        if: inputs.RELEASE == '1.5-dev'
         run: chmod +x ./misc/update-version.sh && ./misc/update-version.sh 1.5-dev
       - name: Extract arch
         run: |
@@ -96,7 +96,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       # Build testing package image
       - name: Build package image
-        if: inputs.RELEASE == 'testing' || inputs.RELEASE == 'dev' || inputs.RELEASE == 'ui' || inputs.RELEASE == '1.5'
+        if: inputs.RELEASE == 'testing' || inputs.RELEASE == 'dev' || inputs.RELEASE == 'ui' || inputs.RELEASE == '1.5-dev'
         uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
         with:
           context: .
@@ -108,7 +108,7 @@ jobs:
           cache-to: type=gha,scope=${{ inputs.LINUX }}-${{ inputs.RELEASE }},mode=min
       # Build non-testing package image
       - name: Build package image
-        if: inputs.RELEASE != 'testing' && inputs.RELEASE != 'dev' && inputs.RELEASE != 'ui' && inputs.RELEASE != '1.5'
+        if: inputs.RELEASE != 'testing' && inputs.RELEASE != 'dev' && inputs.RELEASE != 'ui' && inputs.RELEASE != '1.5-dev'
         uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
         with:
           context: .

diff --git a/.github/workflows/push-packagecloud.yml b/.github/workflows/push-packagecloud.yml
@@ -77,10 +77,19 @@ jobs:
         continue-on-error: true
         env:
           PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
-      # Update name
-      - name: Rename package
-        if: inputs.BW_VERSION == '1.5'
-        run: sudo apt install -y rename && rename 's/dev/1.5-dev/' /tmp/${{ inputs.LINUX }}/*.${{ inputs.PACKAGE }}
+      # Specific removes for 1.5
+      - name: Remove 1.5 dev file
+        if: inputs.BW_VERSION == '1.5-dev' && inputs.LINUX != 'el9' && inputs.LINUX != 'ubuntu-jammy'
+        run: package_cloud yank bunkerity/${{ inputs.REPO }}/${{ inputs.LINUX }}/${{ inputs.VERSION }} bunkerweb${{ inputs.SEPARATOR }}1.5_dev${{ inputs.SEPARATOR }}${{ inputs.SUFFIX }}${{ inputs.PACKAGE_ARCH }}.${{ inputs.PACKAGE }}
+        continue-on-error: true
+        env:
+          PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+      - name: Remove 1.5 dev file (el9)
+        if: inputs.BW_VERSION == '1.5-dev' && inputs.LINUX == 'el9'
+        run: package_cloud yank bunkerity/${{ inputs.REPO }}/el/9 bunkerweb${{ inputs.SEPARATOR }}1.5_dev${{ inputs.SEPARATOR }}${{ inputs.SUFFIX }}${{ inputs.PACKAGE_ARCH }}.${{ inputs.PACKAGE }}
+        continue-on-error: true
+        env:
+          PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
       # Push package
       - name: Push package to packagecloud
         if: inputs.LINUX != 'el9' && inputs.LINUX != 'ubuntu-jammy'

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Changelog
 
-## v1.5.11 - ????/??/??
+## v1.5.12 - ????/??/??
+
+- [SECURITY] Fix CVE-2024-53254
+- [UI] Fix issues in several pages because of a wrong key being used to fetch the data
+
+## v1.5.11 - 2024/11/10
 
 - [BUGFIX] Fix INTERCEPTED_ERROR_CODES to allow empty value
 - [UI] Fix missing settings when a service is published online