Skip to content

Commit f9ad05a

Browse files
Merge pull request #3030 from bunkerity/dev
Merge branch "dev" into branch "staging"
2 parents f15712a + c25722e commit f9ad05a

777 files changed

Lines changed: 258520 additions & 6423 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ jobs:
3636
python -m pip install --no-cache-dir --require-hashes -r src/common/db/requirements.txt
3737
echo "CODEQL_PYTHON=$(which python)" >> $GITHUB_ENV
3838
- name: Initialize CodeQL
39-
uses: github/codeql-action/init@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
39+
uses: github/codeql-action/init@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
4040
with:
4141
languages: ${{ matrix.language }}
4242
config-file: ./.github/codeql.yml
4343
setup-python-dependencies: false
4444
- name: Perform CodeQL Analysis
45-
uses: github/codeql-action/analyze@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
45+
uses: github/codeql-action/analyze@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
4646
with:
4747
category: "/language:${{matrix.language}}"

.github/workflows/container-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ jobs:
7676
SSH_IP: ${{ secrets.ARM_SSH_IP }}
7777
SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }}
7878
- name: Setup Buildx
79-
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
79+
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
8080
if: startsWith(inputs.CACHE_SUFFIX, 'arm') == false
8181
- name: Setup Buildx (ARM)
82-
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
82+
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
8383
if: startsWith(inputs.CACHE_SUFFIX, 'arm')
8484
with:
8585
endpoint: ssh://root@arm

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
rm -f asn.mmdb country.mmdb
5353
gunzip asn.mmdb.gz country.mmdb.gz
5454
- name: Commit and push changes
55-
uses: stefanzweifel/git-auto-commit-action@28e16e81777b558cc906c8750092100bbb34c5e3 # v7.0.0
55+
uses: stefanzweifel/git-auto-commit-action@04702edda442b2e678b25b537cec683a1493fcb9 # v7.1.0
5656
with:
5757
branch: dev
5858
commit_message: "Monthly mmdb update"

.github/workflows/linux-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@ jobs:
8585
SSH_IP: ${{ secrets.ARM_SSH_IP }}
8686
SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }}
8787
- name: Setup Buildx
88-
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
88+
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
8989
if: startsWith(env.ARCH, 'arm') == false
9090
- name: Setup Buildx (ARM)
91-
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
91+
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
9292
if: startsWith(env.ARCH, 'arm') == true
9393
with:
9494
endpoint: ssh://root@arm

.github/workflows/push-docker.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,17 @@ jobs:
6868
SSH_IP: ${{ secrets.ARM_SSH_IP }}
6969
SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }}
7070
- name: Setup Buildx (ARM)
71-
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
71+
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
7272
with:
7373
endpoint: ssh://root@arm
7474
platforms: linux/arm64,linux/arm/v7
7575
buildkitd-flags: --debug
76+
# Sanitize tags (replace ~ with - for valid Docker/GHCR tag names)
77+
- name: Sanitize tags
78+
id: sanitize
79+
run: |
80+
TAGS="${{ inputs.TAGS }}"
81+
echo "tags=${TAGS//\~/-}" >> "$GITHUB_OUTPUT"
7682
# Compute metadata
7783
- name: Extract metadata
7884
id: meta
@@ -87,7 +93,7 @@ jobs:
8793
file: ${{ inputs.DOCKERFILE }}
8894
platforms: linux/amd64,linux/386,linux/arm64,linux/arm/v7
8995
push: true
90-
tags: ${{ inputs.TAGS }}
96+
tags: ${{ steps.sanitize.outputs.tags }}
9197
labels: ${{ steps.meta.outputs.labels }}
9298
cache-from: |
9399
type=registry,ref=docker.io/bunkerity/bw-images-cache:${{ inputs.CACHE_FROM }}-amd64

.github/workflows/push-github.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,27 @@ jobs:
2727
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
2828
with:
2929
name: BunkerWeb_documentation_v${{ inputs.VERSION }}.pdf
30+
# Sanitize version (replace ~ with - for valid Git tag names)
31+
- name: Sanitize version
32+
id: sanitize
33+
run: |
34+
VERSION="${{ inputs.VERSION }}"
35+
echo "version=${VERSION//\~/-}" >> "$GITHUB_OUTPUT"
3036
# Create tag
3137
- uses: rickstaa/action-create-tag@a1c7777fcb2fee4f19b0f283ba888afa11678b72 # v1.7.2
3238
name: Create tag
3339
if: inputs.VERSION != 'testing'
3440
with:
35-
tag: "v${{ inputs.VERSION }}"
36-
message: "v${{ inputs.VERSION }}"
41+
tag: "v${{ steps.sanitize.outputs.version }}"
42+
message: "v${{ steps.sanitize.outputs.version }}"
3743
force_push_tag: true
3844
# Create tag
3945
- uses: rickstaa/action-create-tag@a1c7777fcb2fee4f19b0f283ba888afa11678b72 # v1.7.2
4046
name: Create tag
4147
if: inputs.VERSION == 'testing'
4248
with:
43-
tag: "${{ inputs.VERSION }}"
44-
message: "${{ inputs.VERSION }}"
49+
tag: "${{ steps.sanitize.outputs.version }}"
50+
message: "${{ steps.sanitize.outputs.version }}"
4551
force_push_tag: true
4652
# Extract and preserve changelog formatting
4753
- name: Extract changelog
@@ -119,8 +125,8 @@ jobs:
119125
${{ env.DECODED_CHANGELOG }}
120126
draft: true
121127
prerelease: ${{ inputs.PRERELEASE }}
122-
name: v${{ inputs.VERSION }}
123-
tag_name: v${{ inputs.VERSION }}
128+
name: v${{ steps.sanitize.outputs.version }}
129+
tag_name: v${{ steps.sanitize.outputs.version }}
124130
discussion_category_name: Announcements
125131
files: |
126132
BunkerWeb_documentation_v${{ inputs.VERSION }}.pdf
@@ -148,7 +154,7 @@ jobs:
148154
draft: false
149155
prerelease: ${{ inputs.PRERELEASE }}
150156
name: Testing
151-
tag_name: ${{ inputs.VERSION }}
157+
tag_name: ${{ steps.sanitize.outputs.version }}
152158
files: |
153159
misc/install-bunkerweb.sh
154160
misc/install-bunkerweb.sh.sha256

.github/workflows/push-packagecloud.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- name: Check out repository code
4343
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
4444
- name: Install ruby
45-
uses: ruby/setup-ruby@ac793fdd38cc468a4dd57246fa9d0e868aba9085 # v1.270.0
45+
uses: ruby/setup-ruby@4c24fa5ec04b2e79eb40571b1cee2a0d2b705771 # v1.278.0
4646
with:
4747
ruby-version: "3.0"
4848
- name: Install packagecloud

.github/workflows/scorecards-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ jobs:
2525
results_format: sarif
2626
publish_results: true
2727
- name: "Upload SARIF results to code scanning"
28-
uses: github/codeql-action/upload-sarif@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
28+
uses: github/codeql-action/upload-sarif@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
2929
with:
3030
sarif_file: results.sarif

CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
# Changelog
22

3-
## v1.6.7~rc1 - ????/??/??
3+
## v1.6.7~rc2 - 2026/01/??
4+
5+
- [BUGFIX] Fix wrong certificate name checks in Let's Encrypt
6+
- [LINUX] Updated NGINX version to v1.28.1 for Fedora 42 and 43 integration
7+
- [ALL-IN-ONE] Update CrowdSec version to 1.7.4
8+
- [DEPS] Updated luajit2 version to v2.1-20251229
9+
10+
## v1.6.7~rc1 - 2025/12/17
411

512
- [FEATURE] Refactor logging setup across multiple modules to be able to send logs to a syslog server and have multiple handlers at the same time
613
- [FEATURE] Allow configuration of whether Base64 decoding should be applied to DNS credentials via the new `LETS_ENCRYPT_DNS_CREDENTIAL_DECODE_BASE64` setting in the `Let's Encrypt` plugin (default is `yes`)
@@ -28,6 +35,7 @@
2835
- [DOCS] Update database compatibility matrix
2936
- [DOCS] Refactor API documentation to include new API features and improve clarity
3037
- [DOCS] Add documentation about the new "Custom Pages" PRO plugin
38+
- [DOCS] Refactor web UI documentation to improve clarity
3139
- [DEPS] Update lua-resty-session version to v4.1.5
3240
- [DEPS] Update coreruleset-v4 version to v4.21.0
3341
- [DEPS] Updated zlib version to v1.3.1.2

README.md

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<p align="center">
2-
<img alt="BunkerWeb logo" src="https://github.com/bunkerity/bunkerweb/raw/v1.6.7~rc1/misc/logo.png" height=100 width=350 />
2+
<img alt="BunkerWeb logo" src="https://github.com/bunkerity/bunkerweb/raw/v1.6.7-rc1/misc/logo.png" height=100 width=350 />
33
</p>
44

55
<p align="center">
@@ -30,7 +30,7 @@
3030
&#124;
3131
🧩 <a href="https://github.com/bunkerity/bunkerweb-templates">Templates</a>
3232
&#124;
33-
🛡️ <a href="https://github.com/bunkerity/bunkerweb/raw/v1.6.7~rc1/examples">Examples</a>
33+
🛡️ <a href="https://github.com/bunkerity/bunkerweb/raw/v1.6.7-rc1/examples">Examples</a>
3434
<br/>
3535
💬 <a href="https://discord.com/invite/fTf46FmtyD">Chat</a>
3636
&#124;
@@ -48,7 +48,7 @@
4848
# BunkerWeb
4949

5050
<p align="center">
51-
<img alt="Overview banner" src="https://github.com/bunkerity/bunkerweb/raw/v1.6.7~rc1/docs/assets/img/intro-overview.svg" />
51+
<img alt="Overview banner" src="https://github.com/bunkerity/bunkerweb/raw/v1.6.7-rc1/docs/assets/img/intro-overview.svg" />
5252
</p>
5353

5454
BunkerWeb is a next-generation, open-source Web Application Firewall (WAF).
@@ -156,7 +156,7 @@ Community and social networks:
156156
# Concepts
157157

158158
<p align="center">
159-
<img alt="Concepts banner" src="https://github.com/bunkerity/bunkerweb/raw/v1.6.7~rc1/docs/assets/img/concepts.svg" />
159+
<img alt="Concepts banner" src="https://github.com/bunkerity/bunkerweb/raw/v1.6.7-rc1/docs/assets/img/concepts.svg" />
160160
</p>
161161

162162
You will find more information about the key concepts of BunkerWeb in the [documentation](https://docs.bunkerweb.io/1.6.7~rc1/concepts/?utm_campaign=self&utm_source=github).
@@ -211,7 +211,7 @@ Another core component of BunkerWeb is the ModSecurity Web Application Firewall:
211211
## Database
212212

213213
<p align="center">
214-
<img alt="Database model" src="https://github.com/bunkerity/bunkerweb/raw/v1.6.7~rc1/docs/assets/img/bunkerweb_db.svg" />
214+
<img alt="Database model" src="https://github.com/bunkerity/bunkerweb/raw/v1.6.7-rc1/docs/assets/img/bunkerweb_db.svg" />
215215
</p>
216216

217217
The state of the current configuration of BunkerWeb is stored in a backend database which contains the following data:
@@ -240,7 +240,7 @@ In other words, the scheduler is the brain of BunkerWeb.
240240
<!--## BunkerWeb Cloud
241241
242242
<p align="center">
243-
<img alt="Docker banner" src="https://github.com/bunkerity/bunkerweb/raw/v1.6.7~rc1/docs/assets/img/bunkerweb-cloud.webp" />
243+
<img alt="Docker banner" src="https://github.com/bunkerity/bunkerweb/raw/v1.6.7-rc1/docs/assets/img/bunkerweb-cloud.webp" />
244244
</p>
245245
246246
BunkerWeb Cloud is the easiest way to get started with BunkerWeb. It offers you a fully managed BunkerWeb service with no hassle. Think of it like a BunkerWeb-as-a-Service!
@@ -250,7 +250,7 @@ You will find more information about BunkerWeb Cloud beta [here](https://www.bun
250250
## Linux
251251

252252
<p align="center">
253-
<img alt="Linux banner" src="https://github.com/bunkerity/bunkerweb/raw/v1.6.7~rc1/docs/assets/img/integration-linux.svg" />
253+
<img alt="Linux banner" src="https://github.com/bunkerity/bunkerweb/raw/v1.6.7-rc1/docs/assets/img/integration-linux.svg" />
254254
</p>
255255

256256
List of supported Linux distros:
@@ -270,7 +270,7 @@ You will find more information in the [Linux section](https://docs.bunkerweb.io/
270270
## Docker
271271

272272
<p align="center">
273-
<img alt="Docker banner" src="https://github.com/bunkerity/bunkerweb/raw/v1.6.7~rc1/docs/assets/img/integration-docker.svg" />
273+
<img alt="Docker banner" src="https://github.com/bunkerity/bunkerweb/raw/v1.6.7-rc1/docs/assets/img/integration-docker.svg" />
274274
</p>
275275

276276
We provide ready-to-use prebuilt images for x64, x86, armv7, and arm64 platforms on [Docker Hub](https://hub.docker.com/u/bunkerity).
@@ -286,7 +286,7 @@ You will find more information in the [Docker integration section](https://docs.
286286
## Docker autoconf
287287

288288
<p align="center">
289-
<img alt="Docker autoconf banner" src="https://github.com/bunkerity/bunkerweb/raw/v1.6.7~rc1/docs/assets/img/integration-autoconf.svg" />
289+
<img alt="Docker autoconf banner" src="https://github.com/bunkerity/bunkerweb/raw/v1.6.7-rc1/docs/assets/img/integration-autoconf.svg" />
290290
</p>
291291

292292
The downside of using environment variables is that the container needs to be recreated each time there is an update, which is not very convenient. To counter that issue, you can use another image called **autoconf** which will listen for Docker events and automatically reconfigure BunkerWeb in real-time without recreating the container.
@@ -298,7 +298,7 @@ You will find more information in the [Docker autoconf section](https://docs.bun
298298
## Kubernetes
299299

300300
<p align="center">
301-
<img alt="Kubernetes banner" src="https://github.com/bunkerity/bunkerweb/raw/v1.6.7~rc1/docs/assets/img/integration-kubernetes.svg" />
301+
<img alt="Kubernetes banner" src="https://github.com/bunkerity/bunkerweb/raw/v1.6.7-rc1/docs/assets/img/integration-kubernetes.svg" />
302302
</p>
303303

304304
The autoconf acts as an [Ingress controller](https://kubernetes.io/docs/concepts/services-networking/ingress-controllers/) and will configure the BunkerWeb instances according to the [Ingress resources](https://kubernetes.io/docs/concepts/services-networking/ingress/). It also monitors other Kubernetes objects like [ConfigMap](https://kubernetes.io/docs/concepts/configuration/configmap/) for custom configurations.
@@ -310,17 +310,17 @@ You will find more information in the [Kubernetes section](https://docs.bunkerwe
310310
## Microsoft Azure
311311

312312
<p align="center">
313-
<img alt="Azure banner" src="https://github.com/bunkerity/bunkerweb/raw/v1.6.7~rc1/docs/assets/img/integration-azure.webp" />
313+
<img alt="Azure banner" src="https://github.com/bunkerity/bunkerweb/raw/v1.6.7-rc1/docs/assets/img/integration-azure.webp" />
314314
</p>
315315

316-
BunkerWeb is referenced in the [Azure Marketplace](https://azuremarketplace.microsoft.com/fr-fr/marketplace/apps/bunkerity.bunkerweb?tab=Overview) and an ARM template is available in the [misc folder](https://github.com/bunkerity/bunkerweb/raw/v1.6.7~rc1/misc/integrations/azure-arm-template.json).
316+
BunkerWeb is referenced in the [Azure Marketplace](https://azuremarketplace.microsoft.com/fr-fr/marketplace/apps/bunkerity.bunkerweb?tab=Overview) and an ARM template is available in the [misc folder](https://github.com/bunkerity/bunkerweb/raw/v1.6.7-rc1/misc/integrations/azure-arm-template.json).
317317

318318
You will find more information in the [Microsoft Azure section](https://docs.bunkerweb.io/1.6.7~rc1/integrations/?utm_campaign=self&utm_source=github#microsoft-azure) of the documentation.
319319

320320
## Swarm
321321

322322
<p align="center">
323-
<img alt="Swarm banner" src="https://github.com/bunkerity/bunkerweb/raw/v1.6.7~rc1/docs/assets/img/integration-swarm.svg" />
323+
<img alt="Swarm banner" src="https://github.com/bunkerity/bunkerweb/raw/v1.6.7-rc1/docs/assets/img/integration-swarm.svg" />
324324
</p>
325325

326326
To automatically configure BunkerWeb instances, a special service, called **autoconf** will listen for Docker Swarm events like service creation or deletion and automatically configure the **BunkerWeb instances** in real-time without downtime.
@@ -401,7 +401,7 @@ BunkerWeb UI supports multiple languages. Translations are managed in the `src/u
401401
- Italian (it)
402402
- Turkish (tr)
403403

404-
See the [locales/README.md](https://github.com/bunkerity/bunkerweb/raw/v1.6.7~rc1/src/ui/app/static/locales/README.md) for details on translation provenance and review status.
404+
See the [locales/README.md](https://github.com/bunkerity/bunkerweb/raw/v1.6.7-rc1/src/ui/app/static/locales/README.md) for details on translation provenance and review status.
405405

406406
## Contributing Translations
407407

@@ -417,7 +417,7 @@ We welcome contributions to improve or add new locale files!
417417

418418
For updates, edit the relevant file and update the provenance table as needed.
419419

420-
See the [locales/README.md](https://github.com/bunkerity/bunkerweb/raw/v1.6.7~rc1/src/ui/app/static/locales/README.md) for full guidelines.
420+
See the [locales/README.md](https://github.com/bunkerity/bunkerweb/raw/v1.6.7-rc1/src/ui/app/static/locales/README.md) for full guidelines.
421421

422422
# Support
423423

@@ -440,15 +440,15 @@ Please don't use [GitHub issues](https://github.com/bunkerity/bunkerweb/issues)
440440

441441
# License
442442

443-
This project is licensed under the terms of the [GNU Affero General Public License (AGPL) version 3](https://github.com/bunkerity/bunkerweb/raw/v1.6.7~rc1/LICENSE.md).
443+
This project is licensed under the terms of the [GNU Affero General Public License (AGPL) version 3](https://github.com/bunkerity/bunkerweb/raw/v1.6.7-rc1/LICENSE.md).
444444

445445
# Contribute
446446

447-
If you would like to contribute to the plugins, you can read the [contributing guidelines](https://github.com/bunkerity/bunkerweb/raw/v1.6.7~rc1/CONTRIBUTING.md) to get started.
447+
If you would like to contribute to the plugins, you can read the [contributing guidelines](https://github.com/bunkerity/bunkerweb/raw/v1.6.7-rc1/CONTRIBUTING.md) to get started.
448448

449449
# Security policy
450450

451-
We take security bugs as serious issues and encourage responsible disclosure; see our [security policy](https://github.com/bunkerity/bunkerweb/raw/v1.6.7~rc1/SECURITY.md) for more information.
451+
We take security bugs as serious issues and encourage responsible disclosure; see our [security policy](https://github.com/bunkerity/bunkerweb/raw/v1.6.7-rc1/SECURITY.md) for more information.
452452

453453
# Star History
454454

0 commit comments

Comments
 (0)