Merge branch 'dev'

Author: fl0ppy-d1sk

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -14,7 +14,6 @@ body:
       options:
         - clamav
         - coraza
-        - crowdsec
         - discord
         - slack
         - virustotal

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -14,7 +14,6 @@ body:
       options:
         - clamav
         - coraza
-        - crowdsec
         - discord
         - slack
         - virustotal

.github/codeql.yml

@@ -3,7 +3,6 @@ name: "CodeQL config"
 paths:
   - clamav
   - coraza
-  - crowdsec
   - discord
   - slack
   - virustotal

.github/workflows/codeql.yml

@@ -21,11 +21,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
+        uses: github/codeql-action/init@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
         with:
           languages: ${{ matrix.language }}
           config-file: ./.github/codeql.yml
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
+        uses: github/codeql-action/analyze@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
         with:
           category: "/language:${{matrix.language}}"

.github/workflows/tests.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Get BW tag
         run: |
           if [ "$GITHUB_REF" = "refs/heads/main" ] ; then
-            echo "BW_TAG=1.6.0-beta" >> $GITHUB_ENV
+            echo "BW_TAG=1.6.1" >> $GITHUB_ENV
           else
             echo "BW_TAG=dev" >> $GITHUB_ENV
           fi
@@ -41,20 +41,11 @@ jobs:
       - name: Run Coraza tests
         run: ./.tests/coraza.sh
 
-      - name: Run CrowdSec live tests
-        run: ./.tests/crowdsec.sh live
-
-      - name: Run CrowdSec stream tests
-        run: ./.tests/crowdsec.sh stream
-
-      - name: Run CrowdSec appsec tests
-        run: ./.tests/crowdsec.sh appsec
-
       - name: Run VirusTotal tests
         run: ./.tests/virustotal.sh
         env:
           VIRUSTOTAL_API_KEY: ${{ secrets.VIRUSTOTAL_API_KEY }}
 
       - name: Build and push APIs
-        if: env.BW_TAG == '1.5.9'
+        if: env.BW_TAG == '1.6.1'
         run: ./.tests/build-push.sh "${{ env.BW_TAG }}"

.pre-commit-config.yaml

@@ -28,13 +28,11 @@ repos:
     rev: 84c370104d6a8d1eef00c80a3ebd42f7033aaaad # frozen: v0.20.0
     hooks:
       - id: stylua-github
-        exclude: ^crowdsec/lib/
 
   - repo: https://github.com/lunarmodules/luacheck
     rev: cc089e3f65acdd1ef8716cc73a3eca24a6b845e4 # frozen: v1.2.0
     hooks:
       - id: luacheck
-        exclude: ^crowdsec/lib/
         args: ["--std", "min", "--codes", "--ranges", "--no-cache"]
 
   - repo: https://github.com/pycqa/flake8

.tests/crowdsec.sh

@@ -8,5 +8,12 @@
   "1.5": ["1.5.7", "1.5.8", "1.5.9", "1.5.10", "1.5.11", "1.5.12"],
   "1.6": ["1.5.7", "1.5.8", "1.5.9", "1.5.10", "1.5.11", "1.5.12"],
   "1.7": ["1.5.7", "1.5.8", "1.5.9", "1.5.10", "1.5.11", "1.5.12"],
-  "1.8": ["1.6.0-beta", "1.6.0-rc1"]
+  "1.8": [
+    "1.6.0-beta",
+    "1.6.0-rc1",
+    "1.6.0-rc2",
+    "1.6.0-rc3",
+    "1.6.0-rc4",
+    "1.6.0"
+  ]
 }

.tests/crowdsec/acquis.yaml

@@ -22,7 +22,6 @@ The installation of external plugins is covered in the [plugins section](https:/
 Each plugin is located in a subdirectory of this repository. A README file located in each subdirectory contains documentation about the plugin. Here is the list :
 
 - [ClamAV](https://github.com/bunkerity/bunkerweb-plugins/tree/main/clamav)
-- [CrowdSec](https://github.com/bunkerity/bunkerweb-plugins/tree/main/crowdsec)
 - [Coraza](https://github.com/bunkerity/bunkerweb-plugins/tree/main/coraza)
 - [Discord](https://github.com/bunkerity/bunkerweb-plugins/tree/main/discord)
 - [Slack](https://github.com/bunkerity/bunkerweb-plugins/tree/main/slack)

.tests/crowdsec/appsec.yaml

@@ -2,7 +2,7 @@
   "id": "clamav",
   "name": "ClamAV",
   "description": "Automatic scan of uploaded files with ClamAV antivirus engine.",
-  "version": "1.8",
+  "version": "1.9",
   "stream": "no",
   "settings": {
     "USE_CLAMAV": {

.tests/crowdsec/docker-compose.yml

@@ -2,7 +2,7 @@
   "id": "coraza",
   "name": "Coraza",
   "description": "Use Coraza as a library to inspect client request.",
-  "version": "1.8",
+  "version": "1.9",
   "stream": "no",
   "settings": {
     "USE_CORAZA": {