Merge branch 'staging' into rc

bunkerity · Jan 26, 2025 · 5d382c2 · 5d382c2
2 parents fcbd388 + d7314be
commit 5d382c2
Show file tree

Hide file tree

Showing 157 changed files with 1,903 additions and 855 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.6.0-rc2
+      value: 1.6.0-rc3
     validations:
       required: true
   - type: dropdown

diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
@@ -94,7 +94,7 @@ jobs:
     needs: [create-arm]
     strategy:
       matrix:
-        linux: [ubuntu, debian, fedora, rhel, rhel9, ubuntu-jammy]
+        linux: [ubuntu, debian, fedora, fedora-41, rhel, rhel9, ubuntu-jammy]
         platforms: [linux/amd64, linux/arm64]
         include:
           - release: beta
@@ -104,6 +104,8 @@ jobs:
             package: deb
           - linux: fedora
             package: rpm
+          - linux: fedora-41
+            package: rpm
           - linux: rhel
             package: rpm
           - linux: rhel9
@@ -183,7 +185,7 @@ jobs:
     needs: [wait-builds]
     strategy:
       matrix:
-        linux: [ubuntu, debian, fedora, el, el9, ubuntu-jammy]
+        linux: [ubuntu, debian, fedora, fedora-41, el, el9, ubuntu-jammy]
         arch: [amd64, arm64]
         include:
           - release: beta
@@ -203,6 +205,11 @@ jobs:
             suffix: "1."
             version: 40
             package: rpm
+          - linux: fedora-41
+            separator: "-"
+            suffix: "1."
+            version: 41
+            package: rpm
           - linux: el
             separator: "-"
             suffix: "1."
@@ -227,6 +234,9 @@ jobs:
           - linux: fedora
             arch: amd64
             package_arch: x86_64
+          - linux: fedora-41
+            arch: amd64
+            package_arch: x86_64
           - linux: el
             arch: amd64
             package_arch: x86_64
@@ -245,6 +255,9 @@ jobs:
           - linux: fedora
             arch: arm64
             package_arch: aarch64
+          - linux: fedora-41
+            arch: arm64
+            package_arch: aarch64
           - linux: el
             arch: arm64
             package_arch: aarch64

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -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@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
+        uses: github/codeql-action/init@ee117c905ab18f32fa0f66c2fe40ecc8013f3e04 # v3.28.4
         with:
           languages: ${{ matrix.language }}
           config-file: ./.github/codeql.yml
           setup-python-dependencies: false
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
+        uses: github/codeql-action/analyze@ee117c905ab18f32fa0f66c2fe40ecc8013f3e04 # v3.28.4
         with:
           category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -43,7 +43,7 @@ jobs:
       packages: write
     strategy:
       matrix:
-        linux: [ubuntu, debian, fedora, rhel, rhel9, ubuntu-jammy]
+        linux: [ubuntu, debian, fedora, fedora-41, rhel, rhel9, ubuntu-jammy]
         include:
           - linux: ubuntu
             package: deb
@@ -53,6 +53,8 @@ jobs:
             package: deb
           - linux: fedora
             package: rpm
+          - linux: fedora-41
+            package: rpm
           - linux: rhel
             package: rpm
           - linux: rhel9
@@ -189,7 +191,7 @@ jobs:
     needs: [build-packages]
     strategy:
       matrix:
-        linux: [ubuntu, debian, fedora, el, el9, ubuntu-jammy]
+        linux: [ubuntu, debian, fedora, fedora-41, el, el9, ubuntu-jammy]
         arch: [amd64]
         include:
           - release: dev
@@ -212,6 +214,12 @@ jobs:
             suffix: "1."
             version: 40
             package: rpm
+          - linux: fedora-41
+            package_arch: x86_64
+            separator: "-"
+            suffix: "1."
+            version: 41
+            package: rpm
           - linux: el
             package_arch: x86_64
             separator: "-"

diff --git a/.github/workflows/push-packagecloud.yml b/.github/workflows/push-packagecloud.yml
@@ -60,7 +60,7 @@ jobs:
           path: /tmp/${{ inputs.LINUX }}
       # Remove existing packages
       - name: Remove existing package
-        if: inputs.LINUX != 'el9' && inputs.LINUX != 'ubuntu-jammy'
+        if: inputs.LINUX != 'el9' && inputs.LINUX != 'ubuntu-jammy' && inputs.LINUX != 'fedora-41'
         run: package_cloud yank bunkerity/${{ inputs.REPO }}/${{ inputs.LINUX }}/${{ inputs.VERSION }} bunkerweb${{ inputs.SEPARATOR }}${{ inputs.BW_VERSION }}${{ inputs.SEPARATOR }}${{ inputs.SUFFIX }}${{ inputs.PACKAGE_ARCH }}.${{ inputs.PACKAGE }}
         continue-on-error: true
         env:
@@ -77,13 +77,19 @@ jobs:
         continue-on-error: true
         env:
           PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+      - name: Remove existing package fedora-41
+        if: inputs.LINUX == 'fedora-41'
+        run: package_cloud yank bunkerity/${{ inputs.REPO }}/fedora/41 bunkerweb${{ inputs.SEPARATOR }}${{ inputs.BW_VERSION }}${{ inputs.SEPARATOR }}${{ inputs.SUFFIX }}${{ inputs.PACKAGE_ARCH }}.${{ inputs.PACKAGE }}
+        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 }}
       # Push package
       - name: Push package to packagecloud
-        if: inputs.LINUX != 'el9' && inputs.LINUX != 'ubuntu-jammy'
+        if: inputs.LINUX != 'el9' && inputs.LINUX != 'ubuntu-jammy' && inputs.LINUX != 'fedora-41'
         uses: danielmundi/upload-packagecloud@46cd0e61152bf952dbc0d1759e609d3d22649030 # v1
         with:
           PACKAGE-NAME: /tmp/${{ inputs.LINUX }}/*.${{ inputs.PACKAGE }}
@@ -109,3 +115,12 @@ jobs:
           PACKAGECLOUD-REPO: ${{ inputs.REPO }}
           PACKAGECLOUD-DISTRIB: ubuntu/jammy
           PACKAGECLOUD-TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+      - name: Push package to packagecloud for fedora-41
+        if: inputs.LINUX == 'fedora-41'
+        uses: danielmundi/upload-packagecloud@46cd0e61152bf952dbc0d1759e609d3d22649030 # v1
+        with:
+          PACKAGE-NAME: /tmp/${{ inputs.LINUX }}/*.${{ inputs.PACKAGE }}
+          PACKAGECLOUD-USERNAME: bunkerity
+          PACKAGECLOUD-REPO: ${{ inputs.REPO }}
+          PACKAGECLOUD-DISTRIB: fedora/41
+          PACKAGECLOUD-TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
diff --git a/.github/workflows/rc.yml b/.github/workflows/rc.yml
@@ -94,7 +94,7 @@ jobs:
     needs: [create-arm]
     strategy:
       matrix:
-        linux: [ubuntu, debian, fedora, rhel, rhel9, ubuntu-jammy]
+        linux: [ubuntu, debian, fedora, fedora-41, rhel, rhel9, ubuntu-jammy]
         platforms: [linux/amd64, linux/arm64]
         include:
           - release: rc
@@ -104,6 +104,8 @@ jobs:
             package: deb
           - linux: fedora
             package: rpm
+          - linux: fedora-41
+            package: rpm
           - linux: rhel
             package: rpm
           - linux: rhel9
@@ -183,7 +185,7 @@ jobs:
     needs: [wait-builds]
     strategy:
       matrix:
-        linux: [ubuntu, debian, fedora, el, el9, ubuntu-jammy]
+        linux: [ubuntu, debian, fedora, fedora-41, el, el9, ubuntu-jammy]
         arch: [amd64, arm64]
         include:
           - release: latest
@@ -203,6 +205,11 @@ jobs:
             suffix: "1."
             version: 40
             package: rpm
+          - linux: fedora-41
+            separator: "-"
+            suffix: "1."
+            version: 41
+            package: rpm
           - linux: el
             separator: "-"
             suffix: "1."
@@ -227,6 +234,9 @@ jobs:
           - linux: fedora
             arch: amd64
             package_arch: x86_64
+          - linux: fedora-41
+            arch: amd64
+            package_arch: x86_64
           - linux: el
             arch: amd64
             package_arch: x86_64
@@ -245,6 +255,9 @@ jobs:
           - linux: fedora
             arch: arm64
             package_arch: aarch64
+          - linux: fedora-41
+            arch: arm64
+            package_arch: aarch64
           - linux: el
             arch: arm64
             package_arch: aarch64

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -104,7 +104,7 @@ jobs:
     needs: [create-arm]
     strategy:
       matrix:
-        linux: [ubuntu, debian, fedora, rhel, rhel9, ubuntu-jammy]
+        linux: [ubuntu, debian, fedora, fedora-41, rhel, rhel9, ubuntu-jammy]
         platforms: [linux/amd64, linux/arm64]
         include:
           - release: latest
@@ -114,6 +114,8 @@ jobs:
             package: deb
           - linux: fedora
             package: rpm
+          - linux: fedora-41
+            package: rpm
           - linux: rhel
             package: rpm
           - linux: rhel9
@@ -193,7 +195,7 @@ jobs:
     needs: [wait-builds]
     strategy:
       matrix:
-        linux: [ubuntu, debian, fedora, el, el9, ubuntu-jammy]
+        linux: [ubuntu, debian, fedora, fedora-41, el, el9, ubuntu-jammy]
         arch: [amd64, arm64]
         include:
           - release: latest
@@ -213,6 +215,11 @@ jobs:
             suffix: "1."
             version: 40
             package: rpm
+          - linux: fedora-41
+            separator: "-"
+            suffix: "1."
+            version: 41
+            package: rpm
           - linux: el
             separator: "-"
             suffix: "1."
@@ -237,6 +244,9 @@ jobs:
           - linux: fedora
             arch: amd64
             package_arch: x86_64
+          - linux: fedora-41
+            arch: amd64
+            package_arch: x86_64
           - linux: el
             arch: amd64
             package_arch: x86_64
@@ -255,6 +265,9 @@ jobs:
           - linux: fedora
             arch: arm64
             package_arch: aarch64
+          - linux: fedora-41
+            arch: arm64
+            package_arch: aarch64
           - linux: el
             arch: arm64
             package_arch: aarch64

diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml
@@ -25,6 +25,6 @@ jobs:
           results_format: sarif
           publish_results: true
       - name: "Upload SARIF results to code scanning"
-        uses: github/codeql-action/upload-sarif@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
+        uses: github/codeql-action/upload-sarif@ee117c905ab18f32fa0f66c2fe40ecc8013f3e04 # v3.28.4
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/staging-tests.yml b/.github/workflows/staging-tests.yml
@@ -84,6 +84,9 @@ jobs:
       - name: Pull BW linux fedora test image
         if: inputs.TYPE == 'linux'
         run: docker pull ghcr.io/bunkerity/fedora-tests:testing && docker tag ghcr.io/bunkerity/fedora-tests:testing local/fedora:latest
+      - name: Pull BW linux fedora 41 test image
+        if: inputs.TYPE == 'linux'
+        run: docker pull ghcr.io/bunkerity/fedora-41-tests:testing && docker tag ghcr.io/bunkerity/fedora-41-tests:testing local/fedora-41:latest
       - name: Pull BW linux rhel test image
         if: inputs.TYPE == 'linux'
         run: docker pull ghcr.io/bunkerity/rhel-tests:testing && docker tag ghcr.io/bunkerity/rhel-tests:testing local/rhel:latest
@@ -139,6 +142,12 @@ jobs:
         env:
           TEST_DOMAINS: ${{ secrets.TEST_DOMAINS_LINUX }}
           ROOT_DOMAIN: ${{ secrets.ROOT_DOMAIN }}
+      - name: Run Linux fedora 41 tests
+        if: inputs.TYPE == 'linux'
+        run: export $(echo "$TEST_DOMAINS" | xargs) && chmod +x ./tests/main.py && ./tests/main.py "linux" "fedora-41"
+        env:
+          TEST_DOMAINS: ${{ secrets.TEST_DOMAINS_LINUX }}
+          ROOT_DOMAIN: ${{ secrets.ROOT_DOMAIN }}
       - name: Run Linux rhel tests
         if: inputs.TYPE == 'linux'
         run: export $(echo "$TEST_DOMAINS" | xargs) && chmod +x ./tests/main.py && ./tests/main.py "linux" "rhel"

diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
@@ -43,14 +43,16 @@ jobs:
       packages: write
     strategy:
       matrix:
-        linux: [ubuntu, debian, fedora, rhel, rhel9, ubuntu-jammy]
+        linux: [ubuntu, debian, fedora, fedora-41, rhel, rhel9, ubuntu-jammy]
         include:
           - linux: ubuntu
             package: deb
           - linux: debian
             package: deb
           - linux: fedora
             package: rpm
+          - linux: fedora-41
+            package: rpm
           - linux: rhel
             package: rpm
           - linux: rhel9
@@ -157,7 +159,7 @@ jobs:
     needs: [staging-tests]
     strategy:
       matrix:
-        linux: [ubuntu, debian, fedora, el, el9, ubuntu-jammy]
+        linux: [ubuntu, debian, fedora, fedora-41, el, el9, ubuntu-jammy]
         arch: [amd64]
         include:
           - release: testing
@@ -180,6 +182,12 @@ jobs:
             suffix: "1."
             version: 40
             package: rpm
+          - linux: fedora-41
+            package_arch: x86_64
+            separator: "-"
+            suffix: "1."
+            version: 41
+            package: rpm
           - linux: el
             package_arch: x86_64
             separator: "-"

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -58,7 +58,7 @@ repos:
         exclude: ^tests/
 
   - repo: https://github.com/codespell-project/codespell
-    rev: 193cd7d27cd571f79358af09a8fb8997e54f8fff # frozen: v2.3.0
+    rev: db0100e9569b92719311a5bf6727ca1bb4664409 # frozen: v2.4.0
     hooks:
       - id: codespell
         name: Codespell Spell Checker
@@ -68,7 +68,7 @@ repos:
         types: [text]
 
   - repo: https://github.com/gitleaks/gitleaks
-    rev: fc71f9df1b1edbc7396580766b73013d8bae8c2d # frozen: v8.23.0
+    rev: fdb44522d34ace953737f8501287e0b4fba52887 # frozen: v8.23.1
     hooks:
       - id: gitleaks
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Changelog
 
-## v1.6.0-rc2 - ????/??/??
+## v1.6.0-rc3 - ????/??/??
+
+- [FEATURE] Update BunkerNet's logic to send reports in bulk instead of one by one
+- [AUTOCONF] Add the possibility to add/override settings via ConfigMap in Kubernetes using the `bunkerweb.io/CONFIG_TYPE=settings` annotation
+- [UI] Add support page for easy logs and configuration sharing while anonymizing sensitive data
+- [LINUX] Support Fedora 41
+
+## v1.6.0-rc2 - 2025/01/21
 
 - [BUGFIX] Whitelisting a client no longer bypasses https redirect settings as the `ssl` plugin is now executed before the `whitelist` plugin
 - [UI] Fixed condition when validating the setup wizard form when a custom certificate is used