ci/cd - add automatic build for Linux images

Remove USE_ before authbasic plugin settings

.dockerignore

@@ -0,0 +1 @@
+.git

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,17 @@
+---
+name: Bug report
+about: Something is not working as expected
+title: "[BUG]"
+labels: bug
+assignees: ''
+
+---
+
+**Description**
+Concise description of what you're trying to do, the expected behavior and the current bug.
+
+**How to reproduce**
+Give steps on how to reproduce the bug (e.g. : commands, yaml, configs, tests, environment, version, ...).
+
+**Logs**
+The logs generated by BunkerWeb. **DON'T FORGET TO REMOVE PRIVATE DATA LIKE IP ADDRESSES !**

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,14 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[FEATURE]"
+labels: feature
+assignees: ''
+
+---
+
+**What's needed and why ?**
+Describe the feature you would like to see in the project and why it should be implemented.
+
+**Implementations ideas (optional)**
+How it should be used and integrated into the project ? List some posts, research papers or codes that we can use as implementation.

.github/workflows/autotest-bunkerized-nginx-autoconf.yml

@@ -1,26 +0,0 @@
-name: Automatic test on autoconf
-
-on:
-  push:
-    branches: [dev, master]
-  pull_request:
-    branches: [dev, master]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout source code
-        uses: actions/checkout@v2
-      - name: Build the image
-        run: docker build -t autotest-autoconf -f autoconf/Dockerfile .
-      - name: Run Trivy security scanner
-        uses: aquasecurity/trivy-action@master
-        with:
-          image-ref: 'autotest-autoconf'
-          format: 'table'
-          exit-code: '1'
-          ignore-unfixed: true
-          severity: 'UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL'
-
-

.github/workflows/autotest-bunkerized-nginx-ui.yml

@@ -1,26 +0,0 @@
-name: Automatic test on ui
-
-on:
-  push:
-    branches: [dev, master]
-  pull_request:
-    branches: [dev, master]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout source code
-        uses: actions/checkout@v2
-      - name: Build the image
-        run: docker build -t autotest-ui -f ui/Dockerfile .
-      - name: Run Trivy security scanner
-        uses: aquasecurity/trivy-action@master
-        with:
-          image-ref: 'autotest-ui'
-          format: 'table'
-          exit-code: '1'
-          ignore-unfixed: true
-          severity: 'UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL'
-
-

.github/workflows/autotest-bunkerized-nginx.yml

@@ -1,28 +0,0 @@
-name: Automatic test
-
-on:
-  push:
-    branches: [dev, master]
-  pull_request:
-    branches: [dev, master]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout source code
-        uses: actions/checkout@v2
-      - name: Build the image
-        run: docker build -t autotest .
-      - name: Run autotest
-        run: docker run autotest test
-      - name: Run Trivy security scanner
-        uses: aquasecurity/trivy-action@master
-        with:
-          image-ref: 'autotest'
-          format: 'table'
-          exit-code: '1'
-          ignore-unfixed: true
-          severity: 'UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL'
-
-

.github/workflows/dev.yml

@@ -0,0 +1,402 @@
+name: Automatic test, build, push and deploy (DEV)
+
+on:
+  push:
+    branches: [dev]
+
+jobs:
+
+  # Build for amd64
+  build-bw-amd64:
+    runs-on: ubuntu-latest
+    steps:
+      # Prepare
+      - name: Checkout source code
+        uses: actions/checkout@v3
+      - name: Setup Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Login to private repository
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ secrets.PRIVATE_REGISTRY }}
+          username: registry
+          password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
+
+      # Build images
+      - name: Build BW for amd64
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/amd64
+          push: true
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-amd64:latest
+          cache-from: type=registry,ref=bunkerity/cache:bw-amd64-cache
+          cache-to: type=registry,ref=bunkerity/cache:bw-amd64-cache,mode=min
+      - name: Build BW autoconf for amd64
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: autoconf/Dockerfile
+          platforms: linux/amd64
+          push: true
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-amd64:latest
+          cache-from: type=registry,ref=bunkerity/cache:bw-autoconf-amd64-cache
+          cache-to: type=registry,ref=bunkerity/cache:bw-autoconf-amd64-cache,mode=min
+      - name: Build BW UI for amd64
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ui/Dockerfile
+          platforms: linux/amd64
+          push: true
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-amd64:latest
+          cache-from: type=registry,ref=bunkerity/cache:bw-ui-amd64-cache
+          cache-to: type=registry,ref=bunkerity/cache:bw-ui-amd64-cache,mode=min
+
+  # Build bunkerweb/386
+  build-bw-386:
+    runs-on: ubuntu-latest
+    steps:
+
+      # Prepare
+      - name: Checkout source code
+        uses: actions/checkout@v3
+      - name: Setup Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      # Build images
+      - name: Build BW for 386
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/386
+          tags: bunkerweb-tests-386:latest
+          cache-from: type=registry,ref=bunkerity/cache:bw-386-cache
+          cache-to: type=registry,ref=bunkerity/cache:bw-386-cache,mode=min
+      - name: Build BW autoconf for 386
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: autoconf/Dockerfile
+          platforms: linux/386
+          tags: bunkerweb-autoconf-tests-386:latest
+          cache-from: type=registry,ref=bunkerity/cache:bw-autoconf-386-cache
+          cache-to: type=registry,ref=bunkerity/cache:bw-autoconf-386-cache,mode=min
+      - name: Build BW UI for 386
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ui/Dockerfile
+          platforms: linux/386
+          tags: bunkerweb-autoconf-tests-386:latest
+          cache-from: type=registry,ref=bunkerity/cache:bw-ui-386-cache
+          cache-to: type=registry,ref=bunkerity/cache:bw-ui-386-cache,mode=min
+
+  # Build bunkerweb/arm
+  build-bw-arm:
+    runs-on: ubuntu-latest
+    steps:
+      # Prepare
+      - name: Checkout source code
+        uses: actions/checkout@v3
+      - name: Setup Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Setup SSH for ARM node
+        run: |
+          mkdir -p ~/.ssh
+          echo "$SSH_KEY" > ~/.ssh/id_rsa_arm
+          chmod 600 ~/.ssh/id_rsa_arm
+          echo "$SSH_CONFIG" > ~/.ssh/config
+        env:
+          SSH_KEY: ${{ secrets.ARM_SSH_KEY }}
+          SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }}
+      - name: Append ARM node to buildx
+        run: |
+          docker buildx create --append --name ${{ steps.buildx.outputs.name }} --node arm --platform linux/arm64,linux/arm/v7,linux/arm/v6 ssh://ubuntu@arm
+
+      # Build images
+      - name: Build BW for ARM
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/arm64,linux/arm/v7
+          tags: bunkerweb-tests-arm:latest
+          cache-from: type=registry,ref=bunkerity/cache:bw-arm-cache
+          cache-to: type=registry,ref=bunkerity/cache:bw-arm-cache,mode=min
+      - name: Build BW autoconf for ARM
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: autoconf/Dockerfile
+          platforms: linux/arm64,linux/arm/v7
+          tags: bunkerweb-autoconf-tests-arm:latest
+          cache-from: type=registry,ref=bunkerity/cache:bw-autoconf-arm-cache
+          cache-to: type=registry,ref=bunkerity/cache:bw-autoconf-arm-cache,mode=min
+      - name: Build BW UI for ARM
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ui/Dockerfile
+          platforms: linux/arm64,linux/arm/v7
+          tags: bunkerweb-ui-tests-arm:latest
+          cache-from: type=registry,ref=bunkerity/cache:bw-ui-arm-cache
+          cache-to: type=registry,ref=bunkerity/cache:bw-ui-arm-cache,mode=min
+
+  # Run tests
+  tests:
+    needs: build-bw-amd64
+    runs-on: [self-hosted, X64]
+    steps:
+
+      # Prepare
+      - name: Checkout source code
+        uses: actions/checkout@v3
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Login to private repository
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ secrets.PRIVATE_REGISTRY }}
+          username: registry
+          password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
+      - name: Set variables
+        run: |
+          VER=$(cat VERSION | tr -d '\n')
+          if [ "$GITHUB_REF" = "refs/heads/master" ] ; then
+            echo "BUILD_MODE=prod" >> $GITHUB_ENV
+          else
+            echo "BUILD_MODE=dev" >> $GITHUB_ENV
+          fi
+    
+      # Import images to local registry
+      - name: Import BW image
+        run: docker pull ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-amd64:latest && docker tag ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-amd64:latest 10.20.1.1:5000/bw-tests:latest && docker push 10.20.1.1:5000/bw-tests:latest
+      - name: Import BW autoconf image
+        run: docker pull ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-amd64:latest && docker tag ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-amd64:latest 10.20.1.1:5000/bw-autoconf-tests:latest && docker push 10.20.1.1:5000/bw-autoconf-tests:latest
+      - name: Import BW UI image
+        run: docker pull ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-amd64:latest && docker tag ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-amd64:latest 10.20.1.1:5000/bw-ui-tests:latest && docker push 10.20.1.1:5000/bw-ui-tests:latest
+
+      # CVE check on OS
+      - name: Check security vulnerabilities for BW
+        uses: aquasecurity/trivy-action@master
+        with:
+          vuln-type: os
+          image-ref: 10.20.1.1:5000/bw-tests:latest
+          format: table
+          exit-code: 1
+          ignore-unfixed: false
+          severity: UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL
+      - name: Check security vulnerabilities for autoconf
+        uses: aquasecurity/trivy-action@master
+        with:
+          vuln-type: os
+          image-ref: 10.20.1.1:5000/bw-autoconf-tests:latest
+          format: table
+          exit-code: 1
+          ignore-unfixed: false
+          severity: UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL
+      - name: Check security vulnerabilities for UI
+        uses: aquasecurity/trivy-action@master
+        with:
+          vuln-type: os
+          image-ref: 10.20.1.1:5000/bw-ui-tests:latest
+          format: table
+          exit-code: 1
+          ignore-unfixed: false
+          severity: UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL
+
+      # Run tests
+      - name: Run Docker tests
+        run: ./tests/docker.sh ${{ env.BUILD_MODE }}
+      - name: Run autoconf tests
+        run: ./tests/autoconf.sh ${{ env.BUILD_MODE }}
+      - name: Run Swarm tests
+        run: ./tests/swarm.sh ${{ env.BUILD_MODE }}
+      - name: Run Kubernetes tests
+        run: ./tests/kubernetes.sh ${{ env.BUILD_MODE }}
+      - name: Run Linux tests
+        run: ./tests/linux.sh ${{ env.BUILD_MODE }}
+
+  # Push to dev registries
+  push-docker:
+    needs: [tests, build-bw-386, build-bw-arm]
+    runs-on: ubuntu-latest
+    steps:
+
+      # Prepare
+      - name: Checkout source code
+        uses: actions/checkout@v3
+      - name: Setup Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Login to private repository
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ secrets.PRIVATE_REGISTRY }}
+          username: registry
+          password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
+      - name: Setup SSH for ARM node
+        run: |
+          mkdir -p ~/.ssh
+          echo "$SSH_KEY" > ~/.ssh/id_rsa_arm
+          chmod 600 ~/.ssh/id_rsa_arm
+          echo "$SSH_CONFIG" > ~/.ssh/config
+        env:
+          SSH_KEY: ${{ secrets.ARM_SSH_KEY }}
+          SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }}
+      - name: Append ARM node to buildx
+        run: |
+          docker buildx create --append --name ${{ steps.buildx.outputs.name }} --node arm --platform linux/arm64,linux/arm/v7,linux/arm/v6 ssh://ubuntu@arm
+
+      # Build and push
+      - name: Build and push BW
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/amd64,linux/386,linux/arm64,linux/arm/v7
+          push: true
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb:staging,bunkerity/bunkerweb:dev
+          cache-from: |
+            type=registry,ref=bunkerity/cache:bw-amd64-cache
+            type=registry,ref=bunkerity/cache:bw-386-cache
+            type=registry,ref=bunkerity/cache:bw-arm-cache
+      - name: Build and push BW autoconf
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: autoconf/Dockerfile
+          platforms: linux/amd64,linux/386,linux/arm64,linux/arm/v7
+          push: true
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf:staging,bunkerity/bunkerweb-autoconf:dev
+          cache-from: |
+            type=registry,ref=bunkerity/cache:bw-autoconf-amd64-cache
+            type=registry,ref=bunkerity/cache:bw-autoconf-386-cache
+            type=registry,ref=bunkerity/cache:bw-autoconf-arm-cache
+      - name: Build and push BW UI
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ui/Dockerfile
+          platforms: linux/amd64,linux/386,linux/arm64,linux/arm/v7
+          push: true
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui:staging,bunkerity/bunkerweb-ui:dev
+          cache-from: |
+            type=registry,ref=bunkerity/cache:bw-ui-amd64-cache
+            type=registry,ref=bunkerity/cache:bw-ui-386-cache
+            type=registry,ref=bunkerity/cache:bw-ui-arm-cache
+
+  # Push to PackageCloud
+  push-linux:
+    needs: tests
+    runs-on: [self-hosted, X64]
+    steps:
+
+      - name: Check out repository code
+        uses: actions/checkout@v3
+
+      - name: Set variables
+        run: |
+          VER=$(cat VERSION | tr -d '\n')
+          echo "VERSION=$VER" >> $GITHUB_ENV
+
+      - name: Remove Ubuntu DEB from packagecloud
+        run: package_cloud yank bunkerity/bunkerweb-dev/ubuntu/jammy bunkerweb_${{ env.VERSION }}-1_amd64.deb
+        continue-on-error: true
+        env:
+          PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+
+      - name: Push Ubuntu DEB to packagecloud
+        uses: danielmundi/upload-packagecloud@v1
+        with:
+          PACKAGE-NAME: /opt/packages/dev/ubuntu/bunkerweb_${{ env.VERSION }}-1_amd64.deb
+          PACKAGECLOUD-USERNAME: bunkerity
+          PACKAGECLOUD-REPO: bunkerweb-dev
+          PACKAGECLOUD-DISTRIB: ubuntu/jammy
+          PACKAGECLOUD-TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+
+      - name: Remove Debian DEB from packagecloud
+        run: package_cloud yank bunkerity/bunkerweb-dev/debian/bullseye bunkerweb_${{ env.VERSION }}-1_amd64.deb
+        continue-on-error: true
+        env:
+          PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+
+      - name: Push Debian DEB to packagecloud
+        uses: danielmundi/upload-packagecloud@v1
+        with:
+          PACKAGE-NAME: /opt/packages/dev/debian/bunkerweb_${{ env.VERSION }}-1_amd64.deb
+          PACKAGECLOUD-USERNAME: bunkerity
+          PACKAGECLOUD-REPO: bunkerweb-dev
+          PACKAGECLOUD-DISTRIB: debian/bullseye
+          PACKAGECLOUD-TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+
+      - name: Remove CentOS RPM from packagecloud
+        run: package_cloud yank bunkerity/bunkerweb-dev/el/8 bunkerweb-${{ env.VERSION }}-1.x86_64.rpm
+        continue-on-error: true
+        env:
+          PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+
+      - name: Push CentOS RPM to packagecloud
+        uses: danielmundi/upload-packagecloud@v1
+        with:
+          PACKAGE-NAME: /opt/packages/dev/centos/bunkerweb-${{ env.VERSION }}-1.x86_64.rpm
+          PACKAGECLOUD-USERNAME: bunkerity
+          PACKAGECLOUD-REPO: bunkerweb-dev
+          PACKAGECLOUD-DISTRIB: el/8
+          PACKAGECLOUD-TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+
+      - name: Remove Fedora RPM from packagecloud
+        run: package_cloud yank bunkerity/bunkerweb-dev/fedora/36 bunkerweb-${{ env.VERSION }}-1.x86_64.rpm
+        continue-on-error: true
+        env:
+          PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+
+      - name: Push Fedora RPM to packagecloud
+        uses: danielmundi/upload-packagecloud@v1
+        with:
+          PACKAGE-NAME: /opt/packages/dev/fedora/bunkerweb-${{ env.VERSION }}-1.x86_64.rpm
+          PACKAGECLOUD-USERNAME: bunkerity
+          PACKAGECLOUD-REPO: bunkerweb-dev
+          PACKAGECLOUD-DISTRIB: fedora/36
+          PACKAGECLOUD-TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+
+  # Deploy to staging infrastructure
+  deploy:
+    needs: push-docker
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Checkout source code
+        uses: actions/checkout@v3
+
+      - name: k8s login (staging)
+        uses: azure/k8s-set-context@v2
+        with:
+          method: kubeconfig
+          kubeconfig: ${{ secrets.KUBE_CONFIG_STAGING }}
+
+      - name: k8s deploy (staging)
+        run: kubectl rollout restart deployment bunkerweb-controller && kubectl rollout restart daemonset bunkerweb

.github/workflows/prod.yml

@@ -0,0 +1,529 @@
+name: Automatic test, build, push and deploy (PROD)
+
+on:
+  push:
+    branches: [master]
+
+jobs:
+
+  # Build for amd64
+  build-bw-amd64:
+    runs-on: ubuntu-latest
+    steps:
+      # Prepare
+      - name: Checkout source code
+        uses: actions/checkout@v3
+      - name: Setup Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Login to private repository
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ secrets.PRIVATE_REGISTRY }}
+          username: registry
+          password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
+
+      # Build images
+      - name: Build BW for amd64
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/amd64
+          push: true
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-amd64:latest
+          cache-to: type=registry,ref=bunkerity/cache:bw-amd64-cache,mode=min
+      - name: Build BW autoconf for amd64
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: autoconf/Dockerfile
+          platforms: linux/amd64
+          push: true
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-amd64:latest
+          cache-to: type=registry,ref=bunkerity/cache:bw-autoconf-amd64-cache,mode=min
+      - name: Build BW UI for amd64
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ui/Dockerfile
+          platforms: linux/amd64
+          push: true
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-amd64:latest
+          cache-to: type=registry,ref=bunkerity/cache:bw-ui-amd64-cache,mode=min
+
+  # Build bunkerweb/386
+  build-bw-386:
+    runs-on: ubuntu-latest
+    steps:
+
+      # Prepare
+      - name: Checkout source code
+        uses: actions/checkout@v3
+      - name: Setup Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      # Build images
+      - name: Build BW for 386
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/386
+          tags: bunkerweb-tests-386:latest
+          cache-to: type=registry,ref=bunkerity/cache:bw-386-cache,mode=min
+      - name: Build BW autoconf for 386
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: autoconf/Dockerfile
+          platforms: linux/386
+          tags: bunkerweb-autoconf-tests-386:latest
+          cache-to: type=registry,ref=bunkerity/cache:bw-autoconf-386-cache,mode=min
+      - name: Build BW UI for 386
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ui/Dockerfile
+          platforms: linux/386
+          tags: bunkerweb-autoconf-tests-386:latest
+          cache-to: type=registry,ref=bunkerity/cache:bw-ui-386-cache,mode=min
+
+  # Build bunkerweb/arm
+  build-bw-arm:
+    runs-on: ubuntu-latest
+    steps:
+      # Prepare
+      - name: Checkout source code
+        uses: actions/checkout@v3
+      - name: Setup Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Setup SSH for ARM node
+        run: |
+          mkdir -p ~/.ssh
+          echo "$SSH_KEY" > ~/.ssh/id_rsa_arm
+          chmod 600 ~/.ssh/id_rsa_arm
+          echo "$SSH_CONFIG" > ~/.ssh/config
+        env:
+          SSH_KEY: ${{ secrets.ARM_SSH_KEY }}
+          SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }}
+      - name: Append ARM node to buildx
+        run: |
+          docker buildx create --append --name ${{ steps.buildx.outputs.name }} --node arm --platform linux/arm64,linux/arm/v7,linux/arm/v6 ssh://ubuntu@arm
+
+      # Build images
+      - name: Build BW for ARM
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/arm64,linux/arm/v7
+          tags: bunkerweb-tests-arm:latest
+          cache-to: type=registry,ref=bunkerity/cache:bw-arm-cache,mode=min
+      - name: Build BW autoconf for ARM
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: autoconf/Dockerfile
+          platforms: linux/arm64,linux/arm/v7
+          tags: bunkerweb-autoconf-tests-arm:latest
+          cache-to: type=registry,ref=bunkerity/cache:bw-autoconf-arm-cache,mode=min
+      - name: Build BW UI for ARM
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ui/Dockerfile
+          platforms: linux/arm64,linux/arm/v7
+          tags: bunkerweb-ui-tests-arm:latest
+          cache-to: type=registry,ref=bunkerity/cache:bw-ui-arm-cache,mode=min
+
+  # Build linux ubuntu
+  build-bw-ubuntu:
+    runs-on: ubuntu-latest
+    steps:
+      # Prepare
+      - name: Checkout source code
+        uses: actions/checkout@v3
+      - name: Setup Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Login to private repository
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ secrets.PRIVATE_REGISTRY }}
+          username: registry
+          password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
+
+      # Build image
+      - name: Build BW ubuntu
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: linux/Dockerfile-ubuntu
+          platforms: linux/amd64
+          push: true
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ubuntu:latest
+
+  # Build linux debian
+  build-bw-debian:
+    runs-on: ubuntu-latest
+    steps:
+      # Prepare
+      - name: Checkout source code
+        uses: actions/checkout@v3
+      - name: Setup Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Login to private repository
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ secrets.PRIVATE_REGISTRY }}
+          username: registry
+          password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
+
+      # Build image
+      - name: Build BW debian
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: linux/Dockerfile-debian
+          platforms: linux/amd64
+          push: true
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-debian:latest
+
+  # Build linux centos
+  build-bw-centos:
+    runs-on: ubuntu-latest
+    steps:
+      # Prepare
+      - name: Checkout source code
+        uses: actions/checkout@v3
+      - name: Setup Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Login to private repository
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ secrets.PRIVATE_REGISTRY }}
+          username: registry
+          password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
+
+      # Build image
+      - name: Build BW centos
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: linux/Dockerfile-centos
+          platforms: linux/amd64
+          push: true
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-centos:latest
+
+  # Build linux fedora
+  build-bw-fedora:
+    runs-on: ubuntu-latest
+    steps:
+      # Prepare
+      - name: Checkout source code
+        uses: actions/checkout@v3
+      - name: Setup Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Login to private repository
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ secrets.PRIVATE_REGISTRY }}
+          username: registry
+          password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
+
+      # Build image
+      - name: Build BW fedora
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: linux/Dockerfile-fedora
+          platforms: linux/amd64
+          push: true
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-fedora:latest
+
+  # Run tests
+  tests:
+    needs: [build-bw-amd64, build-bw-ubuntu, build-bw-debian, build-bw-centos, build-bw-fedora]
+    runs-on: [self-hosted, X64]
+    steps:
+
+      # Prepare
+      - name: Checkout source code
+        uses: actions/checkout@v3
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Login to private repository
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ secrets.PRIVATE_REGISTRY }}
+          username: registry
+          password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
+      - name: Set variables
+        run: |
+          VER=$(cat VERSION | tr -d '\n')
+          if [ "$GITHUB_REF" = "refs/heads/master" ] ; then
+            echo "BUILD_MODE=prod" >> $GITHUB_ENV
+          else
+            echo "BUILD_MODE=dev" >> $GITHUB_ENV
+          fi
+    
+      # Import images to local registry
+      - name: Import BW image
+        run: docker pull ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-amd64:latest && docker tag ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-amd64:latest 10.20.1.1:5000/bw-tests:latest && docker push 10.20.1.1:5000/bw-tests:latest
+      - name: Import BW autoconf image
+        run: docker pull ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-amd64:latest && docker tag ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-amd64:latest 10.20.1.1:5000/bw-autoconf-tests:latest && docker push 10.20.1.1:5000/bw-autoconf-tests:latest
+      - name: Import BW UI image
+        run: docker pull ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-amd64:latest && docker tag ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-amd64:latest 10.20.1.1:5000/bw-ui-tests:latest && docker push 10.20.1.1:5000/bw-ui-tests:latest
+      - name: Import Ubuntu image
+        run: docker pull ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ubuntu:latest && docker tag ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ubuntu:latest bw-ubuntu-tests:latest
+      - name: Import Debian image
+        run: docker pull ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-debian:latest && docker tag ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-debian:latest bw-debian-tests:latest
+      - name: Import Centos image
+        run: docker pull ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-centos:latest && docker tag ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-centos:latest bw-centos-tests:latest
+      - name: Import Fedora image
+        run: docker pull ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-fedora:latest && docker tag ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-fedora:latest bw-fedora-tests:latest
+
+      # CVE check on OS
+      - name: Check security vulnerabilities for BW
+        uses: aquasecurity/trivy-action@master
+        with:
+          vuln-type: os
+          image-ref: 10.20.1.1:5000/bw-tests:latest
+          format: table
+          exit-code: 1
+          ignore-unfixed: false
+          severity: UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL
+      - name: Check security vulnerabilities for autoconf
+        uses: aquasecurity/trivy-action@master
+        with:
+          vuln-type: os
+          image-ref: 10.20.1.1:5000/bw-autoconf-tests:latest
+          format: table
+          exit-code: 1
+          ignore-unfixed: false
+          severity: UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL
+      - name: Check security vulnerabilities for UI
+        uses: aquasecurity/trivy-action@master
+        with:
+          vuln-type: os
+          image-ref: 10.20.1.1:5000/bw-ui-tests:latest
+          format: table
+          exit-code: 1
+          ignore-unfixed: false
+          severity: UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL
+
+      # Run tests
+      - name: Run Docker tests
+        run: ./tests/docker.sh ${{ env.BUILD_MODE }}
+      - name: Run autoconf tests
+        run: ./tests/autoconf.sh ${{ env.BUILD_MODE }}
+      - name: Run Swarm tests
+        run: ./tests/swarm.sh ${{ env.BUILD_MODE }}
+      - name: Run Kubernetes tests
+        run: ./tests/kubernetes.sh ${{ env.BUILD_MODE }}
+      - name: Run Linux tests
+        run: ./tests/linux.sh ${{ env.BUILD_MODE }}
+
+  # Push to dev registries
+  push-docker:
+    needs: [tests, build-bw-386, build-bw-arm]
+    runs-on: ubuntu-latest
+    steps:
+
+      # Prepare
+      - name: Checkout source code
+        uses: actions/checkout@v3
+      - name: Set variables
+        run: |
+          VER=$(cat VERSION | tr -d '\n')
+          echo "VERSION=$VER" >> $GITHUB_ENV
+      - name: Setup Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Login to private repository
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ secrets.PRIVATE_REGISTRY }}
+          username: registry
+          password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
+      - name: Setup SSH for ARM node
+        run: |
+          mkdir -p ~/.ssh
+          echo "$SSH_KEY" > ~/.ssh/id_rsa_arm
+          chmod 600 ~/.ssh/id_rsa_arm
+          echo "$SSH_CONFIG" > ~/.ssh/config
+        env:
+          SSH_KEY: ${{ secrets.ARM_SSH_KEY }}
+          SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }}
+      - name: Append ARM node to buildx
+        run: |
+          docker buildx create --append --name ${{ steps.buildx.outputs.name }} --node arm --platform linux/arm64,linux/arm/v7,linux/arm/v6 ssh://ubuntu@arm
+
+      # Build and push
+      - name: Build and push BW
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/amd64,linux/386,linux/arm64,linux/arm/v7
+          push: true
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb:latest,bunkerity/bunkerweb:latest,bunkerity/bunkerweb:${{ env.VERSION }}
+          cache-from: |
+            type=registry,ref=bunkerity/cache:bw-amd64-cache
+            type=registry,ref=bunkerity/cache:bw-386-cache
+            type=registry,ref=bunkerity/cache:bw-arm-cache
+      - name: Build and push BW autoconf
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: autoconf/Dockerfile
+          platforms: linux/amd64,linux/386,linux/arm64,linux/arm/v7
+          push: true
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf:latest,bunkerity/bunkerweb-autoconf:latest,bunkerity/bunkerweb-autoconf:${{ env.VERSION }}
+          cache-from: |
+            type=registry,ref=bunkerity/cache:bw-autoconf-amd64-cache
+            type=registry,ref=bunkerity/cache:bw-autoconf-386-cache
+            type=registry,ref=bunkerity/cache:bw-autoconf-arm-cache
+      - name: Build and push BW UI
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ui/Dockerfile
+          platforms: linux/amd64,linux/386,linux/arm64,linux/arm/v7
+          push: true
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui:latest,bunkerity/bunkerweb-ui:latest,bunkerity/bunkerweb-ui:${{ env.VERSION }}
+          cache-from: |
+            type=registry,ref=bunkerity/cache:bw-ui-amd64-cache
+            type=registry,ref=bunkerity/cache:bw-ui-386-cache
+            type=registry,ref=bunkerity/cache:bw-ui-arm-cache
+
+  # Push to PackageCloud
+  push-linux:
+    needs: tests
+    runs-on: [self-hosted, X64]
+    steps:
+
+      - name: Check out repository code
+        uses: actions/checkout@v3
+
+      - name: Set variables
+        run: |
+          VER=$(cat VERSION | tr -d '\n')
+          echo "VERSION=$VER" >> $GITHUB_ENV
+
+      - name: Remove Ubuntu DEB from packagecloud
+        run: package_cloud yank bunkerity/bunkerweb/ubuntu/jammy bunkerweb_${{ env.VERSION }}-1_amd64.deb
+        continue-on-error: true
+        env:
+          PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+
+      - name: Push Ubuntu DEB to packagecloud
+        uses: danielmundi/upload-packagecloud@v1
+        with:
+          PACKAGE-NAME: /opt/packages/prod/ubuntu/bunkerweb_${{ env.VERSION }}-1_amd64.deb
+          PACKAGECLOUD-USERNAME: bunkerity
+          PACKAGECLOUD-REPO: bunkerweb
+          PACKAGECLOUD-DISTRIB: ubuntu/jammy
+          PACKAGECLOUD-TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+
+      - name: Remove Debian DEB from packagecloud
+        run: package_cloud yank bunkerity/bunkerweb/debian/bullseye bunkerweb_${{ env.VERSION }}-1_amd64.deb
+        continue-on-error: true
+        env:
+          PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+
+      - name: Push Debian DEB to packagecloud
+        uses: danielmundi/upload-packagecloud@v1
+        with:
+          PACKAGE-NAME: /opt/packages/prod/debian/bunkerweb_${{ env.VERSION }}-1_amd64.deb
+          PACKAGECLOUD-USERNAME: bunkerity
+          PACKAGECLOUD-REPO: bunkerweb
+          PACKAGECLOUD-DISTRIB: debian/bullseye
+          PACKAGECLOUD-TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+
+      - name: Remove CentOS RPM from packagecloud
+        run: package_cloud yank bunkerity/bunkerweb/el/8 bunkerweb-${{ env.VERSION }}-1.x86_64.rpm
+        continue-on-error: true
+        env:
+          PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+
+      - name: Push CentOS RPM to packagecloud
+        uses: danielmundi/upload-packagecloud@v1
+        with:
+          PACKAGE-NAME: /opt/packages/prod/centos/bunkerweb-${{ env.VERSION }}-1.x86_64.rpm
+          PACKAGECLOUD-USERNAME: bunkerity
+          PACKAGECLOUD-REPO: bunkerweb
+          PACKAGECLOUD-DISTRIB: el/8
+          PACKAGECLOUD-TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+
+      - name: Remove Fedora RPM from packagecloud
+        run: package_cloud yank bunkerity/bunkerweb/fedora/36 bunkerweb-${{ env.VERSION }}-1.x86_64.rpm
+        continue-on-error: true
+        env:
+          PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+
+      - name: Push Fedora RPM to packagecloud
+        uses: danielmundi/upload-packagecloud@v1
+        with:
+          PACKAGE-NAME: /opt/packages/prod/fedora/bunkerweb-${{ env.VERSION }}-1.x86_64.rpm
+          PACKAGECLOUD-USERNAME: bunkerity
+          PACKAGECLOUD-REPO: bunkerweb
+          PACKAGECLOUD-DISTRIB: fedora/36
+          PACKAGECLOUD-TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+
+  # Deploy to staging infrastructure
+  # deploy:
+    # needs: push-docker
+    # runs-on: ubuntu-latest
+    # steps:
+
+      # - name: Checkout source code
+        # uses: actions/checkout@v3
+
+      # - name: k8s login (staging)
+        # uses: azure/k8s-set-context@v2
+        # with:
+          # method: kubeconfig
+          # kubeconfig: ${{ secrets.KUBE_CONFIG_STAGING }}
+
+      # - name: k8s deploy (staging)
+        # run: kubectl rollout restart deployment bunkerweb-controller && kubectl rollout restart daemonset bunkerweb

.gitignore

@@ -1 +1,5 @@
+site/
 .idea/
+.vscode/
+**/__pycache__/
+ui/env/

CHANGELOG.md

@@ -0,0 +1,114 @@
+# Changelog
+
+## v1.4.1 - 2022/16/06
+- Fix sending local IPs to BunkerNet when DISABLE_DEFAULT_SERVER=yes
+- Fix certbot bug when AUTOCONF_MODE=yes
+- Fix certbot bug when MULTISITE=no
+- Add reverse proxy timeouts settings
+- Add auth_request settings
+- Add authentik and authelia examples
+- Prebuilt Docker images for arm64 and armv7
+- Improve documentation for Linux integration
+- Various fixes in the documentation
+
+## v1.4.0 - 2022/06/06
+
+- Project renamed to BunkerWeb
+- Internal architecture fully revised with a modular approach
+- Improved CI/CD with automatic tests for multiple integrations
+- Plugin improvement
+- Volume improvement for container-based integrations
+- Web UI improvement with various new features
+- Web tool to generate settings from a user-friendly UI
+- Linux packages
+- Various bug fixes
+
+## v1.3.2 - 2021/10/24
+
+- Use API instead of a shared folder for Swarm and Kubernetes integrations
+- Beta integration of distributed bad IPs database through a remote API
+- Improvement of the request limiting feature : hour/day rate and multiple URL support
+- Various bug fixes related to antibot feature
+- Init support of Arch Linux
+- Fix Moodle example
+- Fix ROOT_FOLDER bug in serve-files.conf when using the UI
+- Update default values for PERMISSIONS_POLICY and FEATURE_POLICY
+- Disable COUNTRY ban if IP is local
+
+## v1.3.1 - 2021/09/02
+
+- Use ModSecurity v3.0.4 instead of v3.0.5 to fix memory leak
+- Fix ignored variables to control jobs
+- Fix bug when LISTEN_HTTP=no and MULTISITE=yes
+- Add CUSTOM_HEADER variable
+- Add REVERSE_PROXY_BUFFERING variable
+- Add REVERSE_PROXY_KEEPALIVE variable
+- Fix documentation for modsec and modsec-crs special folders
+
+## v1.3.0 - 2021/08/23
+
+- Kubernetes integration in beta
+- Linux integration in beta
+- autoconf refactoring
+- jobs refactoring
+- UI refactoring
+- UI security : login/password authentication and CRSF protection
+- various dependencies updates
+- move CrowdSec as an external plugin
+- Authelia support
+- improve various regexes
+- add INJECT_BODY variable
+- add WORKER_PROCESSES variable
+- add USE_LETS_ENCRYPT_STAGING variable
+- add LOCAL_PHP and LOCAL_PHP_PATH variables
+- add REDIRECT_TO variable
+
+## v1.2.8 - 2021/07/22
+
+- Fix broken links in README
+- Fix regex for EMAIL_LETS_ENCRYPT
+- Fix regex for REMOTE_PHP and REMOTE_PHP_PATH
+- Fix regex for SELF_SIGNED_*
+- Fix various bugs related to web UI
+- Fix bug in autoconf (missing instances parameter to reload function)
+- Remove old .env files when generating a new configuration
+
+## v1.2.7 - 2021/06/14
+
+- Add custom robots.txt and sitemap to RTD
+- Fix missing GeoIP DB bug when using BLACKLIST/WHITELIST_COUNTRY
+- Add underscore "_" to allowed chars for CUSTOM_HTTPS_CERT/KEY
+- Fix bug when using automatic self-signed certificate
+- Build and push images from GitHub actions instead of Docker Hub autobuild
+- Display the reason when generator is ignoring a variable
+- Various bug fixes related to certbot and jobs
+- Split jobs into pre and post jobs
+- Add HEALTHCHECK to image
+- Fix race condition when using autoconf without Swarm by checking healthy state
+- Bump modsecurity-nginx to v1.0.2
+- Community chat with bridged platforms
+
+## v1.2.6 - 2021/06/06
+
+- Move from "ghetto-style" shell scripts to generic jinja2 templating
+- Init work on a basic plugins system
+- Move ClamAV to external plugin
+- Reduce image size by removing unnecessary dependencies
+- Fix CrowdSec example
+- Change some global variables to multisite
+- Add LOG_LEVEL environment variable
+- Read-only container support
+- Improved antibot javascript with a basic proof of work
+- Update nginx to 1.20.1
+- Support of docker-socket-proxy with web UI
+- Add certbot-cloudflare example
+- Disable DNSBL checks when IP is local
+
+## v1.2.5 - 2021/05/14
+
+- Performance improvement : move some nginx security checks to LUA and external blacklist parsing enhancement
+- Init work on official documentation on readthedocs
+- Fix default value for CONTENT_SECURITY_POLICY to allow file downloads
+- Add ROOT_SITE_SUBFOLDER environment variable
+
+## TODO - retrospective changelog

CONTRIBUTING.md

@@ -0,0 +1,21 @@
+# Contributing to bunkerweb
+
+First off all, thanks for being here and showing your support to the project !
+
+We accept many types of contributions whether they are technical or not. Every community feedback, work or help is, and will always be, appreciated.
+
+## Talk about the project
+
+The first thing you can do is to talk about the project. You can share it on social media (by the way, you can can also follow us on [LinkedIn](https://www.linkedin.com/company/bunkerity/), [Twitter](https://twitter.com/bunkerity) and [GitHub](https://github.com/bunkerity)), make a blog post about it or simply tell your friends/colleagues that's an awesome project..
+
+## Join the community
+
+You can join the [Discord server](https://discord.com/invite/fTf46FmtyD), the [GitHub discussions](https://github.com/bunkerity/bunkerweb/discussions) and the [/r/BunkerWeb](https://www.reddit.com/r/BunkerWeb) subreddit to talk about the project and help others.
+
+## Reporting bugs / ask for features
+
+The preferred way to report bugs and asking for features is using [issues](https://github.com/bunkerity/bunkerweb/issues). Before opening a new one, please check if a related issue is already opened using the "filters" bar. When creating a new issue please select and fill the "Bug report" or "Feature request" template.
+
+## Code contribution
+
+The preferred way to contribute code is using [pull requests](https://github.com/bunkerity/bunkerweb/pulls). Before creating a pull request, please check if your code is related to an opened issue. If that's not the case, you should first create an issue so we can discuss about it. This procedure is here to avoid wasting your time in case the PR will be rejected. For minor changes (e.g. : typo, quick fix, ...), opening an issue might be facultative. **Don't forget to edit the documentations when needed !**

Dockerfile

@@ -1,28 +1,86 @@
-FROM nginx:1.20.0-alpine
+FROM nginx:1.20.2-alpine AS builder
 
-COPY nginx-keys/ /tmp/nginx-keys
+# Copy dependencies sources folder
-COPY compile.sh /tmp/compile.sh
+COPY deps /tmp/bunkerweb/deps
-RUN chmod +x /tmp/compile.sh && \
-    /tmp/compile.sh && \
-    rm -rf /tmp/*
 
-COPY entrypoint/ /opt/entrypoint
+# Compile and install dependencies
-COPY confs/ /opt/confs
+RUN apk add --no-cache --virtual build bash build autoconf libtool automake geoip-dev g++ gcc curl-dev libxml2-dev pcre-dev make linux-headers musl-dev gd-dev gnupg brotli-dev openssl-dev patch readline-dev && \
-COPY scripts/ /opt/scripts
+	mkdir -p /opt/bunkerweb/deps && \
-COPY fail2ban/ /opt/fail2ban
+	chmod +x /tmp/bunkerweb/deps/install.sh && \
-COPY logs/ /opt/logs
+	bash /tmp/bunkerweb/deps/install.sh && \
-COPY lua/ /opt/lua
+	apk del build
 
-COPY prepare.sh /tmp/prepare.sh
+# Copy python requirements
-RUN chmod +x /tmp/prepare.sh && /tmp/prepare.sh && rm -f /tmp/prepare.sh
+COPY deps/requirements.txt /opt/bunkerweb/deps/requirements.txt
 
-# fix CVE-2021-20205
+# Install python requirements
-RUN apk add "libjpeg-turbo>=2.1.0-r0"
+RUN apk add --no-cache --virtual build py3-pip gcc python3-dev musl-dev libffi-dev openssl-dev cargo && \
+	pip install wheel && \
+	mkdir /opt/bunkerweb/deps/python && \
+	pip install --no-cache-dir --require-hashes --target /opt/bunkerweb/deps/python -r /opt/bunkerweb/deps/requirements.txt && \
+	apk del build
 
-VOLUME /www /http-confs /server-confs /modsec-confs /modsec-crs-confs /cache /pre-server-confs /acme-challenge
+FROM nginx:1.20.2-alpine
+
+# Copy dependencies
+COPY --from=builder /opt/bunkerweb /opt/bunkerweb
+
+# Copy files
+# can't exclude deps from . so we are copying everything by hand
+COPY api /opt/bunkerweb/api
+COPY cli /opt/bunkerweb/cli
+COPY confs /opt/bunkerweb/confs
+COPY core /opt/bunkerweb/core
+COPY gen /opt/bunkerweb/gen
+COPY helpers /opt/bunkerweb/helpers
+COPY job /opt/bunkerweb/job
+COPY lua /opt/bunkerweb/lua
+COPY misc /opt/bunkerweb/misc
+COPY utils /opt/bunkerweb/utils
+COPY settings.json /opt/bunkerweb/settings.json
+COPY VERSION /opt/bunkerweb/VERSION
+
+# Install runtime dependencies, pypi packages, move bwcli, create data folders and set permissions
+RUN apk add --no-cache bash python3 libgcc libstdc++ openssl git && \
+	chown root:nginx /opt/bunkerweb/modules && \
+	chmod 750 /opt/bunkerweb/modules && \
+	chmod 740 /opt/bunkerweb/modules/*.so && \
+	cp /opt/bunkerweb/helpers/bwcli /usr/local/bin && \
+	mkdir /opt/bunkerweb/configs && \
+	for dir in $(echo "cache configs configs/http configs/stream configs/server-http configs/server-stream configs/default-server-http configs/default-server-stream configs/modsec configs/modsec-crs letsencrypt plugins www") ; do mkdir -p "/data/${dir}" && ln -s "/data/${dir}" "/opt/bunkerweb/${dir}" ; done && \
+	chown -R root:nginx /data && \
+	chmod -R 770 /data && \
+	mkdir /opt/bunkerweb/tmp && \
+	chown -R root:nginx /opt/bunkerweb && \
+	find /opt/bunkerweb -type f -exec chmod 0740 {} \; && \
+	find /opt/bunkerweb -type d -exec chmod 0750 {} \; && \
+	chmod 770 /opt/bunkerweb/cache /opt/bunkerweb/tmp && \
+	chmod 750 /opt/bunkerweb/gen/main.py /opt/bunkerweb/job/main.py /opt/bunkerweb/cli/main.py /opt/bunkerweb/helpers/*.sh /usr/local/bin/bwcli /opt/bunkerweb/deps/python/bin/* && \
+	find /opt/bunkerweb/core/*/jobs/* -type f -exec chmod 750 {} \; && \
+	chown root:nginx /usr/local/bin/bwcli && \
+	chown -R nginx:nginx /etc/nginx && \
+	ln -s /data/letsencrypt /etc/letsencrypt && \
+	mkdir /var/log/letsencrypt /var/lib/letsencrypt && \
+	chown root:nginx /var/log/letsencrypt /var/lib/letsencrypt && \
+	chmod 770 /var/log/letsencrypt /var/lib/letsencrypt && \
+	chown -R root:nginx /etc/nginx && \
+	chmod -R 770 /etc/nginx && \
+	rm -f /var/log/nginx/* && \
+	ln -s /proc/1/fd/2 /var/log/nginx/error.log && \
+	ln -s /proc/1/fd/2 /var/log/nginx/modsec_audit.log && \
+	ln -s /proc/1/fd/1 /var/log/nginx/access.log && \
+	ln -s /proc/1/fd/1 /var/log/nginx/jobs.log && \
+	ln -s /proc/1/fd/1 /var/log/letsencrypt/letsencrypt.log
+
+# Fix CVE-2022-27405 and CVE-2022-27406
+RUN apk add "freetype>=2.10.4-r3"
+
+VOLUME /data
 
 EXPOSE 8080/tcp 8443/tcp
 
 USER nginx:nginx
 
-ENTRYPOINT ["/opt/entrypoint/entrypoint.sh"]
+HEALTHCHECK --interval=10s --timeout=10s --start-period=30s --retries=6 CMD /opt/bunkerweb/helpers/healthcheck.sh
+
+ENTRYPOINT ["/opt/bunkerweb/helpers/entrypoint.sh"]

Dockerfile-amd64

@@ -1,28 +0,0 @@
-FROM amd64/nginx:1.20.0-alpine
-
-COPY nginx-keys/ /tmp/nginx-keys
-COPY compile.sh /tmp/compile.sh
-RUN chmod +x /tmp/compile.sh && \
-    /tmp/compile.sh && \
-    rm -rf /tmp/*
-
-COPY entrypoint/ /opt/entrypoint
-COPY confs/ /opt/confs
-COPY scripts/ /opt/scripts
-COPY fail2ban/ /opt/fail2ban
-COPY logs/ /opt/logs
-COPY lua/ /opt/lua
-
-COPY prepare.sh /tmp/prepare.sh
-RUN chmod +x /tmp/prepare.sh && /tmp/prepare.sh && rm -f /tmp/prepare.sh
-
-# fix CVE-2021-20205
-RUN apk add "libjpeg-turbo>=2.1.0-r0"
-
-VOLUME /www /http-confs /server-confs /modsec-confs /modsec-crs-confs /cache /pre-server-confs /acme-challenge
-
-EXPOSE 8080/tcp 8443/tcp
-
-USER nginx:nginx
-
-ENTRYPOINT ["/opt/entrypoint/entrypoint.sh"]

Dockerfile-arm32v7

@@ -1,35 +0,0 @@
-FROM alpine AS builder
-
-ENV QEMU_URL https://github.com/balena-io/qemu/releases/download/v4.0.0%2Bbalena2/qemu-4.0.0.balena2-arm.tar.gz
-RUN apk add curl && curl -L ${QEMU_URL} | tar zxvf - -C . --strip-components 1
-
-FROM arm32v7/nginx:1.20.0-alpine
-
-COPY --from=builder qemu-arm-static /usr/bin
-
-COPY nginx-keys/ /tmp/nginx-keys
-COPY compile.sh /tmp/compile.sh
-RUN chmod +x /tmp/compile.sh && \
-    /tmp/compile.sh && \
-    rm -rf /tmp/*
-
-COPY entrypoint/ /opt/entrypoint
-COPY confs/ /opt/confs
-COPY scripts/ /opt/scripts
-COPY fail2ban/ /opt/fail2ban
-COPY logs/ /opt/logs
-COPY lua/ /opt/lua
-
-COPY prepare.sh /tmp/prepare.sh
-RUN chmod +x /tmp/prepare.sh && /tmp/prepare.sh && rm -f /tmp/prepare.sh
-
-# fix CVE-2021-20205
-RUN apk add "libjpeg-turbo>=2.1.0-r0"
-
-VOLUME /www /http-confs /server-confs /modsec-confs /modsec-crs-confs /cache /pre-server-confs /acme-challenge
-
-EXPOSE 8080/tcp 8443/tcp
-
-USER nginx:nginx
-
-ENTRYPOINT ["/opt/entrypoint/entrypoint.sh"]

Dockerfile-arm64v8

@@ -1,35 +0,0 @@
-FROM alpine AS builder
-
-ENV QEMU_URL https://github.com/balena-io/qemu/releases/download/v4.0.0%2Bbalena2/qemu-4.0.0.balena2-aarch64.tar.gz
-RUN apk add curl && curl -L ${QEMU_URL} | tar zxvf - -C . --strip-components 1
-
-FROM arm64v8/nginx:1.20.0-alpine
-
-COPY --from=builder qemu-aarch64-static /usr/bin
-
-COPY nginx-keys/ /tmp/nginx-keys
-COPY compile.sh /tmp/compile.sh
-RUN chmod +x /tmp/compile.sh && \
-    /tmp/compile.sh && \
-    rm -rf /tmp/*
-
-COPY entrypoint/ /opt/entrypoint
-COPY confs/ /opt/confs
-COPY scripts/ /opt/scripts
-COPY fail2ban/ /opt/fail2ban
-COPY logs/ /opt/logs
-COPY lua/ /opt/lua
-
-COPY prepare.sh /tmp/prepare.sh
-RUN chmod +x /tmp/prepare.sh && /tmp/prepare.sh && rm -f /tmp/prepare.sh
-
-# fix CVE-2021-20205
-RUN apk add "libjpeg-turbo>=2.1.0-r0"
-
-VOLUME /www /http-confs /server-confs /modsec-confs /modsec-crs-confs /cache /pre-server-confs /acme-challenge
-
-EXPOSE 8080/tcp 8443/tcp
-
-USER nginx:nginx
-
-ENTRYPOINT ["/opt/entrypoint/entrypoint.sh"]

Dockerfile-i386

@@ -1,28 +0,0 @@
-FROM i386/nginx:1.20.0-alpine
-
-COPY nginx-keys/ /tmp/nginx-keys
-COPY compile.sh /tmp/compile.sh
-RUN chmod +x /tmp/compile.sh && \
-    /tmp/compile.sh && \
-    rm -rf /tmp/*
-
-COPY entrypoint/ /opt/entrypoint
-COPY confs/ /opt/confs
-COPY scripts/ /opt/scripts
-COPY fail2ban/ /opt/fail2ban
-COPY logs/ /opt/logs
-COPY lua/ /opt/lua
-
-COPY prepare.sh /tmp/prepare.sh
-RUN chmod +x /tmp/prepare.sh && /tmp/prepare.sh && rm -f /tmp/prepare.sh
-
-# fix CVE-2021-20205
-RUN apk add "libjpeg-turbo>=2.1.0-r0"
-
-VOLUME /www /http-confs /server-confs /modsec-confs /modsec-crs-confs /cache /pre-server-confs /acme-challenge
-
-EXPOSE 8080/tcp 8443/tcp
-
-USER nginx:nginx
-
-ENTRYPOINT ["/opt/entrypoint/entrypoint.sh"]

LICENSE.md

@@ -0,0 +1,660 @@
+### GNU AFFERO GENERAL PUBLIC LICENSE
+
+Version 3, 19 November 2007
+
+Copyright (C) 2007 Free Software Foundation, Inc.
+<https://fsf.org/>
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+### Preamble
+
+The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains
+free software for all its users.
+
+When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate. Many developers of free software are heartened and
+encouraged by the resulting cooperation. However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community. It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server. Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals. This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing
+under this license.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+### TERMS AND CONDITIONS
+
+#### 0. Definitions.
+
+"This License" refers to version 3 of the GNU Affero General Public
+License.
+
+"Copyright" also means copyright-like laws that apply to other kinds
+of works, such as semiconductor masks.
+
+"The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of
+an exact copy. The resulting work is called a "modified version" of
+the earlier work or a work "based on" the earlier work.
+
+A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user
+through a computer network, with no transfer of a copy, is not
+conveying.
+
+An interactive user interface displays "Appropriate Legal Notices" to
+the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+#### 1. Source Code.
+
+The "source code" for a work means the preferred form of the work for
+making modifications to it. "Object code" means any non-source form of
+a work.
+
+A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users can
+regenerate automatically from other parts of the Corresponding Source.
+
+The Corresponding Source for a work in source code form is that same
+work.
+
+#### 2. Basic Permissions.
+
+All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+You may make, run and propagate covered works that you do not convey,
+without conditions so long as your license otherwise remains in force.
+You may convey covered works to others for the sole purpose of having
+them make modifications exclusively for you, or provide you with
+facilities for running those works, provided that you comply with the
+terms of this License in conveying all material for which you do not
+control copyright. Those thus making or running the covered works for
+you must do so exclusively on your behalf, under your direction and
+control, on terms that prohibit them from making any copies of your
+copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under the
+conditions stated below. Sublicensing is not allowed; section 10 makes
+it unnecessary.
+
+#### 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such
+circumvention is effected by exercising rights under this License with
+respect to the covered work, and you disclaim any intention to limit
+operation or modification of the work as a means of enforcing, against
+the work's users, your or third parties' legal rights to forbid
+circumvention of technological measures.
+
+#### 4. Conveying Verbatim Copies.
+
+You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+#### 5. Conveying Modified Source Versions.
+
+You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these
+conditions:
+
+-   a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+-   b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under
+    section 7. This requirement modifies the requirement in section 4
+    to "keep intact all notices".
+-   c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy. This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged. This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+-   d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+#### 6. Conveying Non-Source Forms.
+
+You may convey a covered work in object code form under the terms of
+sections 4 and 5, provided that you also convey the machine-readable
+Corresponding Source under the terms of this License, in one of these
+ways:
+
+-   a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+-   b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the Corresponding
+    Source from a network server at no charge.
+-   c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source. This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+-   d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge. You need not require recipients to copy the
+    Corresponding Source along with the object code. If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source. Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+-   e) Convey the object code using peer-to-peer transmission,
+    provided you inform other peers where the object code and
+    Corresponding Source of the work are being offered to the general
+    public at no charge under subsection 6d.
+
+A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal,
+family, or household purposes, or (2) anything designed or sold for
+incorporation into a dwelling. In determining whether a product is a
+consumer product, doubtful cases shall be resolved in favor of
+coverage. For a particular product received by a particular user,
+"normally used" refers to a typical or common use of that class of
+product, regardless of the status of the particular user or of the way
+in which the particular user actually uses, or expects or is expected
+to use, the product. A product is a consumer product regardless of
+whether the product has substantial commercial, industrial or
+non-consumer uses, unless such uses represent the only significant
+mode of use of the product.
+
+"Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to
+install and execute modified versions of a covered work in that User
+Product from a modified version of its Corresponding Source. The
+information must suffice to ensure that the continued functioning of
+the modified object code is in no case prevented or interfered with
+solely because modification has been made.
+
+If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or
+updates for a work that has been modified or installed by the
+recipient, or for the User Product in which it has been modified or
+installed. Access to a network may be denied when the modification
+itself materially and adversely affects the operation of the network
+or violates the rules and protocols for communication across the
+network.
+
+Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+#### 7. Additional Terms.
+
+"Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders
+of that material) supplement the terms of this License with terms:
+
+-   a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+-   b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+-   c) Prohibiting misrepresentation of the origin of that material,
+    or requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+-   d) Limiting the use for publicity purposes of names of licensors
+    or authors of the material; or
+-   e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+-   f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions
+    of it) with contractual assumptions of liability to the recipient,
+    for any liability that these contractual assumptions directly
+    impose on those licensors and authors.
+
+All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions; the
+above requirements apply either way.
+
+#### 8. Termination.
+
+You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+However, if you cease all violation of this License, then your license
+from a particular copyright holder is reinstated (a) provisionally,
+unless and until the copyright holder explicitly and finally
+terminates your license, and (b) permanently, if the copyright holder
+fails to notify you of the violation by some reasonable means prior to
+60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+#### 9. Acceptance Not Required for Having Copies.
+
+You are not required to accept this License in order to receive or run
+a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+#### 10. Automatic Licensing of Downstream Recipients.
+
+Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+#### 11. Patents.
+
+A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+A contributor's "essential patent claims" are all patent claims owned
+or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+A patent license is "discriminatory" if it does not include within the
+scope of its coverage, prohibits the exercise of, or is conditioned on
+the non-exercise of one or more of the rights that are specifically
+granted under this License. You may not convey a covered work if you
+are a party to an arrangement with a third party that is in the
+business of distributing software, under which you make payment to the
+third party based on the extent of your activity of conveying the
+work, and under which the third party grants, to any of the parties
+who would receive the covered work from you, a discriminatory patent
+license (a) in connection with copies of the covered work conveyed by
+you (or copies made from those copies), or (b) primarily for and in
+connection with specific products or compilations that contain the
+covered work, unless you entered into that arrangement, or that patent
+license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+#### 12. No Surrender of Others' Freedom.
+
+If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under
+this License and any other pertinent obligations, then as a
+consequence you may not convey it at all. For example, if you agree to
+terms that obligate you to collect a royalty for further conveying
+from those to whom you convey the Program, the only way you could
+satisfy both those terms and this License would be to refrain entirely
+from conveying the Program.
+
+#### 13. Remote Network Interaction; Use with the GNU General Public License.
+
+Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your
+version supports such interaction) an opportunity to receive the
+Corresponding Source of your version by providing access to the
+Corresponding Source from a network server at no charge, through some
+standard or customary means of facilitating copying of software. This
+Corresponding Source shall include the Corresponding Source for any
+work covered by version 3 of the GNU General Public License that is
+incorporated pursuant to the following paragraph.
+
+Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+#### 14. Revised Versions of this License.
+
+The Free Software Foundation may publish revised and/or new versions
+of the GNU Affero General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever
+published by the Free Software Foundation.
+
+If the Program specifies that a proxy can decide which future versions
+of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+#### 15. Disclaimer of Warranty.
+
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
+WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
+DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
+CORRECTION.
+
+#### 16. Limitation of Liability.
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
+CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
+NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
+LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
+TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
+PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+#### 17. Interpretation of Sections 15 and 16.
+
+If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+END OF TERMS AND CONDITIONS
+
+### How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these
+terms.
+
+To do so, attach the following notices to the program. It is safest to
+attach them to the start of each source file to most effectively state
+the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+        <one line to give the program's name and a brief idea of what it does.>
+        Copyright (C) <year>  <name of author>
+
+        This program is free software: you can redistribute it and/or modify
+        it under the terms of the GNU Affero General Public License as
+        published by the Free Software Foundation, either version 3 of the
+        License, or (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU Affero General Public License for more details.
+
+        You should have received a copy of the GNU Affero General Public License
+        along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper
+mail.
+
+If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source. For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code. There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for
+the specific requirements.
+
+You should also get your employer (if you work as a programmer) or
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. For more information on this, and how to apply and follow
+the GNU AGPL, see <https://www.gnu.org/licenses/>.

SECURITY.md

@@ -0,0 +1,17 @@
+# Security policy
+
+Even though this project is focused on security, it is still prone to possible vulnerabilities. We consider every security bug as a serious issue and will try our best to address it.
+
+## Responsible disclosure
+
+If you have found a security bug, please send us an email at security \[@\] bunkerity.com with technical details so we can resolve it as soon as possible.
+
+Here is a non-exhaustive list of issues we consider as high risk :
+- Vulnerability in the code
+- Bypass of a security feature
+- Vulnerability in a third-party dependency
+- Risk in the supply chain
+
+## Bounty
+
+To encourage responsible disclosure, we may reward you with a bounty at the sole discretion of the maintainers.

VERSION

@@ -1 +1 @@
-1.2.4
+1.4.1

api/API.py

@@ -0,0 +1,32 @@
+from requests import request
+
+class API :
+
+    def __init__(self, endpoint, host="bwapi") :
+        self.__endpoint = endpoint
+        self.__host = host
+
+    def get_endpoint(self) :
+        return self.__endpoint
+
+    def get_host(self) :
+        return self.__host
+
+    def request(self, method, url, data=None, files=None, timeout=(10, 30)) :
+        try :
+            headers = {}
+            headers["User-Agent"] = "bwapi"
+            headers["Host"] = self.__host
+            if type(data) is dict :
+                resp = request(method, self.__endpoint + url, json=data, timeout=timeout, headers=headers)
+            elif type(data) is bytes :
+                resp = request(method, self.__endpoint + url, data=data, timeout=timeout, headers=headers)
+            elif files is not None :
+                resp = request(method, self.__endpoint + url, files=files, timeout=timeout, headers=headers)
+            elif data is None :
+                resp = request(method, self.__endpoint + url, timeout=timeout, headers=headers)
+            else :
+                return False, "unsupported data type", None, None
+        except Exception as e :
+            return False, str(e), None, None
+        return True, "ok", resp.status_code, resp.json()

autoconf/AutoConf.py

@@ -1,131 +0,0 @@
-from Config import Config
-import utils
-import os
-
-class AutoConf :
-
-	def __init__(self, swarm, api) :
-		self.__swarm = swarm
-		self.__servers = {}
-		self.__instances = {}
-		self.__sites = {}
-		self.__config = Config(self.__swarm, api)
-
-	def get_server(self, id) :
-		if id in self.__servers :
-			return self.__servers[id]
-		return False
-
-	def reload(self) :
-		return self.__config.reload(self.__instances)
-
-	def pre_process(self, objs) :
-		for instance in objs :
-			(id, name, labels) = self.__get_infos(instance)
-			if "bunkerized-nginx.AUTOCONF" in labels :
-				if self.__swarm :
-					self.__process_instance(instance, "create", id, name, labels)
-				else :
-					if instance.status in ("restarting", "running", "created", "exited") :
-						self.__process_instance(instance, "create", id, name, labels)
-					if instance.status == "running" :
-						self.__process_instance(instance, "start", id, name, labels)
-
-		for server in objs :
-			(id, name, labels) = self.__get_infos(server)
-			if "bunkerized-nginx.SERVER_NAME" in labels :
-				if self.__swarm :
-					self.__process_server(server, "create", id, name, labels)
-				else :
-					if server.status in ("restarting", "running", "created", "exited") :
-						self.__process_server(server, "create", id, name, labels)
-					if server.status == "running" :
-						self.__process_server(server, "start", id, name, labels)
-
-	def process(self, obj, event) :
-		(id, name, labels) = self.__get_infos(obj)
-		if "bunkerized-nginx.AUTOCONF" in labels :
-			self.__process_instance(obj, event, id, name, labels)
-		elif "bunkerized-nginx.SERVER_NAME" in labels :
-			self.__process_server(obj, event, id, name, labels)
-
-	def __get_infos(self, obj) :
-		if self.__swarm :
-			id = obj.id
-			name = obj.name
-			labels = obj.attrs["Spec"]["Labels"]
-		else :
-			id = obj.id
-			name = obj.name
-			labels = obj.labels
-		return (id, name, labels)
-
-	def __process_instance(self, instance, event, id, name, labels) :
-		if event == "create" :
-			self.__instances[id] = instance
-			if self.__swarm and len(self.__instances) == 1 :
-				if self.__config.initconf(self.__instances) :
-					utils.log("[*] Initial config succeeded")
-				else :
-					utils.log("[!] Initial config failed")
-			utils.log("[*] bunkerized-nginx instance created : " + name + " / " + id)
-		elif event == "start" :
-			self.__instances[id].reload()
-			utils.log("[*] bunkerized-nginx instance started : " + name + " / " + id)
-		elif event == "die" :
-			self.__instances[id].reload()
-			utils.log("[*] bunkerized-nginx instance stopped : " + name + " / " + id)
-		elif event == "destroy" or event == "remove" :
-			del self.__instances[id]
-			if self.__swarm and len(self.__instances) == 0 :
-				with open("/etc/crontabs/nginx", "w") as f :
-					f.write("")
-				if os.path.exists("/etc/nginx/autoconf") :
-					os.remove("/etc/nginx/autoconf")
-			utils.log("[*] bunkerized-nginx instance removed : " + name + " / " + id)
-
-	def __process_server(self, instance, event, id, name, labels) :
-		vars = { k.replace("bunkerized-nginx.", "", 1) : v for k, v in labels.items() if k.startswith("bunkerized-nginx.")}
-		if event == "create" :
-			utils.log("[*] Generating config for " + vars["SERVER_NAME"] + " ...")
-			if self.__config.generate(self.__instances, vars) :
-				utils.log("[*] Generated config for " + vars["SERVER_NAME"])
-				self.__servers[id] = instance
-				if self.__swarm :
-					utils.log("[*] Activating config for " + vars["SERVER_NAME"] + " ...")
-					if self.__config.activate(self.__instances, vars) :
-						utils.log("[*] Activated config for " + vars["SERVER_NAME"])
-					else :
-						utils.log("[!] Can't activate config for " + vars["SERVER_NAME"])
-			else :
-				utils.log("[!] Can't generate config for " + vars["SERVER_NAME"])
-		elif event == "start" :
-			if id in self.__servers :
-				self.__servers[id].reload()
-				utils.log("[*] Activating config for " + vars["SERVER_NAME"] + " ...")
-				if self.__config.activate(self.__instances, vars) :
-					utils.log("[*] Activated config for " + vars["SERVER_NAME"])
-				else :
-					utils.log("[!] Can't activate config for " + vars["SERVER_NAME"])
-		elif event == "die" :
-			if id in self.__servers :
-				self.__servers[id].reload()
-				utils.log("[*] Deactivating config for " + vars["SERVER_NAME"])
-				if self.__config.deactivate(self.__instances, vars) :
-					utils.log("[*] Deactivated config for " + vars["SERVER_NAME"])
-				else :
-					utils.log("[!] Can't deactivate config for " + vars["SERVER_NAME"])
-		elif event == "destroy" or event == "remove" :
-			if id in self.__servers :
-				if self.__swarm :
-					utils.log("[*] Deactivating config for " + vars["SERVER_NAME"])
-					if self.__config.deactivate(self.__instances, vars) :
-						utils.log("[*] Deactivated config for " + vars["SERVER_NAME"])
-					else :
-						utils.log("[!] Can't deactivate config for " + vars["SERVER_NAME"])
-				del self.__servers[id]
-				utils.log("[*] Removing config for " + vars["SERVER_NAME"])
-				if self.__config.remove(vars) :
-					utils.log("[*] Removed config for " + vars["SERVER_NAME"])
-				else :
-					utils.log("[!] Can't remove config for " + vars["SERVER_NAME"])

autoconf/Config.py

@@ -1,209 +1,217 @@
-#!/usr/bin/python3
+from traceback import format_exc
+from threading import Thread, Lock
+from time import sleep
+from subprocess import run, DEVNULL, STDOUT
+from glob import glob
+from shutil import rmtree
+from os import makedirs
+from os.path import dirname
+from json import loads
 
-import utils
+from API import API
-import subprocess, shutil, os, traceback, requests, time
+from JobScheduler import JobScheduler
+from ApiCaller import ApiCaller
+from ConfigCaller import ConfigCaller
+from logger import log
 
-class Config :
+class Config(ApiCaller, ConfigCaller) :
 
-	def __init__(self, swarm, api) :
+    def __init__(self, ctrl_type, lock=None) :
-		self.__swarm = swarm
+        ApiCaller.__init__(self)
-		self.__api = api
+        ConfigCaller.__init__(self)
+        self.__ctrl_type = ctrl_type
+        self.__lock = lock
+        self.__instances = []
+        self.__services = []
+        self.__configs = []
+        self.__config = {}
+        self.__scheduler = None
+        self.__scheduler_thread = None
+        self.__schedule = False
+        self.__schedule_lock = Lock()
 
+    def __get_full_env(self) :
+        env_instances = {}
+        for instance in self.__instances :
+            for variable, value in instance["env"].items() :
+                env_instances[variable] = value
+        env_services = {}
+        if not "SERVER_NAME" in env_instances :
+            env_instances["SERVER_NAME"] = ""
+        for service in self.__services :
+            for variable, value in service.items() :
+                env_services[service["SERVER_NAME"].split(" ")[0] + "_" + variable] = value
+            if env_instances["SERVER_NAME"] != "" :
+                env_instances["SERVER_NAME"] += " "
+            env_instances["SERVER_NAME"] += service["SERVER_NAME"].split(" ")[0]
+        return self._full_env(env_instances, env_services)
 
-	def initconf(self, instances) :
+    def __scheduler_run_pending(self) :
-		try :
+        schedule = True
-			for instance_id, instance in instances.items() :
+        while schedule :
-				env = instance.attrs["Spec"]["TaskTemplate"]["ContainerSpec"]["Env"]
+            self.__scheduler.run_pending()
-				break
+            sleep(1)
-			vars = {}
+            self.__schedule_lock.acquire()
-			for var_value in env :
+            schedule = self.__schedule
-				var = var_value.split("=")[0]
+            self.__schedule_lock.release()
-				value = var_value.replace(var + "=", "", 1)
-				vars[var] = value
 
-			utils.log("[*] Generating global config ...")
+    def update_needed(self, instances, services, configs=None) :
-			if not self.globalconf(instances) :
+        if instances != self.__instances :
-				utils.log("[!] Can't generate global config")
+            return True
-				return False
+        if services != self.__services :
-			utils.log("[*] Generated global config")
+            return True
+        if configs is not None and configs != self.__configs :
+            return True
+        return False
 
-			if "SERVER_NAME" in vars and vars["SERVER_NAME"] != "" :
+    def __get_config(self) :
-				for server in vars["SERVER_NAME"].split(" ") :
+        config = {}
-					vars_site = vars.copy()
+        # extract instances variables
-					vars_site["SERVER_NAME"] = server
+        for instance in self.__instances :
-					utils.log("[*] Generating config for " + vars["SERVER_NAME"] + " ...")
+            for variable, value in instance["env"].items() :
-					if not self.generate(instances, vars_site) or not self.activate(instances, vars_site, reload=False) :
+                config[variable] = value
-						utils.log("[!] Can't generate/activate site config for " + server)
+        # extract services variables
-						return False
+        server_names = []
-					utils.log("[*] Generated config for " + vars["SERVER_NAME"])
+        for service in self.__services :
-			with open("/etc/nginx/autoconf", "w") as f :
+            first_server = service["SERVER_NAME"].split(" ")[0]
-				f.write("ok")
+            server_names.append(first_server)
+            for variable, value in service.items() :
+                config[first_server + "_" + variable] = value
+        config["SERVER_NAME"] = " ".join(server_names)
+        return config
 
-			utils.log("[*] Waiting for bunkerized-nginx tasks ...")
+    def __get_apis(self) :
-			i = 1
+        apis = []
-			started = False
+        for instance in self.__instances :
-			while i <= 10 :
+            endpoint = "http://" + instance["hostname"] + ":5000"
-				time.sleep(i)
+            host = "bwapi"
-				if self.__ping(instances) :
+            if "API_SERVER_NAME" in instance["env"] :
-					started = True
+                host = instance["env"]["API_SERVER_NAME"]
-					break
+            apis.append(API(endpoint, host=host))
-				i = i + 1
+        return apis
-				utils.log("[!] Waiting " + str(i) + " seconds before retrying to contact bunkerized-nginx tasks")
-			if started :
-				utils.log("[*] bunkerized-nginx tasks started")
-				proc = subprocess.run(["/bin/su", "-s", "/opt/entrypoint/jobs.sh", "nginx"], env=vars, capture_output=True)
-				return proc.returncode == 0
-			else :
-				utils.log("[!] bunkerized-nginx tasks are not started")
-		except Exception as e :
-			utils.log("[!] Error while initializing config : " + str(e))
-		return False
 
-	def globalconf(self, instances) :
+    def __write_configs(self) :
-		try :
+        ret = True
-			for instance_id, instance in instances.items() :
+        for config_type in self.__configs :
-				env = instance.attrs["Spec"]["TaskTemplate"]["ContainerSpec"]["Env"]
+            rmtree("/data/configs/" + config_type)
-				break
+            makedirs("/data/configs/" + config_type, exist_ok=True)
-			vars = {}
+            for file, data in self.__configs[config_type].items() :
-			for var_value in env :
+                path = "/data/configs/" + config_type + "/" + file
-				var = var_value.split("=")[0]
+                if not path.endswith(".conf") :
-				value = var_value.replace(var + "=", "", 1)
+                    path += ".conf"
-				vars[var] = value
+                makedirs(dirname(path), exist_ok=True)
-			proc = subprocess.run(["/bin/su", "-s", "/opt/entrypoint/global-config.sh", "nginx"], env=vars, capture_output=True)
+                try :
-			if proc.returncode == 0 :
+                    mode = "w"
-				return True
+                    if type(data) is bytes :
-			else :
+                        mode = "wb"
-				utils.log("[*] Error while generating global config : return code = " + str(proc.returncode))
+                    with open(path, mode) as f :
-		except Exception as e :
+                        f.write(data)
-			utils.log("[!] Exception while generating global config : " + str(e))
+                except :
-		return False
+                    print(format_exc())
+                    log("CONFIG", "❌", "Can't save file " + path)
+                    ret = False
+        return ret
 
-	def generate(self, instances, vars) :
+    def apply(self, instances, services, configs=None) :
-		try :
-			# Get env vars from bunkerized-nginx instances
-			vars_instances = {}
-			for instance_id, instance in instances.items() :
-				if self.__swarm :
-					env = instance.attrs["Spec"]["TaskTemplate"]["ContainerSpec"]["Env"]
-				else :
-					env = instance.attrs["Config"]["Env"]
-				for var_value in env :
-					var = var_value.split("=")[0]
-					value = var_value.replace(var + "=", "", 1)
-					vars_instances[var] = value
-			vars_defaults = vars.copy()
-			vars_defaults.update(vars_instances)
-			vars_defaults.update(vars)
-			# Call site-config.sh to generate the config
-			proc = subprocess.run(["/bin/su", "-s", "/bin/sh", "-c", "/opt/entrypoint/site-config.sh" + " \"" + vars["SERVER_NAME"] + "\"", "nginx"], env=vars_defaults, capture_output=True)
-			if proc.returncode == 0 and vars_defaults["MULTISITE"] == "yes" and self.__swarm :
-				proc = subprocess.run(["/bin/su", "-s", "/opt/entrypoint/multisite-config.sh", "nginx"], env=vars_defaults, capture_output=True)
-			if proc.returncode == 0 :
-				return True
-			utils.log("[!] Error while generating site config for " + vars["SERVER_NAME"] + "  : return code = " + str(proc.returncode))
-		except Exception as e :
-			utils.log("[!] Exception while generating site config : " + str(e))
-		return False
 
-	def activate(self, instances, vars, reload=True) :
+        success = True
-		try :
-			# Get first server name
-			first_server_name = vars["SERVER_NAME"].split(" ")[0]
 
-			# Check if file exists
+        # stop scheduler just in case caller didn't do it
-			if not os.path.isfile("/etc/nginx/" + first_server_name + "/server.conf") :
+        self.stop_scheduler()
-				utils.log("[!] /etc/nginx/" + first_server_name + "/server.conf doesn't exist")
-				return False
 
-			# Include the server conf
+        # update values
-			utils.replace_in_file("/etc/nginx/nginx.conf", "}", "include /etc/nginx/" + first_server_name + "/server.conf;\n}")
+        # order here is important :
+        # __get_scheduler needs apis
+        # __get_apis needs __config
+        # __get_full_env needs __instances and __services
+        self.__instances = instances
+        self.__services = services
+        self.__configs = configs
+        self.__config = self.__get_full_env()
+        self._set_apis(self.__get_apis())
 
-			# Reload
+        # write configs
-			if not reload or self.reload(instances) :
+        ret = self.__write_configs()
-				return True
+        if not ret :
+            success = False
+            log("CONFIG", "❌", "saving custom configs failed, configuration will not work as expected...")
 
-		except Exception as e :
+        # get env
-			utils.log("[!] Exception while activating config : " + str(e))
+        env = self.__get_full_env()
 
-		return False
+        # run jobs once
+        i = 1
+        for instance in self.__instances :
+            endpoint = "http://" + instance["hostname"] + ":5000"
+            host = "bwapi"
+            if "API_SERVER_NAME" in instance["env"] :
+                host = instance["env"]["API_SERVER_NAME"]
+            env["CLUSTER_INSTANCE_" + str(i)] = endpoint + " " + host
+            i += 1
+        if self.__scheduler is None :
+            self.__scheduler = JobScheduler(env=env, lock=self.__lock, apis=self._get_apis())
+        ret = self.__scheduler.reload(env)
+        if not ret :
+            success = False
+            log("CONFIG", "❌", "scheduler.reload() failed, configuration will not work as expected...")
         
-	def deactivate(self, instances, vars) :
+        # write config to /tmp/variables.env
-		try :
+        with open("/tmp/variables.env", "w") as f :
-			# Get first server name
+            for variable, value in self.__config.items() :
-			first_server_name = vars["SERVER_NAME"].split(" ")[0]
+                f.write(variable + "=" + value + "\n")
 
-			# Check if file exists
+        # run the generator
-			if not os.path.isfile("/etc/nginx/" + first_server_name + "/server.conf") :
+        cmd = "python /opt/bunkerweb/gen/main.py --settings /opt/bunkerweb/settings.json --templates /opt/bunkerweb/confs --output /etc/nginx --variables /tmp/variables.env"
-				utils.log("[!] /etc/nginx/" + first_server_name + "/server.conf doesn't exist")
+        proc = run(cmd.split(" "), stdin=DEVNULL, stderr=STDOUT)
-				return False
+        if proc.returncode != 0 :
+            success = False
+            log("CONFIG", "❌", "config generator failed, configuration will not work as expected...")
+        cmd = "chown -R root:101 /etc/nginx"
+        run(cmd.split(" "), stdin=DEVNULL, stdout=DEVNULL, stderr=STDOUT)
+        cmd = "chmod -R 770 /etc/nginx" 
+        run(cmd.split(" "), stdin=DEVNULL, stdout=DEVNULL, stderr=STDOUT)
 
-			# Remove the include
+        # send nginx configs
-			utils.replace_in_file("/etc/nginx/nginx.conf", "include /etc/nginx/" + first_server_name + "/server.conf;\n", "")
+        # send data folder
+        # reload nginx
+        ret = self._send_files("/etc/nginx", "/confs")
+        if not ret :
+            success = False
+            log("CONFIG", "❌", "sending nginx configs failed, configuration will not work as expected...")
+        ret = self._send_files("/data", "/data")
+        if not ret :
+            success = False
+            log("CONFIG", "❌", "sending custom configs failed, configuration will not work as expected...")   
+        ret = self._send_to_apis("POST", "/reload")
+        if not ret :
+            success = False
+            log("CONFIG", "❌", "reload failed, configuration will not work as expected...")
 
-			# Reload
+        return success
-			if self.reload(instances) :
-				return True
 
-		except Exception as e :
+    def start_scheduler(self) :
-			utils.log("[!] Exception while deactivating config : " + str(e))
+        if self.__scheduler_thread is not None and self.__scheduler_thread.is_alive() :
+            raise Exception("scheduler is already running, can't run it twice")
+        self.__schedule = True
+        self.__scheduler_thread = Thread(target=self.__scheduler_run_pending)
+        self.__scheduler_thread.start()
 
-		return False
+    def stop_scheduler(self) :
+        if self.__scheduler_thread is not None and self.__scheduler_thread.is_alive() :
+            self.__schedule_lock.acquire()
+            self.__schedule = False
+            self.__schedule_lock.release()
+            self.__scheduler_thread.join()
+            self.__scheduler_thread = None
 
-	def remove(self, vars) :
+    def reload_scheduler(self, env) :
-		try :
+        if self.__scheduler_thread is None :
-			# Get first server name
+            return self.__scheduler.reload(env=env, apis=self._get_apis())
-			first_server_name = vars["SERVER_NAME"].split(" ")[0]
 
-			# Check if file exists
+    def __get_scheduler(self, env) :
-			if not os.path.isfile("/etc/nginx/" + first_server_name + "/server.conf") :
+        self.__schedule_lock.acquire()
-				utils.log("[!] /etc/nginx/" + first_server_name + "/server.conf doesn't exist")
+        if self.__schedule :
-				return False
+            self.__schedule_lock.release()
-
+            raise Exception("can't create new scheduler, old one is still running...")
-			# Remove the folder
+        self.__schedule_lock.release()
-			shutil.rmtree("/etc/nginx/" + first_server_name)
+        return JobScheduler(env=env, lock=self.__lock, apis=self._get_apis())
-			return True
-		except Exception as e :
-			utils.log("[!] Error while deactivating config : " + str(e))
-
-		return False
-
-	def reload(self, instances) :
-		return self.__api_call(instances, "/reload")
-
-	def __ping(self, instances) :
-		return self.__api_call(instances, "/ping")
-
-	def __api_call(self, instances, path) :
-		ret = True
-		for instance_id, instance in instances.items() :
-			# Reload the instance object just in case
-			instance.reload()
-			# Reload via API
-			if self.__swarm :
-				# Send POST request on http://serviceName.NodeID.TaskID:8000/action
-				name = instance.name
-				for task in instance.tasks() :
-					if task["Status"]["State"] != "running" :
-						continue
-					nodeID = task["NodeID"]
-					taskID = task["ID"]
-					fqdn = name + "." + nodeID + "." + taskID
-					req = False
-					try :
-						req = requests.post("http://" + fqdn + ":8080" + self.__api + path)
-					except :
-						pass
-					if req and req.status_code == 200 :
-						utils.log("[*] Sent API order " + path + " to instance " + fqdn + " (service.node.task)")
-					else :
-						utils.log("[!] Can't send API order " + path + " to instance " + fqdn + " (service.node.task)")
-						ret = False
-			# Send SIGHUP to running instance
-			elif instance.status == "running" :
-				try :
-					instance.kill("SIGHUP")
-					utils.log("[*] Sent SIGHUP signal to bunkerized-nginx instance " + instance.name + " / " + instance.id)
-				except docker.errors.APIError as e :
-					utils.log("[!] Docker error while sending SIGHUP signal : " + str(e))
-					ret = False
-		return ret

autoconf/Controller.py

@@ -0,0 +1,79 @@
+from abc import ABC, abstractmethod
+from time import sleep
+
+from Config import Config
+
+from logger import log
+
+class Controller(ABC) :
+
+    def __init__(self, ctrl_type, lock=None) :
+        self._type = ctrl_type
+        self._instances = []
+        self._services = []
+        self._supported_config_types = ["http", "stream", "server-http", "server-stream", "default-server-http", "modsec", "modsec-crs"]
+        self._configs = {}
+        for config_type in self._supported_config_types :
+            self._configs[config_type] = {}
+        self._config = Config(ctrl_type, lock)
+
+    def wait(self, wait_time) :
+        while True :
+            self._instances = self.get_instances()
+            if len(self._instances) == 0 :
+                log("CONTROLLER", "⚠️", "No instance found, waiting " + str(wait_time) + "s ...")
+                sleep(wait_time)
+                continue
+            all_ready = True
+            for instance in self._instances :
+                if not instance["health"] :
+                    log("CONTROLLER", "⚠️", "Instance " + instance["name"] + " is not ready, waiting " + str(wait_time) + "s ...")
+                    sleep(wait_time)
+                    all_ready = False
+                    break
+            if all_ready :
+                break
+        return self._instances
+
+    @abstractmethod
+    def _get_controller_instances(self) :
+        pass
+        
+    @abstractmethod
+    def _to_instances(self, controller_instance) :
+        pass
+
+    def get_instances(self) :
+        instances = []
+        for controller_instance in self._get_controller_instances() :
+            for instance in self._to_instances(controller_instance) :
+                instances.append(instance)
+        return instances
+
+    @abstractmethod
+    def _get_controller_services(self) :
+        pass
+    
+    @abstractmethod
+    def _to_services(self, controller_service) :
+        pass
+
+    def get_services(self) :
+        services = []
+        for controller_service in self._get_controller_services() :
+            for service in self._to_services(controller_service) :
+                services.append(service)
+        return services
+
+    @abstractmethod
+    def get_configs(self) :
+        pass
+
+    @abstractmethod
+    def apply_config(self) :
+        pass
+        
+
+    @abstractmethod
+    def process_events(self) :
+        pass

autoconf/DockerController.py

@@ -0,0 +1,63 @@
+import traceback
+
+from docker import DockerClient
+
+from Controller import Controller
+from logger import log
+
+class DockerController(Controller) :
+
+    def __init__(self, docker_host) :
+        super().__init__("docker")
+        self.__client = DockerClient(base_url=docker_host)
+
+    def _get_controller_instances(self) :
+        return self.__client.containers.list(filters={"label" : "bunkerweb.AUTOCONF"})
+        
+    def _to_instances(self, controller_instance) :
+        instance = {}
+        instance["name"] = controller_instance.name
+        instance["hostname"] = controller_instance.name
+        instance["health"] = controller_instance.status == "running" and controller_instance.attrs["State"]["Health"]["Status"] == "healthy"
+        instance["env"] = {}
+        for env in controller_instance.attrs["Config"]["Env"] :
+            variable = env.split("=")[0]
+            if variable in ["PATH", "NGINX_VERSION", "NJS_VERSION", "PKG_RELEASE"] :
+                continue
+            value = env.replace(variable + "=", "", 1)
+            instance["env"][variable] = value
+        return [instance]
+
+    def _get_controller_services(self) :
+        return self.__client.containers.list(filters={"label" : "bunkerweb.SERVER_NAME"})
+        
+    def _to_services(self, controller_service) :
+        service = {}
+        for variable, value in controller_service.labels.items() :
+            if not variable.startswith("bunkerweb.") :
+                continue
+            service[variable.replace("bunkerweb.", "", 1)] = value
+        return [service]
+
+    def get_configs(self) :
+        raise("get_configs is not supported with DockerController")
+
+    def apply_config(self) :
+        return self._config.apply(self._instances, self._services, configs=self._configs)
+
+    def process_events(self) :
+        for event in self.__client.events(decode=True, filters={"type": "container"}) :
+            self._instances = self.get_instances()
+            self._services = self.get_services()
+            if not self._config.update_needed(self._instances, self._services) :
+                continue
+            log("DOCKER-CONTROLLER", "ℹ️", "Catched docker event, deploying new configuration ...")
+            try :
+                ret = self.apply_config()
+                if not ret :
+                    log("DOCKER-CONTROLLER", "❌", "Error while deploying new configuration")
+                else :
+                    log("DOCKER-CONTROLLER", "ℹ️", "Successfully deployed new configuration 🚀")
+            except :
+                log("DOCKER-CONTROLLER", "❌", "Exception while deploying new configuration :")
+                print(traceback.format_exc())

autoconf/Dockerfile

@@ -1,45 +1,54 @@
-FROM nginx:stable-alpine AS builder
+FROM python:3-alpine
 
-FROM alpine
+# Install dependencies
+COPY deps/requirements.txt /opt/bunkerweb/deps/requirements.txt
+RUN apk add --no-cache --virtual build gcc python3-dev musl-dev libffi-dev openssl-dev cargo && \
+        mkdir /opt/bunkerweb/deps/python && \
+        pip install --no-cache-dir --require-hashes --target /opt/bunkerweb/deps/python -r /opt/bunkerweb/deps/requirements.txt && \
+        apk del build
 
-COPY --from=builder /etc/nginx/ /opt/confs/nginx
+# Copy files
+# can't exclude specific files/dir from . so we are copying everything by hand
+COPY api /opt/bunkerweb/api
+COPY cli /opt/bunkerweb/cli
+COPY confs /opt/bunkerweb/confs
+COPY core /opt/bunkerweb/core
+COPY gen /opt/bunkerweb/gen
+COPY helpers /opt/bunkerweb/helpers
+COPY job /opt/bunkerweb/job
+COPY utils /opt/bunkerweb/utils
+COPY settings.json /opt/bunkerweb/settings.json
+COPY VERSION /opt/bunkerweb/VERSION
+COPY autoconf /opt/bunkerweb/autoconf
 
-RUN apk add py3-pip apache2-utils bash certbot curl logrotate openssl && \
+# Add nginx user, drop bwcli, setup data folders, permissions and logging
-    pip3 install docker requests && \
+RUN apk add --no-cache git && \
-    mkdir /opt/entrypoint && \
+    ln -s /usr/local/bin/python3 /usr/bin/python3 && \
-    mkdir -p /opt/confs/site && \
-    mkdir -p /opt/confs/global && \
-    mkdir /opt/scripts && \
     addgroup -g 101 nginx && \
-    adduser -h /var/cache/nginx -g nginx -s /sbin/nologin -G nginx -D -H -u 101 nginx && \
+    adduser -h /var/cache/nginx -g nginx -s /bin/sh -G nginx -D -H -u 101 nginx && \
-    mkdir /etc/letsencrypt && \
+    apk add --no-cache bash && \
-    chown root:nginx /etc/letsencrypt && \
+    cp /opt/bunkerweb/helpers/bwcli /usr/local/bin && \
-    chmod 770 /etc/letsencrypt && \
+    mkdir /opt/bunkerweb/configs && \
-    mkdir /var/log/letsencrypt && \
+    for dir in $(echo "cache configs configs/http configs/stream configs/server-http configs/server-stream configs/default-server-http configs/default-server-stream configs/modsec configs/modsec-crs letsencrypt plugins www") ; do ln -s "/data/${dir}" "/opt/bunkerweb/${dir}" ; done && \
-    chown root:nginx /var/log/letsencrypt && \
+    mkdir /opt/bunkerweb/tmp && \
-    chmod 770 /var/log/letsencrypt && \
+    chown -R root:nginx /opt/bunkerweb && \
-    mkdir /var/lib/letsencrypt && \
+    find /opt/bunkerweb -type f -exec chmod 0740 {} \; && \
-    chown root:nginx /var/lib/letsencrypt && \
+    find /opt/bunkerweb -type d -exec chmod 0750 {} \; && \
-    chmod 770 /var/lib/letsencrypt && \
+    chmod 770 /opt/bunkerweb/tmp && \
-    mkdir /cache && \
+    chmod 750 /opt/bunkerweb/gen/main.py /opt/bunkerweb/job/main.py /opt/bunkerweb/cli/main.py /usr/local/bin/bwcli /opt/bunkerweb/helpers/*.sh /opt/bunkerweb/autoconf/main.py /opt/bunkerweb/deps/python/bin/* && \
-    chown root:nginx /cache && \
+    find /opt/bunkerweb/core/*/jobs/* -type f -exec chmod 750 {} \; && \
-    chmod 770 /cache && \
+    chown root:nginx /usr/local/bin/bwcli && \
-    touch /var/log/jobs.log && \
+    mkdir /etc/nginx && \
-    chown root:nginx /var/log/jobs.log && \
+    chown -R nginx:nginx /etc/nginx && \
-    chmod 770 /var/log/jobs.log && \
+    chmod -R 770 /etc/nginx && \
-    chown -R root:nginx /opt/confs/nginx && \
+    ln -s /data/letsencrypt /etc/letsencrypt && \
-    chmod -R 770 /opt/confs/nginx && \
+    mkdir /var/log/letsencrypt /var/lib/letsencrypt && \
-    mkdir /acme-challenge && \
+    chown root:nginx /var/log/letsencrypt /var/lib/letsencrypt && \
-    chown root:nginx /acme-challenge && \
+    chmod 770 /var/log/letsencrypt /var/lib/letsencrypt && \
-    chmod 770 /acme-challenge
+    ln -s /proc/1/fd/1 /var/log/letsencrypt/letsencrypt.log
 
+VOLUME /data /etc/nginx
 
-COPY autoconf/misc/logrotate.conf /etc/logrotate.conf
+WORKDIR /opt/bunkerweb/autoconf
-COPY scripts/* /opt/scripts/
-COPY confs/site/ /opt/confs/site
-COPY confs/global/ /opt/confs/global
-COPY entrypoint/* /opt/entrypoint/
-COPY autoconf/* /opt/entrypoint/
-RUN chmod +x /opt/entrypoint/*.py /opt/entrypoint/*.sh /opt/scripts/*.sh
 
-ENTRYPOINT ["/opt/entrypoint/entrypoint.sh"]
+CMD ["python", "/opt/bunkerweb/autoconf/main.py"]

autoconf/Dockerfile-amd64

@@ -1,44 +0,0 @@
-FROM nginx:stable-alpine AS builder
-
-FROM amd64/alpine
-
-COPY --from=builder /etc/nginx/ /opt/confs/nginx
-
-RUN apk add py3-pip apache2-utils bash certbot curl logrotate openssl && \
-    pip3 install docker requests && \
-    mkdir /opt/entrypoint && \
-    mkdir -p /opt/confs/site && \
-    mkdir -p /opt/confs/global && \
-    mkdir /opt/scripts && \
-    addgroup -g 101 nginx && \
-    adduser -h /var/cache/nginx -g nginx -s /sbin/nologin -G nginx -D -H -u 101 nginx && \
-    mkdir /etc/letsencrypt && \
-    chown root:nginx /etc/letsencrypt && \
-    chmod 770 /etc/letsencrypt && \
-    mkdir /var/log/letsencrypt && \
-    chown root:nginx /var/log/letsencrypt && \
-    chmod 770 /var/log/letsencrypt && \
-    mkdir /var/lib/letsencrypt && \
-    chown root:nginx /var/lib/letsencrypt && \
-    chmod 770 /var/lib/letsencrypt && \
-    mkdir /cache && \
-    chown root:nginx /cache && \
-    chmod 770 /cache && \
-    touch /var/log/jobs.log && \
-    chown root:nginx /var/log/jobs.log && \
-    chmod 770 /var/log/jobs.log && \
-    chown -R root:nginx /opt/confs/nginx && \
-    chmod -R 770 /opt/confs/nginx && \
-    mkdir /acme-challenge && \
-    chown root:nginx /acme-challenge && \
-    chmod 770 /acme-challenge
-
-COPY autoconf/misc/logrotate.conf /etc/logrotate.conf
-COPY scripts/* /opt/scripts/
-COPY confs/global/ /opt/confs/global
-COPY confs/site/ /opt/confs/site
-COPY entrypoint/* /opt/entrypoint/
-COPY autoconf/* /opt/entrypoint/
-RUN chmod +x /opt/entrypoint/*.py /opt/entrypoint/*.sh /opt/scripts/*.sh
-
-ENTRYPOINT ["/opt/entrypoint/entrypoint.sh"]

autoconf/Dockerfile-arm32v7

@@ -1,50 +0,0 @@
-FROM alpine AS builder
-
-ENV QEMU_URL https://github.com/balena-io/qemu/releases/download/v4.0.0%2Bbalena2/qemu-4.0.0.balena2-arm.tar.gz
-RUN apk add curl && curl -L ${QEMU_URL} | tar zxvf - -C . --strip-components 1
-
-FROM nginx:stable-alpine AS builder2
-
-FROM arm32v7/alpine
-
-COPY --from=builder qemu-arm-static /usr/bin
-COPY --from=builder2 /etc/nginx/ /opt/confs/nginx
-
-RUN apk add py3-pip apache2-utils bash certbot curl logrotate openssl && \
-    pip3 install docker requests && \
-    mkdir /opt/entrypoint && \
-    mkdir -p /opt/confs/site && \
-    mkdir -p /opt/confs/global && \
-    mkdir /opt/scripts && \
-    addgroup -g 101 nginx && \
-    adduser -h /var/cache/nginx -g nginx -s /sbin/nologin -G nginx -D -H -u 101 nginx && \
-    mkdir /etc/letsencrypt && \
-    chown root:nginx /etc/letsencrypt && \
-    chmod 770 /etc/letsencrypt && \
-    mkdir /var/log/letsencrypt && \
-    chown root:nginx /var/log/letsencrypt && \
-    chmod 770 /var/log/letsencrypt && \
-    mkdir /var/lib/letsencrypt && \
-    chown root:nginx /var/lib/letsencrypt && \
-    chmod 770 /var/lib/letsencrypt && \
-    mkdir /cache && \
-    chown root:nginx /cache && \
-    chmod 770 /cache && \
-    touch /var/log/jobs.log && \
-    chown root:nginx /var/log/jobs.log && \
-    chmod 770 /var/log/jobs.log && \
-    chown -R root:nginx /opt/confs/nginx && \
-    chmod -R 770 /opt/confs/nginx && \
-    mkdir /acme-challenge && \
-    chown root:nginx /acme-challenge && \
-    chmod 770 /acme-challenge
-
-COPY autoconf/misc/logrotate.conf /etc/logrotate.conf
-COPY scripts/* /opt/scripts/
-COPY confs/global/ /opt/confs/global
-COPY confs/site/ /opt/confs/site
-COPY entrypoint/* /opt/entrypoint/
-COPY autoconf/* /opt/entrypoint/
-RUN chmod +x /opt/entrypoint/*.py /opt/entrypoint/*.sh /opt/scripts/*.sh
-
-ENTRYPOINT ["/opt/entrypoint/entrypoint.sh"]

autoconf/Dockerfile-arm64v8

@@ -1,50 +0,0 @@
-FROM alpine AS builder
-
-ENV QEMU_URL https://github.com/balena-io/qemu/releases/download/v4.0.0%2Bbalena2/qemu-4.0.0.balena2-aarch64.tar.gz
-RUN apk add curl && curl -L ${QEMU_URL} | tar zxvf - -C . --strip-components 1
-
-FROM nginx:stable-alpine AS builder2
-
-FROM arm64v8/alpine
-
-COPY --from=builder qemu-aarch64-static /usr/bin
-COPY --from=builder2 /etc/nginx/ /opt/confs/nginx
-
-RUN apk add py3-pip apache2-utils bash certbot curl logrotate openssl && \
-    pip3 install docker requests && \
-    mkdir /opt/entrypoint && \
-    mkdir -p /opt/confs/site && \
-    mkdir -p /opt/confs/global && \
-    mkdir /opt/scripts && \
-    addgroup -g 101 nginx && \
-    adduser -h /var/cache/nginx -g nginx -s /sbin/nologin -G nginx -D -H -u 101 nginx && \
-    mkdir /etc/letsencrypt && \
-    chown root:nginx /etc/letsencrypt && \
-    chmod 770 /etc/letsencrypt && \
-    mkdir /var/log/letsencrypt && \
-    chown root:nginx /var/log/letsencrypt && \
-    chmod 770 /var/log/letsencrypt && \
-    mkdir /var/lib/letsencrypt && \
-    chown root:nginx /var/lib/letsencrypt && \
-    chmod 770 /var/lib/letsencrypt && \
-    mkdir /cache && \
-    chown root:nginx /cache && \
-    chmod 770 /cache && \
-    touch /var/log/jobs.log && \
-    chown root:nginx /var/log/jobs.log && \
-    chmod 770 /var/log/jobs.log && \
-    chown -R root:nginx /opt/confs/nginx && \
-    chmod -R 770 /opt/confs/nginx && \
-    mkdir /acme-challenge && \
-    chown root:nginx /acme-challenge && \
-    chmod 770 /acme-challenge
-
-COPY autoconf/misc/logrotate.conf /etc/logrotate.conf
-COPY scripts/* /opt/scripts/
-COPY confs/global/ /opt/confs/global
-COPY confs/site/ /opt/confs/site
-COPY entrypoint/* /opt/entrypoint/
-COPY autoconf/* /opt/entrypoint/
-RUN chmod +x /opt/entrypoint/*.py /opt/entrypoint/*.sh /opt/scripts/*.sh
-
-ENTRYPOINT ["/opt/entrypoint/entrypoint.sh"]

autoconf/Dockerfile-i386

@@ -1,44 +0,0 @@
-FROM nginx:stable-alpine AS builder
-
-FROM i386/alpine
-
-COPY --from=builder /etc/nginx/ /opt/confs/nginx
-
-RUN apk add py3-pip apache2-utils bash certbot curl logrotate openssl && \
-    pip3 install docker requests && \
-    mkdir /opt/entrypoint && \
-    mkdir -p /opt/confs/site && \
-    mkdir -p /opt/confs/global && \
-    mkdir /opt/scripts && \
-    addgroup -g 101 nginx && \
-    adduser -h /var/cache/nginx -g nginx -s /sbin/nologin -G nginx -D -H -u 101 nginx && \
-    mkdir /etc/letsencrypt && \
-    chown root:nginx /etc/letsencrypt && \
-    chmod 770 /etc/letsencrypt && \
-    mkdir /var/log/letsencrypt && \
-    chown root:nginx /var/log/letsencrypt && \
-    chmod 770 /var/log/letsencrypt && \
-    mkdir /var/lib/letsencrypt && \
-    chown root:nginx /var/lib/letsencrypt && \
-    chmod 770 /var/lib/letsencrypt && \
-    mkdir /cache && \
-    chown root:nginx /cache && \
-    chmod 770 /cache && \
-    touch /var/log/jobs.log && \
-    chown root:nginx /var/log/jobs.log && \
-    chmod 770 /var/log/jobs.log && \
-    chown -R root:nginx /opt/confs/nginx && \
-    chmod -R 770 /opt/confs/nginx && \
-    mkdir /acme-challenge && \
-    chown root:nginx /acme-challenge && \
-    chmod 770 /acme-challenge
-
-COPY autoconf/misc/logrotate.conf /etc/logrotate.conf
-COPY scripts/* /opt/scripts/
-COPY confs/global/ /opt/confs/global
-COPY confs/site/ /opt/confs/site
-COPY entrypoint/* /opt/entrypoint/
-COPY autoconf/* /opt/entrypoint/
-RUN chmod +x /opt/entrypoint/*.py /opt/entrypoint/*.sh /opt/scripts/*.sh
-
-ENTRYPOINT ["/opt/entrypoint/entrypoint.sh"]

autoconf/IngressController.py

@@ -0,0 +1,191 @@
+from traceback import format_exc
+from kubernetes import client, config, watch
+from threading import Thread, Lock
+from logger import log
+
+from Controller import Controller
+from ConfigCaller import ConfigCaller
+
+class IngressController(Controller, ConfigCaller) :
+
+    def __init__(self) :
+        Controller.__init__(self, "kubernetes")
+        ConfigCaller.__init__(self)
+        config.load_incluster_config()
+        self.__corev1 = client.CoreV1Api()
+        self.__networkingv1 = client.NetworkingV1Api()
+        self.__internal_lock = Lock()
+
+    def _get_controller_instances(self) :
+        controller_instances = []
+        for pod in self.__corev1.list_pod_for_all_namespaces(watch=False).items :
+            if pod.metadata.annotations != None and "bunkerweb.io/AUTOCONF" in pod.metadata.annotations :
+                controller_instances.append(pod)
+        return controller_instances
+
+    def _to_instances(self, controller_instance) :
+        instance = {}
+        instance["name"] = controller_instance.metadata.name
+        instance["hostname"] = controller_instance.status.pod_ip
+        health = False
+        if controller_instance.status.conditions is not None :
+            for condition in controller_instance.status.conditions :
+                if condition.type == "Ready" and condition.status == "True" :
+                    health = True
+                    break
+        instance["health"] = health
+        instance["env"] = {}
+        for env in controller_instance.spec.containers[0].env :
+            if env.value is not None :
+                instance["env"][env.name] = env.value
+            else :
+                instance["env"][env.name] = ""
+        for controller_service in self._get_controller_services() :
+            if controller_service.metadata.annotations is not None :
+                for annotation, value in controller_service.metadata.annotations.items() :
+                    if not annotation.startswith("bunkerweb.io/") :
+                        continue
+                    variable = annotation.replace("bunkerweb.io/", "", 1)
+                    if self._is_setting(variable) :
+                        instance["env"][variable] = value
+        return [instance]
+
+    def _get_controller_services(self) :
+        return self.__networkingv1.list_ingress_for_all_namespaces(watch=False).items
+
+    def _to_services(self, controller_service) :
+        if controller_service.spec is None or controller_service.spec.rules is None :
+            return []
+        services = []
+        # parse rules
+        for rule in controller_service.spec.rules :
+            if rule.host is None :
+                log("INGRESS-CONTROLLER", "⚠️", "Ignoring unsupported ingress rule without host.")
+                continue
+            service = {}
+            service["SERVER_NAME"] = rule.host
+            if rule.http is None :
+                services.append(service)
+                continue
+            location = 1
+            for path in rule.http.paths :
+                if path.path is None :
+                    log("INGRESS-CONTROLLER", "⚠️", "Ignoring unsupported ingress rule without path.")
+                    continue
+                if path.backend.service is None :
+                    log("INGRESS-CONTROLLER", "⚠️", "Ignoring unsupported ingress rule without backend service.")
+                    continue
+                if path.backend.service.port is None :
+                    log("INGRESS-CONTROLLER", "⚠️", "Ignoring unsupported ingress rule without backend service port.")
+                    continue
+                if path.backend.service.port.number is None :
+                    log("INGRESS-CONTROLLER", "⚠️", "Ignoring unsupported ingress rule without backend service port number.")
+                    continue
+                service_list = self.__corev1.list_service_for_all_namespaces(watch=False, field_selector="metadata.name=" + path.backend.service.name).items
+                if len(service_list) == 0 :
+                    log("INGRESS-CONTROLLER", "⚠️", "Ignoring ingress rule with service " + path.backend.service.name + " : service not found.")
+                    continue
+                reverse_proxy_host = "http://" + path.backend.service.name + "." + service_list[0].metadata.namespace + ".svc.cluster.local:" + str(path.backend.service.port.number)
+                service["USE_REVERSE_PROXY"] = "yes"
+                service["REVERSE_PROXY_HOST_" + str(location)] = reverse_proxy_host
+                service["REVERSE_PROXY_URL_" + str(location)] = path.path
+                location += 1
+            services.append(service)
+
+        # parse tls
+        if controller_service.spec.tls is not None :
+            log("INGRESS-CONTROLLER", "⚠️", "Ignoring unsupported tls.")
+
+        # parse annotations
+        if controller_service.metadata.annotations is not None :
+            for service in services :
+                for annotation, value in controller_service.metadata.annotations.items() :
+                    if not annotation.startswith("bunkerweb.io/") :
+                        continue
+                    variable = annotation.replace("bunkerweb.io/", "", 1)
+                    if not variable.startswith(service["SERVER_NAME"].split(" ")[0] + "_") :
+                        continue
+                    variable = variable.replace(service["SERVER_NAME"].split(" ")[0] + "_", "", 1)
+                    if self._is_multisite_setting(variable) :
+                        service[variable] = value
+        return services
+
+    def get_configs(self) :
+        configs = {}
+        supported_config_types = ["http", "stream", "server-http", "server-stream", "default-server-http", "modsec", "modsec-crs"]
+        for config_type in supported_config_types :
+            configs[config_type] = {}
+        for configmap in self.__corev1.list_config_map_for_all_namespaces(watch=False).items :
+            if configmap.metadata.annotations is None or "bunkerweb.io/CONFIG_TYPE" not in configmap.metadata.annotations :
+                continue
+            config_type = configmap.metadata.annotations["bunkerweb.io/CONFIG_TYPE"]
+            if config_type not in supported_config_types :
+                log("INGRESS-CONTROLLER", "⚠️", "Ignoring unsupported CONFIG_TYPE " + config_type + " for ConfigMap " + configmap.metadata.name)
+                continue
+            if not configmap.data :
+                log("INGRESS-CONTROLLER", "⚠️", "Ignoring blank ConfigMap " + configmap.metadata.name)
+                continue
+            config_site = ""
+            if "bunkerweb.io/CONFIG_SITE" in configmap.metadata.annotations :
+                config_site = configmap.metadata.annotations["bunkerweb.io/CONFIG_SITE"] + "/"
+            for config_name, config_data in configmap.data.items() :
+                configs[config_type][config_site + config_name] = config_data
+        return configs
+
+    def __watch(self, watch_type) :
+        w = watch.Watch()
+        what = None
+        if watch_type == "pod" :
+            what = self.__corev1.list_pod_for_all_namespaces
+        elif watch_type == "ingress" :
+            what = self.__networkingv1.list_ingress_for_all_namespaces
+        elif watch_type == "configmap" :
+            what = self.__corev1.list_config_map_for_all_namespaces
+        else :
+            raise Exception("unsupported watch_type " + watch_type)
+        while True :
+            locked = False
+            try :
+                for event in w.stream(what) :
+                    self.__internal_lock.acquire()
+                    locked = True
+                    self._instances = self.get_instances()
+                    self._services = self.get_services()
+                    self._configs = self.get_configs()
+                    if not self._config.update_needed(self._instances, self._services, configs=self._configs) :
+                        self.__internal_lock.release()
+                        locked = False
+                        continue
+                    log("INGRESS-CONTROLLER", "ℹ️", "Catched kubernetes event, deploying new configuration ...")
+                    try :
+                        ret = self.apply_config()
+                        if not ret :
+                            log("INGRESS-CONTROLLER", "❌", "Error while deploying new configuration ...")
+                        else :
+                            log("INGRESS-CONTROLLER", "ℹ️", "Successfully deployed new configuration 🚀")
+                    except :
+                        log("INGRESS-CONTROLLER", "❌", "Exception while deploying new configuration :")
+                        print(format_exc())
+                    self.__internal_lock.release()
+                    locked = False
+            except Exception as e :
+                log("INGRESS-CONTROLLER", "❌", "Exception while reading k8s event (type = " + watch_type + ") : ")
+                print(format_exc())
+                if locked :
+                    self.__internal_lock.release()
+
+    def apply_config(self) :
+        self._config.stop_scheduler()
+        ret = self._config.apply(self._instances, self._services, configs=self._configs)
+        self._config.start_scheduler()
+        return ret
+
+    def process_events(self) :
+        watch_types = ["pod", "ingress", "configmap"]
+        threads = []
+        for watch_type in watch_types :
+            threads.append(Thread(target=self.__watch, args=(watch_type,)))
+        for thread in threads :
+            thread.start()
+        for thread in threads :
+            thread.join()

autoconf/ReloadServer.py

@@ -1,28 +0,0 @@
-import socketserver, threading, utils, os, stat
-
-class ReloadServerHandler(socketserver.StreamRequestHandler):
-
-	def handle(self) :
-		try :
-			data = self.request.recv(512)
-			if not data :
-				return
-			with self.server.lock :
-				ret = self.server.autoconf.reload()
-			if ret :
-				self.request.sendall("ok".encode("utf-8"))
-			else :
-				self.request.sendall("ko".encode("utf-8"))
-		except Exception as e :
-			utils.log("Exception " + str(e))
-
-def run_reload_server(autoconf, lock) :
-	server = socketserver.UnixStreamServer("/tmp/autoconf.sock", ReloadServerHandler)
-	os.chown("/tmp/autoconf.sock", 0, 101)
-	os.chmod("/tmp/autoconf.sock", 0o770)
-	server.autoconf = autoconf
-	server.lock = lock
-	thread = threading.Thread(target=server.serve_forever)
-	thread.daemon = True
-	thread.start()
-	return (server, thread)

autoconf/SwarmController.py

@@ -0,0 +1,97 @@
+from traceback import format_exc
+from threading import Thread, Lock
+from docker import DockerClient
+from logger import log
+from base64 import b64decode
+
+from Controller import Controller
+
+class SwarmController(Controller) :
+
+    def __init__(self, docker_host) :
+        super().__init__("swarm")
+        self.__client = DockerClient(base_url=docker_host)
+        self.__internal_lock = Lock()
+        
+    def _get_controller_instances(self) :
+        return self.__client.services.list(filters={"label" : "bunkerweb.AUTOCONF"})
+    
+    def _to_instances(self, controller_instance) :
+        instances = []
+        instance_env = {}
+        for env in controller_instance.attrs["Spec"]["TaskTemplate"]["ContainerSpec"]["Env"] :
+            variable = env.split("=")[0]
+            value = env.replace(variable + "=", "", 1)
+            instance_env[variable] = value
+        for task in controller_instance.tasks() :
+            instance = {}
+            instance["name"] = task["ID"]
+            instance["hostname"] = controller_instance.name + "." + task["NodeID"] + "." + task["ID"]
+            instance["health"] = task["Status"]["State"] == "running"
+            instance["env"] = instance_env
+            instances.append(instance)
+        return instances
+
+    def _get_controller_services(self) :
+        return self.__client.services.list(filters={"label" : "bunkerweb.SERVER_NAME"})
+        
+    def _to_services(self, controller_service) :
+        service = {}
+        for variable, value in controller_service.attrs["Spec"]["Labels"].items() :
+            if not variable.startswith("bunkerweb.") :
+                continue
+            service[variable.replace("bunkerweb.", "", 1)] = value
+        return [service]
+
+    def get_configs(self) :
+        configs = {}
+        for config_type in self._supported_config_types :
+            configs[config_type] = {}
+        for config in self.__client.configs.list(filters={"label" : "bunkerweb.CONFIG_TYPE"}) :
+            config_type = config.attrs["Spec"]["Labels"]["bunkerweb.CONFIG_TYPE"]
+            config_name = config.name
+            if config_type not in self._supported_config_types :
+                log("SWARM-CONTROLLER", "⚠️", "Ignoring unsupported CONFIG_TYPE " + config_type + " for Config " + config_name)
+                continue
+            config_site = ""
+            if "bunkerweb.CONFIG_SITE" in config.attrs["Spec"]["Labels"] :
+                config_site = config.attrs["Spec"]["Labels"]["bunkerweb.CONFIG_SITE"] + "/"
+            configs[config_type][config_site + config_name] = b64decode(config.attrs["Spec"]["Data"])
+        return configs
+
+    def apply_config(self) :
+        self._config.stop_scheduler()
+        ret = self._config.apply(self._instances, self._services, configs=self._configs)
+        self._config.start_scheduler()
+        return ret
+                
+    def __event(self, event_type) :
+        for event in self.__client.events(decode=True, filters={"type": event_type}) :
+            self.__internal_lock.acquire()
+            self._instances = self.get_instances()
+            self._services = self.get_services()
+            self._configs = self.get_configs()
+            if not self._config.update_needed(self._instances, self._services, configs=self._configs) :
+                self.__internal_lock.release()
+                continue
+            log("SWARM-CONTROLLER", "ℹ️", "Catched Swarm event, deploying new configuration ...")
+            try :
+                ret = self.apply_config()
+                if not ret :
+                    log("SWARM-CONTROLLER", "❌", "Error while deploying new configuration ...")
+                else :
+                    log("SWARM-CONTROLLER", "ℹ️", "Successfully deployed new configuration 🚀")
+            except :
+                log("SWARM-CONTROLLER", "❌", "Exception while deploying new configuration :")
+                print(format_exc())
+            self.__internal_lock.release()
+    
+    def process_events(self) :
+        event_types = ["service", "config"]
+        threads = []
+        for event_type in event_types :
+            threads.append(Thread(target=self.__event, args=(event_type,)))
+        for thread in threads :
+            thread.start()
+        for thread in threads :
+            thread.join()

autoconf/app.py

@@ -1,73 +0,0 @@
-#!/usr/bin/python3
-
-from AutoConf import AutoConf
-from ReloadServer import run_reload_server
-import utils
-import docker, os, stat, sys, select, threading
-
-# Connect to the endpoint
-endpoint = "/var/run/docker.sock"
-if not os.path.exists(endpoint) or not stat.S_ISSOCK(os.stat(endpoint).st_mode) :
-	utils.log("[!] /var/run/docker.sock not found (is it mounted ?)")
-	sys.exit(1)
-try :
-	client = docker.DockerClient(base_url='unix:///var/run/docker.sock')
-except Exception as e :
-	utils.log("[!] Can't instantiate DockerClient : " + str(e))
-	sys.exit(2)
-
-# Check if we are in Swarm mode
-swarm = os.getenv("SWARM_MODE") == "yes"
-
-# Our object to process events
-api = ""
-if swarm :
-	api = os.getenv("API_URI")
-autoconf = AutoConf(swarm, api)
-lock = threading.Lock()
-if swarm :
-	(server, thread) = run_reload_server(autoconf, lock)
-
-# Get all bunkerized-nginx instances and web services created before
-try :
-	if swarm :
-		before = client.services.list(filters={"label" : "bunkerized-nginx.AUTOCONF"}) + client.services.list(filters={"label" : "bunkerized-nginx.SERVER_NAME"})
-	else :
-		before = client.containers.list(all=True, filters={"label" : "bunkerized-nginx.AUTOCONF"}) + client.containers.list(filters={"label" : "bunkerized-nginx.SERVER_NAME"})
-except docker.errors.APIError as e :
-	utils.log("[!] Docker API error " + str(e))
-	sys.exit(3)
-
-# Process them before events
-with lock :
-	autoconf.pre_process(before)
-
-# Process events received from Docker
-try :
-	utils.log("[*] Listening for Docker events ...")
-	for event in client.events(decode=True) :
-
-		# Process only container/service events
-		if (swarm and event["Type"] != "service") or (not swarm and event["Type"] != "container") :
-			continue
-
-		# Get Container/Service object
-		try :
-			if swarm :
-				id = service_id=event["Actor"]["ID"]
-				server = client.services.get(service_id=id)
-			else :
-				id = event["id"]
-				server = client.containers.get(id)
-		except docker.errors.NotFound as e :
-			server = autoconf.get_server(id)
-			if not server :
-				continue
-
-		# Process the event
-		with lock :
-			autoconf.process(server, event["Action"])
-
-except docker.errors.APIError as e :
-	utils.log("[!] Docker API error " + str(e))
-	sys.exit(4)

autoconf/entrypoint.sh

@@ -1,48 +0,0 @@
-#!/bin/bash
-
-echo "[*] Starting autoconf ..."
-
-# check permissions
-su -s "/opt/entrypoint/permissions.sh" nginx
-if [ "$?" -ne 0 ] ; then
-	exit 1
-fi
-
-if [ "$SWARM_MODE" = "yes" ] ; then
-	cp -r /opt/confs/nginx/* /etc/nginx
-	chown -R root:nginx /etc/nginx
-	chmod -R 770 /etc/nginx
-fi
-
-# trap SIGTERM and SIGINT
-function trap_exit() {
-	echo "[*] Catched stop operation"
-	echo "[*] Stopping crond ..."
-	pkill -TERM crond
-	echo "[*] Stopping python3 ..."
-	pkill -TERM python3
-	pkill -TERM tail
-}
-trap "trap_exit" TERM INT QUIT
-
-# remove old crontabs
-echo "" > /etc/crontabs/root
-
-# setup logrotate
-touch /var/log/jobs.log
-echo "0 0 * * * /usr/sbin/logrotate -f /etc/logrotate.conf > /dev/null 2>&1" >> /etc/crontabs/root
-
-# start cron
-crond
-
-# run autoconf app
-/opt/entrypoint/app.py &
-
-# display logs
-tail -F /var/log/jobs.log &
-pid="$!"
-wait "$pid"
-
-# stop
-echo "[*] autoconf stopped"
-exit 0

autoconf/hooks/post_push

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download/v1.0.3/manifest-tool-linux-amd64
-chmod +x manifest-tool
-
-VERSION=$(cat VERSION | tr -d '\n')
-if [ "$SOURCE_BRANCH" = "dev" ] ; then
-	./manifest-tool push from-args --ignore-missing --platforms linux/amd64,linux/386,linux/arm/v7,linux/arm64/v8 --template bunkerity/bunkerized-nginx-autoconf:dev-ARCHVARIANT --target bunkerity/bunkerized-nginx-autoconf:dev
-elif [ "$SOURCE_BRANCH" = "master" ] ; then
-	./manifest-tool push from-args --ignore-missing --platforms linux/amd64,linux/386,linux/arm/v7,linux/arm64/v8 --template bunkerity/bunkerized-nginx-autoconf:ARCHVARIANT --target bunkerity/bunkerized-nginx-autoconf:${VERSION}
-	./manifest-tool push from-args --ignore-missing --platforms linux/amd64,linux/386,linux/arm/v7,linux/arm64/v8 --template bunkerity/bunkerized-nginx-autoconf:ARCHVARIANT --target bunkerity/bunkerized-nginx-autoconf:latest
-fi

autoconf/hooks/pre_build

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-# Register qemu-*-static for all supported processors except the
-# current one, but also remove all registered binfmt_misc before
-docker run --rm --privileged multiarch/qemu-user-static:register --reset

autoconf/main.py

@@ -0,0 +1,69 @@
+#!/usr/bin/python3
+
+import signal, os, traceback, time, subprocess
+
+import sys
+sys.path.append("/opt/bunkerweb/deps/python")
+sys.path.append("/opt/bunkerweb/utils")
+sys.path.append("/opt/bunkerweb/api")
+sys.path.append("/opt/bunkerweb/job")
+
+from SwarmController import SwarmController
+from IngressController import IngressController
+from DockerController import DockerController
+from logger import log
+
+# Get variables
+swarm			= os.getenv("SWARM_MODE", "no") == "yes"
+kubernetes		= os.getenv("KUBERNETES_MODE", "no") == "yes"
+docker_host		= os.getenv("DOCKER_HOST", "unix:///var/run/docker.sock")
+wait_retry_interval	= int(os.getenv("WAIT_RETRY_INTERVAL", "5"))
+
+def exit_handler(signum, frame) :
+    log("AUTOCONF", "ℹ️", "Stop signal received, exiting...")
+    os._exit(0)
+signal.signal(signal.SIGINT, exit_handler)
+signal.signal(signal.SIGTERM, exit_handler)
+
+try :
+
+    # Setup /data folder if needed
+    #if swarm or kubernetes :
+    proc = subprocess.run(["/opt/bunkerweb/helpers/data.sh", "AUTOCONF"], stdin=subprocess.DEVNULL, stderr=subprocess.STDOUT)
+    if proc.returncode != 0 :
+        os._exit(1)
+
+    # Instantiate the controller
+    if swarm :
+        log("AUTOCONF", "ℹ️", "Swarm mode detected")
+        controller = SwarmController(docker_host)
+    elif kubernetes :
+        log("AUTOCONF", "ℹ️", "Kubernetes mode detected")
+        controller = IngressController()
+    else :
+        log("AUTOCONF", "ℹ️", "Docker mode detected")
+        controller = DockerController(docker_host)
+
+    # Wait for instances
+    log("AUTOCONF", "ℹ️", "Waiting for BunkerWeb instances ...")
+    instances = controller.wait(wait_retry_interval)
+    log("AUTOCONF", "ℹ️", "BunkerWeb instances are ready 🚀")
+    i = 1
+    for instance in instances :
+        log("AUTOCONF", "ℹ️", "Instance #" + str(i) + " : " + instance["name"])
+        i += 1
+
+    # Run first configuration
+    ret = controller.apply_config()
+    if not ret :
+        log("AUTOCONF", "❌", "Error while applying initial configuration")
+        os._exit(1)
+
+    # Process events
+    log("AUTOCONF", "ℹ️", "Processing events ...")
+    controller.process_events()
+
+except :
+    log("AUTOCONF", "❌", "Exception while running autoconf :")
+    print(traceback.format_exc())
+    sys.exit(1)

autoconf/misc/logrotate.conf

@@ -1,23 +0,0 @@
-/var/log/*.log /var/log/letsencrypt/*.log {
-	# compress old files using gzip
-	compress
-
-	# rotate everyday
-	daily
-
-	# remove old logs after X days
-	maxage 7
-	rotate 7
-
-	# no errors if a file is missing
-	missingok
-
-	# disable mailing
-	nomail
-
-	# mininum size of a logfile before rotating
-	minsize 10M
-
-	# make a copy and truncate the files
-	copytruncate
-}

autoconf/reload.py

@@ -1,19 +0,0 @@
-#!/usr/bin/python3
-
-import sys, socket, os
-
-if not os.path.exists("/tmp/autoconf.sock") :
-	sys.exit(1)
-
-try :
-	client = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-	client.connect("/tmp/autoconf.sock")
-	client.send("reload".encode("utf-8"))
-	data = client.recv(512)
-	client.close()
-	if not data or data.decode("utf-8") != "ok" :
-		sys.exit(3)
-except Exception as e :
-	sys.exit(2)
-
-sys.exit(0)

autoconf/utils.py

@@ -1,24 +0,0 @@
-#!/usr/bin/python3
-
-import datetime
-
-def log(event) :
-	print("[" + str(datetime.datetime.now().replace(microsecond=0)) + "] " + event, flush=True)
-
-def replace_in_file(file, old_str, new_str) :
-	with open(file) as f :
-		data = f.read()
-	data = data[::-1].replace(old_str[::-1], new_str[::-1], 1)[::-1]
-	with open(file, "w") as f :
-		f.write(data)
-
-def install_cron(service, vars, crons) :
-	for var in vars :
-		if var in crons :
-			with open("/etc/crontabs/root", "a+") as f :
-				f.write(vars[var] + " /opt/cron/" + crons[var] + ".py " + service["Actor"]["ID"])
-
-def uninstall_cron(service, vars, crons) :
-	for var in vars :
-		if var in crons :
-			replace_in_file("/etc/crontabs/root", vars[var] + " /opt/cron/" + crons[var] + ".py " + service["Actor"]["ID"] + "\n", "")

cli/CLI.py

@@ -0,0 +1,99 @@
+from os.path import isfile
+from dotenv import dotenv_values
+from docker import DockerClient
+from kubernetes import client, config
+
+from ApiCaller import ApiCaller
+from API import API
+
+class CLI(ApiCaller) :
+
+    def __init__(self) :
+        self.__variables = dotenv_values("/etc/nginx/variables.env")
+        self.__integration = self.__detect_integration()
+        super().__init__(self.__get_apis())
+
+    def __detect_integration(self) :
+        ret = "unknown"
+        distrib = ""
+        if isfile("/etc/os-release") :
+            with open("/etc/os-release", "r") as f :
+                if "Alpine" in f.read() :
+                    distrib = "alpine"
+                else :
+                    distrib = "other"
+        # Docker case
+        if distrib == "alpine" and isfile("/usr/sbin/nginx") :
+            return "docker"
+        # Linux case
+        if distrib == "other" :
+            return "linux"
+        # Swarm case
+        if self.__variables["SWARM_MODE"] == "yes" :
+            return "swarm"
+        # Kubernetes case
+        if self.__variables["KUBERNETES_MODE"] == "yes" :
+            return "kubernetes"
+        # Autoconf case
+        if distrib == "alpine" :
+            return "autoconf"
+        
+        raise Exception("can't detect integration")
+
+    def __get_apis(self) :
+        # Docker case
+        if self.__integration == "docker" :
+            return [API("http://127.0.0.1:" + self.__variables["API_HTTP_PORT"], host=self.__variables["API_SERVER_NAME"])]
+
+        # Autoconf case
+        if self.__integration == "autoconf" :
+            docker_client = DockerClient()
+            apis = []
+            for container in self.__client.containers.list(filters={"label" : "bunkerweb.AUTOCONF"}) :
+                port = "5000"
+                host = "bwapi"
+                for env in container.attrs["Config"]["Env"] :
+                    if env.startswith("API_HTTP_PORT=") :
+                        port = env.split("=")[1]
+                    elif env.startswith("API_SERVER_NAME=") :
+                        host = env.split("=")[1]
+                apis.append(API("http://" + container.name + ":" + port, host=host))
+            return apis
+
+        # Swarm case
+        if self.__integration == "swarm" :
+            docker_client = DockerClient()
+            apis = []
+            for service in self.__client.services.list(filters={"label" : "bunkerweb.AUTOCONF"}) :
+                port = "5000"
+                host = "bwapi"
+                for env in service.attrs["Spec"]["TaskTemplate"]["ContainerSpec"]["Env"] :
+                    if env.startswith("API_HTTP_PORT=") :
+                        port = env.split("=")[1]
+                    elif env.startswith("API_SERVER_NAME=") :
+                        host = env.split("=")[1]
+                for task in service.tasks() :
+                    apis.append(API("http://" + service.name + "." + task["NodeID"] + "." + task["ID"] + ":" + port, host=host))
+            return apis
+        
+        # Kubernetes case
+        if self.__integration == "kubernetes" :
+            config.load_incluster_config()
+            corev1 = client.CoreV1Api()
+            apis = []
+            for pod in corev1.list_pod_for_all_namespaces(watch=False).items :
+                if pod.metadata.annotations != None and "bunkerweb.io/AUTOCONF" in pod.metadata.annotations and pod.status.pod_ip :
+                    port = "5000"
+                    host = "bwapi"
+                    for env in pod.spec.containers[0].env :
+                        if env.name == "API_HTTP_PORT" :
+                            port = env.value
+                        elif env.name == "API_SERVER_NAME" :
+                            host = env.value
+                    apis.append(API("http://" + pod.status.pod_ip + ":" + port, host=host))
+            return apis
+        
+    def unban(self, ip) :
+        if self._send_to_apis("POST", "/unban", data={"ip": ip}) :
+            return True, "IP " + ip + " has been unbanned"
+        return False, "error"

cli/main.py

@@ -0,0 +1,52 @@
+#!/usr/bin/env python3
+
+import argparse, traceback, os
+
+import sys
+sys.path.append("/opt/bunkerweb/deps/python")
+sys.path.append("/opt/bunkerweb/cli")
+sys.path.append("/opt/bunkerweb/utils")
+sys.path.append("/opt/bunkerweb/api")
+
+from logger import log
+from CLI import CLI
+
+if __name__ == "__main__" :
+
+    try :
+        # Global parser
+        parser = argparse.ArgumentParser(description="BunkerWeb Command Line Interface")
+        subparsers = parser.add_subparsers(help="command", dest="command")
+        
+        # Unban subparser
+        parser_unban = subparsers.add_parser("unban", help="remove a ban from the cache")
+        parser_unban.add_argument("ip", type=str, help="IP address to unban")
+
+        # Parse args
+        args = parser.parse_args()
+
+        # Instantiate CLI
+        cli = CLI()
+        
+        # Execute command
+        ret, err = False, "unknown command"
+        if args.command == "unban" :
+            ret, err = cli.unban(args.ip)
+
+        if not ret :
+            print("CLI command status : ❌ (fail)")
+            print(err)
+            os._exit(1)
+        else :
+            print("CLI command status : ✔️ (success)")
+            print(err)
+            os._exit(0)
+
+    except SystemExit as se :
+        sys.exit(se.code)
+    except :
+        print("❌ Error while executing bwcli : ")
+        print(traceback.format_exc())
+        sys.exit(1)
+        
+    sys.exit(0)

compile.sh

@@ -1,166 +0,0 @@
-#!/bin/sh
-
-function git_secure_checkout() {
-	path="$1"
-	commit="$2"
-	ret=$(pwd)
-	cd $path
-	git checkout "${commit}^{commit}"
-	if [ $? -ne 0 ] ; then
-		echo "[!] Commit hash $commit is absent from submodules $path !"
-		exit 3
-	fi
-	cd $ret
-}
-
-function git_secure_clone() {
-	repo="$1"
-	commit="$2"
-	folder=$(echo "$repo" | sed -E "s@https://github.com/.*/(.*)\.git@\1@")
-	git clone "$repo"
-	cd "$folder"
-	git checkout "${commit}^{commit}"
-	if [ $? -ne 0 ] ; then
-		echo "[!] Commit hash $commit is absent from repository $repo !"
-		exit 2
-	fi
-	cd ..
-}
-
-NTASK=$(nproc)
-
-# install build dependencies
-apk add --no-cache --virtual build autoconf libtool automake git geoip-dev yajl-dev g++ gcc curl-dev libxml2-dev pcre-dev make linux-headers libmaxminddb-dev musl-dev lua-dev gd-dev gnupg brotli-dev openssl-dev
-
-# compile and install ModSecurity library
-cd /tmp
-git_secure_clone https://github.com/SpiderLabs/ModSecurity.git 753145fbd1d6751a6b14fdd700921eb3cc3a1d35
-cd ModSecurity
-./build.sh
-git submodule init
-git submodule update
-git_secure_checkout bindings/python 47a6925df187f96e4593afab18dc92d5f22bd4d5
-git_secure_checkout others/libinjection bf234eb2f385b969c4f803b35fda53cffdd93922
-git_secure_checkout test/test-cases/secrules-language-tests d03f4c1e930440df46c1faa37d820a919704d9da
-./configure --enable-static=no --disable-doxygen-doc --disable-dependency-tracking
-make -j $NTASK
-make install-strip
-
-# download and install CRS rules
-cd /tmp
-git_secure_clone https://github.com/coreruleset/coreruleset.git 7776fe23f127fd2315bad0e400bdceb2cabb97dc
-cd coreruleset
-mkdir /opt/owasp
-cp -r rules /opt/owasp/crs
-cp crs-setup.conf.example /opt/owasp/crs.conf
-
-# get nginx modules
-cd /tmp
-# ModSecurity connector for nginx
-git_secure_clone https://github.com/SpiderLabs/ModSecurity-nginx.git 22e53aba4e3ae8c7d59a3672d6727e49246afe96
-# headers more
-git_secure_clone https://github.com/openresty/headers-more-nginx-module.git d6d7ebab3c0c5b32ab421ba186783d3e5d2c6a17
-# geoip
-git_secure_clone https://github.com/leev/ngx_http_geoip2_module.git 1cabd8a1f68ea3998f94e9f3504431970f848fbf
-# cookie
-git_secure_clone https://github.com/AirisX/nginx_cookie_flag_module.git c4ff449318474fbbb4ba5f40cb67ccd54dc595d4
-# brotli
-git_secure_clone https://github.com/google/ngx_brotli.git 9aec15e2aa6feea2113119ba06460af70ab3ea62
-
-# LUA requirements
-git_secure_clone https://github.com/openresty/luajit2.git fe32831adcb3f5fe9259a9ce404fc54e1399bba3
-cd luajit2
-make -j $NTASK
-make install
-cd /tmp
-git_secure_clone https://github.com/openresty/lua-resty-core.git b7d0a681bb41e6e3f29e8ddc438ef26fd819bb19
-cd lua-resty-core
-make install
-cd /tmp
-git_secure_clone https://github.com/openresty/lua-resty-lrucache.git b2035269ac353444ac65af3969692bcae4fc1605
-cd lua-resty-lrucache
-make install
-cd /tmp
-git_secure_clone https://github.com/openresty/lua-resty-dns.git 24c9a69808aedfaf029ae57707cdef75d83e2d19
-cd lua-resty-dns
-make install
-cd /tmp
-git_secure_clone https://github.com/bungle/lua-resty-session.git f300870ce4eee3f4903e0565c589f1faf0c1c5aa
-cd lua-resty-session
-cp -r lib/resty/* /usr/local/lib/lua/resty
-cd /tmp
-git_secure_clone https://github.com/bungle/lua-resty-random.git 17b604f7f7dd217557ca548fc1a9a0d373386480
-cd lua-resty-random
-make install
-cd /tmp
-git_secure_clone https://github.com/openresty/lua-resty-string.git 9a543f8531241745f8814e8e02475351042774ec
-cd lua-resty-string
-make install
-cd /tmp
-git_secure_clone https://github.com/openresty/lua-cjson.git 0df488874f52a881d14b5876babaa780bb6200ee
-cd lua-cjson
-make -j $NTASK
-make install
-make install-extra
-cd /tmp
-git_secure_clone https://github.com/ittner/lua-gd.git 2ce8e478a8591afd71e607506bc8c64b161bbd30
-cd lua-gd
-make -j $NTASK
-make INSTALL_PATH=/usr/local/lib/lua/5.1 install
-cd /tmp
-git_secure_clone https://github.com/ledgetech/lua-resty-http.git 984fdc26054376384e3df238fb0f7dfde01cacf1
-cd lua-resty-http
-make install
-cd /tmp
-git_secure_clone https://github.com/Neopallium/lualogging.git cadc4e8fd652be07a65b121a3e024838db330c15
-cd lualogging
-cp -r src/* /usr/local/lib/lua
-cd /tmp
-git_secure_clone https://github.com/diegonehab/luasocket.git 5b18e475f38fcf28429b1cc4b17baee3b9793a62
-cd luasocket
-make -j $NTASK
-make CDIR_linux=lib/lua/5.1 LDIR_linux=lib/lua install
-cd /tmp
-git_secure_clone https://github.com/brunoos/luasec.git c6704919bdc85f3324340bdb35c2795a02f7d625
-cd luasec
-make linux -j $NTASK
-make LUACPATH=/usr/local/lib/lua/5.1 LUAPATH=/usr/local/lib/lua install
-cd /tmp
-git_secure_clone https://github.com/crowdsecurity/lua-cs-bouncer.git 3c235c813fc453dcf51a391bc9e9a36ca77958b0
-cd lua-cs-bouncer
-mkdir /usr/local/lib/lua/crowdsec
-cp lib/*.lua /usr/local/lib/lua/crowdsec
-cp template.conf /usr/local/lib/lua/crowdsec/crowdsec.conf
-sed -i 's/^API_URL=.*/API_URL=%CROWDSEC_HOST%/' /usr/local/lib/lua/crowdsec/crowdsec.conf
-sed -i 's/^API_KEY=.*/API_KEY=%CROWDSEC_KEY%/' /usr/local/lib/lua/crowdsec/crowdsec.conf
-sed -i 's/require "lrucache"/require "resty.lrucache"/' /usr/local/lib/lua/crowdsec/CrowdSec.lua
-sed -i 's/require "config"/require "crowdsec.config"/' /usr/local/lib/lua/crowdsec/CrowdSec.lua
-cd /tmp
-git_secure_clone https://github.com/hamishforbes/lua-resty-iputils.git 3151d6485e830421266eee5c0f386c32c835dba4
-cd lua-resty-iputils
-make LUA_LIB_DIR=/usr/local/lib/lua install
-cd /tmp
-git_secure_clone https://github.com/openresty/lua-nginx-module.git 2d23bc4f0a29ed79aaaa754c11bffb1080aa44ba
-export LUAJIT_LIB=/usr/local/lib
-export LUAJIT_INC=/usr/local/include/luajit-2.1
-
-# compile and install dynamic modules
-cd /tmp
-wget https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz
-wget https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz.asc
-gpg --import /tmp/nginx-keys/*.key
-check=$(gpg --verify /tmp/nginx-${NGINX_VERSION}.tar.gz.asc /tmp/nginx-${NGINX_VERSION}.tar.gz 2>&1 | grep "^gpg: Good signature from ")
-if [ "$check" = "" ] ; then
-	echo "[!] Wrong signature from nginx source !"
-	exit 1
-fi
-tar -xvzf nginx-${NGINX_VERSION}.tar.gz
-cd nginx-$NGINX_VERSION
-CONFARGS=$(nginx -V 2>&1 | sed -n -e 's/^.*arguments: //p')
-CONFARGS=${CONFARGS/-Os -fomit-frame-pointer -g/-Os}
-./configure $CONFARGS --add-dynamic-module=/tmp/ModSecurity-nginx --add-dynamic-module=/tmp/headers-more-nginx-module --add-dynamic-module=/tmp/ngx_http_geoip2_module --add-dynamic-module=/tmp/nginx_cookie_flag_module --add-dynamic-module=/tmp/lua-nginx-module --add-dynamic-module=/tmp/ngx_brotli
-make -j $NTASK modules
-cp ./objs/*.so /usr/lib/nginx/modules
-
-# remove build dependencies
-apk del build

confs/api.conf

@@ -0,0 +1,38 @@
+server {
+	server_name {{ API_SERVER_NAME }};
+	
+	# HTTP listen
+	listen 0.0.0.0:{{ API_HTTP_PORT }};
+	listen 127.0.0.1:{{ API_HTTP_PORT }};
+
+	# maximum body size for API
+	client_max_body_size 1G;
+
+	# default mime type is JSON
+	default_type 'application/json';
+
+	# check IP and do the API call
+	access_by_lua_block {
+		local api		= require "api"
+		local logger	= require "logger"
+		if not ngx.var.http_host or ngx.var.http_host ~= "{{ API_SERVER_NAME }}" then
+			logger.log(ngx.WARN, "API", "Wrong Host header from IP " .. ngx.var.remote_addr)
+			return ngx.exit(ngx.HTTP_CLOSE)
+		end
+		local ok, err	= api:is_allowed_ip()
+		if not ok then
+			logger.log(ngx.WARN, "API", "Can't validate access from IP " .. ngx.var.remote_addr .. " : " .. err)
+			return ngx.exit(ngx.HTTP_CLOSE)
+		end
+		logger.log(ngx.NOTICE, "API", "Validated access from IP " .. ngx.var.remote_addr)
+		local ok, err, status, resp = api:do_api_call()
+		if not ok then
+			logger.log(ngx.WARN, "API", "Call from " .. ngx.var.remote_addr .. " on " .. ngx.var.uri .. " failed : " .. err)
+		else
+			logger.log(ngx.NOTICE, "API", "Successful call from " .. ngx.var.remote_addr .. " on " .. ngx.var.uri .. " : " .. err)
+		end
+		ngx.status = status
+		ngx.say(resp)
+		return ngx.exit(status)
+	}
+}

confs/default-server-http.conf

@@ -0,0 +1,15 @@
+server {
+
+	server_name _;
+
+	# HTTP listen
+{% if LISTEN_HTTP == "yes" +%}
+	listen 0.0.0.0:{{ HTTP_PORT }} default_server {% if USE_PROXY_PROTOCOL == "yes" %}proxy_protocol{% endif %};
+{% endif %}
+
+	# include core and plugins default-server configurations
+	include /etc/nginx/default-server-http/*.conf;
+	
+	# include custom default-server configurations
+	include /opt/bunkerweb/configs/default-server-http/*.conf;
+}

confs/fastcgi_params

@@ -0,0 +1,25 @@
+
+fastcgi_param  QUERY_STRING       $query_string;
+fastcgi_param  REQUEST_METHOD     $request_method;
+fastcgi_param  CONTENT_TYPE       $content_type;
+fastcgi_param  CONTENT_LENGTH     $content_length;
+
+fastcgi_param  SCRIPT_NAME        $fastcgi_script_name;
+fastcgi_param  REQUEST_URI        $request_uri;
+fastcgi_param  DOCUMENT_URI       $document_uri;
+fastcgi_param  DOCUMENT_ROOT      $document_root;
+fastcgi_param  SERVER_PROTOCOL    $server_protocol;
+fastcgi_param  REQUEST_SCHEME     $scheme;
+fastcgi_param  HTTPS              $https if_not_empty;
+
+fastcgi_param  GATEWAY_INTERFACE  CGI/1.1;
+fastcgi_param  SERVER_SOFTWARE    nginx/$nginx_version;
+
+fastcgi_param  REMOTE_ADDR        $remote_addr;
+fastcgi_param  REMOTE_PORT        $remote_port;
+fastcgi_param  SERVER_ADDR        $server_addr;
+fastcgi_param  SERVER_PORT        $server_port;
+fastcgi_param  SERVER_NAME        $server_name;
+
+# PHP only, required if PHP was built with --enable-force-cgi-redirect
+fastcgi_param  REDIRECT_STATUS    200;

confs/global/api-temp.conf

@@ -1,30 +0,0 @@
-
-location ~ ^%API_URI%/ping {
-	return 444;
-}
-
-location ~ ^%API_URI% {
-
-rewrite_by_lua_block {
-	
-	local api = require "api"
-	local api_uri = "%API_URI%"
-
-	if api.is_api_call(api_uri) then
-		ngx.header.content_type = 'text/plain'
-		if api.do_api_call(api_uri) then
-			ngx.log(ngx.NOTICE, "[API] API call " .. ngx.var.request_uri .. " successfull from " .. ngx.var.remote_addr)
-			ngx.say("ok")
-		else
-			ngx.log(ngx.WARN, "[API] API call " .. ngx.var.request_uri .. " failed from " .. ngx.var.remote_addr)
-			ngx.say("ko")
-		end
-
-		ngx.exit(ngx.HTTP_OK)
-
-	end
-
-	ngx.exit(ngx.OK)
-}
-
-}

confs/global/api.conf

@@ -1,21 +0,0 @@
-rewrite_by_lua_block {
-	
-	local api = require "api"
-	local api_uri = "%API_URI%"
-
-	if api.is_api_call(api_uri) then
-		ngx.header.content_type = 'text/plain'
-		if api.do_api_call(api_uri) then
-			ngx.log(ngx.NOTICE, "[API] API call " .. ngx.var.request_uri .. " successfull from " .. ngx.var.remote_addr)
-			ngx.say("ok")
-		else
-			ngx.log(ngx.WARN, "[API] API call " .. ngx.var.request_uri .. " failed from " .. ngx.var.remote_addr)
-			ngx.say("ko")
-		end
-
-		ngx.exit(ngx.HTTP_OK)
-
-	end
-
-	ngx.exit(ngx.OK)
-}

confs/global/cache.conf

@@ -1,4 +0,0 @@
-open_file_cache %CACHE%;
-open_file_cache_errors %CACHE_ERRORS%;
-open_file_cache_min_uses %CACHE_USES%;
-open_file_cache_valid %CACHE_VALID%;

confs/global/crowdsec.conf

@@ -1,9 +0,0 @@
-init_by_lua_block {
-	local cs = require "crowdsec.CrowdSec"
-	local ok, err = cs.init("/usr/local/lib/lua/crowdsec/crowdsec.conf")
-	if ok == nil then
-		ngx.log(ngx.ERR, "[Crowdsec] " .. err)
-		error()
-	end
-	ngx.log(ngx.NOTICE, "[Crowdsec] Initialisation done")
-}

confs/global/geoip.conf

@@ -1,10 +0,0 @@
-geoip2 /etc/nginx/geoip.mmdb {
-	auto_reload 5m;
-	$geoip2_metadata_country_build metadata build_epoch;
-	$geoip2_data_country_code country iso_code;
-}
-
-map $geoip2_data_country_code $allowed_country {
-	default %DEFAULT%;
-	%COUNTRY%
-}

confs/global/map-referrer.conf

@@ -1 +0,0 @@
-map $http_referer $bad_referrer { hostnames; default no; }

confs/global/map-user-agent.conf

@@ -1 +0,0 @@
-map $http_user_agent $bad_user_agent { default no; }

confs/global/multisite-default-server-https.conf

@@ -1,11 +0,0 @@
-listen 0.0.0.0:%HTTPS_PORT% default_server ssl %HTTP2%;
-ssl_certificate /etc/nginx/default-cert.pem;
-ssl_certificate_key /etc/nginx/default-key.pem;
-ssl_protocols %HTTPS_PROTOCOLS%;
-ssl_prefer_server_ciphers off;
-ssl_session_tickets off;
-ssl_session_timeout 1d;
-ssl_session_cache shared:MozSSL:10m;
-%SSL_DHPARAM%
-%SSL_CIPHERS%
-%LETS_ENCRYPT_WEBROOT%

confs/global/multisite-default-server-lets-encrypt-webroot.conf

@@ -1,3 +0,0 @@
-location ~ ^/.well-known/acme-challenge/ {
-	root /acme-challenge;
-}

confs/global/multisite-default-server.conf

@@ -1,6 +0,0 @@
-server {
-	%LISTEN_HTTP%
-	server_name _;
-	%USE_HTTPS%
-	%MULTISITE_DISABLE_DEFAULT_SERVER%
-}

confs/global/multisite-disable-default-server.conf

@@ -1,3 +0,0 @@
-location / {
-	return 444;
-}

confs/global/nginx-temp.conf

@@ -1,30 +0,0 @@
-load_module /usr/lib/nginx/modules/ngx_http_lua_module.so;
-
-daemon on;
-
-pid /tmp/nginx-temp.pid;
-
-events {
-        worker_connections 1024;
-        use epoll;
-}
-
-http {
-	proxy_temp_path /tmp/proxy_temp;
-	client_body_temp_path /tmp/client_temp;
-	fastcgi_temp_path /tmp/fastcgi_temp;
-	uwsgi_temp_path /tmp/uwsgi_temp;
-	scgi_temp_path /tmp/scgi_temp;
-	lua_package_path "/usr/local/lib/lua/?.lua;;";
-	server {
-		listen 0.0.0.0:%HTTP_PORT% default_server;
-		server_name _;
-		location ~ ^/.well-known/acme-challenge/ {
-			root /acme-challenge;
-		}
-		%USE_API%
-		location / {
-			return 444;
-		}
-	}
-}

confs/global/nginx.conf

@@ -1,117 +0,0 @@
-# /etc/nginx/nginx.conf
-
-# load dynamic modules
-load_module /usr/lib/nginx/modules/ngx_http_cookie_flag_filter_module.so;
-load_module /usr/lib/nginx/modules/ngx_http_geoip2_module.so;
-load_module /usr/lib/nginx/modules/ngx_http_headers_more_filter_module.so;
-load_module /usr/lib/nginx/modules/ngx_http_lua_module.so;
-load_module /usr/lib/nginx/modules/ngx_http_modsecurity_module.so;
-load_module /usr/lib/nginx/modules/ngx_stream_geoip2_module.so;
-load_module /usr/lib/nginx/modules/ngx_http_brotli_filter_module.so;
-load_module /usr/lib/nginx/modules/ngx_http_brotli_static_module.so;
-
-# run as daemon
-daemon on;
-
-# PID file
-pid /tmp/nginx.pid;
-
-# worker number = CPU core(s)
-worker_processes auto;
-
-# faster regexp
-pcre_jit on;
-
-# config files for dynamic modules
-include /etc/nginx/modules/*.conf;
-
-events {
-	# max connections per worker
-	worker_connections 1024;
-
-	# epoll seems to be the best on Linux
-	use epoll;
-}
-
-http {
-	# zero copy within the kernel
-	sendfile on;
-
-	# send packets only if filled
-	tcp_nopush on;
-
-	# remove 200ms delay
-	tcp_nodelay on;
-
-	# load mime types and set default one
-	include /etc/nginx/mime.types;
-	default_type application/octet-stream;
-
-	# write logs to local syslog
-	log_format logf '%LOG_FORMAT%';
-	access_log syslog:server=unix:/tmp/log,nohostname,facility=local0,severity=notice logf;
-	error_log syslog:server=unix:/tmp/log,nohostname,facility=local0 notice;
-
-	# temp paths
-	proxy_temp_path /tmp/proxy_temp;
-	client_body_temp_path /tmp/client_temp;
-	fastcgi_temp_path /tmp/fastcgi_temp;
-	uwsgi_temp_path /tmp/uwsgi_temp;
-	scgi_temp_path /tmp/scgi_temp;
-
-	# close connections in FIN_WAIT1 state
-	reset_timedout_connection on;
-
-	# timeouts
-	client_body_timeout 12;
-	client_header_timeout 12;
-	keepalive_timeout 15;
-	send_timeout 10;
-
-	# resolvers to use
-	resolver %DNS_RESOLVERS% ipv6=off;
-
-	# remove ports when sending redirects
-	port_in_redirect off;
-
-	# lua path and dicts
-	lua_package_path "/usr/local/lib/lua/?.lua;;";
-	%WHITELIST_IP_CACHE%
-	%WHITELIST_REVERSE_CACHE%
-	%BLACKLIST_IP_CACHE%
-	%BLACKLIST_REVERSE_CACHE%
-	%DNSBL_CACHE%
-
-	# crowdsec init
-	%USE_CROWDSEC%
-	
-	# shared memory zone for limit_req
-	%LIMIT_REQ_ZONE%
-
-	# shared memory zone for limit_conn
-	%LIMIT_CONN_ZONE%
-
-	# whitelist or blacklist country
-	%USE_COUNTRY%
-
-	# list of blocked user agents
-	%BLOCK_USER_AGENT%
-
-	# list of blocked referrers
-	%BLOCK_REFERRER%
-
-	# zone for proxy_cache
-	%PROXY_CACHE_PATH%
-
-	# custom http confs
-	include /http-confs/*.conf;
-
-	# default server when MULTISITE=yes
-	%MULTISITE_DEFAULT_SERVER%
-
-	# server config(s)
-	%INCLUDE_SERVER%
-
-	# API
-	%USE_API%
-}

confs/healthcheck.conf

@@ -0,0 +1,25 @@
+server {
+
+	# healthcheck service for docker, swarm and k8s
+	server_name healthcheck.bunkerweb.io;
+
+	# only listen on localhost
+	listen 127.0.0.1:6000;
+
+	# healthcheck endpoint
+	location ~ ^/healthz$ {
+		keepalive_timeout 0;
+		default_type "text/plain";
+		content_by_lua_block {
+			ngx.say("ok")
+		}
+	}
+	
+	# disable logging
+	access_log off;
+	
+	# don't respond to other requests
+	location / {
+		return 444;
+	}
+}

confs/http.conf

@@ -0,0 +1,94 @@
+# /etc/nginx/base_http.conf
+
+# zero copy within the kernel
+sendfile on;
+
+# send packets only if filled
+tcp_nopush on;
+
+# remove 200ms delay
+tcp_nodelay on;
+
+# load mime types and set default one
+include /etc/nginx/mime.types;
+default_type application/octet-stream;
+
+# access log format
+log_format logf '{{ LOG_FORMAT }}';
+access_log /var/log/nginx/access.log logf;
+
+# temp paths
+proxy_temp_path /opt/bunkerweb/tmp/proxy_temp;
+client_body_temp_path /opt/bunkerweb/tmp/client_temp;
+fastcgi_temp_path /opt/bunkerweb/tmp/fastcgi_temp;
+uwsgi_temp_path /opt/bunkerweb/tmp/uwsgi_temp;
+scgi_temp_path /opt/bunkerweb/tmp/scgi_temp;
+
+# close connections in FIN_WAIT1 state
+reset_timedout_connection on;
+
+# timeouts
+client_body_timeout 10;
+client_header_timeout 10;
+keepalive_timeout 15;
+send_timeout 10;
+
+# resolvers to use
+resolver {{ DNS_RESOLVERS }} ipv6=off;
+
+# remove ports when sending redirects
+port_in_redirect off;
+
+# lua path and dicts
+lua_package_path "/opt/bunkerweb/lua/?.lua;/opt/bunkerweb/core/?.lua;/opt/bunkerweb/plugins/?.lua;/opt/bunkerweb/deps/lib/lua/?.lua;;";
+lua_package_cpath "/opt/bunkerweb/deps/lib/?.so;/opt/bunkerweb/deps/lib/lua/?.so;;";
+lua_ssl_trusted_certificate "/opt/bunkerweb/misc/root-ca.pem";
+lua_ssl_verify_depth 2;
+lua_shared_dict datastore {{ DATASTORE_MEMORY_SIZE }};
+
+# LUA init block
+include /etc/nginx/init-lua.conf;
+
+# API server
+{% if USE_API == "yes" %}include /etc/nginx/api.conf;{% endif +%}
+
+# healthcheck server
+include /etc/nginx/healthcheck.conf;
+
+# default server
+{% if MULTISITE == "yes" or DISABLE_DEFAULT_SERVER == "yes" +%}
+include /etc/nginx/default-server-http.conf;
+{% endif +%}
+
+# disable sending nginx version globally
+server_tokens off;
+
+# server config(s)
+{% if TEMP_NGINX != "yes" +%}
+{% if MULTISITE == "yes" and SERVER_NAME != "" %}
+	{% set map_servers = {} %}
+	{% for server_name in SERVER_NAME.split(" ") %}
+		{% if server_name + "_SERVER_NAME" in all %}
+			{% set x = map_servers.update({server_name : all[server_name + "_SERVER_NAME"].split(" ")}) %}
+		{% endif %}
+	{% endfor %}
+	{% for server_name in SERVER_NAME.split(" ") %}
+		{% if not server_name in map_servers %}
+			{% set found = {"res": false} %}
+			{% for first_server, servers in map_servers.items() %}
+				{% if server_name in servers %}
+					{% set x = found.update({"res" : true}) %}
+				{% endif %}
+			{% endfor %}
+			{% if not found["res"] %}
+				{% set x = map_servers.update({server_name : [server_name]}) %}
+			{% endif %} 
+		{% endif %}
+	{% endfor %}
+	{% for first_server in map_servers +%}
+include /etc/nginx/{{ first_server }}/server.conf;
+	{% endfor %}
+{% elif MULTISITE == "no" and SERVER_NAME != "" +%}
+include /etc/nginx/server.conf;
+{% endif %}
+{% endif %}

confs/init-lua.conf

@@ -0,0 +1,118 @@
+init_by_lua_block {
+
+local logger	= require "logger"
+local datastore	= require "datastore"
+local plugins	= require "plugins"
+local utils		= require "utils"
+local cjson		= require "cjson"
+
+logger.log(ngx.NOTICE, "INIT", "Init phase started")
+
+-- Remove previous data from the datastore
+local data_keys = {"^plugin_", "^variable_", "^plugins$", "^api_", "^misc_"}
+for i, key in pairs(data_keys) do
+	local ok, err = datastore:delete_all(key)
+	if not ok then
+		logger.log(ngx.ERR, "INIT", "Can't delete " .. key .. " from datastore : " .. err)
+		return false
+	end
+	logger.log(ngx.INFO, "INIT", "Deleted " .. key .. " from datastore")
+end
+
+-- Load variables into the datastore
+local file = io.open("/etc/nginx/variables.env")
+if not file then
+	logger.log(ngx.ERR, "INIT", "Can't open /etc/nginx/variables.env file")
+	return false
+end
+file:close()
+for line in io.lines("/etc/nginx/variables.env") do
+	local variable, value = line:match("(.+)=(.*)")
+	ok, err = datastore:set("variable_" .. variable, value)
+	if not ok then
+		logger.log(ngx.ERR, "INIT", "Can't save variable " .. variable .. " into datastore")
+		return false
+	end
+end
+
+-- Set default values into the datastore
+ok, err = datastore:set("plugins", cjson.encode({}))
+if not ok then
+	logger.log(ngx.ERR, "INIT", "Can't set default value for plugins into the datastore : " .. err)
+	return false
+end
+ok, err = utils.set_values()
+if not ok then
+	logger.log(ngx.ERR, "INIT", "Error while setting default values : " .. err)
+	return false
+end
+
+-- API setup
+local value, err = datastore:get("variable_USE_API")
+if not value then
+	logger.log(ngx.ERR, "INIT", "Can't get variable USE_API from the datastore")
+	return false
+end
+if value == "yes" then
+	value, err = datastore:get("variable_API_WHITELIST_IP")
+	if not value then
+		logger.log(ngx.ERR, "INIT", "Can't get variable API_WHITELIST_IP from the datastore")
+		return false
+	end
+	local whitelists = { data = {}}
+	for whitelist in value:gmatch("%S+") do
+		table.insert(whitelists.data, whitelist)
+	end
+	ok, err = datastore:set("api_whitelist_ip", cjson.encode(whitelists))
+	if not ok then
+		logger.log(ngx.ERR, "INIT", "Can't save api_whitelist_ip to datastore : " .. err)
+		return false
+	end
+end
+
+-- Load plugins into the datastore
+local plugin_paths = {"/opt/bunkerweb/core", "/opt/bunkerweb/plugins"}
+for i, plugin_path in ipairs(plugin_paths) do
+	local paths = io.popen("find -L " .. plugin_path .. " -maxdepth 1 -type d ! -path " .. plugin_path)
+	for path in paths:lines() do
+		plugin, err = plugins:load(path)
+		if not plugin then
+			logger.log(ngx.ERR, "INIT", "Error while loading plugin from " .. path .. " : " .. err)
+			return false
+		end
+		logger.log(ngx.NOTICE, "INIT", "Loaded plugin " .. plugin.id .. " v" .. plugin.version)
+	end
+end
+
+-- Call init method of plugins
+local list, err = plugins:list()
+if not list then
+	logger.log(ngx.ERR, "INIT", "Can't list loaded plugins : " .. err)
+	list = {}
+end
+for i, plugin in ipairs(list) do
+	local ret, plugin_lua = pcall(require, plugin.id .. "/" .. plugin.id)
+	if ret then
+		local plugin_obj = plugin_lua.new()
+		if plugin_obj.init ~= nil then
+			ok, err = plugin_obj:init()
+			if not ok then
+				logger.log(ngx.ERR, "INIT", "Plugin " .. plugin.id .. " failed on init() : " .. err)
+			else
+				logger.log(ngx.INFO, "INIT", "Successfull init() call for plugin " .. plugin.id .. " : " .. err)
+			end
+		else
+			logger.log(ngx.INFO, "INIT", "init() method not found in " .. plugin.id .. ", skipped execution")
+		end
+	else
+		if plugin_lua:match("not found") then
+			logger.log(ngx.INFO, "INIT", "can't require " .. plugin.id .. " : not found")
+		else
+			logger.log(ngx.ERR, "INIT", "can't require " .. plugin.id .. " : " .. plugin_lua)
+		end
+	end
+end
+
+logger.log(ngx.NOTICE, "INIT", "Init phase ended")
+
+}

confs/mime.types

@@ -0,0 +1,99 @@
+
+types {
+    text/html                                        html htm shtml;
+    text/css                                         css;
+    text/xml                                         xml;
+    image/gif                                        gif;
+    image/jpeg                                       jpeg jpg;
+    application/javascript                           js;
+    application/atom+xml                             atom;
+    application/rss+xml                              rss;
+
+    text/mathml                                      mml;
+    text/plain                                       txt;
+    text/vnd.sun.j2me.app-descriptor                 jad;
+    text/vnd.wap.wml                                 wml;
+    text/x-component                                 htc;
+
+    image/avif                                       avif;
+    image/png                                        png;
+    image/svg+xml                                    svg svgz;
+    image/tiff                                       tif tiff;
+    image/vnd.wap.wbmp                               wbmp;
+    image/webp                                       webp;
+    image/x-icon                                     ico;
+    image/x-jng                                      jng;
+    image/x-ms-bmp                                   bmp;
+
+    font/woff                                        woff;
+    font/woff2                                       woff2;
+
+    application/java-archive                         jar war ear;
+    application/json                                 json;
+    application/mac-binhex40                         hqx;
+    application/msword                               doc;
+    application/pdf                                  pdf;
+    application/postscript                           ps eps ai;
+    application/rtf                                  rtf;
+    application/vnd.apple.mpegurl                    m3u8;
+    application/vnd.google-earth.kml+xml             kml;
+    application/vnd.google-earth.kmz                 kmz;
+    application/vnd.ms-excel                         xls;
+    application/vnd.ms-fontobject                    eot;
+    application/vnd.ms-powerpoint                    ppt;
+    application/vnd.oasis.opendocument.graphics      odg;
+    application/vnd.oasis.opendocument.presentation  odp;
+    application/vnd.oasis.opendocument.spreadsheet   ods;
+    application/vnd.oasis.opendocument.text          odt;
+    application/vnd.openxmlformats-officedocument.presentationml.presentation
+                                                     pptx;
+    application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+                                                     xlsx;
+    application/vnd.openxmlformats-officedocument.wordprocessingml.document
+                                                     docx;
+    application/vnd.wap.wmlc                         wmlc;
+    application/wasm                                 wasm;
+    application/x-7z-compressed                      7z;
+    application/x-cocoa                              cco;
+    application/x-java-archive-diff                  jardiff;
+    application/x-java-jnlp-file                     jnlp;
+    application/x-makeself                           run;
+    application/x-perl                               pl pm;
+    application/x-pilot                              prc pdb;
+    application/x-rar-compressed                     rar;
+    application/x-redhat-package-manager             rpm;
+    application/x-sea                                sea;
+    application/x-shockwave-flash                    swf;
+    application/x-stuffit                            sit;
+    application/x-tcl                                tcl tk;
+    application/x-x509-ca-cert                       der pem crt;
+    application/x-xpinstall                          xpi;
+    application/xhtml+xml                            xhtml;
+    application/xspf+xml                             xspf;
+    application/zip                                  zip;
+
+    application/octet-stream                         bin exe dll;
+    application/octet-stream                         deb;
+    application/octet-stream                         dmg;
+    application/octet-stream                         iso img;
+    application/octet-stream                         msi msp msm;
+
+    audio/midi                                       mid midi kar;
+    audio/mpeg                                       mp3;
+    audio/ogg                                        ogg;
+    audio/x-m4a                                      m4a;
+    audio/x-realaudio                                ra;
+
+    video/3gpp                                       3gpp 3gp;
+    video/mp2t                                       ts;
+    video/mp4                                        mp4;
+    video/mpeg                                       mpeg mpg;
+    video/quicktime                                  mov;
+    video/webm                                       webm;
+    video/x-flv                                      flv;
+    video/x-m4v                                      m4v;
+    video/x-mng                                      mng;
+    video/x-ms-asf                                   asx asf;
+    video/x-ms-wmv                                   wmv;
+    video/x-msvideo                                  avi;
+}

confs/nginx.conf

@@ -0,0 +1,64 @@
+# /etc/nginx/nginx.conf
+
+# load dynamic modules
+load_module /opt/bunkerweb/modules/ngx_http_cookie_flag_filter_module.so;
+#load_module /opt/bunkerweb/modules/ngx_http_geoip2_module.so;
+load_module /opt/bunkerweb/modules/ngx_http_headers_more_filter_module.so;
+load_module /opt/bunkerweb/modules/ngx_http_lua_module.so;
+load_module /opt/bunkerweb/modules/ngx_http_modsecurity_module.so;
+load_module /opt/bunkerweb/modules/ngx_http_brotli_filter_module.so;
+load_module /opt/bunkerweb/modules/ngx_http_brotli_static_module.so;
+#load_module /opt/bunkerweb/modules/ngx_stream_geoip2_module.so;
+#load_module /opt/bunkerweb/modules/ngx_stream_lua_module.so;
+
+# PID file
+{% if TEMP_NGINX != "yes" +%}
+pid /opt/bunkerweb/tmp/nginx.pid;
+{% else +%}
+pid /opt/bunkerweb/tmp/nginx-temp.pid;
+{% endif %}
+
+# worker number (default = auto)
+worker_processes {{ WORKER_PROCESSES }};
+
+# faster regexp
+pcre_jit on;
+
+# max open files for each worker
+worker_rlimit_nofile {{ WORKER_RLIMIT_NOFILE }};
+
+# error log level
+error_log /var/log/nginx/error.log {{ LOG_LEVEL }};
+
+# reason env var
+env REASON;
+
+events {
+	# max connections per worker
+	worker_connections {{ WORKER_CONNECTIONS }};
+
+	# epoll seems to be the best on Linux
+	use epoll;
+}
+
+http {
+	# include base http configuration
+	include /etc/nginx/http.conf;
+
+	# include core and plugins http configurations
+	include /etc/nginx/http/*.conf;
+
+	# include custom http configurations
+	include /opt/bunkerweb/configs/http/*.conf;
+}
+
+#stream {
+	# include base stream configuration
+#	include /etc/nginx/stream.conf;
+
+	# include core and plugins stream configurations
+#	include /etc/nginx/stream/*.conf;
+
+	# include custom stream configurations
+#	include /opt/bunkerweb/configs/stream/*.conf;
+#}

confs/scgi_params

@@ -0,0 +1,17 @@
+
+scgi_param  REQUEST_METHOD     $request_method;
+scgi_param  REQUEST_URI        $request_uri;
+scgi_param  QUERY_STRING       $query_string;
+scgi_param  CONTENT_TYPE       $content_type;
+
+scgi_param  DOCUMENT_URI       $document_uri;
+scgi_param  DOCUMENT_ROOT      $document_root;
+scgi_param  SCGI               1;
+scgi_param  SERVER_PROTOCOL    $server_protocol;
+scgi_param  REQUEST_SCHEME     $scheme;
+scgi_param  HTTPS              $https if_not_empty;
+
+scgi_param  REMOTE_ADDR        $remote_addr;
+scgi_param  REMOTE_PORT        $remote_port;
+scgi_param  SERVER_PORT        $server_port;
+scgi_param  SERVER_NAME        $server_name;

confs/server-http/access-lua.conf

@@ -0,0 +1,63 @@
+access_by_lua_block {
+
+local logger	= require "logger"
+local datastore	= require "datastore"
+local plugins	= require "plugins"
+
+-- Don't process internal requests
+if ngx.req.is_internal() then
+	logger.log(ngx.INFO, "ACCESS", "Skipped access phase because request is internal")
+	return
+end
+
+logger.log(ngx.INFO, "ACCESS", "Access phase started")
+
+-- Process bans as soon as possible
+local banned, err = datastore:get("bans_ip_" .. ngx.var.remote_addr)
+if banned then
+	logger.log(ngx.WARN, "ACCESS", "IP " .. ngx.var.remote_addr .. " is banned with reason : " .. banned)
+	ngx.exit(ngx.HTTP_FORBIDDEN)
+end
+
+-- List all plugins
+local list, err = plugins:list()
+if not list then
+	logger.log(ngx.ERR, "ACCESS", "Can't list loaded plugins : " .. err)
+	list = {}
+end
+
+-- Call access method of plugins
+for i, plugin in ipairs(list) do
+	local ret, plugin_lua = pcall(require, plugin.id .. "/" .. plugin.id)
+	if ret then
+		local plugin_obj = plugin_lua.new()
+		if plugin_obj.access ~= nil then
+			logger.log(ngx.INFO, "ACCESS", "Executing access() of " .. plugin.id)
+			local ok, err, ret, value = plugin_obj:access()
+			if not ok then
+				logger.log(ngx.ERR, "ACCESS", "Error while calling access() on plugin " .. plugin.id .. " : " .. err)
+			else
+				logger.log(ngx.INFO, "ACCESS", "Return value from " .. plugin.id .. ".access() is : " .. err)
+			end
+			if ret then
+				if type(value) == "number" then
+					if value == ngx.HTTP_FORBIDDEN then
+						logger.log(ngx.WARN, "ACCESS", "Denied access from " .. plugin.id .. " : " .. err)
+						ngx.var.reason = plugin.id
+					else
+						logger.log(ngx.NOTICE, "ACCESS", plugin.id .. " returned status " .. tostring(value) .. " : " .. err)
+					end
+					return ngx.exit(value)
+				else
+					return value
+				end
+			end
+		else
+			logger.log(ngx.INFO, "ACCESS", "access() method not found in " .. plugin.id .. ", skipped execution")
+		end
+	end
+end
+
+logger.log(ngx.INFO, "ACCESS", "Access phase ended")
+
+}

confs/server-http/log-lua.conf

@@ -0,0 +1,44 @@
+log_by_lua_block {
+
+local utils		= require "utils"
+local logger	= require "logger"
+local datastore	= require "datastore"
+local plugins	= require "plugins"
+
+logger.log(ngx.INFO, "LOG", "Log phase started")
+
+-- List all plugins
+local list, err = plugins:list()
+if not list then
+	logger.log(ngx.ERR, "LOG", "Can't list loaded plugins : " .. err)
+	list = {}
+end
+
+-- Call log method of plugins
+for i, plugin in ipairs(list) do
+	local ret, plugin_lua = pcall(require, plugin.id .. "/" .. plugin.id)
+	if ret then
+		local plugin_obj = plugin_lua.new()
+		if plugin_obj.log ~= nil then
+			logger.log(ngx.INFO, "LOG", "Executing log() of " .. plugin.id)
+			local ok, err = plugin_obj:log()
+			if not ok then
+				logger.log(ngx.ERR, "LOG", "Error while calling log() on plugin " .. plugin.id .. " : " .. err)
+			else
+				logger.log(ngx.INFO, "LOG", "Return value from " .. plugin.id .. ".log() is : " .. err)
+			end
+		else
+			logger.log(ngx.INFO, "LOG", "log() method not found in " .. plugin.id .. ", skipped execution")
+		end
+	end
+end
+
+-- Display reason at info level
+local reason = utils.get_reason()
+if reason then
+	logger.log(ngx.INFO, "LOG", "Client was denied with reason : " .. reason)
+end
+
+logger.log(ngx.INFO, "LOG", "Log phase ended")
+
+}

confs/server-http/server.conf

@@ -0,0 +1,27 @@
+server {
+	# server name (vhost)
+	server_name {{ SERVER_NAME }};
+
+	# HTTP listen
+{% if LISTEN_HTTP == "yes" +%}
+	listen 0.0.0.0:{{ HTTP_PORT }}{% if MULTISITE == "no" and DISABLE_DEFAULT_SERVER == "no" %} default_server{% endif %}{% if USE_PROXY_PROTOCOL == "yes" %} proxy_protocol{% endif %};
+{% endif %}
+
+	index index.php index.html index.htm;
+
+	# custom config
+	include /opt/bunkerweb/configs/server-http/*.conf;
+{% if MULTISITE == "yes" +%}
+	include /opt/bunkerweb/configs/server-http/{{ SERVER_NAME.split(" ")[0] }}/*.conf;
+{% endif %}
+
+	# reason variable
+	set $reason '';
+
+	# include LUA files
+	include {{ NGINX_PREFIX }}access-lua.conf;
+	include {{ NGINX_PREFIX }}log-lua.conf;
+	
+	# include config files
+	include {{ NGINX_PREFIX }}server-http/*.conf;
+}

confs/site/antibot-captcha.conf

@@ -1,44 +0,0 @@
-location = %ANTIBOT_URI% {
-
-	default_type 'text/html';
-	
-	if ($request_method = GET) {
-		content_by_lua_block {
-			local cookie	= require "cookie"
-			local captcha	= require "captcha"
-			if not cookie.is_set("uri") then
-				ngx.log(ngx.NOTICE, "[ANTIBOT] captcha fail (1) for " .. ngx.var.remote_addr)
-				return ngx.exit(ngx.HTTP_FORBIDDEN)
-			end
-			local img, res = captcha.get_challenge()
-			cookie.set({captchares = res})
-			local code = captcha.get_code(img, "%ANTIBOT_URI%")
-			ngx.say(code)
-		}
-	}
-	
-	if ($request_method = POST) {
-		access_by_lua_block {
-			local cookie	= require "cookie"
-			local captcha	= require "captcha"
-			if not cookie.is_set("captchares") then
-				ngx.log(ngx.NOTICE, "[ANTIBOT] captcha fail (2) for " .. ngx.var.remote_addr)
-				return ngx.exit(ngx.HTTP_FORBIDDEN)
-			end
-			ngx.req.read_body()
-			local args, err = ngx.req.get_post_args(1)
-			if err == "truncated" or not args or not args["captcha"] then
-				ngx.log(ngx.NOTICE, "[ANTIBOT] captcha fail (3) for " .. ngx.var.remote_addr)
-				return ngx.exit(ngx.HTTP_FORBIDDEN)
-			end
-			local captcha_user	= args["captcha"]
-			local check		= captcha.check(captcha_user, cookie.get("captchares"))
-			if not check then
-				ngx.log(ngx.NOTICE, "[ANTIBOT] captcha fail (4) for " .. ngx.var.remote_addr)
-				return ngx.redirect("%ANTIBOT_URI%")
-			end
-			cookie.set({captcha = "ok"})
-			return ngx.redirect(cookie.get("uri"))
-		}
-	}
-}

confs/site/antibot-javascript.conf

@@ -1,43 +0,0 @@
-location = %ANTIBOT_URI% {
-
-	default_type 'text/html';
-	
-	if ($request_method = GET) {
-		content_by_lua_block {
-			local cookie		= require "cookie"
-			local javascript	= require "javascript"
-			if not cookie.is_set("challenge") then
-				ngx.log(ngx.WARN, "[ANTIBOT] javascript fail (1) for " .. ngx.var.remote_addr)
-				return ngx.exit(ngx.HTTP_FORBIDDEN)
-			end
-			local challenge	= cookie.get("challenge")
-			local code	= javascript.get_code(challenge, "%ANTIBOT_URI%", cookie.get("uri"))
-			ngx.say(code)
-		}
-	}
-	
-	if ($request_method = POST) {
-		content_by_lua_block {
-			local cookie		= require "cookie"
-			local javascript	= require "javascript"
-			if not cookie.is_set("challenge") then
-				ngx.log(ngx.WARN, "[ANTIBOT] javascript fail (2) for " .. ngx.var.remote_addr)
-				return ngx.exit(ngx.HTTP_FORBIDDEN)
-			end
-			ngx.req.read_body()
-			local args, err = ngx.req.get_post_args(1)
-			if err == "truncated" or not args or not args["challenge"] then
-				ngx.log(ngx.WARN, "[ANTIBOT] javascript fail (3) for " .. ngx.var.remote_addr)
-				return ngx.exit(ngx.HTTP_FORBIDDEN)
-			end
-			local challenge		= args["challenge"]
-			local check		= javascript.check(cookie.get("challenge"), challenge)
-			if not check then
-				ngx.log(ngx.WARN, "[ANTIBOT] javascript fail (4) for " .. ngx.var.remote_addr)
-				return ngx.exit(ngx.HTTP_FORBIDDEN)
-			end
-			cookie.set({javascript = "ok"})
-			return ngx.exit(ngx.OK)
-		}
-	}
-}

confs/site/antibot-recaptcha.conf

@@ -1,42 +0,0 @@
-location = %ANTIBOT_URI% {
-
-	default_type 'text/html';
-	
-	if ($request_method = GET) {
-		content_by_lua_block {
-			local cookie	= require "cookie"
-			local recaptcha	= require "recaptcha"
-			if not cookie.is_set("uri") then
-				ngx.log(ngx.NOTICE, "[ANTIBOT] recaptcha fail (1) for " .. ngx.var.remote_addr)
-				return ngx.exit(ngx.HTTP_FORBIDDEN)
-			end
-			local code = recaptcha.get_code("%ANTIBOT_URI%", "%ANTIBOT_RECAPTCHA_SITEKEY%")
-			ngx.say(code)
-		}
-	}
-	
-	if ($request_method = POST) {
-		access_by_lua_block {
-			local cookie	= require "cookie"
-			local recaptcha	= require "recaptcha"
-			if not cookie.is_set("uri") then
-				ngx.log(ngx.NOTICE, "[ANTIBOT] recaptcha fail (2) for " .. ngx.var.remote_addr)
-				return ngx.exit(ngx.HTTP_FORBIDDEN)
-			end
-			ngx.req.read_body()
-			local args, err = ngx.req.get_post_args(1)
-			if err == "truncated" or not args or not args["token"] then
-				ngx.log(ngx.NOTICE, "[ANTIBOT] recaptcha fail (3) for " .. ngx.var.remote_addr)
-				return ngx.exit(ngx.HTTP_FORBIDDEN)
-			end
-			local token	= args["token"]
-			local check	= recaptcha.check(token, "%ANTIBOT_RECAPTCHA_SECRET%")
-			if check < %ANTIBOT_RECAPTCHA_SCORE% then
-				ngx.log(ngx.NOTICE, "[ANTIBOT] recaptcha fail (4) for " .. ngx.var.remote_addr .. " (score = " .. tostring(check) .. ")")
-				return ngx.exit(ngx.HTTP_FORBIDDEN)
-			end
-			cookie.set({recaptcha = "ok"})
-			return ngx.redirect(cookie.get("uri"))
-		}
-	}
-}

confs/site/auth-basic-sitewide.conf

@@ -1,2 +0,0 @@
-auth_basic "%AUTH_BASIC_TEXT%";
-auth_basic_user_file %NGINX_PREFIX%.htpasswd;

confs/site/auth-basic.conf

@@ -1,4 +0,0 @@
-location %AUTH_BASIC_LOCATION% {
-	auth_basic "%AUTH_BASIC_TEXT%";
-	auth_basic_user_file %NGINX_PREFIX%.htpasswd; 
-}

confs/site/brotli.conf

@@ -1,4 +0,0 @@
-brotli on;
-brotli_types %BROTLI_TYPES%;
-brotli_comp_level %BROTLI_COMP_LEVEL%;
-brotli_min_length %BROTLI_MIN_LENGTH%;

confs/site/client-cache.conf

@@ -1,6 +0,0 @@
-etag %CLIENT_CACHE_ETAG%;
-set $cache "";
-if ($uri ~* \.(%CLIENT_CACHE_EXTENSIONS%)$) {
-	set $cache "%CLIENT_CACHE_CONTROL%";
-}
-add_header Cache-Control $cache;

confs/site/content-security-policy.conf

@@ -1 +0,0 @@
-more_set_headers "Content-Security-Policy: %CONTENT_SECURITY_POLICY%";

confs/site/cookie-flags.conf

@@ -1 +0,0 @@
-set_cookie_flag %COOKIE_FLAGS%;

confs/site/custom-https.conf

@@ -1,7 +0,0 @@
-listen 0.0.0.0:443 ssl %HTTP2%;
-ssl_certificate %HTTPS_CUSTOM_CERT%;
-ssl_certificate_key %HTTPS_CUSTOM_KEY%;
-ssl_protocols TLSv1.3;
-ssl_prefer_server_ciphers off;
-ssl_session_tickets off;
-%STRICT_TRANSPORT_SECURITY%

confs/site/disable-default-server.conf

@@ -1,3 +0,0 @@
-if ($host !~ ^(%SERVER_NAME%)$) {
-	return 444;
-}

confs/site/error.conf

@@ -1,7 +0,0 @@
-error_page %CODE% %PAGE%;
-
-location = %PAGE% {
-    root %ROOT_FOLDER%;
-    modsecurity off;
-    internal;
-}

confs/site/feature-policy.conf

@@ -1 +0,0 @@
-more_set_headers "Feature-Policy: %FEATURE_POLICY%";

confs/site/gzip.conf

@@ -1,4 +0,0 @@
-gzip on;
-gzip_comp_level %GZIP_COMP_LEVEL%;
-gzip_min_length %GZIP_MIN_LENGTH%;
-gzip_types %GZIP_TYPES%;

confs/site/https.conf

@@ -1,12 +0,0 @@
-listen 0.0.0.0:%HTTPS_PORT% ssl %HTTP2%;
-ssl_certificate %HTTPS_CERT%;
-ssl_certificate_key %HTTPS_KEY%;
-ssl_protocols %HTTPS_PROTOCOLS%;
-ssl_prefer_server_ciphers on;
-ssl_session_tickets off;
-ssl_session_timeout 1d;
-ssl_session_cache shared:MozSSL:10m;
-%STRICT_TRANSPORT_SECURITY%
-%SSL_DHPARAM%
-%SSL_CIPHERS%
-%LETS_ENCRYPT_WEBROOT%

confs/site/lets-encrypt-webroot.conf

@@ -1,3 +0,0 @@
-location ~ ^/.well-known/acme-challenge/ {
-	root /acme-challenge;
-}

confs/site/limit-conn.conf

@@ -1 +0,0 @@
-limit_conn ddos %LIMIT_CONN_MAX%;

confs/site/limit-req.conf

@@ -1,3 +0,0 @@
-limit_req_status 429;
-limit_req zone=limit burst=%LIMIT_REQ_BURST% nodelay;
-

confs/site/main-lua.conf

@@ -1,198 +0,0 @@
-set $session_secret %ANTIBOT_SESSION_SECRET%;
-set $session_check_addr on;
-
-access_by_lua_block {
-
-local use_lets_encrypt		= %USE_LETS_ENCRYPT%
-local use_whitelist_ip		= %USE_WHITELIST_IP%
-local use_whitelist_reverse	= %USE_WHITELIST_REVERSE%
-local use_user_agent		= %USE_USER_AGENT%
-local use_referrer		= %USE_REFERRER%
-local use_country		= %USE_COUNTRY%
-local use_blacklist_ip		= %USE_BLACKLIST_IP%
-local use_blacklist_reverse	= %USE_BLACKLIST_REVERSE%
-local use_dnsbl			= %USE_DNSBL%
-local use_crowdsec		= %USE_CROWDSEC%
-local use_antibot_cookie	= %USE_ANTIBOT_COOKIE%
-local use_antibot_javascript	= %USE_ANTIBOT_JAVASCRIPT%
-local use_antibot_captcha	= %USE_ANTIBOT_CAPTCHA%
-local use_antibot_recaptcha	= %USE_ANTIBOT_RECAPTCHA%
-
--- include LUA code
-local whitelist		= require "whitelist"
-local blacklist		= require "blacklist"
-local dnsbl		= require "dnsbl"
-local cookie		= require "cookie"
-local javascript	= require "javascript"
-local captcha		= require "captcha"
-local recaptcha		= require "recaptcha"
-
--- user variables
-local antibot_uri		= "%ANTIBOT_URI%"
-local whitelist_user_agent	= {%WHITELIST_USER_AGENT%}
-local whitelist_uri		= {%WHITELIST_URI%}
-
--- check if already in whitelist cache
-if use_whitelist_ip and whitelist.ip_cached_ok() then
-	ngx.exit(ngx.OK)
-end
-if use_whitelist_reverse and whitelist.reverse_cached_ok() then
-	ngx.exit(ngx.OK)
-end
-
--- check if already in blacklist cache
-if use_blacklist_ip and blacklist.ip_cached_ko() then
-	ngx.exit(ngx.HTTP_FORBIDDEN)
-end
-if use_blacklist_reverse and blacklist.reverse_cached_ko() then
-	ngx.exit(ngx.HTTP_FORBIDDEN)
-end
-
--- check if already in dnsbl cache
-if use_dnsbl and dnsbl.cached_ko() then
-	ngx.exit(ngx.HTTP_FORBIDDEN)
-end
-
--- check if IP is whitelisted (only if not in cache)
-if use_whitelist_ip and not whitelist.ip_cached() then
-	if whitelist.check_ip() then
-		ngx.exit(ngx.OK)
-	end
-end
-
--- check if reverse is whitelisted (only if not in cache)
-if use_whitelist_reverse and not whitelist.reverse_cached() then
-	if whitelist.check_reverse() then
-		ngx.exit(ngx.OK)
-	end
-end
-
--- check if URI is whitelisted
-for k, v in pairs(whitelist_uri) do
-	if ngx.var.request_uri == v then
-		ngx.log(ngx.NOTICE, "[WHITELIST] URI " .. v .. " is whitelisted")
-		ngx.exit(ngx.OK)
-	end
-end
-
--- check if it's certbot
-if use_lets_encrypt and string.match(ngx.var.request_uri, "^/.well-known/acme-challenge/") then
-	ngx.exit(ngx.OK)
-end
-
--- check if IP is blacklisted (only if not in cache)
-if use_blacklist_ip and not blacklist.ip_cached() then
-	if blacklist.check_ip() then
-		ngx.exit(ngx.HTTP_FORBIDDEN)
-	end
-end
-
--- check if reverse is blacklisted (only if not in cache)
-if use_blacklist_reverse and not blacklist.reverse_cached() then
-	if blacklist.check_reverse() then
-		ngx.exit(ngx.HTTP_FORBIDDEN)
-	end
-end
-
--- check if user-agent is allowed
-if use_user_agent and ngx.var.bad_user_agent == "yes" then
-	local block = false
-	for k, v in pairs(whitelist_user_agent) do
-		if string.match(ngx.var.http_user_agent, v) then
-			ngx.log(ngx.NOTICE, "[ALLOW] User-Agent " .. ngx.var.http_user_agent .. " is whitelisted")
-			block = false
-			break
-		end
-	end
-	if block then
-		ngx.log(ngx.NOTICE, "[BLOCK] User-Agent " .. ngx.var.http_user_agent .. " is blacklisted")
-		ngx.exit(ngx.HTTP_FORBIDDEN)
-	end
-end
-
--- check if referrer is allowed
-if use_referrer and ngx.var.bad_referrer == "yes" then
-	ngx.log(ngx.NOTICE, "[BLOCK] Referrer " .. ngx.var.http_referer .. " is blacklisted")
-	ngx.exit(ngx.HTTP_FORBIDDEN)
-end
-
--- check if country is allowed
-if use_country and ngx.var.allowed_country == "no" then
-	ngx.log(ngx.NOTICE, "[BLOCK] Country of " .. ngx.var.remote_addr .. " is blacklisted")
-	ngx.exit(ngx.HTTP_FORBIDDEN)
-end
-
--- check if IP is in DNSBLs (only if not in cache)
-if use_dnsbl and not dnsbl.cached() then
-	if dnsbl.check() then
-		ngx.exit(ngx.HTTP_FORBIDDEN)
-	end
-end
-
--- check if IP is in CrowdSec DB
-if use_crowdsec then
-	local ok, err = require "crowdsec.CrowdSec".allowIp(ngx.var.remote_addr)
-	if ok == nil then
-		ngx.log(ngx.ERR, "[Crowdsec] " .. err)
-	end
-	if not ok then
-		ngx.log(ngx.NOTICE, "[Crowdsec] denied '" .. ngx.var.remote_addr .. "'")
-		ngx.exit(ngx.HTTP_FORBIDDEN)
-	end
-end
-
--- cookie check
-if use_antibot_cookie then
-	if not cookie.is_set("uri") then
-		if ngx.var.request_uri ~= antibot_uri then
-			cookie.set({uri = ngx.var.request_uri})
-			return ngx.redirect(antibot_uri)
-		end
-		ngx.log(ngx.NOTICE, "[ANTIBOT] cookie fail for " .. ngx.var.remote_addr)
-		return ngx.exit(ngx.HTTP_FORBIDDEN)
-	else
-		if ngx.var.request_uri == antibot_uri then
-			return ngx.redirect(cookie.get("uri"))
-		end
-	end
-end
-
--- javascript check
-if use_antibot_javascript then
-	if not cookie.is_set("javascript") then
-		if ngx.var.request_uri ~= antibot_uri then
-			cookie.set({uri = ngx.var.request_uri, challenge = javascript.get_challenge()})
-			return ngx.redirect(antibot_uri)
-		end
-	end
-end
-
--- captcha check
-if use_antibot_captcha then
-	if not cookie.is_set("captcha") then
-		if ngx.var.request_uri ~= antibot_uri then
-			cookie.set({uri = ngx.var.request_uri})
-			return ngx.redirect(antibot_uri)
-		end
-	end
-end
-
--- recaptcha check
-if use_antibot_recaptcha then
-	if not cookie.is_set("recaptcha") then
-		if ngx.var.request_uri ~= antibot_uri then
-			cookie.set({uri = ngx.var.request_uri})
-			return ngx.redirect(antibot_uri)
-		end
-	end
-end
-
-ngx.exit(ngx.OK)
-
-}
-
-%INCLUDE_ANTIBOT_JAVASCRIPT%
-
-%INCLUDE_ANTIBOT_CAPTCHA%
-
-%INCLUDE_ANTIBOT_RECAPTCHA%

confs/site/modsecurity-clamav.conf

@@ -1,4 +0,0 @@
-SecUploadDir /tmp
-SecUploadKeepFiles On
-SecRule FILES_TMPNAMES "@inspectFile /opt/scripts/clamav.sh" \
-"phase:2,t:none,deny,msg:'Virus found in uploaded file',id:'399999'"

confs/site/modsecurity-rules.conf

@@ -1,65 +0,0 @@
-# process rules with disruptive actions
-SecRuleEngine On
-
-# allow body checks
-SecRequestBodyAccess On
-
-# enable XML parsing
-SecRule REQUEST_HEADERS:Content-Type "(?:application(?:/soap\+|/)|text/)xml" \
-     "id:'200000',phase:1,t:none,t:lowercase,pass,nolog,ctl:requestBodyProcessor=XML"
-
-# enable JSON parsing
-SecRule REQUEST_HEADERS:Content-Type "application/json" \
-     "id:'200001',phase:1,t:none,t:lowercase,pass,nolog,ctl:requestBodyProcessor=JSON"
-
-# maximum data size
-SecRequestBodyLimit 13107200
-SecRequestBodyNoFilesLimit 131072
-
-# reject requests if bigger than max data size
-SecRequestBodyLimitAction Reject
-
-# reject if we can't process the body
-SecRule REQBODY_ERROR "!@eq 0" \
-"id:'200002', phase:2,t:none,log,deny,status:400,msg:'Failed to parse request body.',logdata:'%{reqbody_error_msg}',severity:2"
-
-# be strict with multipart/form-data body
-SecRule MULTIPART_STRICT_ERROR "!@eq 0" \
-"id:'200003',phase:2,t:none,log,deny,status:400, \
-msg:'Multipart request body failed strict validation: \
-PE %{REQBODY_PROCESSOR_ERROR}, \
-BQ %{MULTIPART_BOUNDARY_QUOTED}, \
-BW %{MULTIPART_BOUNDARY_WHITESPACE}, \
-DB %{MULTIPART_DATA_BEFORE}, \
-DA %{MULTIPART_DATA_AFTER}, \
-HF %{MULTIPART_HEADER_FOLDING}, \
-LF %{MULTIPART_LF_LINE}, \
-SM %{MULTIPART_MISSING_SEMICOLON}, \
-IQ %{MULTIPART_INVALID_QUOTING}, \
-IP %{MULTIPART_INVALID_PART}, \
-IH %{MULTIPART_INVALID_HEADER_FOLDING}, \
-FL %{MULTIPART_FILE_LIMIT_EXCEEDED}'"
-SecRule MULTIPART_UNMATCHED_BOUNDARY "@eq 1" \
-    "id:'200004',phase:2,t:none,log,deny,msg:'Multipart parser detected a possible unmatched boundary.'"
-
-# enable response body checks
-SecResponseBodyAccess On
-SecResponseBodyMimeType text/plain text/html text/xml application/json
-SecResponseBodyLimit 524288
-SecResponseBodyLimitAction ProcessPartial
-
-# log usefull stuff
-SecAuditEngine RelevantOnly
-SecAuditLogType Serial
-SecAuditLog /var/log/nginx/modsec_audit.log
-
-# scan uploaded files with clamv
-%USE_CLAMAV_UPLOAD%
-
-# include OWASP CRS rules
-%MODSECURITY_INCLUDE_CRS%
-%MODSECURITY_INCLUDE_CUSTOM_CRS%
-%MODSECURITY_INCLUDE_CRS_RULES%
-
-# include custom rules
-%MODSECURITY_INCLUDE_CUSTOM_RULES%

confs/site/modsecurity.conf

@@ -1,2 +0,0 @@
-modsecurity on;
-modsecurity_rules_file %MODSEC_RULES_FILE%;

confs/site/open-file-cache.conf

@@ -1,4 +0,0 @@
-open_file_cache %OPEN_FILE_CACHE%;
-open_file_cache_errors %OPEN_FILE_CACHE_ERRORS%;
-open_file_cache_min_uses %OPEN_FILE_CACHE_MIN_USES%;
-open_file_cache_valid %OPEN_FILE_CACHE_VALID%;

confs/site/permissions-policy.conf

@@ -1 +0,0 @@
-more_set_headers "Permissions-Policy: %PERMISSIONS_POLICY%";

confs/site/php.conf

@@ -1,4 +0,0 @@
-location ~ \.php$ {
-	fastcgi_pass      %REMOTE_PHP%:9000;
-	fastcgi_index     index.php;
-}

confs/site/proxy-cache.conf

@@ -1,7 +0,0 @@
-proxy_cache proxycache;
-proxy_cache_methods %PROXY_CACHE_METHODS%;
-proxy_cache_min_uses %PROXY_CACHE_MIN_USES%;
-proxy_cache_key %PROXY_CACHE_KEY%;
-proxy_no_cache %PROXY_NO_CACHE%;
-proxy_cache_bypass %PROXY_CACHE_BYPASS%;
-%PROXY_CACHE_VALID%

confs/site/proxy-real-ip.conf

@@ -1,4 +0,0 @@
-%PROXY_REAL_IP_FROM%
-real_ip_header %PROXY_REAL_IP_HEADER%;
-real_ip_recursive %PROXY_REAL_IP_RECURSIVE%;
-

confs/site/redirect-http-to-https.conf

@@ -1,3 +0,0 @@
-if ($scheme = http) {
-	return 301 https://$host$request_uri;
-}

confs/site/referrer-policy.conf

@@ -1 +0,0 @@
-more_set_headers "Referrer-Policy: %REFERRER_POLICY%";