Merge pull request #199 from Myzel394/patch-1

Fix typo

.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, configs, tests, environment, version, ...).
+
+**Logs**
+The logs generated by bunkerized-nginx. **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: enhancement
+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/build-bunkerized-nginx-autoconf.yml

@@ -0,0 +1,82 @@
+name: Build and push bunkerized-nginx-autoconf
+
+on:
+  push:
+    branches: [dev, master]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Checkout source code
+        uses: actions/checkout@v2
+
+      # temp fix : can't use buildx + load because of manifest error
+      # so we need to build the image the traditional way
+      - name: Temp build to check security issues
+        run: docker build -t bunkerized-nginx-autoconf -f autoconf/Dockerfile .
+
+      - name: Run Trivy security scanner
+        uses: aquasecurity/trivy-action@master
+        with:
+          image-ref: 'bunkerized-nginx-autoconf'
+          format: 'table'
+          exit-code: '1'
+          ignore-unfixed: true
+          severity: 'UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL'
+
+      - name: Set variables
+        run: |
+          VER=$(cat VERSION | tr -d '\n')
+          echo "VERSION=$VER" >> $GITHUB_ENV
+
+      - name: Setup QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Setup Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Setup Docker cache
+        uses: actions/cache@v2
+        if: github.ref == 'refs/heads/dev'
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: Build and push (dev)
+        uses: docker/build-push-action@v2
+        if: github.ref == 'refs/heads/dev'
+        with:
+          context: .
+          file: autoconf/Dockerfile
+          platforms: linux/amd64,linux/386,linux/arm/v7,linux/arm64/v8
+          push: true
+          tags: bunkerity/bunkerized-nginx-autoconf:dev
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache-new
+
+      - name: Move Docker cache
+        if: github.ref == 'refs/heads/dev'
+        run: |
+          rm -rf /tmp/.buildx-cache
+          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+
+      - name: Build and push (master)
+        uses: docker/build-push-action@v2
+        if: github.ref == 'refs/heads/master'
+        with:
+          context: .
+          file: autoconf/Dockerfile
+          platforms: linux/amd64,linux/386,linux/arm/v7,linux/arm64/v8
+          push: true
+          tags: bunkerity/bunkerized-nginx-autoconf:latest,bunkerity/bunkerized-nginx-autoconf:${{ env.VERSION }}
+

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

@@ -0,0 +1,81 @@
+name: Build and push bunkerized-nginx-ui
+
+on:
+  push:
+    branches: [dev, master]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Checkout source code
+        uses: actions/checkout@v2
+
+      # temp fix : can't use buildx + load because of manifest error
+      # so we need to build the image the traditional way
+      - name: Temp build to check security issues
+        run: docker build -t bunkerized-nginx-ui -f ui/Dockerfile .
+
+      - name: Run Trivy security scanner
+        uses: aquasecurity/trivy-action@master
+        with:
+          image-ref: 'bunkerized-nginx-ui'
+          format: 'table'
+          exit-code: '1'
+          ignore-unfixed: true
+          severity: 'UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL'
+
+      - name: Set variables
+        run: |
+          VER=$(cat VERSION | tr -d '\n')
+          echo "VERSION=$VER" >> $GITHUB_ENV
+
+      - name: Setup QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Setup Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Setup Docker cache
+        uses: actions/cache@v2
+        if: github.ref == 'refs/heads/dev'
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: Build and push (dev)
+        uses: docker/build-push-action@v2
+        if: github.ref == 'refs/heads/dev'
+        with:
+          context: .
+          file: ui/Dockerfile
+          platforms: linux/amd64,linux/386,linux/arm/v7,linux/arm64/v8
+          push: true
+          tags: bunkerity/bunkerized-nginx-ui:dev
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache-new
+
+      - name: Move Docker cache
+        if: github.ref == 'refs/heads/dev'
+        run: |
+          rm -rf /tmp/.buildx-cache
+          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+
+      - name: Build and push (master)
+        uses: docker/build-push-action@v2
+        if: github.ref == 'refs/heads/master'
+        with:
+          context: .
+          file: ui/Dockerfile
+          platforms: linux/amd64,linux/386,linux/arm/v7,linux/arm64/v8
+          push: true
+          tags: bunkerity/bunkerized-nginx-ui:latest,bunkerity/bunkerized-nginx-ui:${{ env.VERSION }}

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

@@ -0,0 +1,82 @@
+name: Build and push bunkerized-nginx
+
+on:
+  push:
+    branches: [dev, master]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Checkout source code
+        uses: actions/checkout@v2
+
+      # temp fix : can't use buildx + load because of manifest error
+      # so we need to build the image the traditional way
+      - name: Temp build to check security issues
+        run: docker build -t bunkerized-nginx .
+   
+      - name: Run Trivy security scanner
+        uses: aquasecurity/trivy-action@master
+        with:
+          image-ref: 'bunkerized-nginx'
+          format: 'table'
+          exit-code: '1'
+          ignore-unfixed: true
+          severity: 'UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL'
+
+      - name: Run autotest
+        run: docker run bunkerized-nginx test
+
+      - name: Set variables
+        run: |
+          VER=$(cat VERSION | tr -d '\n')
+          echo "VERSION=$VER" >> $GITHUB_ENV
+
+      - name: Setup QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Setup Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Setup Docker cache
+        uses: actions/cache@v2
+        if: github.ref == 'refs/heads/dev'
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: Build and push (dev)
+        uses: docker/build-push-action@v2
+        if: github.ref == 'refs/heads/dev'
+        with:
+          context: .
+          platforms: linux/amd64,linux/386,linux/arm/v7,linux/arm64/v8
+          push: true
+          tags: bunkerity/bunkerized-nginx:dev
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache-new
+
+      - name: Move Docker cache
+        if: github.ref == 'refs/heads/dev'
+        run: |
+          rm -rf /tmp/.buildx-cache
+          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+
+      - name: Build and push (master)
+        uses: docker/build-push-action@v2
+        if: github.ref == 'refs/heads/master'
+        with:
+          context: .
+          platforms: linux/amd64,linux/386,linux/arm/v7,linux/arm64/v8
+          push: true
+          tags: bunkerity/bunkerized-nginx:latest,bunkerity/bunkerized-nginx:${{ env.VERSION }}

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

@@ -0,0 +1,34 @@
+name: Automatic test for Linux
+
+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 Debian with systemd
+        run: docker build -t debian-systemd -f tests/Dockerfile-debian .
+      - name: Build Ubuntu with systemd
+        run: docker build -t ubuntu-systemd -f tests/Dockerfile-ubuntu .
+      - name: Build CentOS with systemd
+        run: docker build -t centos-systemd -f tests/Dockerfile-centos .
+      - name: Build Fedora with systemd
+        run: docker build -t fedora-systemd -f tests/Dockerfile-fedora .
+      - name: Build Arch Linux with systemd
+        run: docker build -t archlinux-systemd -f tests/Dockerfile-archlinux .
+      - name: Debian test
+        run: ./tests/linux-run.sh debian-systemd test-debian
+      - name: Ubuntu test
+        run: ./tests/linux-run.sh ubuntu-systemd test-ubuntu
+      - name: CentOS test
+        run: ./tests/linux-run.sh centos-systemd test-centos
+      - name: Fedora test
+        run: ./tests/linux-run.sh fedora-systemd test-fedora
+      - name: Arch Linux test
+        run: ./tests/linux-run.sh archlinux-systemd test-archlinux

.gitignore

@@ -1 +1,2 @@
 .idea/
+docs/_build/

.gitmodules

@@ -0,0 +1,7 @@
+[submodule "bunkerized-nginx-crowdsec"]
+	path = examples/crowdsec/bunkerized-nginx-crowdsec
+	url = https://github.com/bunkerity/bunkerized-nginx-crowdsec
+
+[submodule "examples/clamav/bunkerized-nginx-clamav"]
+	path = examples/clamav/bunkerized-nginx-clamav
+	url = https://github.com/bunkerity/bunkerized-nginx-clamav.git

CHANGELOG.md

@@ -0,0 +1,91 @@
+# Changelog
+
+## v1.3.2 -
+
+- 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,24 @@
+# Contributing to bunkerized-nginx
+
+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, make a blog post about it or simply tell your friends/colleagues that's an awesome project.
+
+## Join the community chat
+
+You can join [the community chat](https://coso.me/bunkerity-chat) to talk about the project and ask for help. Please note that you can choose the platform you want, thanks to [matterbridge](https://github.com/42wim/matterbridge) all messages coming from a platform are relayed to the others.
+
+## Reporting bugs / ask for features
+
+The preferred way to report bugs and asking for features is using [issues](https://github.com/bunkerity/bunkerized-nginx/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/bunkerized-nginx/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,26 @@
-FROM nginx:1.20.0-alpine
+FROM nginx:1.20.1-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 . /tmp/bunkerized-nginx-docker
+COPY helpers/install.sh /tmp/install.sh
+RUN apk --no-cache add bash && \
+    chmod +x /tmp/install.sh && \
+    /tmp/install.sh && \
+    rm -f /tmp/install.sh
 
-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 helpers/docker.sh /tmp/docker.sh
+RUN chmod +x /tmp/docker.sh && \
+    /tmp/docker.sh && \
+    rm -f /tmp/docker.sh
 
-COPY prepare.sh /tmp/prepare.sh
-RUN chmod +x /tmp/prepare.sh && /tmp/prepare.sh && rm -f /tmp/prepare.sh
+# Fix CVE-2021-22945, CVE-2021-22946, CVE-2021-22947 and CVE-2021-40528
+RUN apk add "curl>=7.79.0-r0" "libgcrypt>=1.8.8-r1"
 
-# 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
+VOLUME /www /http-confs /server-confs /modsec-confs /modsec-crs-confs /cache /pre-server-confs /acme-challenge /plugins
 
 EXPOSE 8080/tcp 8443/tcp
 
 USER nginx:nginx
 
-ENTRYPOINT ["/opt/entrypoint/entrypoint.sh"]
+HEALTHCHECK --interval=30s --timeout=10s --start-period=120s --retries=3 CMD [ -f /tmp/nginx.pid ] || [ -f /tmp/nginx-temp.pid ] || exit 1
+
+ENTRYPOINT ["/opt/bunkerized-nginx/entrypoint/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 core
+- 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.3.2

antibot/captcha.data

@@ -0,0 +1,5 @@
+<form method="POST" action="%s">
+	<img src="data:image/jpeg;base64,%s" /><br>
+	Captcha : <input type="text" name="captcha" /><br />
+	<input type="submit" value="send" />
+</form>

antibot/captcha.html

@@ -0,0 +1,24 @@
+<html>
+	<head>
+		<title>Website protection</title>
+		<style>
+			body {
+				background-color: #1d70b7;
+			}
+			.centered {
+				position: fixed;
+				top: 50%;
+				left: 50%;
+				transform: translate(-50%, -50%);
+				text-align: center;
+			}
+		</style>
+	</head>
+	<body>
+		<div class="centered" style="color: white;">
+			<h1>As a security measure, we ask you to complete this captcha to access our website :</h1>
+			%CAPTCHA%
+			<div>&#128737;&#65039; this website is protected with <a href="https://github.com/bunkerity/bunkerized-nginx" target="_blank">bunkerized-nginx</a> &#128737;&#65039;</div>
+		</div>
+	</body>
+</html>

antibot/javascript.data

@@ -0,0 +1,29 @@
+<script>
+	async function digestMessage(message) {
+		const msgUint8 = new TextEncoder().encode(message);
+		const hashBuffer = await crypto.subtle.digest('SHA-256', msgUint8);
+		const hashArray = Array.from(new Uint8Array(hashBuffer));
+		const hashHex = hashArray.map(b => b.toString(16).padStart(2, '0')).join('');
+		return hashHex;
+	}
+	(async () => {
+		const nonce = '%s';
+		var i = 0;
+		while (true) {
+			var digestHex = await digestMessage(nonce + i.toString());
+			if (digestHex.startsWith("0000")) {
+				break;
+			}
+			i++;
+		}
+		xhr = new XMLHttpRequest();
+		xhr.open('POST', '%s');
+		xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+		xhr.onload = function() {
+			if (xhr.status === 200) {
+				window.location.replace('%s');
+			}
+		};
+		xhr.send(encodeURI('challenge=' + i.toString()));
+	})();
+</script>

antibot/javascript.html

@@ -0,0 +1,43 @@
+<html>
+	<head>
+		<title>Website protection</title>
+		<style>
+			body {
+				background-color: #1d70b7;
+			}
+			.centered {
+				position: fixed;
+				top: 50%;
+				left: 50%;
+				transform: translate(-50%, -50%);
+				text-align: center;
+			}
+			.loader {
+				border: 16px solid #1d70b7;
+				border-top: 16px solid #2dab66;
+				border-radius: 50%;
+				width: 120px;
+				height: 120px;
+				animation: spin 2s linear infinite;
+				display: block;
+				margin-left: auto;
+				margin-right: auto;
+			}
+			@keyframes spin {
+				0% { transform: rotate(0deg); }
+				100% { transform: rotate(360deg); }
+			}
+		</style>
+	</head>
+	<body>
+		<div class="centered" style="color: white;">
+			<div class="loader"></div>
+			<noscript>
+				<h1 style="color: red;">In order to access this website, you need to enable JavaScript.</h1>
+			</noscript>
+			<h1>Please wait while we are doing some security checks...</h1>
+			&#128737;&#65039; this website is protected with <a href="https://github.com/bunkerity/bunkerized-nginx" target="_blank">bunkerized-nginx</a> &#128737;&#65039;
+		</div>
+		%JAVASCRIPT%
+	</body>
+</html>

antibot/recaptcha-body.data

@@ -0,0 +1,11 @@
+<form method="POST" action="%s" id="form">
+	<input type="hidden" name="token" id="token">
+</form>
+<script>
+	grecaptcha.ready(function() {
+		grecaptcha.execute('%s', {action: 'recaptcha'}).then(function(token) {
+			document.getElementById("token").value = token;
+			document.getElementById("form").submit();
+		});;
+	});
+</script>

antibot/recaptcha-head.data

@@ -0,0 +1 @@
+<script src="https://www.google.com/recaptcha/api.js?render=%s"></script>

antibot/recaptcha.html

@@ -0,0 +1,44 @@
+<html>
+	<head>
+		<title>Website protection</title>
+		<style>
+			body {
+				background-color: #1d70b7;
+			}
+			.centered {
+				position: fixed;
+				top: 50%;
+				left: 50%;
+				transform: translate(-50%, -50%);
+				text-align: center;
+			}
+			.loader {
+				border: 16px solid #1d70b7;
+				border-top: 16px solid #2dab66;
+				border-radius: 50%;
+				width: 120px;
+				height: 120px;
+				animation: spin 2s linear infinite;
+				display: block;
+				margin-left: auto;
+				margin-right: auto;
+			}
+			@keyframes spin {
+				0% { transform: rotate(0deg); }
+				100% { transform: rotate(360deg); }
+			}
+		</style>
+		%RECAPTCHA_HEAD%
+	</head>
+	<body>
+		<div class="centered" style="color: white;">
+			<div class="loader"></div>
+			<noscript>
+				<h1 style="color: red;">In order to access this website, you need to enable JavaScript.</h1>
+			</noscript>
+			<h1>Please wait while we are doing some security checks...</h1>
+			&#128737;&#65039; this website is protected with <a href="https://github.com/bunkerity/bunkerized-nginx" target="_blank">bunkerized-nginx</a> &#128737;&#65039;
+		</div>
+		%RECAPTCHA_BODY%
+	</body>
+</html>

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 +0,0 @@
-#!/usr/bin/python3
-
-import utils
-import subprocess, shutil, os, traceback, requests, time
-
-class Config :
-
-	def __init__(self, swarm, api) :
-		self.__swarm = swarm
-		self.__api = api
-
-
-	def initconf(self, instances) :
-		try :
-			for instance_id, instance in instances.items() :
-				env = instance.attrs["Spec"]["TaskTemplate"]["ContainerSpec"]["Env"]
-				break
-			vars = {}
-			for var_value in env :
-				var = var_value.split("=")[0]
-				value = var_value.replace(var + "=", "", 1)
-				vars[var] = value
-
-			utils.log("[*] Generating global config ...")
-			if not self.globalconf(instances) :
-				utils.log("[!] Can't generate global config")
-				return False
-			utils.log("[*] Generated global config")
-
-			if "SERVER_NAME" in vars and vars["SERVER_NAME"] != "" :
-				for server in vars["SERVER_NAME"].split(" ") :
-					vars_site = vars.copy()
-					vars_site["SERVER_NAME"] = server
-					utils.log("[*] Generating config for " + vars["SERVER_NAME"] + " ...")
-					if not self.generate(instances, vars_site) or not self.activate(instances, vars_site, reload=False) :
-						utils.log("[!] Can't generate/activate site config for " + server)
-						return False
-					utils.log("[*] Generated config for " + vars["SERVER_NAME"])
-			with open("/etc/nginx/autoconf", "w") as f :
-				f.write("ok")
-
-			utils.log("[*] Waiting for bunkerized-nginx tasks ...")
-			i = 1
-			started = False
-			while i <= 10 :
-				time.sleep(i)
-				if self.__ping(instances) :
-					started = True
-					break
-				i = i + 1
-				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) :
-		try :
-			for instance_id, instance in instances.items() :
-				env = instance.attrs["Spec"]["TaskTemplate"]["ContainerSpec"]["Env"]
-				break
-			vars = {}
-			for var_value in env :
-				var = var_value.split("=")[0]
-				value = var_value.replace(var + "=", "", 1)
-				vars[var] = value
-			proc = subprocess.run(["/bin/su", "-s", "/opt/entrypoint/global-config.sh", "nginx"], env=vars, capture_output=True)
-			if proc.returncode == 0 :
-				return True
-			else :
-				utils.log("[*] Error while generating global config : return code = " + str(proc.returncode))
-		except Exception as e :
-			utils.log("[!] Exception while generating global config : " + str(e))
-		return False
-
-	def generate(self, instances, vars) :
-		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) :
-		try :
-			# Get first server name
-			first_server_name = vars["SERVER_NAME"].split(" ")[0]
-
-			# Check if file exists
-			if not os.path.isfile("/etc/nginx/" + first_server_name + "/server.conf") :
-				utils.log("[!] /etc/nginx/" + first_server_name + "/server.conf doesn't exist")
-				return False
-
-			# Include the server conf
-			utils.replace_in_file("/etc/nginx/nginx.conf", "}", "include /etc/nginx/" + first_server_name + "/server.conf;\n}")
-
-			# Reload
-			if not reload or self.reload(instances) :
-				return True
-
-		except Exception as e :
-			utils.log("[!] Exception while activating config : " + str(e))
-
-		return False
-
-	def deactivate(self, instances, vars) :
-		try :
-			# Get first server name
-			first_server_name = vars["SERVER_NAME"].split(" ")[0]
-
-			# Check if file exists
-			if not os.path.isfile("/etc/nginx/" + first_server_name + "/server.conf") :
-				utils.log("[!] /etc/nginx/" + first_server_name + "/server.conf doesn't exist")
-				return False
-
-			# Remove the include
-			utils.replace_in_file("/etc/nginx/nginx.conf", "include /etc/nginx/" + first_server_name + "/server.conf;\n", "")
-
-			# Reload
-			if self.reload(instances) :
-				return True
-
-		except Exception as e :
-			utils.log("[!] Exception while deactivating config : " + str(e))
-
-		return False
-
-	def remove(self, vars) :
-		try :
-			# Get first server name
-			first_server_name = vars["SERVER_NAME"].split(" ")[0]
-
-			# Check if file exists
-			if not os.path.isfile("/etc/nginx/" + first_server_name + "/server.conf") :
-				utils.log("[!] /etc/nginx/" + first_server_name + "/server.conf doesn't exist")
-				return False
-
-			# Remove the folder
-			shutil.rmtree("/etc/nginx/" + first_server_name)
-			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/Dockerfile

@@ -1,45 +1,27 @@
-FROM nginx:stable-alpine AS builder
-
 FROM alpine
 
-COPY --from=builder /etc/nginx/ /opt/confs/nginx
+COPY gen/ /opt/bunkerized-nginx/gen
+COPY entrypoint/ /opt/bunkerized-nginx/entrypoint
+COPY confs/global/ /opt/bunkerized-nginx/confs/global
+COPY confs/site/ /opt/bunkerized-nginx/confs/site
+COPY jobs/ /opt/bunkerized-nginx/jobs
+COPY settings.json /opt/bunkerized-nginx/
+COPY misc/cron-autoconf /etc/crontabs/root
+COPY autoconf/entrypoint.sh /opt/bunkerized-nginx/entrypoint/
+COPY autoconf/requirements.txt /opt/bunkerized-nginx/entrypoint/
+COPY autoconf/src/* /opt/bunkerized-nginx/entrypoint/
+COPY VERSION /opt/bunkerized-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
+RUN apk add --no-cache py3-pip bash certbot curl openssl socat && \
+    pip3 install -r /opt/bunkerized-nginx/gen/requirements.txt && \
+    pip3 install -r /opt/bunkerized-nginx/entrypoint/requirements.txt && \
+    pip3 install -r /opt/bunkerized-nginx/jobs/requirements.txt
 
+COPY autoconf/prepare.sh /tmp
+RUN chmod +x /tmp/prepare.sh && \
+    /tmp/prepare.sh && \
+    rm -f /tmp/prepare.sh
 
-COPY autoconf/misc/logrotate.conf /etc/logrotate.conf
-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
+#VOLUME /http-confs /server-confs /modsec-confs /modsec-crs-confs /cache /etc/letsencrypt /acme-challenge
 
-ENTRYPOINT ["/opt/entrypoint/entrypoint.sh"]
+ENTRYPOINT ["/opt/bunkerized-nginx/entrypoint/entrypoint.sh"]

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/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/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

@@ -3,44 +3,29 @@
 echo "[*] Starting autoconf ..."
 
 # check permissions
-su -s "/opt/entrypoint/permissions.sh" nginx
+su -s "/opt/bunkerized-nginx/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 ..."
+	echo "[*] Stopping autoconf ..."
 	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 &
+/opt/bunkerized-nginx/entrypoint/app.py &
 pid="$!"
+
+# wait while app is up
 wait "$pid"
 
 # stop

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/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/prepare.sh

@@ -0,0 +1,81 @@
+#!/bin/sh
+
+# create nginx user
+addgroup -g 101 nginx
+adduser -h /var/cache/nginx -g nginx -s /bin/sh -G nginx -D -H -u 101 nginx
+
+# prepare /opt
+chown root:nginx /opt
+chmod 750 /opt
+
+# prepare /opt/bunkerized-nginx
+chown -R root:nginx /opt/bunkerized-nginx
+find /opt/bunkerized-nginx -type f -exec chmod 0740 {} \;
+find /opt/bunkerized-nginx -type d -exec chmod 0750 {} \;
+chmod ugo+x /opt/bunkerized-nginx/entrypoint/* /opt/bunkerized-nginx/scripts/*
+chmod ugo+x /opt/bunkerized-nginx/gen/main.py
+chmod ugo+x /opt/bunkerized-nginx/jobs/main.py
+chmod ugo+x /opt/bunkerized-nginx/jobs/reload.py
+chmod ugo+x /opt/bunkerized-nginx/jobs/certbot-*.py
+chmod 770 /opt/bunkerized-nginx
+chmod 440 /opt/bunkerized-nginx/settings.json
+
+# prepare /var/log
+mkdir /var/log/nginx
+chown root:nginx /var/log/nginx
+chmod 770 /var/log/nginx
+ln -s /proc/1/fd/1 /var/log/nginx/jobs.log
+mkdir /var/log/letsencrypt
+chown nginx:nginx /var/log/letsencrypt
+chmod 770 /var/log/letsencrypt
+
+# prepare /etc/nginx
+mkdir /etc/nginx
+chown root:nginx /etc/nginx
+chmod 770 /etc/nginx
+
+# prepare /etc/letsencrypt
+mkdir /etc/letsencrypt
+chown root:nginx /etc/letsencrypt
+chmod 770 /etc/letsencrypt
+
+# prepare /var/lib/letsencrypt
+mkdir /var/lib/letsencrypt
+chown root:nginx /var/lib/letsencrypt
+chmod 770 /var/lib/letsencrypt
+
+# prepare /opt/bunkerized-nginx/cache
+ln -s /cache /opt/bunkerized-nginx/cache
+mkdir /cache
+chown root:nginx /cache
+chmod 770 /cache
+
+# prepare /acme-challenge
+ln -s /acme-challenge /opt/bunkerized-nginx/acme-challenge
+mkdir -p /acme-challenge/.well-known/acme-challenge
+chown -R root:nginx /acme-challenge
+chmod -R 770 /acme-challenge
+
+# prepare /http-confs
+ln -s /http-confs /opt/bunkerized-nginx/http-confs
+mkdir /http-confs
+chown root:nginx /http-confs
+chmod 770 /http-confs
+
+# prepare /server-confs
+ln -s /server-confs /opt/bunkerized-nginx/server-confs
+mkdir /server-confs
+chown root:nginx /server-confs
+chmod 770 /server-confs
+
+# prepare /modsec-confs
+ln -s /modsec-confs /opt/bunkerized-nginx/modsec-confs
+mkdir /modsec-confs
+chown root:nginx /modsec-confs
+chmod 770 /modsec-confs
+
+# prepare /modsec-crs-confs
+ln -s /modsec-crs-confs /opt/bunkerized-nginx/modsec-crs-confs
+mkdir /modsec-crs-confs
+chown root:nginx /modsec-crs-confs
+chmod 770 /modsec-crs-confs

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/requirements.txt

@@ -0,0 +1,5 @@
+docker
+requests
+jinja2
+kubernetes
+dnspython

autoconf/src/Config.py

@@ -0,0 +1,195 @@
+#!/usr/bin/python3
+
+import subprocess, shutil, os, traceback, requests, time, dns.resolver, io, tarfile
+
+import Controller
+
+from logger import log
+
+CONFIGS = {
+	"conf": "/etc/nginx",
+	"letsencrypt": "/etc/letsencrypt",
+	"http": "/http-confs",
+	"server": "/server-confs",
+	"modsec": "/modsec-confs",
+	"modsec-crs": "/modsec-crs-confs",
+	"acme": "/acme-challenge"
+}
+
+class Config :
+
+	def __init__(self, type, api_uri, http_port="8080") :
+		self.__type = type
+		self.__api_uri = api_uri
+		self.__http_port = http_port
+
+	def __jobs(self) :
+		log("config", "INFO", "starting jobs ...")
+		proc = subprocess.run(["/bin/su", "-c", "/opt/bunkerized-nginx/entrypoint/jobs.sh", "nginx"], capture_output=True)
+		stdout = proc.stdout.decode("ascii")
+		stderr = proc.stderr.decode("ascii")
+		if len(stdout) > 1 :
+			log("config", "INFO", "jobs stdout :\n" + stdout)
+		if stderr != "" :
+			log("config", "ERROR", "jobs stderr :\n" + stderr)
+		if proc.returncode != 0 :
+			log("config", "ERROR", "jobs error (return code = " + str(proc.returncode) + ")")
+			return False
+		return True
+
+	def gen(self, env) :
+		try :
+			# Write environment variables to a file
+			with open("/tmp/variables.env", "w") as f :
+				for k, v in env.items() :
+					f.write(k + "=" + v + "\n")
+
+			# Call the generator
+			proc = subprocess.run(["/bin/su", "-c", "/opt/bunkerized-nginx/gen/main.py --settings /opt/bunkerized-nginx/settings.json --templates /opt/bunkerized-nginx/confs --output /etc/nginx --variables /tmp/variables.env", "nginx"], capture_output=True)
+
+			# Print stdout/stderr
+			stdout = proc.stdout.decode("ascii")
+			stderr = proc.stderr.decode("ascii")
+			if len(stdout) > 1 :
+				log("config", "INFO", "generator output : " + stdout)
+			if stderr != "" :
+				log("config", "ERROR", "generator error : " + stderr)
+
+			# We're done
+			if proc.returncode == 0 :
+				if self.__type == Controller.Type.SWARM or self.__type == Controller.Type.KUBERNETES :
+					return self.__jobs()
+				return True
+			log("config", "ERROR", "error while generating config (return code = " + str(proc.returncode) + ")")
+
+		except Exception as e :
+			log("config", "ERROR", "exception while generating site config : " + traceback.format_exc())
+		return False
+
+	def reload(self, instances) :
+		ret = True
+		if self.__type == Controller.Type.DOCKER :
+			for instance in instances :
+				try :
+					instance.kill("SIGHUP")
+				except :
+					ret = False
+		elif self.__type == Controller.Type.SWARM or self.__type == Controller.Type.KUBERNETES :
+			ret = self.__api_call(instances, "/reload")
+		return ret
+
+	def send(self, instances, files="all") :
+		ret = True
+		fail = False
+		for name, path in CONFIGS.items() :
+			if files != "all" and name != files :
+				continue
+			file = self.__tarball(path)
+			if not self.__api_call(instances, "/" + name, file=file) :
+				log("config", "ERROR", "can't send config " + name + " to instance(s)")
+				fail = True
+			file.close()
+		if fail :
+			ret = False
+		return ret
+
+	def stop_temp(self, instances) :
+		return self.__api_call(instances, "/stop-temp")
+
+	def __tarball(self, path) :
+		file = io.BytesIO()
+		with tarfile.open(mode="w:gz", fileobj=file) as tar :
+			tar.add(path, arcname=".")
+		file.seek(0, 0)
+		return file
+
+	def __ping(self, instances) :
+		return self.__api_call(instances, "/ping")
+
+	def wait(self, instances) :
+		ret = True
+		if self.__type == Controller.Type.DOCKER :
+			ret = self.__wait_docker(instances)
+		elif self.__type == Controller.Type.SWARM or self.__type == Controller.Type.KUBERNETES :
+			ret = self.__wait_api(instances)
+		return ret
+
+	def __wait_docker(self, instances) :
+		all_healthy = False
+		i = 0
+		while i < 120 :
+			one_not_healthy = False
+			for instance in instances :
+				instance.reload()
+				if instance.attrs["State"]["Health"]["Status"] != "healthy" :
+					one_not_healthy = True
+					break
+			if not one_not_healthy :
+				all_healthy = True
+				break
+			time.sleep(1)
+			i += 1
+		return all_healthy
+
+	def __wait_api(self, instances) :
+		try :
+			with open("/etc/nginx/autoconf", "w") as f :
+				f.write("ok")
+			i = 1
+			started = False
+			while i <= 10 :
+				time.sleep(i)
+				if self.__ping(instances) :
+					started = True
+					break
+				i = i + 1
+				log("config", "INFO", "waiting " + str(i) + " seconds before retrying to contact bunkerized-nginx instances")
+			if started :
+				log("config", "INFO", "bunkerized-nginx instances started")
+				return True
+			else :
+				log("config", "ERROR", "bunkerized-nginx instances are not started")
+		except Exception as e :
+			log("config", "ERROR", "exception while waiting for bunkerized-nginx instances : " + traceback.format_exc())
+		return False
+
+	def __api_call(self, instances, path, file=None) :
+		ret = True
+		nb = 0
+		urls = []
+		if self.__type == Controller.Type.SWARM :
+			for instance in instances :
+				name = instance.name
+				try :
+					dns_result = dns.resolver.query("tasks." + name)
+					for ip in dns_result :
+						urls.append("http://" + ip.to_text() + ":" + self.__http_port + self.__api_uri + path)
+				except :
+					ret = False
+		elif self.__type == Controller.Type.KUBERNETES :
+			for instance in instances :
+				name = instance.metadata.name
+				try :
+					dns_result = dns.resolver.query(name + "." + instance.metadata.namespace + ".svc.cluster.local")
+					for ip in dns_result :
+						urls.append("http://" + ip.to_text() + ":" + self.__http_port + self.__api_uri + path)
+				except :
+					ret = False
+
+		for url in urls :
+			req = None
+			try :
+				if file == None :
+					req = requests.post(url)
+				else :
+					file.seek(0, 0)
+					req = requests.post(url, files={'file': file})
+			except :
+				pass
+			if req and req.status_code == 200 and req.text == "ok" :
+				log("config", "INFO", "successfully sent API order to " + url)
+				nb += 1
+			else :
+				log("config", "INFO", "failed API order to " + url)
+				ret = False
+		return ret and nb > 0

autoconf/src/Controller.py

@@ -0,0 +1,68 @@
+import traceback
+from abc import ABC, abstractmethod
+from enum import Enum
+
+from Config import Config
+
+class Type(Enum) :
+	DOCKER = 1
+	SWARM = 2
+	KUBERNETES = 3
+
+class Controller(ABC) :
+
+	def __init__(self, type, api_uri=None, lock=None, http_port="8080") :
+		self._config = Config(type, api_uri, http_port=http_port)
+		self.lock = lock
+
+	@abstractmethod
+	def get_env(self) :
+		pass
+
+	def _fix_env(self, env) :
+		fixed_env = env.copy()
+		blacklist = ["NGINX_VERSION", "NJS_VERSION", "PATH", "PKG_RELEASE"]
+		for key in blacklist :
+			if key in fixed_env :
+				del fixed_env[key]
+		return fixed_env
+
+	def gen_conf(self, env) :
+		try :
+			ret = self._config.gen(env)
+		except :
+			ret = False
+		return ret
+
+	@abstractmethod
+	def wait(self) :
+		pass
+
+	@abstractmethod
+	def process_events(self, current_env) :
+		pass
+
+	@abstractmethod
+	def reload(self) :
+		pass
+
+	def _reload(self, instances) :
+		try :
+			ret = self._config.reload(instances)
+		except :
+			ret = False
+		return ret
+
+	def _send(self, instances, files="all") :
+		try :
+			ret = self._config.send(instances, files=files)
+		except Exception as e :
+			ret = False
+		return ret
+
+	def _stop_temp(self, instances) :
+		try :
+			ret = self._config.stop_temp(instances)
+		except Exception as e :
+			ret = False
+		return ret

autoconf/src/DockerController.py

@@ -0,0 +1,78 @@
+import docker, time
+import Controller
+
+from logger import log
+
+class DockerController(Controller.Controller) :
+
+	def __init__(self, docker_host) :
+		super().__init__(Controller.Type.DOCKER)
+		self.__client = docker.DockerClient(base_url=docker_host)
+
+	def __get_instances(self) :
+		return self.__client.containers.list(filters={"label" : "bunkerized-nginx.AUTOCONF"})
+
+	def __get_containers(self) :
+		return self.__client.containers.list(filters={"label" : "bunkerized-nginx.SERVER_NAME"})
+
+	def get_env(self) :
+		env = {}
+		for instance in self.__get_instances() :
+			for variable in instance.attrs["Config"]["Env"] :
+				env[variable.split("=")[0]] = variable.replace(variable.split("=")[0] + "=", "", 1)
+		first_servers = []
+		if "SERVER_NAME" in env and env["SERVER_NAME"] != "" :
+			first_servers = env["SERVER_NAME"].split(" ")
+		for container in self.__get_containers() :
+			first_server = container.labels["bunkerized-nginx.SERVER_NAME"].split(" ")[0]
+			first_servers.append(first_server)
+			for variable, value in container.labels.items() :
+				if variable.startswith("bunkerized-nginx.") and variable != "bunkerized-nginx.AUTOCONF" :
+					env[first_server + "_" + variable.replace("bunkerized-nginx.", "", 1)] = value
+		if len(first_servers) == 0 :
+			env["SERVER_NAME"] = ""
+		else :
+			env["SERVER_NAME"] = " ".join(first_servers)
+		return self._fix_env(env)
+
+	def process_events(self, current_env) :
+		old_env = current_env
+		# TODO : check why filter isn't working as expected
+		#for event in self.__client.events(decode=True, filters={"type": "container", "label": ["bunkerized-nginx.AUTOCONF", "bunkerized-nginx.SERVER_NAME"]}) :
+		for event in self.__client.events(decode=True, filters={"type": "container"}) :
+			new_env = self.get_env()
+			if new_env != old_env :
+				try :
+					log("controller", "INFO", "generating new configuration")
+					if self.gen_conf(new_env) :
+						old_env = new_env.copy()
+						log("controller", "INFO", "successfully generated new configuration")
+						if self.reload() :
+							log("controller", "INFO", "successful reload")
+						else :
+							log("controller", "ERROR", "failed reload")
+					else :
+						log("controller", "ERROR", "can't generate new configuration")
+				except :
+					log("controller", "ERROR", "exception while receiving event")
+
+	def reload(self) :
+		return self._reload(self.__get_instances())
+
+
+	def wait(self) :
+		try :
+			# Wait for a container
+			instances = self.__get_instances()
+			while len(instances) == 0 :
+				time.sleep(1)
+				instances = self.__get_instances()
+			# Generate first config
+			env = self.get_env()
+			if not self.gen_conf(env) :
+				return False, env
+			# Wait for nginx
+			return self._config.wait(instances), env
+		except :
+			pass
+		return False, {}

autoconf/src/IngressController.py

@@ -0,0 +1,191 @@
+from kubernetes import client, config, watch
+from threading import Thread, Lock
+import time
+
+import Controller
+
+from logger import log
+
+class IngressController(Controller.Controller) :
+
+	def __init__(self, api_uri, http_port) :
+		super().__init__(Controller.Type.KUBERNETES, api_uri=api_uri, lock=Lock(), http_port=http_port)
+		config.load_incluster_config()
+		self.__api = client.CoreV1Api()
+		self.__extensions_api = client.ExtensionsV1beta1Api()
+		self.__old_env = {}
+
+	def __get_pods(self) :
+		return self.__api.list_pod_for_all_namespaces(watch=False, label_selector="bunkerized-nginx").items
+
+	def __get_ingresses(self) :
+		return self.__extensions_api.list_ingress_for_all_namespaces(watch=False, label_selector="bunkerized-nginx").items
+
+	def __get_services(self, autoconf=False) :
+		services = self.__api.list_service_for_all_namespaces(watch=False, label_selector="bunkerized-nginx").items
+		if not autoconf :
+			return services
+		services_autoconf = []
+		for service in services :
+			if service.metadata.annotations != None and "bunkerized-nginx.AUTOCONF" in service.metadata.annotations :
+				services_autoconf.append(service)
+		return services_autoconf
+
+	def __pod_to_env(self, pod_env) :
+		env = {}
+		for env_var in pod_env :
+			env[env_var.name] = env_var.value
+			if env_var.value == None :
+				env[env_var.name] = ""
+		return env
+
+	def __annotations_to_env(self, annotations) :
+		env = {}
+		prefix = ""
+		if "bunkerized-nginx.SERVER_NAME" in annotations :
+			prefix = annotations["bunkerized-nginx.SERVER_NAME"].split(" ")[0] + "_"
+		for annotation in annotations :
+			if annotation.startswith("bunkerized-nginx.") and annotation.replace("bunkerized-nginx.", "", 1) != "" and annotation.replace("bunkerized-nginx.", "", 1) != "AUTOCONF" :
+				env[prefix + annotation.replace("bunkerized-nginx.", "", 1)] = annotations[annotation]
+		return env
+
+	def __rules_to_env(self, rules, namespace="default") :
+		env = {}
+		first_servers = []
+		numbers = {}
+		for rule in rules :
+			rule = rule.to_dict()
+			prefix = ""
+			number = 1
+			if "host" in rule :
+				prefix = rule["host"] + "_"
+				first_servers.append(rule["host"])
+				if not rule["host"] in numbers :
+					numbers[rule["host"]] = 1
+				number = numbers[rule["host"]]
+			if not "http" in rule or not "paths" in rule["http"] :
+				continue
+			env[prefix + "USE_REVERSE_PROXY"] = "yes"
+			for path in rule["http"]["paths"] :
+				suffix = "_" + str(number)
+				env[prefix + "REVERSE_PROXY_URL" + suffix] = path["path"]
+				env[prefix + "REVERSE_PROXY_HOST" + suffix] = "http://" + path["backend"]["service_name"] + "." + namespace + ".svc.cluster.local:" + str(path["backend"]["service_port"])
+				number += 1
+			numbers[rule["host"]] = number
+		env["SERVER_NAME"] = " ".join(first_servers)
+		return env
+
+	def get_env(self) :
+		pods = self.__get_pods()
+		ingresses = self.__get_ingresses()
+		services = self.__get_services()
+		env = {}
+		first_servers = []
+		for pod in pods :
+			env.update(self.__pod_to_env(pod.spec.containers[0].env))
+			if "SERVER_NAME" in env and env["SERVER_NAME"] != "" :
+				first_servers.extend(env["SERVER_NAME"].split(" "))
+		for ingress in ingresses :
+			env.update(self.__rules_to_env(ingress.spec.rules, namespace=ingress.metadata.namespace))
+			if ingress.metadata.annotations != None :
+				env.update(self.__annotations_to_env(ingress.metadata.annotations))
+			if ingress.spec.tls :
+				for tls_entry in ingress.spec.tls :
+					for host in tls_entry.hosts :
+						env[host + "_AUTO_LETS_ENCRYPT"] = "yes"
+			if "SERVER_NAME" in env and env["SERVER_NAME"] != "" :
+				first_servers.extend(env["SERVER_NAME"].split(" "))
+		for service in services :
+			if service.metadata.annotations != None and "bunkerized-nginx.SERVER_NAME" in service.metadata.annotations :
+				env.update(self.__annotations_to_env(service.metadata.annotations))
+				first_servers.append(service.metadata.annotations["bunkerized-nginx.SERVER_NAME"])
+		first_servers = list(dict.fromkeys(first_servers))
+		if len(first_servers) == 0 :
+			env["SERVER_NAME"] = ""
+		else :
+			env["SERVER_NAME"] = " ".join(first_servers)
+		return self._fix_env(env)
+
+	def process_events(self, current_env) :
+		self.__old_env = current_env
+		t_pod = Thread(target=self.__watch, args=("pod",))
+		t_ingress = Thread(target=self.__watch, args=("ingress",))
+		t_service = Thread(target=self.__watch, args=("service",))
+		t_pod.start()
+		t_ingress.start()
+		t_service.start()
+		t_pod.join()
+		t_ingress.join()
+		t_service.join()
+
+	def __watch(self, type) :
+		w = watch.Watch()
+		what = None
+		if type == "pod" :
+			what = self.__api.list_pod_for_all_namespaces
+		elif type == "ingress" :
+			what = self.__extensions_api.list_ingress_for_all_namespaces
+		elif type == "service" :
+			what = self.__api.list_service_for_all_namespaces
+		for event in w.stream(what, label_selector="bunkerized-nginx") :
+			self.lock.acquire()
+			new_env = self.get_env()
+			if new_env != self.__old_env :
+				try :
+					if not self.gen_conf(new_env) :
+						raise Exception("can't generate configuration")
+					if not self.send() :
+						raise Exception("can't send configuration")
+					if not self.reload() :
+						raise Exception("can't reload configuration")
+					self.__old_env = new_env.copy()
+					log("CONTROLLER", "INFO", "successfully loaded new configuration")
+				except Exception as e :
+					log("controller", "ERROR", "error while computing new event : " + str(e))
+			self.lock.release()
+
+	def reload(self) :
+		return self._reload(self.__get_services(autoconf=True))
+
+	def send(self, files="all") :
+		return self._send(self.__get_services(autoconf=True), files=files)
+
+	def stop_temp(self) :
+		return self._stop_temp(self.__get_services(autoconf=True))
+
+	def wait(self) :
+		self.lock.acquire()
+		try :
+			# Wait for at least one bunkerized-nginx pod
+			pods = self.__get_pods()
+			while len(pods) == 0 :
+				time.sleep(1)
+				pods = self.__get_pods()
+			# Wait for at least one bunkerized-nginx service
+			services = self.__get_services(autoconf=True)
+			while len(services) == 0 :
+				time.sleep(1)
+				services = self.__get_services(autoconf=True)
+			# Generate first config
+			env = self.get_env()
+			if not self.gen_conf(env) :
+				self.lock.release()
+				return False, env
+			# Send the config
+			if not self.send() :
+				self.lock.release()
+				return False, env
+			# Stop the temporary server
+			if not self.stop_temp() :
+				self.lock.release()
+				return False, env
+			# Wait for bunkerized-nginx
+			if not self._config.wait(instances) :
+				self.lock.release()
+				return False, env
+			self.lock.release()
+			return self._config.wait(services), env
+		except :
+			pass
+		self.lock.release()
+		return False, {}

autoconf/src/ReloadServer.py

@@ -0,0 +1,51 @@
+import socketserver, threading, os, stat
+
+from logger import log
+
+class ReloadServerHandler(socketserver.BaseRequestHandler):
+
+	def handle(self) :
+		locked = False
+		try :
+
+			while True :
+				data = self.request.recv(512)
+				if not data or not data in [b"lock", b"reload", b"unlock", b"acme"] :
+					break
+				if data == b"lock" :
+					self.server.controller.lock.acquire()
+					locked = True
+					self.request.sendall(b"ok")
+				elif data == b"unlock" :
+					self.server.controller.lock.release()
+					locked = False
+					self.request.sendall(b"ok")
+				elif data == b"acme" :
+					ret = self.server.controller.send(files="acme")
+					if ret :
+						self.request.sendall(b"ok")
+					else :
+						self.request.sendall(b"ko")
+				elif data == b"reload" :
+					ret = self.server.controller.reload()
+					if ret :
+						self.request.sendall(b"ok")
+					else :
+						self.request.sendall(b"ko")
+		except Exception as e :
+			log("RELOADSERVER", "ERROR", "exception : " + str(e))
+		if locked :
+			self.server.controller.lock.release()
+
+class ThreadingUnixServer(socketserver.ThreadingMixIn, socketserver.UnixStreamServer) :
+	pass
+
+def run_reload_server(controller) :
+	server = ThreadingUnixServer("/tmp/autoconf.sock", ReloadServerHandler)
+	os.chown("/tmp/autoconf.sock", 0, 101)
+	os.chmod("/tmp/autoconf.sock", 0o770)
+	server.controller = controller
+	thread = threading.Thread(target=server.serve_forever)
+	thread.daemon = True
+	thread.start()
+	return (server, thread)

autoconf/src/SwarmController.py

@@ -0,0 +1,104 @@
+import docker, time
+from threading import Lock
+
+from logger import log
+
+import Controller
+
+class SwarmController(Controller.Controller) :
+
+	def __init__(self, docker_host, api_uri, http_port) :
+		super().__init__(Controller.Type.SWARM, api_uri=api_uri, lock=Lock(), http_port=http_port)
+		self.__client = docker.DockerClient(base_url=docker_host)
+
+	def __get_instances(self) :
+		return self.__client.services.list(filters={"label" : "bunkerized-nginx.AUTOCONF"})
+
+	def __get_services(self) :
+		return self.__client.services.list(filters={"label" : "bunkerized-nginx.SERVER_NAME"})
+
+	def get_env(self) :
+		env = {}
+		for instance in self.__get_instances() :
+			for variable in instance.attrs["Spec"]["TaskTemplate"]["ContainerSpec"]["Env"] :
+				env[variable.split("=")[0]] = variable.replace(variable.split("=")[0] + "=", "", 1)
+		first_servers = []
+		if "SERVER_NAME" in env and env["SERVER_NAME"] != "" :
+			first_servers = env["SERVER_NAME"].split(" ")
+		for service in self.__get_services() :
+			first_server = service.attrs["Spec"]["Labels"]["bunkerized-nginx.SERVER_NAME"].split(" ")[0]
+			first_servers.append(first_server)
+			for variable, value in service.attrs["Spec"]["Labels"].items() :
+				if variable.startswith("bunkerized-nginx.") and variable != "bunkerized-nginx.AUTOCONF" :
+					env[first_server + "_" + variable.replace("bunkerized-nginx.", "", 1)] = value
+		if len(first_servers) == 0 :
+			env["SERVER_NAME"] = ""
+		else :
+			env["SERVER_NAME"] = " ".join(first_servers)
+		return self._fix_env(env)
+
+	def process_events(self, current_env) :
+		old_env = current_env
+		# TODO : check why filter isn't working as expected
+		#for event in self.__client.events(decode=True, filters={"type": "service", "label": ["bunkerized-nginx.AUTOCONF", "bunkerized-nginx.SERVER_NAME"]}) :
+		for event in self.__client.events(decode=True, filters={"type": "service"}) :
+			new_env = self.get_env()
+			if new_env != old_env :
+				self.lock.acquire()
+				try :
+					if not self.gen_conf(new_env) :
+						raise Exception("can't generate configuration")
+					if not self.send() :
+						raise Exception("can't send configuration")
+					if not self.reload() :
+						raise Exception("can't reload configuration")
+					self.__old_env = new_env.copy()
+					log("CONTROLLER", "INFO", "successfully loaded new configuration")
+				except Exception as e :
+					log("controller", "ERROR", "error while computing new event : " + str(e))
+				self.lock.release()
+
+	def reload(self) :
+		return self._reload(self.__get_instances())
+
+	def send(self, files="all") :
+		return self._send(self.__get_instances(), files=files)
+
+	def stop_temp(self) :
+		return self._stop_temp(self.__get_instances())
+
+	def wait(self) :
+		self.lock.acquire()
+		try :
+			# Wait for a service
+			instances = self.__get_instances()
+			while len(instances) == 0 :
+				time.sleep(1)
+				instances = self.__get_instances()
+			# Wait for temporary bunkerized-nginx
+			if not self._config.wait(instances) :
+				self.lock.release()
+				return False, env
+			# Generate first config
+			env = self.get_env()
+			if not self.gen_conf(env) :
+				self.lock.release()
+				return False, env
+			# Send the config
+			if not self.send() :
+				self.lock.release()
+				return False, env
+			# Stop the temporary server
+			if not self.stop_temp() :
+				self.lock.release()
+				return False, env
+			# Wait for bunkerized-nginx
+			if not self._config.wait(instances) :
+				self.lock.release()
+				return False, env
+			self.lock.release()
+			return True, env
+		except :
+			pass
+		self.lock.release()
+		return False, {}

autoconf/src/app.py

@@ -0,0 +1,46 @@
+#!/usr/bin/python3
+
+from ReloadServer import run_reload_server
+
+import docker, os, stat, sys, select, threading
+
+from DockerController import DockerController
+from SwarmController import SwarmController
+from IngressController import IngressController
+
+from logger import log
+
+# Get variables
+swarm		= os.getenv("SWARM_MODE", "no") == "yes"
+kubernetes	= os.getenv("KUBERNETES_MODE", "no") == "yes"
+api_uri		= os.getenv("API_URI", "")
+docker_host	= os.getenv("DOCKER_HOST", "unix:///var/run/docker.sock")
+http_port	= os.getenv("HTTP_PORT", "8080")
+
+# Instantiate the controller
+if swarm :
+	log("autoconf", "INFO", "swarm mode detected")
+	controller = SwarmController(docker_host, api_uri, http_port)
+elif kubernetes :
+	log("autoconf", "INFO", "kubernetes mode detected")
+	controller = IngressController(api_uri, http_port)
+else :
+	log("autoconf", "INFO", "docker mode detected")
+	controller = DockerController(docker_host)
+
+# Run the reload server in background if needed
+if swarm or kubernetes :
+	log("autoconf", "INFO", "start reload server in background")
+	(server, thread) = run_reload_server(controller)
+
+# Wait for instances
+log("autoconf", "INFO", "wait until a bunkerized-nginx instance is started ...")
+ret, env = controller.wait()
+if ret :
+	log("autoconf", "INFO", "bunkerized-nginx instances started")
+else :
+	log("autoconf", "ERROR", "bunkerized-nginx instances not started")
+
+# Process events
+log("autoconf", "INFO", "waiting for events ...")
+controller.process_events(env)

autoconf/src/logger.py

@@ -0,0 +1,6 @@
+import datetime
+
+def log(title, severity, msg) :
+	when = datetime.datetime.today().strftime("[%Y-%m-%d %H:%M:%S]")
+	what = title + " - " + severity + " - " + msg
+	print(when + " " + what, flush=True)

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", "")

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/global/api-temp.conf

@@ -1,23 +1,22 @@
+client_max_body_size 1G;
 
-location ~ ^%API_URI%/ping {
-	return 444;
-}
-
-location ~ ^%API_URI% {
+location ~ %API_URI% {
 
 rewrite_by_lua_block {
 	
-	local api = require "api"
-	local api_uri = "%API_URI%"
+	local api		= require "api"
+	local api_whitelist_ip  = { %API_WHITELIST_IP% }
+	local api_uri		= "%API_URI%"
+	local logger		= require "logger"
 
-	if api.is_api_call(api_uri) then
+	if api.is_api_call(api_uri, api_whitelist_ip) 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")
+			logger.log(ngx.NOTICE, "API", "API call " .. ngx.var.request_uri .. " successfull from " .. ngx.var.remote_addr)
+			ngx.print("ok")
 		else
-			ngx.log(ngx.WARN, "[API] API call " .. ngx.var.request_uri .. " failed from " .. ngx.var.remote_addr)
-			ngx.say("ko")
+			logger.log(ngx.WARN, "API", "API call " .. ngx.var.request_uri .. " failed from " .. ngx.var.remote_addr)
+			ngx.print("ko")
 		end
 
 		ngx.exit(ngx.HTTP_OK)
@@ -28,3 +27,4 @@ rewrite_by_lua_block {
 }
 
 }
+

confs/global/api.conf

@@ -1,16 +1,20 @@
+# todo : if api_uri == "random"
+client_max_body_size 1G;
 rewrite_by_lua_block {
 	
-	local api = require "api"
-	local api_uri = "%API_URI%"
+	local api		= require "api"
+	local api_whitelist_ip	= {% raw %}{{% endraw %}{% if API_WHITELIST_IP != ""%}{% set elements = API_WHITELIST_IP.split(" ") %}{% for i in range(0, elements|length) %}"{{ elements[i] }}"{% if i < elements|length-1 %},{% endif %}{% endfor %}{% endif %}{% raw %}}{% endraw +%}
+	local api_uri		= "{{ API_URI }}"
+	local logger		= require "logger"
 
-	if api.is_api_call(api_uri) then
+	if api.is_api_call(api_uri, api_whitelist_ip) 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")
+			logger.log(ngx.NOTICE, "API", "API call " .. ngx.var.request_uri .. " successfull from " .. ngx.var.remote_addr)
+			ngx.print("ok")
 		else
-			ngx.log(ngx.WARN, "[API] API call " .. ngx.var.request_uri .. " failed from " .. ngx.var.remote_addr)
-			ngx.say("ko")
+			logger.log(ngx.WARN, "API", "API call " .. ngx.var.request_uri .. " failed from " .. ngx.var.remote_addr)
+			ngx.print("ko")
 		end
 
 		ngx.exit(ngx.HTTP_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 +1,5 @@
-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")
-}
+API_URL={{ CROWDSEC_HOST }}
+API_KEY={{ CROWDSEC_KEY }}
+LOG_FILE=/tmp/lua_mod.log
+CACHE_EXPIRATION=1
+CACHE_SIZE=1000

confs/global/fastcgi.conf

@@ -0,0 +1,25 @@
+fastcgi_param  SCRIPT_FILENAME    $document_root$fastcgi_script_name;
+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/geoip.conf

@@ -5,6 +5,15 @@ geoip2 /etc/nginx/geoip.mmdb {
 }
 
 map $geoip2_data_country_code $allowed_country {
-	default %DEFAULT%;
-	%COUNTRY%
+	default {% if WHITELIST_COUNTRY != "" %}no{% else %}yes{% endif +%};
+	{% if WHITELIST_COUNTRY != "" %}
+		{% for country in WHITELIST_COUNTRY.split(" ") +%}
+	{{ country }} yes;
+		{% endfor %}
+	{% endif %}
+	{% if BLACKLIST_COUNTRY != "" %}
+		{% for country in BLACKLIST_COUNTRY.split(" ") +%}
+	{{ country }} no;
+		{% endfor %}
+	{% endif %}
 }

confs/global/init-lua.conf

@@ -0,0 +1,147 @@
+init_by_lua_block {
+
+local dataloader		= require "dataloader"
+local logger			= require "logger"
+local cjson			= require "cjson"
+local remoteapi			= require "remoteapi"
+local iputils			= require "resty.iputils"
+
+local use_redis			= {% if USE_REDIS == "yes" %}true{% else %}false{% endif +%}
+
+local use_proxies		= {% if has_value("BLOCK_PROXIES", "yes") %}true{% else %}false{% endif +%}
+local use_abusers		= {% if has_value("BLOCK_ABUSERS", "yes") %}true{% else %}false{% endif +%}
+local use_tor_exit_nodes	= {% if has_value("BLOCK_TOR_EXIT_NODE", "yes") %}true{% else %}false{% endif +%}
+local use_user_agents		= {% if has_value("BLOCK_USER_AGENT", "yes") %}true{% else %}false{% endif +%}
+local use_referrers		= {% if has_value("BLOCK_REFERRER", "yes") %}true{% else %}false{% endif +%}
+
+local use_remote_api		= {% if has_value("USE_REMOTE_API", "yes") %}true{% else %}false{% endif +%}
+
+
+-- Load reserved IPs
+local reserved_ips = {
+	"0.0.0.0/8",
+	"10.0.0.0/8",
+	"100.64.0.0/10",
+	"127.0.0.0/8",
+	"169.254.0.0/16",
+	"172.16.0.0/12",
+	"192.0.0.0/24",
+	"192.0.2.0/24",
+	"192.88.99.0/24",
+	"192.168.0.0/16",
+	"198.18.0.0/15",
+	"198.51.100.0/24",
+	"203.0.113.0/24",
+	"224.0.0.0/4",
+	"233.252.0.0/24",
+	"240.0.0.0/4",
+	"255.255.255.255/32"
+}
+local success, err, forcible = ngx.shared.reserved_ips:set("data", cjson.encode(iputils.parse_cidrs(reserved_ips)), 0)
+if not success then
+	logger.log(ngx.ERR, "INIT", "Can't load reserved IPs : " .. err)
+end
+
+-- Load blacklists
+if not use_redis then
+	if use_proxies then
+		dataloader.load_ip("/etc/nginx/proxies.list", ngx.shared.proxies_data)
+	end
+
+	if use_abusers then
+		dataloader.load_ip("/etc/nginx/abusers.list", ngx.shared.abusers_data)
+	end
+
+	if use_tor_exit_nodes then
+		dataloader.load_ip("/etc/nginx/tor-exit-nodes.list", ngx.shared.tor_exit_nodes_data)
+	end
+
+	if use_user_agents then
+		dataloader.load_raw("/etc/nginx/user-agents.list", ngx.shared.user_agents_data)
+	end
+
+	if use_referrers then
+		dataloader.load_raw("/etc/nginx/referrers.list", ngx.shared.referrers_data)
+	end
+end
+
+-- Load plugins
+ngx.shared.plugins_data:safe_set("plugins", nil, 0)
+local p = io.popen("find /opt/bunkerized-nginx/plugins -maxdepth 1 -type d ! -path /opt/bunkerized-nginx/plugins")
+for dir in p:lines() do
+	-- read JSON
+	local file = io.open(dir .. "/plugin.json")
+	if file then
+		-- store settings
+		local data = cjson.decode(file:read("*a"))
+		for k, v in pairs(data.settings) do
+			ngx.shared.plugins_data:safe_set(data.id .. "_" .. k, v, 0)
+		end
+		file:close()
+		-- call init
+		local plugin = require(data.id .. "/" .. data.id)
+		local init = true
+		if plugin["init"] ~= nil then
+			init = plugin.init()
+		end
+		-- store plugin
+		if init then
+			local plugins, flags = ngx.shared.plugins_data:get("plugins")
+			if plugins == nil then
+				ngx.shared.plugins_data:safe_set("plugins", data.id, 0)
+			else
+				ngx.shared.plugins_data:safe_set("plugins", plugins .. " " .. data.id, 0)
+			end
+			logger.log(ngx.ERR, "PLUGINS", "*NOT AN ERROR* plugin " .. data.name .. "/" .. data.version .. " has been loaded")
+		else
+			logger.log(ngx.ERR, "PLUGINS", "init failed for plugin " .. data.name .. "/" .. data.version)
+		end
+	else
+		logger.log(ngx.ERR, "PLUGINS", "Can't load " .. dir .. "/plugin.json")
+	end
+
+end
+p:close()
+
+-- Remote API
+if use_remote_api then
+
+	-- Save server
+	ngx.shared.remote_api:set("server", "{{ REMOTE_API_SERVER }}", 0)
+
+	-- Save version
+	local f = io.open("/opt/bunkerized-nginx/VERSION", "r")
+	ngx.shared.remote_api:set("version", f:read("*all"):gsub("[\r\n]", ""), 0)
+	f:close()
+
+	-- Save machine ID
+	local id = "empty"
+	local f = io.open("/etc/nginx/machine.id", "r")
+	if f == nil then
+		logger.log(ngx.ERR, "REMOTE API", "USE_REMOTE_API is set to yes but machine ID is not generated - communication with {{ REMOTE_API_SERVER }} won't work")
+	else
+		id = f:read("*all"):gsub("[\r\n]", "")
+		logger.log(ngx.ERR, "REMOTE API", "*NOT AN ERROR* Using existing machine ID (" .. id .. ")")	
+		f:close()
+	end
+	ngx.shared.remote_api:set("id", id, 0)
+
+	-- Ping the remote API
+	local ping = "ko"
+	if id ~= "empty" then
+		if remoteapi.ping2() then
+			ping = "ok"
+			logger.log(ngx.ERR, "REMOTE API", "*NOT AN ERROR* Successfully requested the remote API")
+		else
+			logger.log(ngx.ERR, "REMOTE API", "Can't contact the remote API, feature will be disabled")
+		end
+	end
+	ngx.shared.remote_api:set("ping", ping, 0)
+
+	-- Load the database
+	if ping ~= "ko" then
+		dataloader.load_ip("/etc/nginx/remote-api.db", ngx.shared.remote_api_db)
+	end
+end
+
+}

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/mime-types.conf

@@ -0,0 +1,96 @@
+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/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/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/global/multisite-default-server-https.conf

@@ -1,11 +1,12 @@
-listen 0.0.0.0:%HTTPS_PORT% default_server ssl %HTTP2%;
+listen 0.0.0.0:{{ HTTPS_PORT }} default_server ssl {% if USE_HTTP2 == "yes" %}http2{% endif %};
 ssl_certificate /etc/nginx/default-cert.pem;
 ssl_certificate_key /etc/nginx/default-key.pem;
-ssl_protocols %HTTPS_PROTOCOLS%;
+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%
+{% if "TLSv1.2" in HTTPS_PROTOCOLS +%}
+ssl_dhparam /etc/nginx/dhparam;
+ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
+{% endif +%}

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

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

confs/global/multisite-default-server.conf

@@ -1,6 +1,12 @@
 server {
-	%LISTEN_HTTP%
+	{% if LISTEN_HTTP == "yes" %}listen 0.0.0.0:{{ HTTP_PORT }} default_server;{% endif +%}
 	server_name _;
-	%USE_HTTPS%
-	%MULTISITE_DISABLE_DEFAULT_SERVER%
+	{% if has_value("AUTO_LETS_ENCRYPT", "yes") %}include /etc/nginx/multisite-default-server-https.conf;{% endif +%}
+	include /etc/nginx/multisite-default-server-lets-encrypt-webroot.conf;
+	{% if USE_API == "yes" %}
+	location ^~ {{ API_URI }} {
+		include /etc/nginx/api.conf;
+	}
+	{% endif %}
+	{% if DISABLE_DEFAULT_SERVER == "yes" %}include /etc/nginx/multisite-disable-default-server.conf;{% endif +%}
 }

confs/global/nginx-temp.conf

@@ -1,6 +1,6 @@
 load_module /usr/lib/nginx/modules/ngx_http_lua_module.so;
 
-daemon on;
+#daemon on;
 
 pid /tmp/nginx-temp.pid;
 
@@ -15,12 +15,13 @@ http {
 	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;;";
+	lua_package_path "/opt/bunkerized-nginx/lua/?.lua;/opt/bunkerized-nginx/plugins/?.lua;/opt/bunkerized-nginx/deps/lib/lua/?.lua;;";
+	lua_package_cpath "/opt/bunkerized-nginx/deps/lib/?.so;/opt/bunkerized-nginx/deps/lib/lua/?.so;;";
 	server {
 		listen 0.0.0.0:%HTTP_PORT% default_server;
 		server_name _;
 		location ~ ^/.well-known/acme-challenge/ {
-			root /acme-challenge;
+			root /opt/bunkerized-nginx/acme-challenge;
 		}
 		%USE_API%
 		location / {

confs/global/nginx.conf

@@ -6,18 +6,14 @@ 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;
+# worker number (default = auto)
+worker_processes {{ WORKER_PROCESSES }};
 
 # faster regexp
 pcre_jit on;
@@ -25,9 +21,12 @@ pcre_jit on;
 # config files for dynamic modules
 include /etc/nginx/modules/*.conf;
 
+# max open files for each worker
+worker_rlimit_nofile {{ WORKER_RLIMIT_NOFILE }};
+
 events {
 	# max connections per worker
-	worker_connections 1024;
+	worker_connections {{ WORKER_CONNECTIONS }};
 
 	# epoll seems to be the best on Linux
 	use epoll;
@@ -44,13 +43,13 @@ http {
 	tcp_nodelay on;
 
 	# load mime types and set default one
-	include /etc/nginx/mime.types;
+	include /etc/nginx/mime-types.conf;
 	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;
+	log_format logf '{{ LOG_FORMAT }}';
+	access_log /var/log/nginx/access.log logf;
+	error_log /var/log/nginx/error.log {{ LOG_LEVEL }};
 
 	# temp paths
 	proxy_temp_path /tmp/proxy_temp;
@@ -63,55 +62,91 @@ http {
 	reset_timedout_connection on;
 
 	# timeouts
-	client_body_timeout 12;
-	client_header_timeout 12;
+	client_body_timeout 10;
+	client_header_timeout 10;
 	keepalive_timeout 15;
 	send_timeout 10;
 
 	# resolvers to use
-	resolver %DNS_RESOLVERS% ipv6=off;
+	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%
+	lua_package_path "/opt/bunkerized-nginx/lua/?.lua;/opt/bunkerized-nginx/plugins/?.lua;/opt/bunkerized-nginx/deps/lib/lua/?.lua;;";
+	lua_package_cpath "/opt/bunkerized-nginx/deps/lib/?.so;/opt/bunkerized-nginx/deps/lib/lua/?.so;;";
+	lua_ssl_trusted_certificate "/opt/bunkerized-nginx/lua/misc/root-ca.pem";
+	lua_ssl_verify_depth 2;
+	{% if has_value("USE_WHITELIST_IP", "yes") %}lua_shared_dict whitelist_ip_cache 10m;{% endif +%}
+	{% if has_value("USE_WHITELIST_REVERSE", "yes") %}lua_shared_dict whitelist_reverse_cache 10m;{% endif +%}
+	{% if has_value("USE_BLACKLIST_IP", "yes") %}lua_shared_dict blacklist_ip_cache 10m;{% endif +%}
+	{% if has_value("USE_BLACKLIST_REVERSE", "yes") %}lua_shared_dict blacklist_reverse_cache 10m;{% endif +%}
+	{% if has_value("USE_DNSBL", "yes") %}lua_shared_dict dnsbl_cache 10m;{% endif +%}
+	{% if has_value("BLOCK_PROXIES", "yes") %}lua_shared_dict proxies_data 250m;{% endif +%}
+	{% if has_value("BLOCK_ABUSERS", "yes") %}lua_shared_dict abusers_data 50m;{% endif +%}
+	{% if has_value("BLOCK_TOR_EXIT_NODE", "yes") %}lua_shared_dict tor_exit_nodes_data 1m;{% endif +%}
+	{% if has_value("BLOCK_USER_AGENT", "yes") %}lua_shared_dict user_agents_data 1m;{% endif +%}
+	{% if has_value("BLOCK_USER_AGENT", "yes") %}lua_shared_dict user_agents_cache 10m;{% endif +%}
+	{% if has_value("BLOCK_REFERRER", "yes") %}lua_shared_dict referrers_data 1m;{% endif +%}
+	{% if has_value("BLOCK_REFERRER", "yes") %}lua_shared_dict referrers_cache 10m;{% endif +%}
+	{% if has_value("USE_BAD_BEHAVIOR", "yes") %}lua_shared_dict behavior_ban 10m;{% endif +%}
+	{% if has_value("USE_BAD_BEHAVIOR", "yes") %}lua_shared_dict behavior_count 10m;{% endif +%}
+	{% if has_value("USE_LIMIT_REQ", "yes") %}lua_shared_dict limit_req {{ LIMIT_REQ_CACHE }};{% endif +%}
+	lua_shared_dict plugins_data 10m;
+	lua_shared_dict reserved_ips 1m;
+	{% if has_value("USE_REMOTE_API", "yes") %}lua_shared_dict remote_api 1m;{% endif +%}
+	{% if has_value("USE_REMOTE_API", "yes") %}lua_shared_dict remote_api_db 10m;{% endif +%}
 
-	# crowdsec init
-	%USE_CROWDSEC%
-	
 	# shared memory zone for limit_req
-	%LIMIT_REQ_ZONE%
+	#{% if has_value("USE_LIMIT_REQ", "yes") %}limit_req_zone $binary_remote_addr$uri zone=limit:{{ LIMIT_REQ_CACHE }} rate={{ LIMIT_REQ_RATE }};{% endif +%}
 
 	# shared memory zone for limit_conn
-	%LIMIT_CONN_ZONE%
+	{% if has_value("USE_LIMIT_CONN", "yes") %}limit_conn_zone $binary_remote_addr zone=ddos:{{ LIMIT_CONN_CACHE }};{% endif +%}
 
 	# whitelist or blacklist country
-	%USE_COUNTRY%
-
-	# list of blocked user agents
-	%BLOCK_USER_AGENT%
-
-	# list of blocked referrers
-	%BLOCK_REFERRER%
+	{% if BLACKLIST_COUNTRY != "" or WHITELIST_COUNTRY != "" %}include /etc/nginx/geoip.conf;{% endif +%}
 
 	# zone for proxy_cache
-	%PROXY_CACHE_PATH%
+	{% if has_value("USE_PROXY_CACHE", "yes") %}proxy_cache_path /tmp/proxy_cache keys_zone=proxycache:{{ PROXY_CACHE_PATH_ZONE_SIZE }} {{ PROXY_CACHE_PATH_PARAMS }};{% endif +%}
 
 	# custom http confs
-	include /http-confs/*.conf;
+	include /opt/bunkerized-nginx/http-confs/*.conf;
+
+	# LUA init block
+	include /etc/nginx/init-lua.conf;
 
 	# default server when MULTISITE=yes
-	%MULTISITE_DEFAULT_SERVER%
+	{% if MULTISITE == "yes" %}include /etc/nginx/multisite-default-server.conf;{% endif +%}
 
 	# server config(s)
-	%INCLUDE_SERVER%
+	{% 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" +%}
+	include /etc/nginx/server.conf;
+	{% endif %}
 
 	# API
-	%USE_API%
+	{% if USE_API == "yes" %}include /etc/nginx/api.conf;{% endif +%}
 }

confs/site/antibot-captcha.conf

@@ -1,4 +1,4 @@
-location = %ANTIBOT_URI% {
+location = {{ ANTIBOT_URI }} {
 
 	default_type 'text/html';
 	
@@ -6,13 +6,14 @@ location = %ANTIBOT_URI% {
 		content_by_lua_block {
 			local cookie	= require "cookie"
 			local captcha	= require "captcha"
+			local logger	= require "logger"
 			if not cookie.is_set("uri") then
-				ngx.log(ngx.NOTICE, "[ANTIBOT] captcha fail (1) for " .. ngx.var.remote_addr)
+				logger.log(ngx.WARN, "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%")
+			local code = captcha.get_code(img, "{{ ANTIBOT_URI }}")
 			ngx.say(code)
 		}
 	}
@@ -21,21 +22,22 @@ location = %ANTIBOT_URI% {
 		access_by_lua_block {
 			local cookie	= require "cookie"
 			local captcha	= require "captcha"
+			local logger	= require "logger"
 			if not cookie.is_set("captchares") then
-				ngx.log(ngx.NOTICE, "[ANTIBOT] captcha fail (2) for " .. ngx.var.remote_addr)
+				logger.log(ngx.WARN, "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)
+				logger.log(ngx.WARN, "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%")
+				logger.log(ngx.WARN, "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,4 +1,4 @@
-location = %ANTIBOT_URI% {
+location = {{ ANTIBOT_URI }} {
 
 	default_type 'text/html';
 	
@@ -6,12 +6,13 @@ location = %ANTIBOT_URI% {
 		content_by_lua_block {
 			local cookie		= require "cookie"
 			local javascript	= require "javascript"
+			local logger		= require "logger"
 			if not cookie.is_set("challenge") then
-				ngx.log(ngx.WARN, "[ANTIBOT] javascript fail (1) for " .. ngx.var.remote_addr)
+				logger.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"))
+			local code	= javascript.get_code(challenge, "{{ ANTIBOT_URI }}", cookie.get("uri"))
 			ngx.say(code)
 		}
 	}
@@ -20,20 +21,21 @@ location = %ANTIBOT_URI% {
 		content_by_lua_block {
 			local cookie		= require "cookie"
 			local javascript	= require "javascript"
+			local logger		= require "logger"
 			if not cookie.is_set("challenge") then
-				ngx.log(ngx.WARN, "[ANTIBOT] javascript fail (2) for " .. ngx.var.remote_addr)
+				logger.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)
+				logger.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)
+				logger.log(ngx.WARN, "ANTIBOT", "javascript fail (4) for " .. ngx.var.remote_addr)
 				return ngx.exit(ngx.HTTP_FORBIDDEN)
 			end
 			cookie.set({javascript = "ok"})

confs/site/antibot-recaptcha.conf

@@ -1,4 +1,4 @@
-location = %ANTIBOT_URI% {
+location = {{ ANTIBOT_URI }} {
 
 	default_type 'text/html';
 	
@@ -6,11 +6,12 @@ location = %ANTIBOT_URI% {
 		content_by_lua_block {
 			local cookie	= require "cookie"
 			local recaptcha	= require "recaptcha"
+			local logger	= require "logger"
 			if not cookie.is_set("uri") then
-				ngx.log(ngx.NOTICE, "[ANTIBOT] recaptcha fail (1) for " .. ngx.var.remote_addr)
+				logger.log(ngx.WARN, "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%")
+			local code = recaptcha.get_code("{{ ANTIBOT_URI }}", "{{ ANTIBOT_RECAPTCHA_SITEKEY }}")
 			ngx.say(code)
 		}
 	}
@@ -19,20 +20,21 @@ location = %ANTIBOT_URI% {
 		access_by_lua_block {
 			local cookie	= require "cookie"
 			local recaptcha	= require "recaptcha"
+			local logger	= require "logger"
 			if not cookie.is_set("uri") then
-				ngx.log(ngx.NOTICE, "[ANTIBOT] recaptcha fail (2) for " .. ngx.var.remote_addr)
+				logger.log(ngx.WARN, "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)
+				logger.log(ngx.WARN, "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) .. ")")
+			local check	= recaptcha.check(token, "{{ ANTIBOT_RECAPTCHA_SECRET }}")
+			if check < {{ ANTIBOT_RECAPTCHA_SCORE }} then
+				logger.log(ngx.WARN, "ANTIBOT", "recaptcha fail (4) for " .. ngx.var.remote_addr .. " (score = " .. tostring(check) .. ")")
 				return ngx.exit(ngx.HTTP_FORBIDDEN)
 			end
 			cookie.set({recaptcha = "ok"})

confs/site/auth-basic-sitewide.conf

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

confs/site/auth-basic.conf

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

confs/site/authelia-auth-request.conf

@@ -0,0 +1,26 @@
+# Basic Authelia Config
+# Send a subsequent request to Authelia to verify if the user is authenticated
+# and has the right permissions to access the resource.
+auth_request /authelia;
+# Set the `target_url` variable based on the request. It will be used to build the portal
+# URL with the correct redirection parameter.
+auth_request_set $target_url $scheme://$http_host$request_uri;
+# Set the X-Forwarded-User and X-Forwarded-Groups with the headers
+# returned by Authelia for the backends which can consume them.
+# This is not safe, as the backend must make sure that they come from the
+# proxy. In the future, it's gonna be safe to just use OAuth.
+auth_request_set $user $upstream_http_remote_user;
+auth_request_set $groups $upstream_http_remote_groups;
+auth_request_set $name $upstream_http_remote_name;
+auth_request_set $email $upstream_http_remote_email;
+fastcgi_param REMOTE_USER $user;
+fastcgi_param REMOTE_GROUPS $groups;
+fastcgi_param REMOTE_NAME $name;
+fastcgi_param REMOTE_EMAIL $email;
+proxy_set_header Remote-User $user;
+proxy_set_header Remote-Groups $groups;
+proxy_set_header Remote-Name $name;
+proxy_set_header Remote-Email $email;
+{% if AUTHELIA_MODE == "portal" +%}
+error_page 401 =302 {{ AUTHELIA_BACKEND }}/?rd=$target_url;
+{% endif %}

confs/site/authelia-upstream.conf

@@ -0,0 +1,40 @@
+set $upstream_authelia {{ AUTHELIA_UPSTREAM }}/api/verify;
+
+# Virtual endpoint created by nginx to forward auth requests.
+location /authelia {
+    internal;
+    proxy_pass_request_body off;
+    proxy_pass $upstream_authelia;
+    proxy_set_header Content-Length "";
+
+    # Timeout if the real server is dead
+    proxy_next_upstream error timeout invalid_header http_500 http_502 http_503;
+
+    # [REQUIRED] Needed by Authelia to check authorizations of the resource.
+    # Provide either X-Original-URL and X-Forwarded-Proto or
+    # X-Forwarded-Proto, X-Forwarded-Host and X-Forwarded-Uri or both.
+    # Those headers will be used by Authelia to deduce the target url of the user.
+    # Basic Proxy Config
+    client_body_buffer_size 128k;
+    proxy_set_header Host $host;
+    proxy_set_header X-Original-URL $scheme://$http_host$request_uri;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-Method $request_method;
+    proxy_set_header X-Forwarded-Proto $scheme;
+    proxy_set_header X-Forwarded-Host $http_host;
+    proxy_set_header X-Forwarded-Uri $request_uri;
+    proxy_set_header X-Forwarded-For $remote_addr;
+    proxy_set_header X-Forwarded-Ssl on;
+    proxy_redirect  http://  $scheme://;
+    proxy_http_version 1.1;
+    proxy_set_header Connection "";
+    proxy_cache_bypass $cookie_session;
+    proxy_no_cache $cookie_session;
+    proxy_buffers 4 32k;
+
+    # Advanced Proxy Config
+    send_timeout 5m;
+    proxy_read_timeout 240;
+    proxy_send_timeout 240;
+    proxy_connect_timeout 240;
+}

confs/site/brotli.conf

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

confs/site/client-cache.conf

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

confs/site/content-security-policy.conf

@@ -1 +1 @@
-more_set_headers "Content-Security-Policy: %CONTENT_SECURITY_POLICY%";
+more_set_headers "Content-Security-Policy: {{ CONTENT_SECURITY_POLICY }}";

confs/site/cookie-flags.conf

@@ -1 +1 @@
-set_cookie_flag %COOKIE_FLAGS%;
+set_cookie_flag {{ COOKIE_FLAGS }}{% if COOKIE_AUTO_SECURE_FLAG == "yes" and (AUTO_LETS_ENCRYPT == "yes" or USE_CUSTOM_HTTPS == "yes" or GENERATE_SELF_SIGNED_SSL == "yes") %} Secure{% endif %};

confs/site/custom-headers.conf

@@ -0,0 +1,5 @@
+{% for k, v in all.items() +%}
+	{% if k.startswith("CUSTOM_HEADER") and v != "" +%}
+more_set_header "{{ v }}";
+	{% endif %}
+{% endfor %}

confs/site/custom-https.conf

@@ -1,7 +1,9 @@
-listen 0.0.0.0:443 ssl %HTTP2%;
-ssl_certificate %HTTPS_CUSTOM_CERT%;
-ssl_certificate_key %HTTPS_CUSTOM_KEY%;
+listen 0.0.0.0:443 ssl {% if HTTP2 == "yes" %}http2{% endif %};
+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%
+{% if STRICT_TRANSPORT_SECURITY != "" +%}
+more_set_headers 'Strict-Transport-Security: {{ STRICT_TRANSPORT_SECURITY }}';
+{% endif %}

confs/site/disable-default-server.conf

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

confs/site/error.conf

@@ -1,7 +1,26 @@
-error_page %CODE% %PAGE%;
+{% if ERRORS != "" %}
+	{% for element in ERRORS.split(" ") %}
+		{% set code = element.split("=")[0] %}
+		{% set page = element.split("=")[1] %}
+error_page {{ code }} {{ page }};
 
-location = %PAGE% {
-    root %ROOT_FOLDER%;
+location = {{ page }} {
+    root {{ ROOT_FOLDER }};
     modsecurity off;
     internal;
 }
+	{% endfor %}
+{% endif %}
+
+{% set default_errors = ["400", "401", "403", "404", "429", "500", "501", "502", "503", "504"] %}
+{% for default_error in default_errors %}
+	{% if not default_error + "=" in ERRORS +%}
+error_page {{ default_error }} /errors/{{ default_error }}.html;
+
+location = /errors/{{ default_error }}.html {
+    root /opt/bunkerized-nginx/defaults;
+    modsecurity off;
+    internal;
+}
+	{% endif %}
+{% endfor %}

confs/site/fastcgi.conf

@@ -1,4 +1,10 @@
-fastcgi_param  SCRIPT_FILENAME    $document_root$fastcgi_script_name;
+{% if REMOTE_PHP != "" +%}
+fastcgi_param  SCRIPT_FILENAME    {{ REMOTE_PHP_PATH }}/$fastcgi_script_name;
+{% elif LOCAL_PHP != "" +%}
+fastcgi_param  SCRIPT_FILENAME    {{ LOCAL_PHP_PATH }}/$fastcgi_script_name;
+{% else +%}
+fastcgi_param  SCRIPT_FILENAME    $fastcgi_script_name;
+{% endif %}
 fastcgi_param  QUERY_STRING       $query_string;
 fastcgi_param  REQUEST_METHOD     $request_method;
 fastcgi_param  CONTENT_TYPE       $content_type;
@@ -13,7 +19,7 @@ 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  SERVER_SOFTWARE    nginx;
 
 fastcgi_param  REMOTE_ADDR        $remote_addr;
 fastcgi_param  REMOTE_PORT        $remote_port;

confs/site/feature-policy.conf

@@ -1 +1 @@
-more_set_headers "Feature-Policy: %FEATURE_POLICY%";
+more_set_headers "Feature-Policy: {{ FEATURE_POLICY }}";

confs/site/gzip.conf

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

confs/site/htpasswd

@@ -0,0 +1,3 @@
+{% if USE_AUTH_BASIC == "yes" %}
+{{ AUTH_BASIC_USER }}:{{ sha512_crypt(AUTH_BASIC_PASSWORD) }}
+{% endif %}

confs/site/https.conf

@@ -1,12 +1,34 @@
-listen 0.0.0.0:%HTTPS_PORT% ssl %HTTP2%;
-ssl_certificate %HTTPS_CERT%;
-ssl_certificate_key %HTTPS_KEY%;
-ssl_protocols %HTTPS_PROTOCOLS%;
+listen 0.0.0.0:{{ HTTPS_PORT }} ssl {% if HTTP2 == "yes" %}http2{% endif %};
+{% set paths = {"cert": "", "key": ""} %}
+{% if AUTO_LETS_ENCRYPT == "yes" %}
+	{% set x = paths.update({"cert": "/etc/letsencrypt/live/" + FIRST_SERVER + "/fullchain.pem"}) %}
+	{% set x = paths.update({"key": "/etc/letsencrypt/live/" + FIRST_SERVER + "/privkey.pem"}) %}
+{% elif USE_CUSTOM_HTTPS == "yes" %}
+	{% set x = paths.update({"cert": CUSTOM_HTTPS_CERT}) %}
+	{% set x = paths.update({"key": CUSTOM_HTTPS_KEY}) %}
+{% elif GENERATE_SELF_SIGNED_SSL == "yes" %}
+	{% if MULTISITE == "yes" %}
+		{% set x = paths.update({"cert": "/etc/nginx/" + FIRST_SERVER + "/self-cert.pem"}) %}
+		{% set x = paths.update({"key": "/etc/nginx/" + FIRST_SERVER + "/self-key.pem"}) %}
+	{% else %}
+		{% set x = paths.update({"cert": "/etc/nginx/self-cert.pem"}) %}
+		{% set x = paths.update({"key": "/etc/nginx/self-key.pem"}) %}
+	{% endif %}
+{% endif %}
+ssl_certificate {{ paths["cert"] }};
+ssl_certificate_key {{ paths["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%
+{% if STRICT_TRANSPORT_SECURITY != "" +%}
+more_set_headers 'Strict-Transport-Security: {{ STRICT_TRANSPORT_SECURITY }}';
+{% endif %}
+{% if "TLSv1.2" in HTTPS_PROTOCOLS +%}
+ssl_dhparam /etc/nginx/dhparam;
+ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
+{% endif %}
+{% if AUTO_LETS_ENCRYPT +%}
+include {{ NGINX_PREFIX }}lets-encrypt-webroot.conf;
+{% endif %}

confs/site/inject-body.conf

@@ -0,0 +1 @@
+sub_filter '</body>' '{{ INJECT_BODY }}</body>';

confs/site/lets-encrypt-webroot.conf

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

confs/site/limit-conn.conf

@@ -1 +1 @@
-limit_conn ddos %LIMIT_CONN_MAX%;
+limit_conn ddos {{ LIMIT_CONN_MAX }};

confs/site/limit-req.conf

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

confs/site/log-lua.conf

@@ -0,0 +1,58 @@
+log_by_lua_block {
+
+local logger			= require "logger"
+local cjson			= require "cjson"
+
+-- bad behavior
+local use_bad_behavior		= {% if USE_BAD_BEHAVIOR == "yes" %}true{% else %}false{% endif +%}
+local behavior			= require "behavior"
+local bad_behavior_status_codes = {% raw %}{{% endraw %}{% if BAD_BEHAVIOR_STATUS_CODES != "" %}{% set elements = BAD_BEHAVIOR_STATUS_CODES.split(" ") %}{% for i in range(0, elements|length) %}"{{ elements[i] }}"{% if i < elements|length-1 %},{% endif %}{% endfor %}{% endif %}{% raw %}}{% endraw +%}
+local bad_behavior_threshold    = {{ BAD_BEHAVIOR_THRESHOLD }}
+local bad_behavior_count_time   = {{ BAD_BEHAVIOR_COUNT_TIME }}
+local bad_behavior_ban_time     = {{ BAD_BEHAVIOR_BAN_TIME }}
+
+if use_bad_behavior then
+	local new_bad_behavior_ban = false
+	if not behavior.is_banned() then
+		new_bad_behavior_ban = behavior.count(bad_behavior_status_codes, bad_behavior_threshold, bad_behavior_count_time, bad_behavior_ban_time)
+	end
+end
+
+-- remote API
+local use_remote_api            = {% if USE_REMOTE_API == "yes" %}true{% else %}false{% endif +%}
+local remoteapi			= require "remoteapi"
+local iputils			= require "resty.iputils"
+
+if use_remote_api and ngx.status == ngx.HTTP_FORBIDDEN and not iputils.ip_in_cidrs(ngx.var.remote_addr, cjson.decode(ngx.shared.reserved_ips:get("data"))) and ngx.shared.remote_api:get("id") ~= "empty" then
+	if ngx.shared.remote_api:get("ping") == "ko" then
+		if remoteapi.ping2() then
+			ngx.shared.remote_api:set("ping", "ok", 0)
+			logger.log(ngx.NOTICE, "REMOTE API", "Successfully requested the remote API again")
+		else
+			logger.log(ngx.ERR, "REMOTE API", "Can't contact the remote API, feature will be disabled")
+		end
+	end
+	if ngx.shared.remote_api:get("ping") ~= "ko" then
+		local reason = "other"
+		if use_bad_behavior and new_bad_behavior_ban then
+			reason = "behavior"
+		end
+		local report_ip = function (premature, ip, reason)
+			if premature then
+				return
+			end
+			local remoteapi = require "remoteapi"
+			local logger = require "logger"
+			local res, data = remoteapi.ip(ip, reason)
+			-- TODO : find a way to log
+		end
+		local ok, err = ngx.timer.at(0, report_ip, ngx.var.remote_addr, reason)
+		if not ok then
+			logger.log(ngx.ERR, "REMOTE API", "Error while creating report timer " .. err)
+		else
+			logger.log(ngx.NOTICE, "REMOTE API", "Reporting " .. ngx.var.remote_addr .. "(reason: " .. reason .. ") to the remote API")
+		end
+	end
+end
+
+}

confs/site/main-lua.conf

@@ -1,36 +1,88 @@
-set $session_secret %ANTIBOT_SESSION_SECRET%;
+{% if ANTIBOT_SESSION_SECRET == "random" +%}
+set $session_secret {{ random(32) }};
+{% else +%}
+set $session_secret {{ ANTIBOT_SESSION_SECRET }};
+{% endif %}
 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%
+-- disable checks for internal requests
+if ngx.req.is_internal() then
+	return
+end
+
+-- let's encrypt
+local use_lets_encrypt		= {% if AUTO_LETS_ENCRYPT == "yes" %}true{% else %}false{% endif +%}
+
+-- redis
+local use_redis			= {% if USE_REDIS == "yes" %}true{% else %}false{% endif +%}
+local redis_host		= "{{ REDIS_HOST }}"
+
+-- external blacklists
+local use_user_agents		= {% if BLOCK_USER_AGENT == "yes" %}true{% else %}false{% endif +%}
+local use_proxies		= {% if BLOCK_PROXIES == "yes" %}true{% else %}false{% endif +%}
+local use_abusers		= {% if BLOCK_ABUSERS == "yes" %}true{% else %}false{% endif +%}
+local use_tor_exit_nodes	= {% if BLOCK_TOR_EXIT_NODE == "yes" %}true{% else %}false{% endif +%}
+local use_referrers		= {% if BLOCK_REFERRER == "yes" %}true{% else %}false{% endif +%}
+
+-- countries
+local use_country		= {% if WHITELIST_COUNTRY != "" or BLACKLIST_COUNTRY != "" %}true{% else %}false{% endif +%}
+
+-- antibot
+local use_antibot_cookie	= {% if USE_ANTIBOT == "cookie" %}true{% else %}false{% endif +%}
+local use_antibot_javascript	= {% if USE_ANTIBOT == "javascript" %}true{% else %}false{% endif +%}
+local use_antibot_captcha	= {% if USE_ANTIBOT == "captcha" %}true{% else %}false{% endif +%}
+local use_antibot_recaptcha	= {% if USE_ANTIBOT == "recaptcha" %}true{% else %}false{% endif +%}
+
+-- resolvers
+local dns_resolvers		= {% raw %}{{% endraw %}{% if DNS_RESOLVERS != "" %}{% set elements = DNS_RESOLVERS.split(" ") %}{% for i in range(0, elements|length) %}"{{ elements[i] }}"{% if i < elements|length-1 %},{% endif %}{% endfor %}{% endif %}{% raw %}}{% endraw +%}
+
+-- whitelist
+local use_whitelist_ip		= {% if USE_WHITELIST_IP == "yes" %}true{% else %}false{% endif +%}
+local use_whitelist_reverse	= {% if USE_WHITELIST_REVERSE == "yes" %}true{% else %}false{% endif +%}
+local whitelist_ip_list		= {% raw %}{{% endraw %}{% if WHITELIST_IP_LIST != "" %}{% set elements = WHITELIST_IP_LIST.split(" ") %}{% for i in range(0, elements|length) %}"{{ elements[i] }}"{% if i < elements|length-1 %},{% endif %}{% endfor %}{% endif %}{% raw %}}{% endraw +%}
+local whitelist_reverse_list	= {% raw %}{{% endraw %}{% if WHITELIST_REVERSE_LIST != "" %}{% set elements = WHITELIST_REVERSE_LIST.split(" ") %}{% for i in range(0, elements|length) %}"{{ elements[i] }}"{% if i < elements|length-1 %},{% endif %}{% endfor %}{% endif %}{% raw %}}{% endraw +%}
+
+-- blacklist
+local use_blacklist_ip		= {% if USE_BLACKLIST_IP == "yes" %}true{% else %}false{% endif +%}
+local use_blacklist_reverse	= {% if USE_BLACKLIST_REVERSE == "yes" %}true{% else %}false{% endif +%}
+local blacklist_ip_list		= {% raw %}{{% endraw %}{% if BLACKLIST_IP_LIST != "" %}{% set elements = BLACKLIST_IP_LIST.split(" ") %}{% for i in range(0, elements|length) %}"{{ elements[i] }}"{% if i < elements|length-1 %},{% endif %}{% endfor %}{% endif %}{% raw %}}{% endraw +%}
+local blacklist_reverse_list	= {% raw %}{{% endraw %}{% if BLACKLIST_REVERSE_LIST != "" %}{% set elements = BLACKLIST_REVERSE_LIST.split(" ") %}{% for i in range(0, elements|length) %}"{{ elements[i] }}"{% if i < elements|length-1 %},{% endif %}{% endfor %}{% endif %}{% raw %}}{% endraw +%}
+
+-- dnsbl
+local use_dnsbl			= {% if USE_DNSBL == "yes" %}true{% else %}false{% endif +%}
+local dnsbl_list		= {% raw %}{{% endraw %}{% if DNSBL_LIST != "" %}{% set elements = DNSBL_LIST.split(" ") %}{% for i in range(0, elements|length) %}"{{ elements[i] }}"{% if i < elements|length-1 %},{% endif %}{% endfor %}{% endif %}{% raw %}}{% endraw +%}
+
+-- bad behavior
+local use_bad_behavior		= {% if USE_BAD_BEHAVIOR == "yes" %}true{% else %}false{% endif +%}
+
+-- limit req
+local use_limit_req		= {% if USE_LIMIT_REQ == "yes" %}true{% else %}false{% endif +%}
+
+-- remote API
+local use_remote_api		= {% if USE_REMOTE_API == "yes" %}true{% else %}false{% endif +%}
 
 -- 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"
+local whitelist			= require "whitelist"
+local blacklist			= require "blacklist"
+local dnsbl				= require "dnsbl"
+local cookie			= require "cookie"
+local cjson				= require "cjson"
+local javascript		= require "javascript"
+local captcha			= require "captcha"
+local recaptcha			= require "recaptcha"
+local iputils			= require "resty.iputils"
+local behavior			= require "behavior"
+local logger			= require "logger"
+local redis				= require "resty.redis"
+local checker			= require "checker"
+local limitreq			= require "limitreq"
 
 -- user variables
-local antibot_uri		= "%ANTIBOT_URI%"
-local whitelist_user_agent	= {%WHITELIST_USER_AGENT%}
-local whitelist_uri		= {%WHITELIST_URI%}
+local antibot_uri		= "{{ ANTIBOT_URI }}"
+local whitelist_user_agent	= {% raw %}{{% endraw %}{% if WHITELIST_USER_AGENT != "" %}{% set elements = WHITELIST_USER_AGENT.split(" ") %}{% for i in range(0, elements|length) %}"{{ elements[i] }}"{% if i < elements|length-1 %},{% endif %}{% endfor %}{% endif %}{% raw %}}{% endraw +%}
+local whitelist_uri		= {% raw %}{{% endraw %}{% if WHITELIST_URI != "" %}{% set elements = WHITELIST_URI.split(" ") %}{% for i in range(0, elements|length) %}"{{ elements[i] }}"{% if i < elements|length-1 %},{% endif %}{% endfor %}{% endif %}{% raw %}}{% endraw +%}
 
 -- check if already in whitelist cache
 if use_whitelist_ip and whitelist.ip_cached_ok() then
@@ -55,14 +107,14 @@ 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
+	if whitelist.check_ip(whitelist_ip_list) 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
+	if whitelist.check_reverse(whitelist_reverse_list) then
 		ngx.exit(ngx.OK)
 	end
 end
@@ -70,85 +122,157 @@ 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")
+		logger.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
+if use_lets_encrypt and string.match(ngx.var.request_uri, "^/%.well%-known/acme%-challenge/[A-Za-z0-9%-%_]+$") then
+	logger.log(ngx.INFO, "LETSENCRYPT", "got a visit from Let's Encrypt")
 	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
+	if blacklist.check_ip(blacklist_ip_list) 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
+	if blacklist.check_reverse(blacklist_reverse_list, dns_resolvers) then
+		ngx.exit(ngx.HTTP_FORBIDDEN)
+	end
+end
+
+-- check if IP is banned because of "bad behavior"
+if use_bad_behavior and behavior.is_banned() then
+	logger.log(ngx.WARN, "BEHAVIOR", "IP " .. ngx.var.remote_addr .. " is banned because of bad behavior")
+	ngx.exit(ngx.HTTP_FORBIDDEN)
+end
+
+-- check if IP is banned because of "request limit"
+if use_limit_req then
+{% if USE_LIMIT_REQ == "yes" %}
+	{% for k, v in all.items() %}
+		{% if k.startswith("LIMIT_REQ_URL") and v != "" +%}
+			{% set url = v %}
+			{% set rate = all[k.replace("URL", "RATE")] if k.replace("URL", "RATE") in all else "1r/s" %}
+			{% set burst = all[k.replace("URL", "BURST")] if k.replace("URL", "BURST") in all else "5" %}
+			{% set delay = all[k.replace("URL", "DELAY")] if k.replace("URL", "DELAY") in all else "1" %}
+			{% if url == "/" %}
+	if limitreq.check("{{ rate }}", {{ burst }}, {{ delay }}) then
+		ngx.exit(ngx.HTTP_TOO_MANY_REQUESTS)
+	end
+			{% else %}
+	if ngx.var.uri == "{{ url }}" and limitreq.check("{{ rate }}", {{ burst }}, {{ delay }}) then
+		ngx.exit(ngx.HTTP_TOO_MANY_REQUESTS)
+	end
+			{% endif %}
+		{% endif %}
+	{% endfor %}
+{% endif %}
+
+end
+
+-- our redis client
+local redis_client = nil
+if use_redis then
+	redis_client = redis:new()
+	local ok, err = redis_client:connect(redis_host, 6379)
+	if not ok then
+		redis_client = nil
+		logger.log(ngx.ERR, "REDIS", "Can't connect to the Redis service " .. redis_host)
+	end
+end
+
+-- check if IP is in proxies list
+if use_proxies then
+	local checker = checker:new("proxies", ngx.shared.proxies_data, redis_client, "simple")
+	if checker:check(iputils.ip2bin(ngx.var.remote_addr)) then
+		logger.log(ngx.WARN, "PROXIES", "IP " .. ngx.var.remote_addr .. " is in proxies list")
+		ngx.exit(ngx.HTTP_FORBIDDEN)
+	end
+end
+
+-- check if IP is in abusers list
+if use_abusers then
+	local checker = checker:new("abusers", ngx.shared.abusers_data, redis_client, "simple")
+	if checker:check(iputils.ip2bin(ngx.var.remote_addr)) then
+		logger.log(ngx.WARN, "ABUSERS", "IP " .. ngx.var.remote_addr .. " is in abusers list")
+		ngx.exit(ngx.HTTP_FORBIDDEN)
+	end
+end
+
+-- check if IP is in TOR exit nodes list
+if use_tor_exit_nodes then
+	local checker = checker:new("exit-nodes", ngx.shared.tor_exit_nodes_data, redis_client, "simple")
+	if checker:check(iputils.ip2bin(ngx.var.remote_addr)) then
+		logger.log(ngx.WARN, "TOR", "IP " .. ngx.var.remote_addr .. " is in TOR exit nodes list")
 		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
+if use_user_agents and ngx.var.http_user_agent ~= nil then
+	local whitelisted = 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
+			logger.log(ngx.NOTICE, "WHITELIST", "User-Agent " .. ngx.var.http_user_agent .. " is whitelisted")
+			whitelisted = true
 			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)
+	if not whitelisted then
+		local checker = checker:new("user-agents", ngx.shared.user_agents_data, redis_client, "match")
+		if checker:check(ngx.var.http_user_agent) then
+			logger.log(ngx.WARN, "USER-AGENTS", "User-Agent " .. ngx.var.http_user_agent .. " is blacklisted")
+			ngx.exit(ngx.HTTP_FORBIDDEN)
+		end
 	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)
+if use_referrer and ngx.var.http_referer ~= nil then
+	local checker = checker:new("referrers", ngx.shared.referrers_data, redis_client, "match")
+	if checker:check(ngx.var.http_referer) then
+		logger.log(ngx.WARN, "REFERRERS", "Referrer " .. ngx.var.http_referer .. " is blacklisted")
+		ngx.exit(ngx.HTTP_FORBIDDEN)
+	end
 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")
+if use_country and ngx.var.allowed_country == "no" and not iputils.ip_in_cidrs(ngx.var.remote_addr, cjson.decode(ngx.shared.reserved_ips:get("data"))) then
+	logger.log(ngx.WARN, "COUNTRY", "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
+	if dnsbl.check(dnsbl_list, dns_resolvers) 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 .. "'")
+-- check if IP is in distributed DB
+if use_remote_api then
+	local checker = checker:new("remote-api-db", ngx.shared.remote_api_db, redis_client, "simple")
+	if checker:check(iputils.ip2bin(ngx.var.remote_addr)) then
+		logger.log(ngx.WARN, "REMOTE API", "IP " .. ngx.var.remote_addr .. " is in the distributed DB")
 		ngx.exit(ngx.HTTP_FORBIDDEN)
 	end
 end
 
 -- cookie check
-if use_antibot_cookie then
+if use_antibot_cookie and ngx.var.uri ~= "/favicon.ico" 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)
+		logger.log(ngx.WARN, "ANTIBOT", "cookie fail for " .. ngx.var.remote_addr)
 		return ngx.exit(ngx.HTTP_FORBIDDEN)
 	else
 		if ngx.var.request_uri == antibot_uri then
@@ -158,7 +282,7 @@ if use_antibot_cookie then
 end
 
 -- javascript check
-if use_antibot_javascript then
+if use_antibot_javascript and ngx.var.uri ~= "/favicon.ico" 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()})
@@ -168,7 +292,7 @@ if use_antibot_javascript then
 end
 
 -- captcha check
-if use_antibot_captcha then
+if use_antibot_captcha and ngx.var.uri ~= "/favicon.ico" then
 	if not cookie.is_set("captcha") then
 		if ngx.var.request_uri ~= antibot_uri then
 			cookie.set({uri = ngx.var.request_uri})
@@ -178,7 +302,7 @@ if use_antibot_captcha then
 end
 
 -- recaptcha check
-if use_antibot_recaptcha then
+if use_antibot_recaptcha and ngx.var.uri ~= "/favicon.ico" then
 	if not cookie.is_set("recaptcha") then
 		if ngx.var.request_uri ~= antibot_uri then
 			cookie.set({uri = ngx.var.request_uri})
@@ -187,12 +311,23 @@ if use_antibot_recaptcha then
 	end
 end
 
+-- plugins check
+local plugins, flags = ngx.shared.plugins_data:get("plugins")
+if plugins ~= nil then
+	for plugin_id in string.gmatch(plugins, "%w+") do
+		local plugin = require(plugin_id .. "/" .. plugin_id)
+		plugin.check()
+	end
+end
+
 ngx.exit(ngx.OK)
 
 }
 
-%INCLUDE_ANTIBOT_JAVASCRIPT%
-
-%INCLUDE_ANTIBOT_CAPTCHA%
-
-%INCLUDE_ANTIBOT_RECAPTCHA%
+{% if USE_ANTIBOT == "javascript" +%}
+include {{ NGINX_PREFIX }}antibot-javascript.conf;
+{% elif USE_ANTIBOT == "captcha" +%}
+include {{ NGINX_PREFIX }}antibot-captcha.conf;
+{% elif USE_ANTIBOT == "recaptcha" +%}
+include {{ NGINX_PREFIX }}antibot-recaptcha.conf;
+{% endif %}

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'"