Cargo.toml

fix linter warnings

.dockerignore

@@ -0,0 +1,9 @@
+.git/
+.github/
+.gitignore
+.dockerignore
+/charts/
+#
+docker-compose.yml
+#
+/.cargo/

.github/workflows/build-test.yaml

@@ -0,0 +1,50 @@
+name: Build check
+
+on:
+  workflow_dispatch: {}
+  pull_request:
+    branches:
+      - main
+    paths:
+      - "src/**"
+      - "Dockerfile"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    name: Build and Test
+    timeout-minutes: 15
+    runs-on: ubuntu-24.04
+    if: github.event.pull_request.draft == false
+    permissions:
+      contents: read
+    steps:
+      - name: Checkout
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+
+      - name: Rust toolchain
+        uses: dtolnay/rust-toolchain@6c977a6ca4077a0ceb28ffbe03f59d46e9ac8772 # v1
+        with:
+          toolchain: "1.98"
+          components: clippy, rustfmt
+      - name: Install cargo-deny
+        uses: taiki-e/install-action@3f74d7c16a4242f1c95561e98edc25d36adb4375 # v2.87.12
+        with:
+          tool: cargo-deny
+      - name: Rust cache
+        uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
+
+      - name: Rust build
+        run: make build test
+
+      - name: Rust fmt
+        run: make fmt
+      - name: Rust linter
+        run: make lint
+      - name: Rust dependencies check
+        run: make deps

.github/workflows/release.yaml

@@ -0,0 +1,58 @@
+name: Release
+
+on:
+  workflow_dispatch: {}
+  # push:
+  #   tags:
+  #     - "v*"
+
+jobs:
+  goreleaser:
+    name: GoReleaser
+    runs-on: ubuntu-24.04
+    permissions:
+      contents: write
+      packages: write
+      id-token: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          fetch-depth: 0
+          persist-credentials: false
+
+      - name: Setup Zig
+        uses: mlugg/setup-zig@d1434d08867e3ee9daa34448df10607b98908d29 # v2.2.1
+      - name: Rust toolchain
+        uses: dtolnay/rust-toolchain@6c977a6ca4077a0ceb28ffbe03f59d46e9ac8772 # v1
+        with:
+          toolchain: "1.98"
+          components: clippy, rustfmt
+      - name: Rust cache
+        uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
+
+      - name: Install Cosign
+        uses: sigstore/cosign-installer@6f9f17788090df1f26f669e9d70d6ae9567deba6 # v4.1.2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@99012661954931238ded8c8b007157a8430204e1 # v4.4.0
+        with:
+          platforms: arm64
+      - name: Set up docker buildx
+        uses: docker/setup-buildx-action@f87e5991a6d7451dcb8d9637bfbc97413f497069 # v4.4.1
+
+      - name: Github registry login
+        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Run GoReleaser
+        timeout-minutes: 60
+        uses: goreleaser/goreleaser-action@f06c13b6b1a9625abc9e6e439d9c05a8f2190e94 # v7.2.3
+        with:
+          version: "v2.18.2"
+          args: release --clean
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          USERNAME: ${{ github.repository_owner }}

.gitignore

@@ -21,6 +21,7 @@ com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
 /target
+/.zig-cache/
 /z_shpo
 /configs
 Makefile

.goreleaser.yml

@@ -0,0 +1,126 @@
+# yaml-language-server: $schema=https://goreleaser.com/static/schema.json
+version: 2
+project_name: aralez
+
+before:
+  hooks:
+    - cargo install --locked cargo-zigbuild
+
+dist: target
+builds:
+  - id: aralez
+    builder: rust
+    flags:
+      - --release
+    targets:
+      - x86_64-unknown-linux-gnu
+      - aarch64-unknown-linux-gnu
+    env:
+      - RUSTFLAGS={{ if eq .Arch "amd64" }}-C target-cpu=x86-64-v3 -C target-feature=+aes,+ssse3{{else}}-C target-cpu=neoverse-n1 -C target-feature=+aes,+sha2,+neon,+crc{{ end }}
+
+  - id: aralez-musl
+    builder: rust
+    flags:
+      - --release
+    targets:
+      - x86_64-unknown-linux-musl
+      - aarch64-unknown-linux-musl
+    env:
+      - RUSTFLAGS={{ if eq .Arch "amd64" }}-C target-cpu=x86-64-v3 -C target-feature=+aes,+ssse3{{else}}-C target-cpu=neoverse-n1 -C target-feature=+aes,+sha2,+neon,+crc{{ end }}
+
+  - id: aralez-compat
+    builder: rust
+    flags:
+      - --release
+    targets:
+      - x86_64-unknown-linux-gnu
+    env:
+      - RUSTFLAGS=-C target-cpu=x86-64
+
+  - id: aralez-compat-musl
+    builder: rust
+    flags:
+      - --release
+    targets:
+      - x86_64-unknown-linux-musl
+    env:
+      - RUSTFLAGS=-C target-cpu=x86-64
+
+snapshot:
+  version_template: edge
+
+archives:
+  - id: aralez
+    ids:
+      - aralez
+    formats: [binary]
+    name_template: "{{ .ProjectName }}_{{ .Arch }}-glibc"
+
+  - id: aralez-musl
+    ids:
+      - aralez-musl
+    formats: [binary]
+    name_template: "{{ .ProjectName }}_{{ .Arch }}-musl"
+
+  - id: aralez-compat
+    ids:
+      - aralez-compat
+    formats: [binary]
+    name_template: "{{ .ProjectName }}_{{ .Arch }}-compat-glibc"
+
+  - id: aralez-compat-musl
+    ids:
+      - aralez-compat-musl
+    formats: [binary]
+    name_template: "{{ .ProjectName }}_{{ .Arch }}-compat-musl"
+
+dockers_v2:
+  - id: aralez
+    ids:
+      - aralez
+    flags:
+      - --target=release
+    images:
+      - "ghcr.io/{{ .Env.USERNAME }}/{{ .ProjectName }}"
+      # - "{{ .Env.USERNAME }}/{{ .ProjectName }}"
+    tags:
+      - "{{ if not .IsSnapshot }}v{{.Version}}{{ else }}edge{{ end }}"
+    platforms:
+      - linux/amd64
+      - linux/arm64
+    annotations:
+      org.opencontainers.image.name: "{{ .ProjectName }}"
+      org.opencontainers.image.licenses: "Apache-2.0"
+      org.opencontainers.image.source: "https://github.com/{{ .Env.USERNAME }}/{{ .ProjectName }}"
+      org.opencontainers.image.url: "{{ .GitURL }}"
+      org.opencontainers.image.created: "{{ .Date }}"
+      org.opencontainers.image.version: "{{ .Version }}"
+      org.opencontainers.image.revision: "{{ .FullCommit }}"
+      io.artifacthub.package.readme-url: "https://raw.githubusercontent.com/{{ .Env.USERNAME }}/{{ .ProjectName }}/main/README.md"
+      io.artifacthub.package.license: "Apache-2.0"
+
+docker_signs:
+  - id: docker
+    ids:
+      - aralez
+    cmd: cosign
+    args:
+      - sign
+      - "--yes"
+      - "${artifact}"
+    output: true
+
+checksum:
+  name_template: checksums.txt
+  algorithm: sha256
+
+signs:
+  - artifacts: checksum
+    signature: "${artifact}.sigstore.json"
+    cmd: cosign
+    args:
+      - sign-blob
+      - "--yes"
+      - "--bundle=${signature}"
+      - "${artifact}"
+    output: true

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "aralez"
-version = "0.93.4"
+version = "0.95.2"
-edition = "2021"
+edition = "2024"
 license = "Apache-2.0"
 description = "Reverse proxy built on top of Cloudflare's Pingora"
 exclude = ["configs/*"]
@@ -16,23 +16,24 @@ strip = true
 
 [dependencies]
 tokio = { version = "1.53.1", features = ["full"] }
-pingora = { version = "0.8.1", features = ["lb", "openssl"] } # openssl, rustls, boringssl
+pingora = { version = "0.9.0", features = ["lb", "openssl"] } # openssl, rustls, boringssl
-pingora-core = "0.8.1"
+pingora-core = "0.9.0"
-pingora-proxy = "0.8.1"
+pingora-proxy = "0.9.0"
-pingora-http = "0.8.1"
+pingora-http = "0.9.0"
-pingora-limits = "0.8.1"
+pingora-limits = "0.9.0"
-pingora-cache = "0.8.1"
+pingora-cache = "0.9.0"
 dashmap = "7.0.0-rc2"
 async-trait = "0.1.92"
 log = "0.4.34"
 notify = "9.0.0-rc.4"
 axum = { version = "0.8.9" }
-serde = { version = "1.0.229", features = ["derive"] }
+serde = { version = "1.0.229", features = ["derive", "rc"] }
-noyalib = { version = "0.0.32", features = ["compat-serde-yaml"] }
+#serde = { version = "1.0.229", features = ["derive"] }
+noyalib = { version = "0.0.44", features = ["compat-serde-yaml"] }
 rand = "0.10.2"
 base64 = "0.23.1"
-jsonwebtoken = { version = "11.0.0", default-features = false, features = ["use_pem", "rust_crypto"] }
+jsonwebtoken = { version = "11.1.0", default-features = false, features = ["use_pem", "rust_crypto"] }
-sha2 = { version = "0.11.0-rc.5", default-features = false }
+sha2 = { version = "0.11.0", default-features = false }
 base16ct = { version = "1.0.0", features = ["alloc"] }
 urlencoding = "2.1.3"
 arc-swap = "1.9.2"
@@ -63,3 +64,12 @@ kube = { version = "4.2.0", features = ["runtime", "client", "derive"] }
 k8s-openapi = { version = "0.28.0", features = ["v1_32"] }
 futures = "0.3.34"
 lazy_static = "1.5.0"
+anyhow = "1.0.103"
+inventory = "0.3.24"
+elasticsearch = "9.1.0-alpha.1"
+humantime = "2.4.0"
+reqwest = "0.12.28"
+hickory-resolver = { version = "0.26", features = ["tokio"] }
+aws-sdk-route53 = "1.127.0"
+aws-config = { version = "1.12.0", features = ["behavior-version-latest"] }
+redis = { version = "1.7.1", features = ["tokio-comp", "connection-manager"] }

Dockerfile

@@ -0,0 +1,49 @@
+# syntax = docker/dockerfile:1.22
+########################################
+
+FROM rust:1.98-trixie AS builder
+ARG TARGETARCH
+
+RUN apt-get update && \
+    apt-get install -y build-essential make cmake pkg-config libssl-dev musl-dev musl-tools
+
+RUN case "${TARGETARCH}" in \
+        amd64) \
+            apt-get install -y --no-install-recommends gcc-x86-64-linux-gnu && \
+            rustup target add x86_64-unknown-linux-gnu; \
+            rustup target add x86_64-unknown-linux-musl; \
+            ;; \
+        arm64) \
+            apt-get install -y --no-install-recommends gcc-aarch64-linux-gnu && \
+            rustup target add aarch64-unknown-linux-gnu; \
+            rustup target add aarch64-unknown-linux-musl; \
+            ;; \
+        *) echo "Unsupported architecture: ${TARGETARCH}" >&2; exit 1 ;; \
+    esac
+RUN rustup component add rustfmt clippy && \
+    cargo install cargo-deny
+
+RUN ARCH=$(case "${TARGETARCH}" in \
+        amd64) echo "x86_64" ;; \
+        arm64) echo "aarch64" ;; \
+        *) echo "${TARGETARCH}" ;; \
+    esac) && curl -LO https://ziglang.org/download/0.16.0/zig-${ARCH}-linux-0.16.0.tar.xz \
+    && tar -xf zig-${ARCH}-linux-0.16.0.tar.xz -C /opt \
+    && ln -s /opt/zig-${ARCH}-linux-0.16.0/zig /usr/local/bin/zig
+
+RUN echo 'deb [trusted=yes] https://repo.goreleaser.com/apt/ /' | tee /etc/apt/sources.list.d/goreleaser.list && \
+    apt-get update && apt-get install -y goreleaser
+
+RUN cargo install cargo-binstall --locked && \
+    cargo binstall cargo-zigbuild --no-confirm
+
+COPY [".", "/src"]
+
+########################################
+
+FROM --platform=${TARGETARCH} gcr.io/distroless/cc-debian13:nonroot AS release
+
+ARG TARGETPLATFORM
+COPY ${TARGETPLATFORM}/aralez /usr/local/bin/aralez
+
+ENTRYPOINT ["/usr/local/bin/aralez"]

Makefile

@@ -0,0 +1,68 @@
+########################################################
+
+USERNAME ?= aralez
+TARGET ?=  --all-targets
+FEATURES ?= --all-features
+
+########################################################
+
+.PHONY: help
+help:
+	@awk 'BEGIN {FS = ":.*?## "} /^[0-9a-zA-Z_-]+:.*?## / {sub("\\\\n",sprintf("\n%22c"," "), $$2);printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
+
+########################################################
+
+.PHONY: all
+all: build test fmt checkup ## Build and test project
+
+.PHONY: build
+build: ## Build project
+	cargo build --workspace $(TARGET) $(FEATURES)
+
+.PHONY: test
+test: ## Run tests
+	cargo test --workspace $(TARGET) $(FEATURES)
+
+.PHONY: fmt
+fmt: ## Check code formatting
+	cargo fmt --all -- --check
+
+.PHONY: lint
+lint: ## Run linter
+	cargo clippy --workspace $(TARGET) $(FEATURES) -- -D warnings
+
+.PHONY: checkup
+checkup: lint ## Run linter and check project
+	cargo check --workspace $(TARGET) $(FEATURES)
+
+.PHONY: deps
+deps: ## Check project dependencies for advisories
+	cargo deny check advisories
+
+########################################################
+
+.PHONY: update
+update:
+	cargo update --verbose
+
+.PHONY: features
+features:
+	cargo features
+
+########################################################
+
+.PHONY: fix
+fix:
+	cargo fix
+
+.PHONY: fix-all
+fix-all:
+	cargo fix --all
+	cargo clippy --workspace $(TARGET) $(FEATURES) --fix
+
+########################################################
+
+.PHONY: docker-build
+docker-build: ## Build project in Docker
+	docker build --target=builder -t builder .
+	docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -v ${PWD}:/src -e USERNAME=${USERNAME} -w /src -ti builder:latest

README.md

@@ -60,30 +60,41 @@ Built on Rust, on top of **Cloudflare’s Pingora engine**, **Aralez** delivers
 
 ### `main.yaml`
 
-| Key                              | Example Value                    | Description                                                                                                                                                           |
+| Key                              | Example Value                             | Description                                                                                                                                                                                                            |
-|----------------------------------|----------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+|----------------------------------|-------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **threads**                      | 12                               | Number of running daemon threads. Optional, defaults to 1                                                                                                             |
+| **threads**                      | `12`                                      | Number of running daemon threads. Optional, defaults to 1                                                                                                                                                              |
-| **runuser**                      | aralez                           | Optional. Username for running aralez after dropping root privileges (requires launch as root)                                                                        |
+| **runuser**                      | `aralez`                                  | Optional. Username for running aralez after dropping root privileges (requires launch as root)                                                                                                                         |
-| **rungroup**                     | aralez                           | Optional. Group for running aralez after dropping root privileges (requires launch as root)                                                                           |
+| **rungroup**                     | `aralez`                                  | Optional. Group for running aralez after dropping root privileges (requires launch as root)                                                                                                                            |
-| **daemon**                       | false                            | Run in background (boolean)                                                                                                                                           |
+| **daemon**                       | `false`                                   | Run in background (boolean)                                                                                                                                                                                            |
-| **upstream_keepalive_pool_size** | 500                              | Pool size for upstream keepalive connections                                                                                                                          |
+| **upstream_keepalive_pool_size** | `500`                                     | Pool size for upstream keepalive connections                                                                                                                                                                           |
-| **pid_file**                     | /tmp/aralez.pid                  | Path to PID file                                                                                                                                                      |
+| **pid_file**                     | `/tmp/aralez.pid`                         | Path to PID file                                                                                                                                                                                                       |
-| **config_address**               | 0.0.0.0:3000                     | HTTP API address for pushing upstreams.yaml from remote location                                                                                                      |
+| **upgrade_sock**                 | `/tmp/aralez.sock`                        | Path to socket file                                                                                                                                                                                                    |
-| **proxy_tls_grade**              | high, medium, unsafe             | Grade of TLS ciphers. `high` matches Qualys SSL Labs A+ (defaults to `medium`)                                                                                        |
+| **config_address**               | `0.0.0.0:3000`                            | HTTP API address for pushing upstreams.yaml from remote location                                                                                                                                                       |
-| **proxy_address_http**           | 0.0.0.0:6193                     | Aralez HTTP bind address                                                                                                                                              |
+| **proxy_tls_grade**              | `high, medium, unsafe`                    | Grade of TLS ciphers. `high` matches Qualys SSL Labs A+ (defaults to `medium`)                                                                                                                                         |
-| **proxy_address_tls**            | 0.0.0.0:6194                     | Aralez HTTPS bind address (Optional)                                                                                                                                  |
+| **proxy_address_http**           | `0.0.0.0:6193`                            | Aralez HTTP bind address                                                                                                                                                                                               |
-| **proxy_configs**                | /etc/aralez/                     | Direcotry containing configuration files, must be writeable by user  `aralez`                                                                                         |
+| **proxy_address_tls**            | `0.0.0.0:6194`                            | Aralez HTTPS bind address (Optional)                                                                                                                                                                                   |
-| **upstreams_conf**               | /etc/aralez/upstreams.yaml       | Location of the upstreams file                                                                                                                                        |
+| **proxy_configs**                | `/etc/aralez/`                            | Direcotry containing configuration files, must be writeable by user  `aralez`                                                                                                                                          |
-| **access_log**                   | access                           | Configure access logging. Values: `access, error`                                                                                                                     |
+| **upstreams_conf**               | `/etc/aralez/upstreams.yaml`              | Location of the upstreams file                                                                                                                                                                                         |
-| **log_level**                    | info                             | Log level: `info`, `warn`, `error`, `debug`, `trace`, `off`                                                                                                           |
+| **access_log**                   | `access`                                  | Configure access logging. Values: `access, error`                                                                                                                                                                      |
-| **log_file**                     | /tmp/aralez.log, 20, 5, compress | Optional, the location of log file, file size in megabytes, number of log files to keep, compress files .valueas are separated by comma. Defaults to None, 100, 5, No |
+| **log_level**                    | `info`                                    | Log level: `info`, `warn`, `error`, `debug`, `trace`, `off`                                                                                                                                                            |
-| **hc_method**                    | HEAD                             | Healthcheck method: HEAD, GET, POST (UPPERCASE)                                                                                                                       |
+| **log_file**                     | `/tmp/aralez.log, 20, 5, compress`        | Optional, the location of log file, file size in megabytes, number of log files to keep, compress files .valueas are separated by comma. Defaults to None, 100, 5, No                                                  |
-| **hc_interval**                  | 2                                | Interval for health checks in seconds                                                                                                                                 |
+| **log_pattern**                  | `{d(%Y-%m-%d %H:%M:%S)} {l} - {m}{n}`     | Optional log pattern, defaults to `{d(%Y-%m-%d %H:%M:%S)} {l} - {m}{n}`. See log4rs official [documentation](https://docs.rs/log4rs/latest/log4rs/encode/pattern/struct.PatternEncoderDeserializer.html#configuration) |
-| **file_server_folder**           | /some/local/folder               | Optional. Local folder to serve                                                                                                                                       |
+| **hc_method**                    | `HEAD`                                    | Healthcheck method: HEAD, GET, POST (UPPERCASE)                                                                                                                                                                        |
-| **file_server_address**          | 127.0.0.1:3002                   | Optional. Local address for file server                                                                                                                               |
+| **hc_interval**                  | `2`                                       | Interval for health checks in seconds                                                                                                                                                                                  |
-| **config_api_enabled**           | true                             | Enable/disable remote config push capability                                                                                                                          |
+| **file_server_folder**           | `/some/local/folder`                      | Optional. Local folder to serve                                                                                                                                                                                        |
-| **cache_size_mb**                | 50                               | Optional. Enable internal cache with size in megabytes of value. Cache is entirely disabled when this line is commented out.                                          |
+| **file_server_address**          | `127.0.0.1:3002`                          | Optional. Local address for file server                                                                                                                                                                                |
-| **cache_ttl**                    | 10                               | Optional. Set Default TTL in seconds for cached items, works if cache control headers are not set via upstream. Defaults to 60 if cache_size_mb is set.               |
+| **config_api_enabled**           | `true`                                    | Enable/disable remote config push capability                                                                                                                                                                           |
+| **cache_size_mb**                | `50`                                      | Optional. Enable internal cache with size in megabytes of value. Cache is entirely disabled when this line is commented out.                                                                                           |
+| **cache_enabled**                | `bool`                                    | Optional. Disabled by default                                                                                                                                                                                          |
+| **cache_storage**                | `memory, redis://host:port`               | Optional Defaults to memory works with Redis, Valkey, Dragonfly (requires redis:// prefix)                                                                                                                             |
+| **cache_ttl**                    | `60`                                      | Optional. Set internal cache with size in megabytes of value. Defaults to 50Mb if cache_enabled: true                                                                                                                  |
+| **tcp_keepalive_idle**           | `60`                                      | Seconds of inactivity before the kernel starts sending keepalive probes to a downstream client. Defaults to 60                                                                                                         |
+| **tcp_keepalive_interval**       | `10`                                      | Seconds between individual keepalive probes if the client does not respond. Defaults to 10                                                                                                                             |
+| **tcp_keepalive_count**          | `5`                                       | Number of unanswered probes before the kernel declares the connection dead and closes it. Defaults to 5                                                                                                                |
+| **cluster_member**               | `master, worker`                          | Optional. Enables cluster mode, Sets node type to master or worker. Disabled by default                                                                                                                                |
+| **worker_nodes**                 | `http(s)://host:port,http(s)://host:port` | Required is if cluster_member: master. Comma separated list of worker nodes http(s)://host:port                                                                                                                        |
+| **log_structured**               | `elasticsearch`                           | Optional. Enables structured logging and sets backend type. Only elasticsearch et the moment.                                                                                                                          |
+| **acme_dns_provider**            | `cloudflare, route53, digitalocean, etc`  | Optional. Enable ACME DNS-01 challenge, sets DNS provider.  ONly coudflare, route53, digitalocean at the moment.                                                                                                       |
 
 ---
 
@@ -297,10 +308,27 @@ openssl req -x509 -newkey rsa:4096 \
 
 ## Remote Config API
 
-Push new `upstreams.yaml` over HTTP to `config_address` (`:3000` by default). Useful for CI/CD automation or remote config updates. URL parameter. `key=MASTERKEY` is required. `MASTERKEY` is the value of `master_key` in the `main.yaml`
+Push new `upstreams.yaml` over HTTP to `config_address` (`127.0.0.1:3000` by default).
+Useful for CI/CD automation or remote config updates.
 
 ```bash
-curl -XPOST --data-binary @./etc/upstreams.txt 127.0.0.1:3000/conf?key=${MASTERKEY}
+curl -XPOST --data-binary @./etc/upstreams.txt 127.0.0.1:3000/conf
+```
+
+Don't run API on address 0.0.0.0 on production servers, keep it on 127.0.0.1 and configure appropriate upstream with supported authentication and TLS termination
+
+Example:
+
+```yaml
+  config.example.com:
+    paths:
+      "/conf":
+        authorization:
+          type: "basic"
+          data: "user:pass"
+        healthcheck: false
+        servers:
+          - "127.0.0.1:3000"
 ```
 
 ---

etc/kubernetes/cert.yaml

@@ -5,5 +5,7 @@ metadata:
   namespace: aralez
 type: kubernetes.io/tls
 data:
-  tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUY3ekNDQTllZ0F3SUJBZ0lVUm12YytSU25LS01HNXVaV1JNS3NtS2dwU1drd0RRWUpLb1pJaHZjTkFRRUwKQlFBd2dZWXhDekFKQmdOVkJBWVRBbGhZTVJJd0VBWURWUVFJREFsVGRHRjBaVTVoYldVeEVUQVBCZ05WQkFjTQpDRU5wZEhsT1lXMWxNUlF3RWdZRFZRUUtEQXREYjIxd1lXNTVUbUZ0WlRFYk1Ca0dBMVVFQ3d3U1EyOXRjR0Z1CmVWTmxZM1JwYjI1T1lXMWxNUjB3R3dZRFZRUUREQlJEYjIxdGIyNU9ZVzFsVDNKSWIzTjBibUZ0WlRBZUZ3MHkKTmpBNE1UZ3hOREkwTVRKYUZ3MHpOakE0TVRVeE5ESTBNVEphTUlHR01Rc3dDUVlEVlFRR0V3SllXREVTTUJBRwpBMVVFQ0F3SlUzUmhkR1ZPWVcxbE1SRXdEd1lEVlFRSERBaERhWFI1VG1GdFpURVVNQklHQTFVRUNnd0xRMjl0CmNHRnVlVTVoYldVeEd6QVpCZ05WQkFzTUVrTnZiWEJoYm5sVFpXTjBhVzl1VG1GdFpURWRNQnNHQTFVRUF3d1UKUTI5dGJXOXVUbUZ0WlU5eVNHOXpkRzVoYldVd2dnSWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUNEd0F3Z2dJSwpBb0lDQVFEQklZejBUNDRnVnZWdTBPMlA3NEV3NzE1c3FDekZuWHhTRDE4RnNCRHE2L1NadW1qYmpvTXBjWFZhCkVVQVQwMXpxRW9JZm5waHY3VExNWmtNNmZ6WTFNVGdOcXVqeHVXUGNVMTBES2VQa0Y1K1RPbWdoUUE1ODRCV1gKcmZrMlp5NXpGT012ODZUZXFCOGRyUVh2SWpHNTZhMW5DMFMwSFlnTnJ6R2srVXdrNWpDZTlaYURnc3Q5VlkrcApRYlZyUVdwR2V6RDl3WVE2bU41MkRGRERYbnp6WUVwRWVVekwwNkpNSlE5M2d5ZDVtbWd4aWlpbU1QMS9UTG5BClo2cWlYQ05UVGQvMERiL2tVWW9tK1hkTm11em83Qm1qaDY4ZzVTYUtYWkJXM25BQnhoaUVkZHoyaUViTGx2UFIKcXltcjVzazgyYlZQTWlWUC82alFLaTk0anBxVDc4ZVZZRG81dmhyMDQvczhVZk9xWVBEY0NLTGFzOEpBdTRvUwpoTnRjYm5GbGJjOG1Qcm00bnY2NlhKUUpIV1cwU1Rqc1pZWVRTRTllM3lMV2JqRlpUQTBIb3lQV1dDS1ZXSS82CnExa09IcnhJWitzOStHajB3aUJhdUpsbWk2by9oZE5qWUhsY2sxbnFTM2l6UXZ2WFpuSWtwTWkrU2pQRzhBZ0MKdEFqSWVPNlFOZVFFM3p3d3ZJb09tRnVTMC8zWkJFSkZuaWdxV0xuKzRidnV4eTNReW5JWHNsY250dDRXbjdMTAp0MWZtMTU3a2x6TUNHeHBWVXFqT1FwVnVuVnVmMDdURHdWbGxxek96TXlxZWdYSHlYODJxVlV2czdidCtpZFdOCngrdks1RUtrQUhidU9QV3lGRkJJci91aE93OWZsOEUxR1ZUYzg1OG5pM0NrWWtGeEpRSURBUUFCbzFNd1VUQWQKQmdOVkhRNEVGZ1FVQkFya1htNXZ2dDhmNVRGdkI0YmJNVS9EcEc4d0h3WURWUjBqQkJnd0ZvQVVCQXJrWG01dgp2dDhmNVRGdkI0YmJNVS9EcEc4d0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBTkJna3Foa2lHOXcwQkFRc0ZBQU9DCkFnRUFYdGJ3TVpkOElrTkxwWGFHeTRleGR6OVN0dVpjYnBhWjVWeURTdTJBdFZERm1BeXNSM0hHaEhWend5a0cKOGtibGdQQ3B3OEhWeGdMd0xmNHFuTWhvdUNHQ3ZiMVd2UjM5VW45NmVOWFA5cHFDTWhRTzFMU0JCSy80UllsUwp4ajhyRlBub3p5OHdFTzRwR1VaejN3LzJIdXgyTGovVHIxRXY5cklsa0hMZ3plazc1clpHTUIxUHhsRU1zUGNsCmtGY3NacGZ5TE5LM0FydUMzbmVGbldSODh5UHFVU3FwVEJ1OVRubjZUQ002TXVEZHlaRTZXYVlGU01zNzBJOU8KN3c5SkdreDc0UlAraTBQeUZUOFNhbUdncTUxWmtrUFZnK3ZZSUhTbGszdGlxZFN0MEYzMnVNaHNDZXZCcVUzQQp2M3lUOW9UUlpRZE9XKzQySDZjVTJ4Q2FCTVBRdnpaZWRtYno1eTNpS1NjMDBQUy8vMDI4YjIzbHpGQVZjbURHCnlOaUcraUJUVkRydHgwZC9qdGhqdzV4cllqNFBnNXl6emM2R3hkaC9VWGpUN1dqSUpweThnR3V2MHhMWVNQTDYKMmROUkYyVDl1TDQ0Z1J2K09ndTRRaHNacGg3WWxNZVp0aVpoT1IvTC8yUWdnZDMrNEhpeXBNNFpiWkUrMVg2TQoyNEtVdG5wZU53dE0wR1huU01aY2dkUm5LMWg0WDQ2T1lMYW9vSTdERkhSUWJSclJQSWl1eXZ2NXpPQzF5NTFFCm9rY0tvMVREQThRcXVHMlBRay9kMEZ0LzNiOEJoOHJCcTR1V3lKWHYyYTJJUmt1Q05MN0Myck5Rem92ekF0aW4KZnB5ejVKb1NHc1dUSVhSYlNucnpocWxFeUJCRGxQQ3AxTW1zM2xzZkFROThIQmM9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
+  tls1.crt: "<FIRST_BASE64_CRT_HERE>"
-  tls.key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUpRUUlCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQ1Nzd2dna25BZ0VBQW9JQ0FRREJJWXowVDQ0Z1Z2VnUKME8yUDc0RXc3MTVzcUN6Rm5YeFNEMThGc0JEcTYvU1p1bWpiam9NcGNYVmFFVUFUMDF6cUVvSWZucGh2N1RMTQpaa002ZnpZMU1UZ05xdWp4dVdQY1UxMERLZVBrRjUrVE9tZ2hRQTU4NEJXWHJmazJaeTV6Rk9Ndjg2VGVxQjhkCnJRWHZJakc1NmExbkMwUzBIWWdOcnpHaytVd2s1akNlOVphRGdzdDlWWStwUWJWclFXcEdlekQ5d1lRNm1ONTIKREZERFhuenpZRXBFZVV6TDA2Sk1KUTkzZ3lkNW1tZ3hpaWltTVAxL1RMbkFaNnFpWENOVFRkLzBEYi9rVVlvbQorWGRObXV6bzdCbWpoNjhnNVNhS1haQlczbkFCeGhpRWRkejJpRWJMbHZQUnF5bXI1c2s4MmJWUE1pVlAvNmpRCktpOTRqcHFUNzhlVllEbzV2aHIwNC9zOFVmT3FZUERjQ0tMYXM4SkF1NG9TaE50Y2JuRmxiYzhtUHJtNG52NjYKWEpRSkhXVzBTVGpzWllZVFNFOWUzeUxXYmpGWlRBMEhveVBXV0NLVldJLzZxMWtPSHJ4SVorczkrR2owd2lCYQp1SmxtaTZvL2hkTmpZSGxjazFucVMzaXpRdnZYWm5Ja3BNaStTalBHOEFnQ3RBakllTzZRTmVRRTN6d3d2SW9PCm1GdVMwLzNaQkVKRm5pZ3FXTG4rNGJ2dXh5M1F5bklYc2xjbnR0NFduN0xMdDFmbTE1N2tsek1DR3hwVlVxak8KUXBWdW5WdWYwN1REd1ZsbHF6T3pNeXFlZ1hIeVg4MnFWVXZzN2J0K2lkV054K3ZLNUVLa0FIYnVPUFd5RkZCSQpyL3VoT3c5Zmw4RTFHVlRjODU4bmkzQ2tZa0Z4SlFJREFRQUJBb0lDQUNjaHhDeXdmZXpCa2VOTlJBVlpFd1UyClN4eWJDczlUdEovdjYySDhwY0RqNUdETnEzZHBMZHhVMStGVEEzZkE2TitvdG1MdndKVlZLMmpOQTZ3em9Ha3cKdXRuU0duYjRDR3JaSFV5SnpWb25DemRLcTFTcFpRWWFaV1doWTVDSllaa0J6M0trM0hBZEFva0J5T1VHT2FzZwoxUGkvQ01HeUJpSTNzRWhzRnVpWEY1enR4L3lIb1BHWlI0MlUrY3hzcWJyME5SNEZldVJnbXhxeUxoOFg0eHR4CkZEdEJsTFRzQWNPSjh0TlZhTWN6NlE2NG5ybmx6VWRnNVhZOXl3NHd1eHVpK05DN2hIa2ZxRzF6T0tBcDF2enUKOGRiM3BCMTNNTkx5V0UreHJHSS9vREllcTVIc1ZPUGxoeXVoa2NUNTh5WjRPa3Q4cnFEQi9aT0lLS3cxd000RQp1S1h3VnhmMEZzZ09pSjhCME1iY1g4OTdEdUJrV29DeHorbVlwVzByTW9EWTlhcEI3ZllZZkN2ZVJXVWt3RmJnCkdhWDZPRndwWkU5cHBOOXR4YUpKYVgrdXowT3ZySWh4c1FPamtSdTA1cXl5NjcvTG04aFpoRkVMMm1PMjBOUGMKVWpVUHpoenF1M3NHaHltR01Kb21aa3VQR1FyYnlYR2lSVjl2dWhWSHlVa3EyWXJ5ZTJpeEpUMWgreDFBZXJHbgo2ZzQxWFA5UzVTNDUzTU8wUVFDcVQ2aG9ZUnBpbUxkYlpmZjJOTmt1ZFFINS9UVjZqTGN0SjZua212ZDVTbGhPCm9YSHdkcW9jVlkrUEVZZHRyVzE5OGxhVG9JVFZQZFBBOHdwL0pmb2pGK0hSM1owQmlBMUFsWjhzL0RsM0xLWVoKb2xHUUVnQ3kwQ2xVazFZa0FiYzFBb0lCQVFEZnNiZWlwOTNrNitjSGJHdTk2eE53b1RHMEdWVnkzWDBzeVhWSAppSERvdnpTNGtzY0c0SEpteHc2S2N0ZDR5eEIvaDRuZHZ2VkV0M3RqTFQ3VGxqOTlhNWJVaTZOS3ZyNll0ZGsxCk50elFTaXJjeG81M3dNUlRSeFVNZnVPQW1Ia3VKWXduZWVFMHcxdnRBZloyR0RnVTBGbGZicThkRFc2TlFZQ0gKS01wNUtWNnJyenE2Y1g1cGNWcWRZckp6Y2REbk5YeXUyUXBDT3FSZFhFQ3RnYmxWdmF6UTh2c0t0K3Awd1NpcgpCdmFqY3c1YW1iZ2x4Zm1uWWhNY2ZkWjRqR3NrVVJmWE5JMGZUcHRwMEdNVlFYZEFkL3BScThjKzljQU1LY3p6Ck9OL0NzVjVpbHpjUDBJZzB0bU50a0tVV3dKTGRKbkp1Z1Vud200SFFtUzJWNUUwL0FvSUJBUURkQmQ4Y0NUbUgKYmJUbmVjcHJnNkd4ZUN3aW95dnVkZVJZS2NCcGdvcW5uUVdEMm9LQmVDWC9HL1lJNVIwcWxLdXZBRlEvWEd3ZAp3N1pwYlZsbUcvQTBBRjNQeW5MMlFHSWhDN1Z6cHNrSFRPOU5VOTJjS0Fhd2Erbk9nZVJSbzBhOEhucGJpcktmCjlEdzkvcjhxTWVmdzhRS3JmMDVwMEVjVVJlTTR2WlJ1cGs5bVZac0x0QmxIMjhEYXE4YnJBYlNXUjNKN1RsZEkKMHZaZE9Cd0xxWkZVTWVOR09rUjN6azAvWDNXOWVIT3RmTkZYQzU3N1Bvby9vTDNobERDcnVXalZodkM0dUttdQpLTU5CMTM2ZnFuanZ6QXcrVTdMbkhHYTlQSHp5aUhFN1B3TVNiSGlBcXpFNXdBaDlLOWJGdEttUE0wN1FudTNSClBWMVlDNk1tMGxTYkFvSUJBQkFRRU9Hck1ESGFCckx2eENUVkZvWkY3TzNEeS9EOW1wbDJ0ZWMzRXZTRGxtT1MKbHB3VnplRTNkZ0hYRVVYcFB2d0pYWXNBeFZmejNQWllMMlMrS3p6MFZ0WllXSmRyYndCRVBwNmxtK0dSRWRiYwpveXBTTzBiSG1lbFZ5enhXdG96cndVNnNYOUdNSGJPOUtsZDhrYnBjNDY0SW9xWnhhbmpXTlVaL1ZWcXg3OHhnClB0VlloUDFKV0hwb3RldTRSb256dTBwSzU0T3Q5bE9GNWxjUE02SEdodnhTRmxqRXNCOUdKNGR3YnBGNkY1UEYKNmdVOFhCcjYzZWh6Mk15N09JNVpERjgxdE5TRXJvQkFxSHpFUUszdWI1a2h2cUwwdnArZytNaVdVdXNHRllMNgozTWRUOEJQbzdPYlhOaU9XSEhXbzV4cXNTZ1R2QmJsVzVvRVc3YjBDZ2dFQWZFOWRHT3VuUzZCTWF4UjQ0TmQ4CkRkREZJZ1ljSTFaelE1TFlBWC9HZEZkQVR0U0xLajVsUUlKOWNxdEtLRFRPQ3ZOb2J1cVFkSDByRDBqTlN6elQKY0t2MEYzYUtDaTVVQXJvUEtDamFVQnpaU3Vpc2I3T2piMzZDVmYrQVp0b3FZb3ZSemNMSWpHWlZxNWluOUJkMQptSEkxU2plajVxZWFFckRzQjNHNUZqSzczWmF3U1hqVjd6Q04yMjlaeGJ1RDBqSUZGWTBPVW9zMHZXRmRoTUd1ClYyaG5wNHdHRGt3ZDdsTEdhZlpoT1daR1oyckYxQkZzdURTMEZ6ZTkyQmZEK3JTV2w0NWxBT3MwUnNmcEUreFIKY0syWEJVY1dEQjVST29YVzBLSWs3V21YVkxsbFhSanI2c3N5K3hPNURDRjhiR296SGVzRlh2WGdsakNWWnJSTgptUUtDQVFCQ044M21FMllMVWtlUTUrWVVoS1kyYktQcS9GVnA2NWNPVXZ2R2RCNGxQUTlDU01xWUc0SHR5VFJUCmdzaEdvdjRrYk5NQ2JsdnlkWkttU1RKZk16bnJhdlYrbDVJekRFZWpEUXQrUzMxdWh5OXdiMVlIaFBRNStXZ2sKbnVMcUhzWE9WKzZuWmdyMzJvUVFxeVdlTjFkUW1XTUVoYWVOVVlwamxpTFNlUm55UjVNazBCbm55clJEZGV2NQpLekpyZmdYZG5CSGdJY3M4VmxoWXZoYlFDQmpNT2FIcXp1dXJ3M21VSVJxNlNWWVR5eHprZElEM2tna0VxbDdrCnEwL3RBbkhrNHZIS1JhSU1nSmdGOVVBRG50MHVpTFdVcTZBbCsyRU5sQW16VGhmQlAxOUVPSlFuNC85L0tnOXEKTXV3ZGxLSTl5MWRpQlBmdk00R3RIcGlYaEZnVQotLS0tLUVORCBQUklWQVRFIEtFWS0tLS0tCg==
+  tls1.key: "<FIRST_BASE64_KEY_HERE>"
+  tls2.crt: "<SECOND_BASE64_CRT_HERE>"
+  tls3.key: "<BASE64_BASE64_KEY_HERE>"

etc/main.yaml

@@ -4,24 +4,31 @@ runuser: aralez # Username for running aralez after dropping root privileges, re
 rungroup: aralez # Group for running aralez after dropping root privileges, requires program to start as root
 upstream_keepalive_pool_size: 500 # Pool size for upstream keepalive connections
 pid_file: /tmp/aralez.pid # Path to PID file
+#error_log: /tmp/aralez_err.log # Path to error log
 upgrade_sock: /tmp/aralez.sock # Path to socket file
+cache_enabled: true #  Optional. Disabled by default
+cache_storage: memory # memory | redis://host:port . Optional Defaults to memory works with Redis, Valkey, Dragonfly (requires redis:// prefix)
+cache_size_mb: 50 # Optional. Set internal cache with size in megabytes of value. Defaults to 50Mb if cache_enabled: true
+cache_ttl: 60 # Optional. Set Default TTL in seconds for cached items, works if cache control headers are not set via upstream. Defaults to 60 if cache_enabled: true
 config_api_enabled: true # Boolean to enable/disable remote config push capability.
 config_address: 127.0.0.1:3000 # HTTP API address for pushing upstreams.yaml from remote location
 proxy_address_http: 0.0.0.0:80 # Proxy HTTP bind address
 proxy_address_tls: 0.0.0.0:443 # Optional, Proxy TLS bind address
-proxy_configs: /opt/aralez/asyncweb/etc # Mandatory if proxy_address_tls set, should contain a certificate and key files strictly in a format {NAME}.crt, {NAME}.key.
+proxy_configs: /opt/aralez/etc # Mandatory if proxy_address_tls set, should contain a certificate and key files strictly in a format {NAME}.crt, {NAME}.key.
 proxy_tls_grade: high # Grade of TLS suite for proxy (high, medium, unsafe), matching grades of Qualys SSL Labs
 upstreams_conf: /opt/aralez/etc/upstreams.yaml # the location of upstreams file
 file_server_folder: /opt/aralez/public # Optional, local folder to serve
-file_server_address: 0.0.0.0:3002 # Optional, Local address for file server. Can set as upstream for public access.
+file_server_address: 127.0.0.1:3002 # Optional, Local address for file server. Can set as upstream for public access.
 log_level: info # info, warn, error, debug, trace, off
 log_file: /tmp/aralez.log, 20, 5, compress # Optional, the location of log file, file size in megabytes, number of log files to keep, compress files .valueas are separated by comma.
-access_log: error # all, error, (Off if commented)
+log_pattern: "{d(%Y-%m-%d %H:%M:%S)} {h({l})} {t} - {m} {n}" # Optional log pattern, defaults to "{d(%Y-%m-%d %H:%M:%S)} {l} - {m}{n}"
+access_log: error # all, error, (Off by default)
 hc_method: HEAD # Healthcheck method (HEAD, GET, POST are supported) UPPERCASE
 hc_interval: 2 #Interval for health checks in seconds
 tcp_keepalive_idle: 60 # Seconds of inactivity before the kernel starts sending keepalive probes to a downstream client
 tcp_keepalive_interval: 10 # Seconds between individual keepalive probes if the client does not respond
 tcp_keepalive_count: 5 # Number of unanswered probes before the kernel declares the connection dead and closes it
-cache_size_mb: 50 # Optional. Enable internal cache with size in megabytes of value. Cache is entirely disabled when this line is commented out
+#cluster_member: master | worker  Optional. Enables cluster mode, Sets node type to master or worker. Disabled by default
-cache_ttl: 120 # Optional. Set Default TTL in seconds for cached items, works if cache control headers are not set via upstream. Defaults to 60 if cache_size_mb is set
+#worker_nodes: http://127.0.0.1:8000, http://127.0.0.1:4000 Required is if cluster_member: master. Comma separated list of worker nodes http(s)://host:port
-
+#log_structured: elasticsearch Optional. Enables structured logging and sets backend type. Only elasticsearch et the moment.
+#acme_dns_provider: cloudflare Optional. Enable ACME DNS-01 challenge, sets DNS provider.  ONly coudflare, route53, digitalocean at the moment.

etc/upstreams.yaml

@@ -130,7 +130,7 @@ upstreams:
       "/":
         healthcheck: false
         servers:
-          - "127.0.0.1:3000"
+          - "127.0.0.1:8000"
       "/.well-known/acme-challenge":
         healthcheck: false
         servers:

src/auth/apikey.rs

@@ -0,0 +1,16 @@
+use crate::auth::types::AuthValidator;
+use pingora_proxy::Session;
+use subtle::ConstantTimeEq;
+
+pub struct ApiKeyAuth<'a>(pub(crate) &'a str);
+#[async_trait::async_trait]
+impl AuthValidator for ApiKeyAuth<'_> {
+    async fn validate(&self, session: &mut Session) -> bool {
+        if let Some(header) = session.get_header("x-api-key") {
+            if let Ok(h) = header.to_str() {
+                return h.as_bytes().ct_eq(self.0.as_bytes()).into();
+            }
+        }
+        false
+    }
+}

src/auth/basic.rs

@@ -0,0 +1,24 @@
+use crate::auth::types::AuthValidator;
+use base64::engine::general_purpose::STANDARD;
+use base64::Engine;
+use pingora_proxy::Session;
+use subtle::ConstantTimeEq;
+
+pub struct BasicAuth<'a>(pub(crate) &'a str);
+#[async_trait::async_trait]
+impl AuthValidator for BasicAuth<'_> {
+    async fn validate(&self, session: &mut Session) -> bool {
+        if let Some(header) = session.get_header("authorization") {
+            if let Ok(h) = header.to_str() {
+                if let Some((_, val)) = h.split_once(' ') {
+                    if let Ok(decoded) = STANDARD.decode(val) {
+                        if decoded.as_slice().ct_eq(self.0.as_bytes()).into() {
+                            return true;
+                        }
+                    }
+                }
+            }
+        }
+        false
+    }
+}

src/auth/forward.rs

@@ -1,30 +1,14 @@
-use crate::utils::jwt::{check_jwt, JWT_TOKEN};
+use crate::auth::types::AuthValidator;
-use crate::utils::structs::InnerAuth;
+use crate::utils::tools::split_host_port;
-pub(crate) use crate::utils::tools::split_host_port;
 use axum::http::StatusCode;
-use base64::engine::general_purpose::STANDARD;
-use base64::Engine;
-use pingora::http::RequestHeader;
 use pingora_core::connectors::http::Connector;
-use pingora_core::upstreams::peer::HttpPeer;
+use pingora_core::prelude::HttpPeer;
-use pingora_http::ResponseHeader;
+use pingora_http::{RequestHeader, ResponseHeader};
 use pingora_proxy::Session;
-use std::collections::HashMap;
 use std::sync::LazyLock;
-use subtle::ConstantTimeEq;
-use urlencoding::decode;
-
-#[async_trait::async_trait]
-trait AuthValidator {
-    async fn validate(&self, session: &mut Session) -> bool;
-}
-struct BasicAuth<'a>(&'a str);
-struct ApiKeyAuth<'a>(&'a str);
-struct JwtAuth();
-struct ForwardAuth<'a>(&'a str);
-
-pub static AUTH_CONNECTOR: LazyLock<Connector> = LazyLock::new(|| Connector::new(None));
 
+static AUTH_CONNECTOR: LazyLock<Connector> = LazyLock::new(|| Connector::new(None));
+pub struct ForwardAuth<'a>(pub(crate) &'a str);
 #[async_trait::async_trait]
 impl AuthValidator for ForwardAuth<'_> {
     async fn validate(&self, session: &mut Session) -> bool {
@@ -145,102 +129,3 @@ impl AuthValidator for ForwardAuth<'_> {
         }
     }
 }
-
-#[async_trait::async_trait]
-impl AuthValidator for BasicAuth<'_> {
-    async fn validate(&self, session: &mut Session) -> bool {
-        if let Some(header) = session.get_header("authorization") {
-            if let Ok(h) = header.to_str() {
-                if let Some((_, val)) = h.split_once(' ') {
-                    if let Ok(decoded) = STANDARD.decode(val) {
-                        if decoded.as_slice().ct_eq(self.0.as_bytes()).into() {
-                            return true;
-                        }
-                    }
-                }
-            }
-        }
-        false
-    }
-}
-
-#[async_trait::async_trait]
-impl AuthValidator for ApiKeyAuth<'_> {
-    async fn validate(&self, session: &mut Session) -> bool {
-        if let Some(header) = session.get_header("x-api-key") {
-            if let Ok(h) = header.to_str() {
-                return h.as_bytes().ct_eq(self.0.as_bytes()).into();
-            }
-        }
-        false
-    }
-}
-
-#[async_trait::async_trait]
-impl AuthValidator for JwtAuth {
-    async fn validate(&self, session: &mut Session) -> bool {
-        if let Some(jwtsecret) = JWT_TOKEN.clone() {
-            if let Some(tok) = get_query_param(session, "araleztoken") {
-                return check_jwt(tok.as_str(), jwtsecret.as_ref());
-            }
-            if let Some(auth_header) = session.get_header("authorization") {
-                if let Ok(header_str) = auth_header.to_str() {
-                    if let Some((scheme, token)) = header_str.split_once(' ') {
-                        if scheme.eq_ignore_ascii_case("bearer") {
-                            return check_jwt(token, jwtsecret.as_ref());
-                        }
-                    }
-                }
-            }
-        }
-        false
-    }
-}
-
-pub async fn authenticate(auth: &InnerAuth, session: &mut Session) -> bool {
-    match &*auth.auth_type {
-        "basic" => BasicAuth(&*auth.auth_cred).validate(session).await,
-        "apikey" => ApiKeyAuth(&*auth.auth_cred).validate(session).await,
-        "jwt" => JwtAuth().validate(session).await,
-        "forward" => ForwardAuth(&*auth.auth_cred).validate(session).await,
-        _ => {
-            log::warn!("Unsupported authentication mechanism : {}", &*auth.auth_type);
-            false
-        }
-    }
-}
-
-pub fn get_query_param(session: &mut Session, key: &str) -> Option<String> {
-    let query = session.req_header().uri.query()?;
-
-    let params: HashMap<_, _> = query
-        .split('&')
-        .filter_map(|pair| {
-            let mut parts = pair.splitn(2, '=');
-            let k = parts.next()?;
-            let v = parts.next().unwrap_or(""); // Some params might have no value
-            Some((k, v))
-        })
-        .collect();
-    params.get(key).and_then(|v| decode(v).ok()).map(|s| s.to_string())
-}
-
-// #[allow(clippy::needless_return)]
-// pub fn split_host_port(addr: &str, tls: bool) -> Option<(&str, u16, bool, &str)> {
-//     match addr.split_once(':') {
-//         Some((h, p)) => match p.parse::<u16>() {
-//             Ok(port) => return Some((h, port, tls, h)),
-//             Err(_) => {
-//                 log::warn!("ForwardAuth: invalid port in {}", addr);
-//                 return None;
-//             }
-//         },
-//         None => {
-//             if tls {
-//                 return Some((addr, 443u16, tls, addr));
-//             } else {
-//                 return Some((addr, 80u16, tls, addr));
-//             }
-//         }
-//     };
-// }

src/auth/jwt.rs

@@ -1,13 +1,18 @@
+use crate::auth::types::AuthValidator;
 use ahash::AHasher;
-use base64::{engine::general_purpose::URL_SAFE_NO_PAD, Engine as _};
+use base64::engine::general_purpose::URL_SAFE_NO_PAD;
-use jsonwebtoken::{decode, Algorithm, DecodingKey, Validation};
+use base64::Engine;
+use jsonwebtoken::{Algorithm, DecodingKey, Validation};
 use moka::sync::Cache;
 use moka::Expiry;
+use pingora_proxy::Session;
 use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
 use std::env;
 use std::hash::{Hash, Hasher};
 use std::sync::{Arc, LazyLock};
 use std::time::{Duration, Instant, SystemTime};
+use urlencoding::decode;
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Claims {
@@ -41,6 +46,42 @@ impl Expiry<u64, u64> for JwtExpiry {
         }
     }
 }
+pub struct JwtAuth();
+#[async_trait::async_trait]
+impl AuthValidator for JwtAuth {
+    async fn validate(&self, session: &mut Session) -> bool {
+        if let Some(jwtsecret) = JWT_TOKEN.clone() {
+            if let Some(tok) = get_query_param(session, "araleztoken") {
+                return check_jwt(tok.as_str(), jwtsecret.as_ref());
+            }
+            if let Some(auth_header) = session.get_header("authorization") {
+                if let Ok(header_str) = auth_header.to_str() {
+                    if let Some((scheme, token)) = header_str.split_once(' ') {
+                        if scheme.eq_ignore_ascii_case("bearer") {
+                            return check_jwt(token, jwtsecret.as_ref());
+                        }
+                    }
+                }
+            }
+        }
+        false
+    }
+}
+
+fn get_query_param(session: &mut Session, key: &str) -> Option<String> {
+    let query = session.req_header().uri.query()?;
+
+    let params: HashMap<_, _> = query
+        .split('&')
+        .filter_map(|pair| {
+            let mut parts = pair.splitn(2, '=');
+            let k = parts.next()?;
+            let v = parts.next().unwrap_or(""); // Some params might have no value
+            Some((k, v))
+        })
+        .collect();
+    params.get(key).and_then(|v| decode(v).ok()).map(|s| s.to_string())
+}
 
 pub fn check_jwt(token: &str, secret: &str) -> bool {
     let key = hash_token(token, secret);
@@ -57,7 +98,7 @@ pub fn check_jwt(token: &str, secret: &str) -> bool {
         Err(_) => return false,
     }
 
-    match decode::<Claims>(token, &DecodingKey::from_secret(secret.as_ref()), &JWT_VALIDATION) {
+    match jsonwebtoken::decode::<Claims>(token, &DecodingKey::from_secret(secret.as_ref()), &JWT_VALIDATION) {
         Ok(data) => {
             let now = SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap_or_default().as_secs();
             if data.claims.exp > now {

src/auth/mod.rs

@@ -0,0 +1,7 @@
+pub mod apikey;
+pub mod basic;
+pub mod forward;
+pub mod jwt;
+pub mod types;
+
+pub use types::*;

src/auth/types.rs

@@ -0,0 +1,23 @@
+use crate::auth::apikey::ApiKeyAuth;
+use crate::auth::basic::BasicAuth;
+use crate::auth::forward::ForwardAuth;
+use crate::auth::jwt::JwtAuth;
+use crate::utils::types::InnerAuth;
+use pingora_proxy::Session;
+
+#[async_trait::async_trait]
+pub trait AuthValidator {
+    async fn validate(&self, session: &mut Session) -> bool;
+}
+pub async fn authenticate(auth: &InnerAuth, session: &mut Session) -> bool {
+    match &*auth.auth_type {
+        "basic" => BasicAuth(&auth.auth_cred).validate(session).await,
+        "apikey" => ApiKeyAuth(&auth.auth_cred).validate(session).await,
+        "jwt" => JwtAuth().validate(session).await,
+        "forward" => ForwardAuth(&auth.auth_cred).validate(session).await,
+        _ => {
+            log::warn!("Unsupported authentication mechanism : {}", &*auth.auth_type);
+            false
+        }
+    }
+}

src/cache/mod.rs

@@ -0,0 +1,2 @@
+pub mod redis;
+pub mod types;

src/cache/redis.rs

@@ -0,0 +1,222 @@
+use async_trait::async_trait;
+use bytes::Bytes;
+use log::warn;
+use pingora::Result;
+use pingora_cache::storage::{HandleHit, HandleMiss, HitHandler, MissFinishType, MissHandler, Storage};
+use pingora_cache::trace::SpanHandle;
+use pingora_cache::{CacheKey, CacheMeta, PurgeOutcome, PurgeTarget, PurgeType};
+use redis::aio::ConnectionManager;
+use redis::{AsyncCommands, Client, RedisResult};
+use std::any::Any;
+use std::borrow::Cow;
+use std::sync::Arc;
+
+#[derive(Clone)]
+pub struct RedisCache {
+    pub client: Arc<ConnectionManager>,
+    pub ttl: u64,
+}
+
+pub struct RedisHitHandler {
+    body: Option<Bytes>,
+}
+
+pub struct RedisMissHandler {
+    client: Arc<ConnectionManager>,
+    body_key: String,
+    body_buffer: Vec<u8>,
+    ttl: u64,
+}
+
+impl RedisCache {
+    pub async fn new(url: &str, ttl: u64) -> RedisResult<Self> {
+        let client = Client::open(url)?;
+        let manager = ConnectionManager::new(client).await?;
+        Ok(Self { client: Arc::new(manager), ttl })
+    }
+    fn make_key(key: &CacheKey) -> Cow<'_, str> {
+        match key.primary_key_str() {
+            Some(s) => Cow::Borrowed(s),
+            None => Cow::Owned(key.primary_key().iter().map(|b| format!("{:02x}", b)).collect()),
+        }
+    }
+}
+
+#[async_trait]
+impl HandleHit for RedisHitHandler {
+    async fn read_body(&mut self) -> Result<Option<Bytes>> {
+        Ok(self.body.take())
+    }
+
+    async fn finish(self: Box<Self>, _storage: &'static (dyn Storage + Sync), _key: &CacheKey, _trace: &SpanHandle) -> Result<()> {
+        Ok(())
+    }
+
+    fn can_seek(&self) -> bool {
+        false
+    }
+
+    fn seek(&mut self, _start: usize, _end: Option<usize>) -> Result<()> {
+        Ok(())
+    }
+
+    fn should_count_access(&self) -> bool {
+        true
+    }
+
+    fn get_eviction_weight(&self) -> usize {
+        self.body.as_ref().map(|b| b.len()).unwrap_or(0)
+    }
+
+    fn entry_id(&self) -> Option<pingora_cache::eviction::CacheEntryId> {
+        None
+    }
+
+    fn as_any(&self) -> &(dyn Any + Send + Sync) {
+        self
+    }
+
+    fn as_any_mut(&mut self) -> &mut (dyn Any + Send + Sync) {
+        self
+    }
+}
+
+#[async_trait]
+impl HandleMiss for RedisMissHandler {
+    async fn write_body(&mut self, data: Bytes, _eof: bool) -> Result<()> {
+        self.body_buffer.extend_from_slice(&data);
+        Ok(())
+    }
+
+    async fn finish(self: Box<Self>) -> Result<MissFinishType> {
+        let len = self.body_buffer.len();
+        let mut conn = (*self.client).clone();
+        if let Err(e) = conn.set_ex::<_, _, ()>(&self.body_key, &self.body_buffer, self.ttl).await {
+            warn!("Failed to write cache entry to Redis: {e}");
+        }
+        Ok(MissFinishType::Appended(len, None))
+    }
+
+    fn entry_id(&self) -> Option<pingora_cache::eviction::CacheEntryId> {
+        None
+    }
+}
+
+#[async_trait]
+impl Storage for RedisCache {
+    async fn lookup(&'static self, key: &CacheKey, _trace: &SpanHandle) -> Result<Option<(CacheMeta, HitHandler)>> {
+        let base = Self::make_key(key);
+
+        // Pre-allocate exact capacities to prevent reallocations
+        let mut meta_key = String::with_capacity(base.len() + 5);
+        meta_key.push_str(&base);
+        meta_key.push_str(":meta");
+
+        let mut body_key = String::with_capacity(base.len() + 5);
+        body_key.push_str(&base);
+        body_key.push_str(":body");
+
+        let mut internal_key = String::with_capacity(meta_key.len() + 9);
+        internal_key.push_str(&meta_key);
+        internal_key.push_str(":internal");
+
+        let mut header_key = String::with_capacity(meta_key.len() + 7);
+        header_key.push_str(&meta_key);
+        header_key.push_str(":header");
+
+        let mut conn = (*self.client).clone();
+
+        let internal: Option<Vec<u8>> = conn.get(&internal_key).await.ok().flatten();
+        let header: Option<Vec<u8>> = conn.get(&header_key).await.ok().flatten();
+        let body: Option<Vec<u8>> = conn.get(&body_key).await.ok().flatten();
+
+        match (internal, header, body) {
+            (Some(internal_bytes), Some(header_bytes), Some(body_bytes)) => match CacheMeta::deserialize(&internal_bytes, &header_bytes) {
+                Ok(meta) => {
+                    let handler: HitHandler = Box::new(RedisHitHandler {
+                        body: Some(Bytes::from(body_bytes)),
+                    });
+                    Ok(Some((meta, handler)))
+                }
+                Err(_) => {
+                    let _: RedisResult<()> = conn.del(&[&internal_key, &header_key, &body_key]).await;
+                    Ok(None)
+                }
+            },
+            _ => Ok(None),
+        }
+    }
+
+    async fn get_miss_handler(&'static self, key: &CacheKey, meta: &CacheMeta, _trace: &SpanHandle) -> Result<MissHandler> {
+        let base = Self::make_key(key);
+
+        let mut meta_key = String::with_capacity(base.len() + 5);
+        meta_key.push_str(&base);
+        meta_key.push_str(":meta");
+
+        let mut body_key = String::with_capacity(base.len() + 5);
+        body_key.push_str(&base);
+        body_key.push_str(":body");
+
+        let mut internal_key = String::with_capacity(meta_key.len() + 9);
+        internal_key.push_str(&meta_key);
+        internal_key.push_str(":internal");
+
+        let mut header_key = String::with_capacity(meta_key.len() + 7);
+        header_key.push_str(&meta_key);
+        header_key.push_str(":header");
+
+        let ttl = self.ttl;
+        let (internal_bytes, header_bytes) = meta.serialize()?;
+        let mut conn = (*self.client).clone();
+
+        let _: RedisResult<()> = conn.set_ex(&internal_key, &internal_bytes, ttl).await;
+        let _: RedisResult<()> = conn.set_ex(&header_key, &header_bytes, ttl).await;
+
+        Ok(Box::new(RedisMissHandler {
+            client: self.client.clone(),
+            body_key,
+            body_buffer: Vec::with_capacity(4096),
+            ttl,
+        }))
+    }
+
+    async fn purge(&'static self, _target: PurgeTarget<'_>, _purge_type: PurgeType, _trace: &SpanHandle) -> Result<PurgeOutcome> {
+        Ok(PurgeOutcome::NotFound)
+    }
+
+    async fn update_meta(&'static self, key: &CacheKey, meta: &CacheMeta, _trace: &SpanHandle) -> Result<bool> {
+        let base = Self::make_key(key);
+
+        let mut meta_key = String::with_capacity(base.len() + 5);
+        meta_key.push_str(&base);
+        meta_key.push_str(":meta");
+
+        let mut internal_key = String::with_capacity(meta_key.len() + 9);
+        internal_key.push_str(&meta_key);
+        internal_key.push_str(":internal");
+
+        let mut header_key = String::with_capacity(meta_key.len() + 7);
+        header_key.push_str(&meta_key);
+        header_key.push_str(":header");
+
+        let ttl = self.ttl;
+        match meta.serialize() {
+            Ok((internal_bytes, header_bytes)) => {
+                let mut conn = (*self.client).clone();
+                let _: RedisResult<()> = conn.set_ex(&internal_key, &internal_bytes, ttl).await;
+                let _: RedisResult<()> = conn.set_ex(&header_key, &header_bytes, ttl).await;
+                Ok(true)
+            }
+            Err(_) => Ok(false),
+        }
+    }
+
+    fn support_streaming_partial_write(&self) -> bool {
+        false
+    }
+
+    fn as_any(&self) -> &(dyn Any + Send + Sync) {
+        self
+    }
+}

src/cache/types.rs

@@ -0,0 +1,41 @@
+use crate::cache::redis::RedisCache;
+use crate::utils::lazylock::{CACHE_TTL, EVICTION};
+use crate::utils::types::AppConfig;
+use log::{info, warn};
+use pingora_cache::eviction::simple_lru::Manager;
+use pingora_cache::{MemCache, Storage};
+use std::sync::{Arc, OnceLock};
+
+pub static GLOBAL_STORAGE: OnceLock<Box<dyn Storage + Send + Sync>> = OnceLock::new();
+
+pub async fn init_cache(config: Arc<AppConfig>) {
+    let cache_storage = config.cache_storage.clone().unwrap_or_else(|| {
+        info!("No cache_storage configured, defaulting to memory");
+        "memory".to_string()
+    });
+    let cache_type = cache_storage.splitn(2, ':').next().unwrap_or("memory");
+    let ttl = config.cache_ttl.unwrap_or(60);
+
+    match cache_type {
+        "memory" => {
+            CACHE_TTL.set(ttl).ok();
+            if let Some(size) = config.cache_size_mb {
+                let cache_size = size * 1024 * 1024;
+                drop(EVICTION.set(Manager::new(cache_size)));
+            }
+            GLOBAL_STORAGE.set(Box::new(MemCache::new())).ok();
+            info!("Cache initialized successfully. Storage: {}", cache_storage);
+        }
+        "redis" => match RedisCache::new(&cache_storage, ttl).await {
+            Ok(cache) => {
+                CACHE_TTL.set(ttl).ok();
+                GLOBAL_STORAGE.set(Box::new(cache)).ok();
+                info!("Cache initialized successfully. Storage: {}", cache_storage);
+            }
+            Err(e) => log::error!("Cache storage initialization failed: {}", e),
+        },
+        _ => {
+            warn!("Unsupported storage, disabling caching: {}", cache_storage);
+        }
+    }
+}

src/core/bgservice.rs

@@ -1,39 +1,44 @@
+use crate::cache::types::init_cache;
+use crate::core::proxyhttp::LB;
+use crate::ingress::{APIUpstreamProvider, ConsulProvider, Discovery, FromFileProvider, KubernetesProvider};
+use crate::logging::core::{init_access_log, init_access_logging, log_builder};
 use crate::tls::acme::order::refresh_order;
-use crate::utils::discovery::{APIUpstreamProvider, ConsulProvider, Discovery, FromFileProvider, KubernetesProvider};
 use crate::utils::metrics::calc_cache_metrics;
 use crate::utils::parceyaml::load_configuration;
-use crate::utils::structs::Configuration;
 use crate::utils::tools::*;
+use crate::utils::types::Configuration;
 use crate::utils::*;
-use crate::web::logging::init_logging;
-use crate::web::proxyhttp::LB;
 use async_trait::async_trait;
 use dashmap::DashMap;
 use log::{error, info};
 use pingora_core::server::ShutdownWatch;
 use pingora_core::services::background::BackgroundService;
 use std::sync::Arc;
+use std::time::{SystemTime, UNIX_EPOCH};
 use tokio::sync::mpsc;
 
 #[async_trait]
 impl BackgroundService for LB {
     async fn start(&self, mut shutdown: ShutdownWatch) {
+        log_builder(&self.config, &self.config.log_file).await;
+        let al = &self.config.access_log.clone().unwrap_or("none".to_string());
+        let _ = init_access_log(al.as_str()).await;
+
         info!("Starting background service"); // tx: Sender<Configuration>
         let (tx, mut rx) = mpsc::channel::<Configuration>(1);
         let tx_api = tx.clone();
         let config = load_configuration(self.config.upstreams_conf.clone().as_str(), "filepath")
             .await
             .0
-            .expect("Failed to load configuration");
+            .die("Failed to load configuration");
 
         match config.typecfg.as_str() {
             "file" => {
                 info!("Running File discovery, requested type is: {}", config.typecfg);
-                tx.send(config).await.unwrap();
+                tx.send(config).await.die("Running File discovery");
                 let file_load = FromFileProvider {
                     path: self.config.upstreams_conf.clone(),
                 };
-                // let _ = tokio::spawn(async move { file_load.start(tx).await });
                 drop(tokio::spawn(async move { file_load.start(tx).await }));
             }
             "kubernetes" => {
@@ -67,25 +72,27 @@ impl BackgroundService for LB {
             file_server_folder: self.config.file_server_folder.clone(),
             current_upstreams: self.ump_upst.clone(),
             full_upstreams: self.ump_full.clone(),
+            acme_dns_provider: self.config.acme_dns_provider.clone(),
         };
-        drop(tokio::spawn(async move { api_load.start(tx_api).await }));
+        tokio::spawn(async move { api_load.start(tx_api).await });
-
         let uu = self.ump_upst.clone();
         let ff = self.ump_full.clone();
         let im = self.ump_byid.clone();
         let (hc_method, hc_interval) = (self.config.hc_method.clone(), self.config.hc_interval);
-        drop(tokio::spawn(async move {
+        tokio::spawn(async move { healthcheck::hc2(uu, ff, im, (&*hc_method.to_string(), hc_interval.to_string().parse().die("Unable to spawn HC worker"))).await });
-            healthcheck::hc2(uu, ff, im, (&*hc_method.to_string(), hc_interval.to_string().parse().unwrap())).await
+        tokio::spawn(async move { calc_cache_metrics().await });
-        }));
+        let acme_provider = self.config.acme_dns_provider.clone();
-        drop(tokio::spawn(async move { calc_cache_metrics().await }));
+        tokio::spawn(async move { refresh_order(certdir, confdir, acme_provider).await });
-        drop(tokio::spawn(async move { refresh_order(certdir, confdir).await }));
+
-        init_logging(self.config.access_log.clone());
+        init_cache(self.config.clone()).await;
+        init_access_logging(self.config.access_log.clone()).await;
         loop {
             tokio::select! {
                 _ = shutdown.changed() => {
                     break;
                 }
                 val = rx.recv() => {
+                    let start = SystemTime::now().duration_since(UNIX_EPOCH).die(format!("ON {} {}", file!(), line!()).as_str());
                     if let Some(ss) = val {
                         clone_dashmap_into(&ss.upstreams, &self.ump_full);
                         clone_dashmap_into(&ss.upstreams, &self.ump_upst);
@@ -132,6 +139,9 @@ impl BackgroundService for LB {
                             }
                         }
                     }
+                    let end = SystemTime::now().duration_since(UNIX_EPOCH).die(format!("ON {} {}", file!(), line!()).as_str());
+                    let startup = end - start;
+                    info!("Loading upstreams took: {}ms", startup.as_millis());
                 }
             }
         }

src/core/gethosts.rs

@@ -1,5 +1,5 @@
-use crate::utils::structs::InnerMap;
+use crate::core::proxyhttp::LB;
-use crate::web::proxyhttp::LB;
+use crate::utils::types::InnerMap;
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Arc;
 

src/core/mod.rs

@@ -1,7 +1,5 @@
-pub mod acme;
 pub mod bgservice;
 pub mod gethosts;
-pub mod logging;
 pub mod proxyhttp;
 pub mod start;
 pub mod webserver;

src/core/proxyhttp.rs

@@ -1,16 +1,17 @@
-use crate::utils::auth::authenticate;
+use crate::auth::authenticate;
-use crate::utils::lazylock::{CACHE_LOCK, CACHE_TTL, EVICTION, LOCALHOST, MEM_CACHE, RATE_LIMITER, REQUESTS_4XX, REVERSE_STORE};
+use crate::cache::types::GLOBAL_STORAGE;
+use crate::core::gethosts::{GetHost, GetHostsReturHeaders};
+use crate::logging::core::access_log;
+use crate::utils::lazylock::{CACHE_LOCK, CACHE_TTL, EVICTION, LOCALHOST, RATE_LIMITER, REQUESTS_4XX, REVERSE_STORE};
 use crate::utils::metrics::*;
-use crate::utils::structs::{AppConfig, Extraparams, Headers, InnerMap, UpstreamsDashMap, UpstreamsIdMap};
+use crate::utils::types::{AppConfig, Extraparams, Headers, InnerMap, UpstreamsDashMap, UpstreamsIdMap};
-use crate::web::gethosts::{GetHost, GetHostsReturHeaders};
-use crate::web::logging::access_log;
 use arc_swap::ArcSwap;
 use async_trait::async_trait;
 use axum::body::Bytes;
 use log::error;
+use pingora::ErrorSource::Upstream;
 use pingora::http::{Method, RequestHeader, ResponseHeader, StatusCode};
 use pingora::prelude::*;
-use pingora::ErrorSource::Upstream;
 use pingora_cache::cache_control::CacheControl;
 use pingora_cache::{CacheKey, CacheMetaDefaults, RespCacheable};
 use pingora_core::listeners::ALPN;
@@ -34,6 +35,7 @@ pub struct LB {
     pub config: Arc<AppConfig>,
     pub extraparams: Arc<ArcSwap<Extraparams>>,
     pub cache_enabled: bool,
+    pub master_server: bool,
 }
 
 pub struct Context {
@@ -43,9 +45,12 @@ pub struct Context {
     upstream_peer: Option<Arc<InnerMap>>,
     extraparams: arc_swap::Guard<Arc<Extraparams>>,
     client_headers: Option<Vec<(String, Arc<str>)>>,
-    x4xx_limit: Option<u32>,
+    x4xx_limit: u32,
 }
 
+thread_local! {
+    static KEY_BUF: RefCell<String> = RefCell::new(String::with_capacity(256));
+}
 #[async_trait]
 impl ProxyHttp for LB {
     type CTX = Context;
@@ -57,17 +62,28 @@ impl ProxyHttp for LB {
             upstream_peer: None,
             extraparams: self.extraparams.load(),
             client_headers: None,
-            x4xx_limit: None,
+            x4xx_limit: 0,
         }
     }
 
-    fn cache_key_callback(&self, session: &Session, _ctx: &mut Self::CTX) -> Result<CacheKey> {
+    fn cache_key_callback(&self, session: &Session, ctx: &mut Self::CTX) -> Result<CacheKey> {
-        Ok(CacheKey::new(_ctx.hostname.clone().unwrap_or_default().as_ref(), session.req_header().uri.to_string(), ""))
+        let host = ctx.hostname.as_deref().unwrap_or("default");
+        let path = session.req_header().uri.path_and_query().map_or("/", |pq| pq.as_str());
+        let primary_key = KEY_BUF.with(|buf| {
+            let mut b = buf.borrow_mut();
+            b.clear();
+            b.push_str(host);
+            b.push_str(path);
+            b.clone()
+        });
+        Ok(CacheKey::new(primary_key, host /* host is just for debugging */))
     }
     fn request_cache_filter(&self, session: &mut Session, _ctx: &mut Self::CTX) -> Result<()> {
-        if self.cache_enabled && session.req_header().method == Method::GET {
+        let has_auth = _ctx.upstream_peer.as_ref().map(|m| m.authorization.is_some()).unwrap_or(false) || _ctx.extraparams.authentication.is_some();
-            if let Some(eviction) = EVICTION.get() {
+        if self.cache_enabled && session.req_header().method == Method::GET && !has_auth {
-                session.cache.enable(&*MEM_CACHE, Some(eviction), None, Some(&*CACHE_LOCK), None);
+            if let Some(storage) = GLOBAL_STORAGE.get() {
+                let eviction_mgr = EVICTION.get().map(|e| e as &(dyn pingora_cache::eviction::EvictionManager + Sync));
+                session.cache.enable(storage.as_ref(), eviction_mgr, None, Some(&*CACHE_LOCK), None);
             }
         }
         Ok(())
@@ -89,11 +105,15 @@ impl ProxyHttp for LB {
     }
 
     async fn request_filter(&self, session: &mut Session, _ctx: &mut Self::CTX) -> Result<bool> {
+        if self.master_server {
+            let _ = session.respond_error(400).await;
+            return Ok(true);
+        };
         ACTIVE_SESSIONS.inc();
         let hostname = return_header_host_from_upstream(session, &self.ump_upst);
         _ctx.hostname = hostname;
         let mut backend_id = None;
-        if let Some(_) = _ctx.extraparams.sticky_sessions {
+        if _ctx.extraparams.sticky_sessions > 0 {
             if let Some(cookies) = session.req_header().headers.get("cookie") {
                 if let Ok(cookie_str) = cookies.to_str() {
                     if let Some(pos) = cookie_str.find("backend_id=") {
@@ -112,17 +132,30 @@ impl ProxyHttp for LB {
                     None => return Ok(false),
                     Some(ref innermap) => {
                         if let Some(auth) = _ctx.extraparams.authentication.as_ref().or(innermap.authorization.as_ref()) {
-                            if !authenticate(&auth, session).await {
+                            if !authenticate(auth, session).await {
                                 let _ = session.respond_error(401).await;
                                 return Ok(true);
                             }
                         }
-                        if let Some(rate) = innermap.x4xx_limit.or(_ctx.extraparams.x4xx_limit) {
+                        let rate = if innermap.rate_limit > 0 { innermap.rate_limit } else { _ctx.extraparams.rate_limit };
-                            _ctx.x4xx_limit = innermap.x4xx_limit;
+                        let xrate = if innermap.x4xx_limit > 0 { innermap.x4xx_limit } else { _ctx.extraparams.x4xx_limit };
+                        if xrate > 0 || rate > 0 {
                             let rate_key = session.client_addr().and_then(|addr| addr.as_inet()).map(|inet| inet.ip());
-                            if let Some(rk) = rate_key {
+                            if xrate > 0 {
-                                let count = REQUESTS_4XX.get(&rk).unwrap_or(0);
+                                _ctx.x4xx_limit = xrate;
-                                if count > rate {
+                                if let Some(rk) = rate_key {
+                                    let count = REQUESTS_4XX.get(&rk).unwrap_or(0);
+                                    if count > xrate {
+                                        let header = ResponseHeader::build(429, None)?;
+                                        session.set_keepalive(None);
+                                        session.write_response_header(Box::new(header), true).await?;
+                                        return Ok(true);
+                                    }
+                                }
+                            }
+                            if rate > 0 {
+                                let curr_window_requests = RATE_LIMITER.observe(&rate_key, 1);
+                                if curr_window_requests > rate {
                                     let header = ResponseHeader::build(429, None)?;
                                     session.set_keepalive(None);
                                     session.write_response_header(Box::new(header), true).await?;
@@ -130,16 +163,6 @@ impl ProxyHttp for LB {
                                 }
                             }
                         }
-                        if let Some(rate) = innermap.rate_limit.or(_ctx.extraparams.rate_limit) {
-                            let rate_key = session.client_addr().and_then(|addr| addr.as_inet()).map(|inet| inet.ip());
-                            let curr_window_requests = RATE_LIMITER.observe(&rate_key, 1);
-                            if curr_window_requests > rate {
-                                let header = ResponseHeader::build(429, None)?;
-                                session.set_keepalive(None);
-                                session.write_response_header(Box::new(header), true).await?;
-                                return Ok(true);
-                            }
-                        }
 
                         if let Some(redirect_to) = &innermap.redirect_to {
                             let uri = session.req_header().uri.path();
@@ -154,7 +177,7 @@ impl ProxyHttp for LB {
                             return Ok(true);
                         }
 
-                        if _ctx.extraparams.to_https.unwrap_or(false) || innermap.to_https {
+                        if _ctx.extraparams.to_https || innermap.to_https {
                             if let Some(stream) = session.stream() {
                                 if stream.get_ssl().is_none() {
                                     if let Some(host) = _ctx.hostname.as_ref() {
@@ -197,21 +220,7 @@ impl ProxyHttp for LB {
                         peer.options.verify_cert = false;
                         peer.options.verify_hostname = false;
                     }
-                    /*
+                    if ctx.extraparams.sticky_sessions > 0 {
-                    Experimental optionsv
-                    The following TCP optimizations were tested but caused performance degrade under heavy load:
-                    peer.options.tcp_keepalive = Some(TcpKeepalive {
-                        idle: Duration::from_secs(60),
-                        interval: Duration::from_secs(10),
-                        count: 5,
-                        user_timeout: Duration::from_secs(30),
-                    });
-
-                    peer.options.idle_timeout = Some(Duration::from_secs(300));
-                    peer.options.tcp_recv_buf = Some(128 * 1024);
-                    End of experimental options
-                    */
-                    if let Some(_) = ctx.extraparams.sticky_sessions {
                         let mut s = String::with_capacity(64);
                         write!(
                             &mut s,
@@ -221,9 +230,9 @@ impl ProxyHttp for LB {
                             innermap.port,
                             innermap.is_http2,
                             innermap.to_https,
-                            innermap.x4xx_limit.unwrap_or_default(),
+                            innermap.x4xx_limit,
-                            innermap.rate_limit.unwrap_or_default(),
+                            innermap.rate_limit,
-                            innermap.healthcheck.unwrap_or_default(),
+                            innermap.healthcheck,
                             innermap.authorization
                         )
                         .unwrap_or(());
@@ -287,7 +296,7 @@ impl ProxyHttp for LB {
         Ok(())
     }
     async fn response_filter(&self, _session: &mut Session, _upstream_response: &mut ResponseHeader, ctx: &mut Self::CTX) -> Result<()> {
-        if let Some(val) = ctx.extraparams.sticky_sessions {
+        if ctx.extraparams.sticky_sessions > 0 {
             if let Some(bid) = &ctx.backend_id {
                 let tt = if let Some(existing) = REVERSE_STORE.get(bid) {
                     existing.value().clone()
@@ -305,7 +314,7 @@ impl ProxyHttp for LB {
                 buf.push_str("backend_id=");
                 buf.push_str(&tt);
                 buf.push_str("; Path=/; Max-Age=");
-                buf.push_str(&val.to_string());
+                buf.push_str(&ctx.extraparams.sticky_sessions.to_string());
                 buf.push_str("; HttpOnly; SameSite=Lax");
                 let _ = _upstream_response.append_header("set-cookie", buf.as_str());
             }
@@ -331,22 +340,13 @@ impl ProxyHttp for LB {
         };
         calc_metrics(m);
         ACTIVE_SESSIONS.dec();
-        if let Some(_) = ctx.x4xx_limit.or(ctx.extraparams.x4xx_limit) {
+        if ctx.x4xx_limit > 0 && (400..=499).contains(&response_code) {
-            if (400..=499).contains(&response_code) {
+            if let Some(ip) = session.client_addr().and_then(|a| a.as_inet()).map(|i| i.ip()) {
-                if let Some(ip) = session.client_addr().and_then(|a| a.as_inet()).map(|i| i.ip()) {
+                let current = REQUESTS_4XX.get(&ip).unwrap_or(0);
-                    let current = REQUESTS_4XX.get(&ip).unwrap_or(0);
+                REQUESTS_4XX.insert(ip, current + 1);
-                    REQUESTS_4XX.insert(ip, current + 1);
-                }
             }
         }
-        // match session.cache.phase() {
+        access_log(response_code, &self.request_summary(session, ctx), session).await;
-        //     CachePhase::Hit => info!("Cache Status: HIT (Served from Memory)"),
-        //     CachePhase::Miss => info!("Cache Status: MISS (Fetched from Upstream)"),
-        //     CachePhase::Expired => info!("Cache Status: EXPIRED (Revalidating)"),
-        //     _ => {}
-        // }
-
-        access_log(response_code, &self.request_summary(session, ctx), session);
     }
 }
 

src/core/start.rs

@@ -1,19 +1,19 @@
+use crate::core::proxyhttp::LB;
 use crate::tls::grades;
 use crate::tls::load;
 use crate::tls::load::CertificateConfig;
+use crate::utils::folder_watch;
 use crate::utils::lazylock::{CACHE_TTL, EVICTION};
-use crate::utils::structs::Extraparams;
 use crate::utils::tools::*;
-use crate::web::logging::init_access_log;
+use crate::utils::types::Extraparams;
-use crate::web::proxyhttp::LB;
 use arc_swap::ArcSwap;
 use dashmap::DashMap;
 use log::info;
 use pingora::tls::ssl::{SslAlert, SslRef};
 use pingora_cache::eviction::simple_lru::Manager;
-use pingora_core::listeners::tls::TlsSettings;
 use pingora_core::listeners::TcpSocketOptions;
-use pingora_core::prelude::{background_service, Opt};
+use pingora_core::listeners::tls::TlsSettings;
+use pingora_core::prelude::{Opt, background_service};
 use pingora_core::protocols::TcpKeepalive;
 use pingora_core::server::Server;
 use privdrop::reexports::libc::SIGQUIT;
@@ -23,24 +23,30 @@ use signal_hook::{
     consts::{SIGINT, SIGTERM},
     iterator::Signals,
 };
-use std::sync::mpsc::{channel, Receiver, Sender};
 use std::sync::Arc;
+use std::sync::mpsc::{Receiver, Sender, channel};
 use std::time::Duration;
 use std::{fs, thread};
+
 pub fn run() {
-    default_provider().install_default().expect("Failed to install RusTLS crypto provider");
+    default_provider().install_default().die("Failed to install RusTLS crypto provider:");
     let parameters = Opt::parse_args();
-    let file = parameters.conf.clone().unwrap();
+    let file = parameters.conf.clone().die("Failed to clone the config:");
     let maincfg = crate::utils::parceyaml::parce_main_config(file.as_str());
 
-    let cache_enabled = maincfg.cache_size_mb.is_some();
+    let master_server = maincfg.cluster_member.as_deref() == Some("master");
-    CACHE_TTL.set(maincfg.cache_ttl.unwrap_or(60)).unwrap();
-    if let Some(size) = maincfg.cache_size_mb {
-        let cache_size = size * 1024 * 1024;
-        drop(EVICTION.set(Manager::new(cache_size)));
-    }
 
-    let mut server = Server::new(parameters).unwrap();
+    let cache_enabled = maincfg.cache_enabled.unwrap_or(false);
+
+    // ========================================================================== //
+    CACHE_TTL.set(maincfg.cache_ttl.unwrap_or(60)).die("Failed to set cache TTL");
+    if cache_enabled {
+        let cache_size = maincfg.cache_size_mb.unwrap_or(50);
+        let _ = EVICTION.set(Manager::new(cache_size * 1024 * 1024));
+    }
+    // ========================================================================== //
+
+    let mut server = Server::new(parameters).die("Failed to start the server:");
     server.bootstrap();
 
     let uf_config = Arc::new(DashMap::new());
@@ -50,11 +56,12 @@ pub fn run() {
     let sh_config = Arc::new(DashMap::new());
 
     let ec_config = Arc::new(ArcSwap::from_pointee(Extraparams {
-        to_https: None,
+        to_https: false,
-        sticky_sessions: None,
+        ssl_verify: false,
+        sticky_sessions: 0,
         authentication: None,
-        rate_limit: None,
+        rate_limit: 0,
-        x4xx_limit: None,
+        x4xx_limit: 0,
     }));
 
     let cfg = Arc::new(maincfg);
@@ -67,10 +74,9 @@ pub fn run() {
         client_headers: ch_config,
         server_headers: sh_config,
         extraparams: ec_config,
-        cache_enabled: cache_enabled,
+        cache_enabled,
+        master_server,
     };
-    let al = cfg.access_log.clone().unwrap_or("none".to_string());
-    init_access_log(al.as_str());
 
     let grade = cfg.proxy_tls_grade.clone().unwrap_or("medium".to_string());
     info!("TLS grade set to: [ {} ]", grade);
@@ -83,9 +89,6 @@ pub fn run() {
 
     check_priv(bind_address_http.as_str());
 
-    // let mut tcp_options: Option<TcpSocketOptions> = Some(TcpSocketOptions::default());
-    // let mut tcp_options = TcpSocketOptions::default();
-
     let mut tcp_options: Option<TcpSocketOptions> = None;
     if let Some(idle) = cfg.tcp_keepalive_idle {
         let mut to = TcpSocketOptions::default();
@@ -107,25 +110,25 @@ pub fn run() {
     if let Some(bind_address_tls) = bind_address_tls {
         check_priv(bind_address_tls.as_str());
         let (tx, rx): (Sender<Vec<CertificateConfig>>, Receiver<Vec<CertificateConfig>>) = channel();
-        let certs_path = cfg.proxy_configs.clone().unwrap() + "/certificates";
+        let certs_path = cfg.proxy_configs.clone().die("Failed certificates path") + "/certificates";
 
         if fs::metadata(certs_path.clone()).is_err() {
-            fs::create_dir_all(certs_path.clone()).unwrap();
+            fs::create_dir_all(certs_path.clone()).die("Failed to create directories");
         }
         thread::spawn(move || {
-            watch_folder(certs_path, tx).unwrap();
+            folder_watch(certs_path, tx).die("Failed to spawn certificates channel");
         });
-        let certificate_configs = rx.recv().unwrap();
+        let certificate_configs = rx.recv().die("Failed to spawn certificates channel");
         let first_set = load::Certificates::new(&certificate_configs, grade.as_str()).unwrap_or_else(|| panic!("Unable to load initial certificate info"));
         let certificates = Arc::new(ArcSwap::from_pointee(first_set));
         let certs_for_callback = certificates.clone();
 
         let certs_for_watcher = certificates.clone();
         let new_certs = load::Certificates::new(&certificate_configs, grade.as_str());
-        certs_for_watcher.store(Arc::new(new_certs.unwrap()));
+        certs_for_watcher.store(Arc::new(new_certs.die("Failed to build the watcher")));
 
         let mut tls_settings =
-            TlsSettings::intermediate(&certs_for_callback.load().default_cert_path, &certs_for_callback.load().default_key_path).expect("unable to load or parse cert/key");
+            TlsSettings::intermediate(&certs_for_callback.load().default_cert_path, &certs_for_callback.load().default_key_path).die("unable to load or parse cert/key");
 
         grades::set_tsl_grade(&mut tls_settings, grade.as_str());
         tls_settings.set_servername_callback(move |ssl_ref: &mut SslRef, ssl_alert: &mut SslAlert| certs_for_callback.load().server_name_callback(ssl_ref, ssl_alert));
@@ -163,8 +166,8 @@ pub fn run() {
     if let Err(e) = write_pid_file(pf.as_str()) {
         panic!("Failed to write PID file: {} : {}", pf, e);
     }
-    let mut signals = Signals::new(&[SIGINT, SIGTERM, SIGQUIT]).unwrap();
+    let mut signals = Signals::new([SIGINT, SIGTERM, SIGQUIT]).die("Failed to create signals");
-    for sig in signals.forever() {
+    if let Some(sig) = signals.forever().next() {
         match sig {
             SIGINT => info!("SIGINT received! Exiting..."),
             SIGTERM => info!("SIGTERM received! Exiting..."),
@@ -174,6 +177,5 @@ pub fn run() {
             }
             _ => unreachable!(),
         }
-        break;
     }
 }

src/core/webserver.rs

@@ -1,18 +1,21 @@
-use crate::utils::discovery::APIUpstreamProvider;
+use crate::auth::jwt::Claims;
-use crate::utils::jwt::Claims;
+use crate::ingress::APIUpstreamProvider;
-use crate::utils::metrics::{get_memory_usage, get_open_files, MEMORY_USAGE, OPEN_FILES};
+use crate::tls::acme::http01::{acme_create, acme_order, http01_challenge};
-use crate::utils::structs::{Config, Configuration, UpstreamsDashMap};
+use crate::utils::lazylock::NODE_STATUS;
-use crate::utils::tools::{upstreams_liveness_json, upstreams_to_json};
+use crate::utils::metrics::{MEMORY_USAGE, OPEN_FILES, get_memory_usage, get_open_files};
-use crate::web::acme::{acme_create, acme_order, http01_challenge};
+use crate::utils::tools::{Die, upstreams_liveness_json, upstreams_to_json};
+use crate::utils::types::{Config, Configuration, UpstreamsDashMap};
 use axum::body::Body;
+use axum::extract::ConnectInfo;
 use axum::extract::{Query, State};
+use axum::http::HeaderMap;
 use axum::http::{Response, StatusCode};
 use axum::response::IntoResponse;
 use axum::routing::{any, get, post};
 use axum::{Json, Router};
-use jsonwebtoken::{encode, EncodingKey, Header};
+use jsonwebtoken::{EncodingKey, Header, encode};
 use log::{debug, error, info, warn};
-use prometheus::{gather, Encoder, TextEncoder};
+use prometheus::{Encoder, TextEncoder, gather};
 use serde::Serialize;
 use signal_hook::{consts::SIGQUIT, iterator::Signals};
 use std::collections::HashMap;
@@ -30,10 +33,11 @@ struct OutToken {
 }
 
 #[derive(Clone)]
-pub(crate) struct AppState {
+pub struct AppState {
     master_key: Option<String>,
-    pub(crate) cert_creds: String,
+    pub acme_dns_provider: Option<String>,
-    pub(crate) certs_dir: String,
+    pub cert_creds: String,
+    pub certs_dir: String,
     upstreams_file: String,
     config_sender: mpsc::Sender<Configuration>,
     config_api_enabled: bool,
@@ -53,6 +57,7 @@ pub async fn run_server(config: &APIUpstreamProvider, mut to_return: mpsc::Sende
         config_api_enabled: config.config_api_enabled,
         current_upstreams: upstreams_curr,
         full_upstreams: upstreams_full,
+        acme_dns_provider: config.acme_dns_provider.clone(),
     };
     let app = Router::new()
         // .route("/{*wildcard}", get(senderror))
@@ -61,13 +66,14 @@ pub async fn run_server(config: &APIUpstreamProvider, mut to_return: mpsc::Sende
         .route("/acme_order/{*domain}", any(acme_order))
         .route("/.well-known/acme-challenge/{*token}", any(http01_challenge))
         .route("/conf", post(conf))
+        .route("/workerconf", post(workerconf))
         .route("/metrics", get(metrics))
         .route("/status", get(status))
         .with_state(app_state);
 
     let mut static_handle: Option<tokio::task::JoinHandle<()>> = None;
     if let (Some(address), Some(folder)) = (&config.file_server_address, &config.file_server_folder) {
-        let static_listen = port_is_available("File Server", &address).await;
+        let static_listen = port_is_available("File Server", address).await;
         let static_files = ServeDir::new(folder);
         let static_serve: Router = Router::new().fallback_service(static_files);
         info!("Starting file server on: {}", address);
@@ -78,22 +84,20 @@ pub async fn run_server(config: &APIUpstreamProvider, mut to_return: mpsc::Sende
                 Err(e) => error!("File server exited: {}", e),
             }
         }))
-
-        // let a = config.file_server_address.to_owned();
-        // let f = config.file_server_folder.to_owned();
-        // drop(tokio::spawn(async move { run_file_server(a, f).await }));
     }
 
     let listener = port_is_available("Config API", &config.address).await;
     info!("Starting the API server on: {}", config.address);
-    let api_server = tokio::spawn(async move { axum::serve(listener, app).await.unwrap() });
+    let api_server = tokio::spawn(async move {
-
+        axum::serve(listener, app.into_make_service_with_connect_info::<SocketAddr>())
+            .await
+            .die("Can't start API server")
+    });
     let (tx, mut rx) = mpsc::channel(1);
     std::thread::spawn(move || {
-        let mut signals = Signals::new(&[SIGQUIT]).unwrap();
+        let mut signals = Signals::new([SIGQUIT]).die("Can't initialize OS SIGNALS");
-        for sig in signals.forever() {
+        if let Some(sig) = signals.forever().next() {
-            tx.blocking_send(sig).unwrap();
+            tx.blocking_send(sig).die("Can;t send signal to main thread");
-            break;
         }
     });
     rx.recv().await;
@@ -104,29 +108,79 @@ pub async fn run_server(config: &APIUpstreamProvider, mut to_return: mpsc::Sende
     info!("Exiting...");
 }
 
-async fn conf(State(st): State<AppState>, Query(params): Query<HashMap<String, String>>, content: String) -> impl IntoResponse {
+async fn conf(
+    State(st): State<AppState>,
+    ConnectInfo(addr): ConnectInfo<SocketAddr>,
+    Query(params): Query<HashMap<String, String>>,
+    headers: HeaderMap,
+    content: String,
+) -> impl IntoResponse {
     if !st.config_api_enabled {
-        return Response::builder().status(StatusCode::FORBIDDEN).body(Body::from("Config API is disabled !\n")).unwrap();
+        return (StatusCode::FORBIDDEN, "Config API is disabled !\n").into_response();
+    }
+
+    let api_key = headers.get("API-KEY").and_then(|v| v.to_str().ok());
+    let query_key = params.get("key").map(|k| k.as_str());
+    let authorized = match st.master_key.as_deref() {
+        Some(master_key) if !master_key.is_empty() => api_key == Some(master_key) || query_key == Some(master_key),
+        _ => false,
+    };
+    if !authorized {
+        warn!("Unauthorised access to /conf endpoint from {}", addr.ip());
+        return (StatusCode::UNAUTHORIZED, "Unauthorized: Invalid API-KEY\n").into_response();
     }
 
     let strcontent = content.as_str();
     let parsed = noyalib::from_str::<Config>(strcontent);
     match parsed {
         Ok(_) => {
-            if let Some(_) = params.get("save") {
+            let save = params.contains_key("save");
-                drop(tokio::spawn(async move { apply_config(content.as_str(), st, true).await }));
+            tokio::spawn(async move {
-            } else {
+                apply_config(&content, st, save).await;
-                drop(tokio::spawn(async move { apply_config(content.as_str(), st, false).await }));
+            });
-            }
+            (StatusCode::OK, "Accepted! Applying in background\n").into_response()
-            Response::builder().status(StatusCode::OK).body(Body::from("Accepted! Applying in background\n")).unwrap()
         }
         Err(err) => {
             error!("Failed to parse upstreams file: {}", err);
-            Response::builder().status(StatusCode::BAD_GATEWAY).body(Body::from(format!("Failed: {}\n", err))).unwrap()
+            (StatusCode::BAD_REQUEST, format!("Failed: {}\n", err)).into_response()
         }
     }
 }
 
+async fn workerconf(State(st): State<AppState>, ConnectInfo(addr): ConnectInfo<SocketAddr>, headers: HeaderMap, content: String) -> impl IntoResponse {
+    let api_key = headers.get("API-KEY").and_then(|v| v.to_str().ok());
+    if api_key != st.master_key.as_deref() {
+        warn!("Unauthorised access to workerconf endpoint from {}", addr.ip());
+        return (StatusCode::UNAUTHORIZED, "Unauthorized: Invalid API-KEY\n").into_response();
+    }
+    if let Some(member) = NODE_STATUS.get() {
+        if let Some(mbr) = member.as_ref() {
+            match mbr.as_ref() {
+                "worker" => {
+                    info!("Accepted new config from master server {}", addr.ip());
+                    let strcontent = content.as_str();
+                    let parsed = noyalib::from_str::<Config>(strcontent);
+                    match parsed {
+                        Ok(_) => {
+                            tokio::spawn(async move { apply_config(content.as_str(), st, true).await });
+                            return (StatusCode::OK, "Accepted! Applying in background\n").into_response();
+                        }
+                        Err(err) => {
+                            error!("Failed to parse upstreams file: {}", err);
+                            return (StatusCode::BAD_GATEWAY, format!("Failed: {}\n", err)).into_response();
+                        }
+                    }
+                }
+                _ => {
+                    return (StatusCode::BAD_GATEWAY, "Node is not running on worker mode !\n").into_response();
+                }
+            }
+        }
+        return (StatusCode::BAD_GATEWAY, "Node is not running on worker mode !\n").into_response();
+    }
+    (StatusCode::BAD_GATEWAY, "Node is not running on worker mode !\n").into_response()
+}
+
 async fn apply_config(content: &str, st: AppState, save: bool) {
     let sl = crate::utils::parceyaml::load_configuration(content, "content").await;
     if let Some(serverlist) = sl.0 {
@@ -188,17 +242,13 @@ async fn metrics() -> impl IntoResponse {
     let encoder = TextEncoder::new();
     let mut buffer = Vec::new();
     if let Err(e) = encoder.encode(&metric_families, &mut buffer) {
-        // encoding error fallback
+        return (StatusCode::INTERNAL_SERVER_ERROR, format!("Failed to encode metrics: {}", e)).into_response();
-        return Response::builder()
-            .status(StatusCode::INTERNAL_SERVER_ERROR)
-            .body(Body::from(format!("Failed to encode metrics: {}", e)))
-            .unwrap();
     }
     Response::builder()
         .status(StatusCode::OK)
         .header("Content-Type", encoder.format_type())
         .body(Body::from(buffer))
-        .unwrap()
+        .unwrap_or_else(|_| (StatusCode::INTERNAL_SERVER_ERROR, "Internal Server Error\n").into_response())
 }
 
 #[allow(clippy::needless_return)]
@@ -209,7 +259,7 @@ async fn status(State(st): State<AppState>, Query(params): Query<HashMap<String,
             .status(StatusCode::OK)
             .header("Content-Type", "application/json")
             .body(Body::from(format!("{}", r)))
-            .unwrap();
+            .unwrap_or_else(|_| (StatusCode::INTERNAL_SERVER_ERROR, "Internal Server Error\n").into_response());
     }
     if params.contains_key("all") {
         let resp = upstreams_to_json(&st.current_upstreams);
@@ -219,29 +269,17 @@ async fn status(State(st): State<AppState>, Query(params): Query<HashMap<String,
                     .status(StatusCode::OK)
                     .header("Content-Type", "application/json")
                     .body(Body::from(j))
-                    .unwrap()
+                    .unwrap_or_else(|_| (StatusCode::INTERNAL_SERVER_ERROR, "Internal Server Error\n").into_response());
-            }
-            Err(e) => {
-                return Response::builder()
-                    .status(StatusCode::INTERNAL_SERVER_ERROR)
-                    .body(Body::from(format!("Failed to get status: {}", e)))
-                    .unwrap();
             }
+            Err(e) => return (StatusCode::BAD_GATEWAY, format!("Internal Server Error {}\n", e)).into_response(),
         }
     }
-    Response::builder()
+    (StatusCode::INTERNAL_SERVER_ERROR, "Parameter mismatch\n").into_response()
-        .status(StatusCode::INTERNAL_SERVER_ERROR)
-        .body(Body::from("Parameter mismatch"))
-        .unwrap()
 }
 
 pub async fn port_is_available(name: &str, address: &str) -> TcpListener {
     let addr = SocketAddr::from_str(address).unwrap_or_else(|e| panic!("{}: Invalid address format: {:?}", name, e));
     let t = Duration::from_secs(2);
-
-    //if addr.ip() == IpAddr::V4(Ipv4Addr::UNSPECIFIED) {
-    //    addr.set_ip(IpAddr::V4(Ipv4Addr::LOCALHOST));
-    //}
     let p = addr.port();
     loop {
         match TcpListener::bind(addr).await {

src/ingress/consul.rs

@@ -1,7 +1,9 @@
+use crate::ingress::kuberconsul;
+use crate::ingress::kuberconsul::{ServiceDiscovery, list_to_upstreams};
 use crate::utils::httpclient;
-use crate::utils::kuberconsul::{list_to_upstreams, ServiceDiscovery};
 use crate::utils::parceyaml::build_headers;
-use crate::utils::structs::{Configuration, GlobalServiceMapping, UpstreamsDashMap};
+use crate::utils::tools::Die;
+use crate::utils::types::{Configuration, GlobalServiceMapping, UpstreamsDashMap};
 use async_trait::async_trait;
 use dashmap::DashMap;
 use pingora::prelude::sleep;
@@ -37,7 +39,7 @@ impl ServiceDiscovery for ConsulDiscovery {
                 });
                 let end = servers.len().saturating_sub(1);
                 let num = if end > 0 { rand::rng().random_range(0..end) } else { 0 };
-                let consul_data = servers.get(num).unwrap().to_string();
+                let consul_data = servers.get(num).die("Reading consul data").to_string();
                 let ss = format!("{}/v1/catalog/service/", consul_data);
                 let dc = format!("{}/v1/catalog/services?filter=%22aralez.service=yes%22+in+ServiceTags", consul_data);
 
@@ -81,7 +83,7 @@ impl ServiceDiscovery for ConsulDiscovery {
                 }
             }
 
-            if let Some(lt) = crate::utils::kuberconsul::clone_compare(&upstreams, &config).await {
+            if let Some(lt) = kuberconsul::clone_compare(&upstreams, &config).await {
                 let _ = toreturn.send(lt).await;
             }
 

src/ingress/discovery.rs

@@ -1,9 +1,9 @@
-use crate::utils::consul::ConsulDiscovery;
+use crate::core::webserver;
-use crate::utils::filewatch;
+use crate::ingress::consul::ConsulDiscovery;
-use crate::utils::kuberconsul::ServiceDiscovery;
+use crate::ingress::kuberconsul::ServiceDiscovery;
-use crate::utils::kubernetes::KubernetesDiscovery;
+use crate::ingress::kubernetes::KubernetesDiscovery;
-use crate::utils::structs::{Configuration, UpstreamsDashMap};
+use crate::utils::types::{Configuration, UpstreamsDashMap};
-use crate::web::webserver;
+use crate::utils::watch;
 use async_trait::async_trait;
 use std::sync::Arc;
 use tokio::sync::mpsc::Sender;
@@ -12,6 +12,7 @@ pub struct APIUpstreamProvider {
     pub config_api_enabled: bool,
     pub address: String,
     pub masterkey: Option<String>,
+    pub acme_dns_provider: Option<String>,
     pub certs_dir: String,
     pub config_dir: String,
     pub upstreams_file: String,
@@ -48,7 +49,7 @@ impl Discovery for APIUpstreamProvider {
 #[async_trait]
 impl Discovery for FromFileProvider {
     async fn start(&self, tx: Sender<Configuration>) {
-        tokio::spawn(filewatch::start(self.path.clone(), tx));
+        tokio::spawn(watch::file_watch(self.path.clone(), tx));
     }
 }
 

src/ingress/kuberconsul.rs

@@ -1,9 +1,9 @@
-use crate::utils::structs::{Configuration, GlobalServiceMapping, InnerMap, UpstreamsDashMap};
+use crate::utils::tools::{Die, clone_dashmap_into, compare_dashmaps, print_upstreams};
-use crate::utils::tools::{clone_dashmap_into, compare_dashmaps, print_upstreams};
+use crate::utils::types::{Configuration, GlobalServiceMapping, InnerMap, UpstreamsDashMap};
 use async_trait::async_trait;
 use dashmap::DashMap;
-use std::sync::atomic::AtomicUsize;
 use std::sync::Arc;
+use std::sync::atomic::AtomicUsize;
 use tokio::fs::File;
 use tokio::io::AsyncReadExt;
 use tokio::sync::mpsc::Sender;
@@ -31,9 +31,9 @@ pub fn match_path(conf: &GlobalServiceMapping, upstreams: &DashMap<Arc<str>, (Ve
 }
 
 pub async fn read_token(path: &str) -> String {
-    let mut file = File::open(path).await.unwrap();
+    let mut file = File::open(path).await.die("Reading kubernetes token");
     let mut contents = String::new();
-    file.read_to_string(&mut contents).await.unwrap();
+    file.read_to_string(&mut contents).await.die("Kubernetes token to string");
     contents.trim().to_string()
 }
 

src/ingress/kubernetes.rs

@@ -1,7 +1,6 @@
 use crate::utils::httpclient;
-use crate::utils::kubewatcher::{start_ingress_watcher_with_config, AralezRouteUpdate};
 use crate::utils::parceyaml::build_headers;
-use crate::utils::structs::{Configuration, GlobalServiceMapping, UpstreamsDashMap};
+use crate::utils::types::{Configuration, GlobalServiceMapping, UpstreamsDashMap};
 use async_trait::async_trait;
 use dashmap::DashMap;
 use log::error;
@@ -9,9 +8,12 @@ use rand::RngExt;
 use std::env;
 use std::sync::Arc;
 
-use crate::utils::kuberconsul::{clone_compare, list_to_upstreams, ServiceDiscovery};
+use crate::ingress::kuberconsul;
-use rustls::crypto::ring::default_provider;
+use crate::ingress::kuberconsul::{ServiceDiscovery, clone_compare, list_to_upstreams};
+use crate::ingress::kubewatcher::{AralezRouteUpdate, start_ingress_watcher_with_config};
+use crate::utils::tools::Die;
 use rustls::crypto::CryptoProvider;
+use rustls::crypto::ring::default_provider;
 use tokio::sync::mpsc::Sender;
 
 #[derive(Debug, serde::Deserialize)]
@@ -65,12 +67,12 @@ impl ServiceDiscovery for KubernetesDiscovery {
 
             let end = servers.len().saturating_sub(1);
             let num = if end > 0 { rand::rng().random_range(0..end) } else { 0 };
-            let server = servers.get(num).unwrap().to_string();
+            let server = servers.get(num).die("Getting k8s api server").to_string();
             let path = kuber.tokenpath.unwrap_or_else(|| "/var/run/secrets/kubernetes.io/serviceaccount/token".to_string());
-            let token = crate::utils::kuberconsul::read_token(path.as_str()).await;
+            let token = kuberconsul::read_token(path.as_str()).await;
 
             if CryptoProvider::get_default().is_none() {
-                default_provider().install_default().expect("Failed to install rustls crypto provider");
+                default_provider().install_default().die("Failed to install rustls crypto provider");
             }
 
             let (tx, mut rx) = tokio::sync::mpsc::channel::<AralezRouteUpdate>(100);

src/ingress/kubewatcher.rs

@@ -107,7 +107,7 @@ async fn process_ingress_change(client: &Client, ing: &Ingress, target_class: &s
                 let key_clone = key.clone();
                 tokio::spawn(async move {
                     if let Err(e) = patch_ingress_status_address(&client_clone, &ns_clone, &name_clone, &external_ip).await {
-                        error!("Failed to patch ingress status address {}/{}: {}", &ns_clone, &name_clone, e);
+                        error!("Failed to patch ingress status address {}/{}: {}", ns_clone, name_clone, e);
                         PATCHED_INGRESSES.remove(&key_clone);
                     }
                 });

src/ingress/mod.rs

@@ -0,0 +1,7 @@
+pub mod consul;
+pub mod discovery;
+pub mod kuberconsul;
+pub mod kubernetes;
+pub mod kubewatcher;
+
+pub use discovery::*;

src/lib.rs

@@ -0,0 +1,7 @@
+pub mod auth;
+pub mod cache;
+pub mod core;
+pub mod ingress;
+pub mod logging;
+pub mod tls;
+pub mod utils;

src/logging/core.rs

@@ -0,0 +1,337 @@
+use crate::logging::types::start_logging_backend;
+use crate::utils::metrics::LOGGING_ERRORS;
+use crate::utils::tools::Die;
+use crate::utils::types::AppConfig;
+use anyhow::Result;
+use log::{Level, LevelFilter, Record, error, info, log};
+use log4rs::append::Append;
+use log4rs::append::rolling_file::RollingFileAppender;
+use log4rs::append::rolling_file::policy::compound::CompoundPolicy;
+use log4rs::append::rolling_file::policy::compound::roll::fixed_window::FixedWindowRoller;
+use log4rs::append::rolling_file::policy::compound::trigger::size::SizeTrigger;
+use log4rs::config::Logger;
+use log4rs::{
+    append::console::ConsoleAppender,
+    config::{Appender, Config as Log4rsConfig, Root},
+    encode::pattern::PatternEncoder,
+};
+use pingora_cache::CachePhase;
+use pingora_http::Version;
+use pingora_proxy::Session;
+use serde::Serialize;
+use std::cell::RefCell;
+use std::fmt::Write;
+use std::net::{IpAddr, Ipv4Addr};
+use std::sync::OnceLock;
+use tokio::sync::mpsc;
+
+#[derive(Debug)]
+pub struct LogMessage {
+    pub response_code: u16,
+    pub summary: String,
+    pub client_ip: IpAddr,
+    pub version: Version,
+    pub user_agent: String,
+    pub cache_status: CachePhase,
+}
+
+#[derive(Debug, Serialize, Clone)]
+pub struct StructuredSystemLog {
+    pub target: &'static str,
+    pub level: Level,
+    pub message: String,
+}
+thread_local! {
+    static LOG_BUF: RefCell<String> = RefCell::new(String::with_capacity(512));
+}
+
+static ACCESS_LOG_SENDER: OnceLock<mpsc::Sender<LogMessage>> = OnceLock::new();
+pub(crate) static SYSTEM_LOG_SENDER: OnceLock<mpsc::Sender<StructuredSystemLog>> = OnceLock::new();
+static ACCESS_LOG: OnceLock<LogLevel> = OnceLock::new();
+const LOG_BUFFER: usize = 16384;
+static IS_STRUCTURED: OnceLock<bool> = OnceLock::new();
+static LOG_BACKEND: OnceLock<&'static str> = OnceLock::new();
+
+pub fn set_backend(key: String) -> Result<(), &'static str> {
+    let static_key: &'static str = Box::leak(key.into_boxed_str());
+    LOG_BACKEND.set(static_key).map_err(|_| "LOG_BACKEND was already initialized!")
+}
+
+pub fn get_backend() -> &'static str {
+    LOG_BACKEND.get().copied().unwrap_or("system")
+}
+
+#[derive(Debug)]
+pub struct StructuredChannelAppender {
+    sender: mpsc::Sender<StructuredSystemLog>,
+}
+
+impl StructuredChannelAppender {
+    pub fn new(sender: mpsc::Sender<StructuredSystemLog>) -> Self {
+        Self { sender }
+    }
+}
+
+impl Append for StructuredChannelAppender {
+    fn append(&self, record: &Record) -> Result<()> {
+        let message = LOG_BUF.with(|buf| {
+            let mut b = buf.borrow_mut();
+            b.clear();
+            let _ = write!(&mut *b, "{}", record.args());
+            b.clone()
+        });
+
+        let target: &'static str = unsafe { std::mem::transmute(record.target()) };
+
+        let msg = StructuredSystemLog {
+            target,
+            level: record.level(),
+            message,
+        };
+
+        let _ = self.sender.try_send(msg);
+        Ok(())
+    }
+
+    fn flush(&self) {}
+}
+pub async fn log_builder(conf: &AppConfig, location: &Option<String>) {
+    let log_level = match conf.log_level.as_str() {
+        "info" => LevelFilter::Info,
+        "error" => LevelFilter::Error,
+        "warn" => LevelFilter::Warn,
+        "debug" => LevelFilter::Debug,
+        "trace" => LevelFilter::Trace,
+        "off" => LevelFilter::Off,
+        _ => {
+            println!("Error reading log level, defaulting to: INFO");
+            LevelFilter::Info
+        }
+    };
+
+    let mut pat: String = "{d(%Y-%m-%d %H:%M:%S)} {l} - {m} {n}".to_string();
+
+    if let Some(ptrn) = conf.log_pattern.clone() {
+        pat = ptrn;
+    }
+    let pattern = pat.as_str();
+
+    if let Some(backend) = conf.log_structured.as_deref() {
+        if let Some(backend_name) = backend.split_whitespace().next() {
+            let _ = set_backend(backend_name.to_string());
+            init_structured_log().await;
+        }
+        let syslog_appender: Option<Box<dyn Append>> = SYSTEM_LOG_SENDER
+            .get()
+            .cloned()
+            .map(|sender| Box::new(StructuredChannelAppender::new(sender)) as Box<dyn Append>);
+
+        let stdout = ConsoleAppender::builder().encoder(Box::new(PatternEncoder::new(pattern))).build();
+
+        let mut config_builder = Log4rsConfig::builder().appender(Appender::builder().build("stdout", Box::new(stdout)));
+
+        if let Some(appender) = syslog_appender {
+            config_builder = config_builder
+                .appender(Appender::builder().build("syslog_appender", appender))
+                .logger(Logger::builder().appender("syslog_appender").additive(false).build("pingora_proxy", log_level))
+                .logger(Logger::builder().appender("syslog_appender").additive(false).build("pingora_core", log_level))
+                .logger(Logger::builder().appender("syslog_appender").additive(false).build("pingora_pool", log_level))
+                .logger(Logger::builder().appender("syslog_appender").additive(false).build("pingora_cache", log_level))
+                .logger(Logger::builder().appender("syslog_appender").additive(false).build("hyper_util", log_level))
+                .logger(Logger::builder().appender("syslog_appender").additive(false).build("aralez", log_level))
+                .logger(Logger::builder().appender("syslog_appender").additive(false).build("h2", log_level));
+        } else {
+            config_builder = config_builder
+                .logger(Logger::builder().build("pingora_core", LevelFilter::Off))
+                .logger(Logger::builder().build("pingora_pool", LevelFilter::Off))
+                .logger(Logger::builder().build("pingora_cache", LevelFilter::Off))
+                .logger(Logger::builder().build("hyper_util", LevelFilter::Off))
+                .logger(Logger::builder().build("aralez", LevelFilter::Off))
+                .logger(Logger::builder().build("h2", LevelFilter::Off));
+        }
+
+        let config = config_builder.build(Root::builder().appender("stdout").build(log_level)).die("Logging config builder");
+
+        if let Err(e) = log4rs::init_config(config) {
+            eprintln!("Warning: log4rs logger already initialized: {:?}", e);
+        }
+        info!("Enabling structured logging with backend : {}", backend);
+        let _ = IS_STRUCTURED.set(true);
+        return;
+    }
+    if let Some(location) = location {
+        let parts: Vec<&str> = location.split(',').map(|s| s.trim()).collect();
+        let path = match parts.first().filter(|s| !s.is_empty()) {
+            Some(p) => p,
+            None => {
+                error!("Invalid log location string provided; falling back to stdout");
+                return;
+            }
+        };
+
+        let compress = parts.get(3).unwrap_or(&"No");
+        let size_mb: u64 = parts.get(1).and_then(|s| s.parse().ok()).unwrap_or(100);
+        let keep: u32 = parts.get(2).and_then(|s| s.parse().ok()).unwrap_or(5);
+
+        let pattern_str = match compress {
+            &"compress" => format!("{}.{{}}.gz", path),
+            _ => format!("{}.{{}}", path),
+        };
+
+        let roller = FixedWindowRoller::builder().build(pattern_str.as_str(), keep).die("Logging roller builder");
+        let trigger = SizeTrigger::new(size_mb * 1024 * 1024);
+        let policy = CompoundPolicy::new(Box::new(trigger), Box::new(roller));
+
+        let file = match RollingFileAppender::builder().encoder(Box::new(PatternEncoder::new(pattern))).build(path, Box::new(policy)) {
+            Ok(f) => f,
+            Err(e) => {
+                error!("Failed to create log file at {}: {}. Falling back to stdout.", path, e);
+                return;
+            }
+        };
+
+        let config = Log4rsConfig::builder()
+            .appender(Appender::builder().build("file", Box::new(file)))
+            .logger(Logger::builder().build("pingora_proxy", LevelFilter::Off))
+            .build(Root::builder().appender("file").build(log_level))
+            .die("Parsing Lo4rsConfig");
+        if let Err(e) = log4rs::init_config(config) {
+            eprintln!("Warning: log4rs logger already initialized: {:?}", e);
+        }
+        info!("Logging to: {}, Max file size: {}mb, Files to keep: {}, compression: {} ", path, size_mb, keep, compress);
+    } else {
+        let stdout = ConsoleAppender::builder().encoder(Box::new(PatternEncoder::new(pattern))).build();
+        let config = Log4rsConfig::builder()
+            .appender(Appender::builder().build("stdout", Box::new(stdout)))
+            .logger(Logger::builder().build("pingora_proxy", LevelFilter::Off))
+            .build(Root::builder().appender("stdout").build(log_level))
+            .die("Parsing Lo4rsConfig");
+        if let Err(e) = log4rs::init_config(config) {
+            eprintln!("Warning: log4rs logger already initialized: {:?}", e);
+        }
+        info!("No files are configured, logging to stdout");
+    }
+}
+
+pub async fn init_access_log(level_str: &str) {
+    let level = LogLevel::parse(level_str);
+    let _ = ACCESS_LOG.set(level);
+}
+
+#[derive(Debug)]
+pub enum LogLevel {
+    Access,
+    Error,
+    None,
+}
+
+impl LogLevel {
+    pub fn parse(s: &str) -> Self {
+        match s {
+            "all" => LogLevel::Access,
+            "error" => LogLevel::Error,
+            _ => LogLevel::None,
+        }
+    }
+}
+
+#[derive(Debug)]
+pub enum MatchStatus {
+    Ok2xx,
+    Er4xx,
+    Er5xx,
+}
+
+impl MatchStatus {
+    #[inline]
+    pub fn from_code(code: u16) -> Self {
+        match code {
+            100..=399 => Self::Ok2xx,
+            400..=499 => Self::Er4xx,
+            _ => Self::Er5xx,
+        }
+    }
+}
+
+pub async fn access_log(response_code: u16, summary: &str, session: &Session) {
+    let level = ACCESS_LOG.get().unwrap_or(&LogLevel::None);
+    let status = MatchStatus::from_code(response_code);
+
+    let should_log = match level {
+        LogLevel::Access => true,
+        LogLevel::None => false,
+        LogLevel::Error => matches!(status, MatchStatus::Er5xx),
+    };
+
+    if !should_log {
+        return;
+    }
+
+    let ip = session
+        .client_addr()
+        .and_then(|addr| addr.as_inet())
+        .map(|addr| addr.ip())
+        .unwrap_or(IpAddr::V4(Ipv4Addr::LOCALHOST));
+
+    let user_agent = session.req_header().headers.get("user-agent").and_then(|v| v.to_str().ok()).unwrap_or("-");
+
+    let msg = LogMessage {
+        response_code,
+        summary: summary.to_owned(),
+        client_ip: ip,
+        version: session.req_header().version,
+        user_agent: user_agent.to_owned(),
+        cache_status: session.cache.phase(),
+    };
+
+    if IS_STRUCTURED.get().is_some() {
+        write_access_log(&msg).await;
+        return;
+    }
+    if let Some(sender) = ACCESS_LOG_SENDER.get() {
+        if sender.try_send(msg).is_err() {
+            LOGGING_ERRORS.inc();
+        }
+    }
+}
+
+pub async fn init_access_logging(enabled: Option<String>) {
+    if enabled.is_some() {
+        LOGGING_ERRORS.set(0);
+        info!("Enabling {:?} log, with buffer of {} messages", ACCESS_LOG.get().unwrap_or(&LogLevel::None), LOG_BUFFER);
+        let (ltx, lrx) = mpsc::channel(LOG_BUFFER);
+        let _ = ACCESS_LOG_SENDER.set(ltx);
+        tokio::spawn(async move { access_log_receiver(lrx).await });
+    }
+}
+
+pub async fn init_structured_log() {
+    let (tx, rx) = mpsc::channel::<StructuredSystemLog>(LOG_BUFFER);
+    let _ = SYSTEM_LOG_SENDER.set(tx);
+    let backend = get_backend();
+    start_logging_backend(backend, rx);
+}
+
+pub async fn access_log_receiver(mut receiver: mpsc::Receiver<LogMessage>) {
+    while let Some(msg) = receiver.recv().await {
+        write_access_log(&msg).await;
+    }
+}
+
+async fn write_access_log(msg: &LogMessage) {
+    let level = match MatchStatus::from_code(msg.response_code) {
+        MatchStatus::Ok2xx => Level::Info,
+        MatchStatus::Er4xx => Level::Warn,
+        MatchStatus::Er5xx => Level::Error,
+    };
+    log!(
+        level,
+        "{}, {}, {}, client: {}, version: {:?}, useragent: {}",
+        msg.response_code,
+        msg.cache_status.as_str(),
+        msg.summary,
+        msg.client_ip,
+        msg.version,
+        msg.user_agent,
+    );
+}

src/logging/elasticsearch.rs

@@ -0,0 +1,187 @@
+use crate::logging::core::StructuredSystemLog;
+use crate::logging::types::{LogBackendPlugin, WriteLog};
+use crate::utils::tools::get_hostname;
+use async_trait::async_trait;
+use bytes::{BufMut, BytesMut};
+use elasticsearch::auth::Credentials;
+use elasticsearch::http::transport::Transport;
+use elasticsearch::{BulkParts, Elasticsearch};
+use humantime::format_rfc3339;
+use serde_json::json;
+use std::env;
+use std::sync::LazyLock;
+use std::time::{Duration, SystemTime};
+use tokio::sync::mpsc;
+use tokio::sync::OnceCell;
+
+static CLIENT: OnceCell<Elasticsearch> = OnceCell::const_new();
+
+#[derive(Debug)]
+struct ElasticHost {
+    url: &'static str,
+}
+
+struct ElasticSearchConfig {
+    pub hosts: &'static [ElasticHost],
+    pub user: &'static str,
+    pub password: &'static str,
+    pub hostname: &'static str,
+    pub index_name: &'static str,
+    pub flush_duration: u64,
+    pub batch_len: usize,
+    pub buffer_size: usize,
+}
+
+static ELASTIC: LazyLock<ElasticSearchConfig> = LazyLock::new(ElasticSearchConfig::load_from_env);
+
+impl ElasticSearchConfig {
+    pub fn load_from_env() -> Self {
+        let raw_hosts = env::var("LOG_ELASTIC_HOSTS").unwrap_or_else(|_| "http://127.0.0.1:9200".to_string());
+
+        let mut hosts_struct = Vec::new();
+
+        for entry in raw_hosts.split(',') {
+            let entry = entry.trim();
+            if entry.is_empty() {
+                continue;
+            }
+
+            let (scheme, rest) = if let Some(stripped) = entry.strip_prefix("https://") {
+                ("https", stripped)
+            } else if let Some(stripped) = entry.strip_prefix("http://") {
+                ("http", stripped)
+            } else {
+                ("http", entry)
+            };
+
+            let (address, port) = match rest.split_once(':') {
+                Some((host_part, port_part)) => {
+                    let port = port_part.parse::<u16>().unwrap_or(9200);
+                    (host_part, port)
+                }
+                None => (rest, 9200),
+            };
+
+            let full_url = format!("{}://{}:{}", scheme, address, port);
+
+            hosts_struct.push(ElasticHost {
+                url: Box::leak(full_url.into_boxed_str()),
+            });
+        }
+
+        let user = env::var("LOG_ELASTIC_USER").unwrap_or_else(|_| "elastic".to_string());
+        let password = env::var("LOG_ELASTIC_PASSWORD").unwrap_or_else(|_| "elastic".to_string());
+        let index_name = env::var("LOG_ELASTIC_INDEX").unwrap_or_else(|_| "aralez-logs".to_string());
+        let s_flush_duration = env::var("LOG_ELASTIC_FLUSH_DURATION").unwrap_or_else(|_| "2".to_string());
+        let flush_duration = s_flush_duration.parse::<u64>().unwrap_or(2);
+        let s_batch_len = env::var("LOG_ELASTIC_BATCH_LEN").unwrap_or_else(|_| "200".to_string());
+        let batch_len = s_batch_len.parse::<usize>().unwrap_or(200);
+        let buffer_size: usize = 100 * 512;
+
+        Self {
+            hosts: Box::leak(hosts_struct.into_boxed_slice()),
+            user: Box::leak(user.into_boxed_str()),
+            password: Box::leak(password.into_boxed_str()),
+            flush_duration,
+            batch_len,
+            buffer_size,
+            hostname: Box::leak(get_hostname().into_boxed_str()),
+            index_name: Box::leak(index_name.into_boxed_str()),
+        }
+    }
+}
+
+async fn make_es_pool() -> Elasticsearch {
+    let valid_urls: Vec<&str> = ELASTIC.hosts.iter().map(|target| target.url).collect();
+    if valid_urls.is_empty() {
+        log::error!("No valid Elasticsearch host URLs found in configuration");
+        return Elasticsearch::default();
+    }
+    let transport = match Transport::sniffing_node_list(valid_urls, Duration::from_secs(180)) {
+        Ok(t) => t,
+        Err(e) => {
+            log::error!("Failed to create sniffing transport: {}", e);
+            return Elasticsearch::default();
+        }
+    };
+    let credentials = Credentials::Basic(ELASTIC.user.to_string(), ELASTIC.password.to_string());
+    transport.set_auth(credentials);
+    let client = Elasticsearch::new(transport);
+    if let Ok(res) = client.ping().send().await {
+        if res.status_code().is_success() {
+            log::info!("Elasticsearch sniffing pool initialized successfully");
+            return client;
+        }
+    }
+    log::warn!("Elasticsearch pool initialized, but cluster ping returned non-200");
+    client
+}
+
+struct ElasticSearch;
+
+#[async_trait]
+impl WriteLog for ElasticSearch {
+    async fn run(&self, mut rx: mpsc::Receiver<StructuredSystemLog>) {
+        let mut batch = Vec::with_capacity(ELASTIC.batch_len);
+        let mut timer = tokio::time::interval(Duration::from_secs(ELASTIC.flush_duration));
+        let mut buffer = BytesMut::with_capacity(ELASTIC.buffer_size);
+        let index_header = format!("{{\"index\":{{\"_index\":\"{}\"}}}}\n", ELASTIC.index_name).into_bytes();
+
+        loop {
+            tokio::select! {
+                Some(msg) = rx.recv() => {
+                    batch.push(msg);
+                    if batch.len() >= ELASTIC.batch_len {
+                        flush_to_es(&mut batch, &mut buffer, &index_header, ELASTIC.hostname).await;
+                    }
+                }
+                _ = timer.tick() => {
+                    if !batch.is_empty() {
+                        flush_to_es(&mut batch, &mut buffer, &index_header, ELASTIC.hostname).await;
+                    }
+                }
+            }
+        }
+    }
+}
+
+async fn flush_to_es(batch: &mut Vec<StructuredSystemLog>, buffer: &mut BytesMut, index_header: &[u8], hostname: &str) {
+    buffer.clear();
+
+    for msg in batch.drain(..) {
+        buffer.extend_from_slice(index_header);
+
+        let logstash_payload = json!({
+            "@timestamp": format_rfc3339(SystemTime::now()).to_string(),
+            "@version": "1",
+            "log": {
+                "level": msg.level,
+                "logger": msg.target,
+            },
+            "message": msg.message,
+            "host": {
+                "hostname": hostname,
+            }
+        });
+
+        if serde_json::to_writer((buffer).writer(), &logstash_payload).is_ok() {
+            buffer.extend_from_slice(b"\n");
+        }
+    }
+
+    if buffer.is_empty() {
+        return;
+    }
+
+    let payload = buffer.split().freeze();
+    let client = CLIENT.get_or_init(make_es_pool).await;
+
+    let _ = client.bulk(BulkParts::None).body(vec![payload]).send().await;
+}
+
+inventory::submit! {
+    LogBackendPlugin {
+        name: "elasticsearch",
+        factory: || Box::new(ElasticSearch),
+    }
+}

src/logging/example.rs

@@ -0,0 +1,22 @@
+use crate::logging::core::StructuredSystemLog;
+use crate::logging::types::{LogBackendPlugin, WriteLog};
+use async_trait::async_trait;
+use tokio::sync::mpsc;
+
+pub struct Example;
+
+#[async_trait]
+impl WriteLog for Example {
+    async fn run(&self, mut rx: mpsc::Receiver<StructuredSystemLog>) {
+        while let Some(msg) = rx.recv().await {
+            println!("Sending log Example : {:?}", msg);
+        }
+    }
+}
+
+inventory::submit! {
+    LogBackendPlugin {
+        name: "example",
+        factory: || Box::new(Example),
+    }
+}

src/logging/mod.rs

@@ -0,0 +1,4 @@
+pub mod core;
+pub mod elasticsearch;
+pub mod example;
+pub mod types;

src/logging/types.rs

@@ -0,0 +1,36 @@
+use crate::logging::core::StructuredSystemLog;
+use async_trait::async_trait;
+use std::collections::HashMap;
+use std::sync::LazyLock;
+use tokio::sync::mpsc;
+
+#[async_trait]
+pub trait WriteLog: Send + Sync {
+    async fn run(&self, rx: mpsc::Receiver<StructuredSystemLog>);
+}
+
+pub struct LogBackendPlugin {
+    pub name: &'static str,
+    pub factory: fn() -> Box<dyn WriteLog>,
+}
+
+inventory::collect!(LogBackendPlugin);
+
+static BACKENDS: LazyLock<HashMap<&'static str, Box<dyn WriteLog>>> = LazyLock::new(|| {
+    let mut map = HashMap::new();
+    for plugin in inventory::iter::<LogBackendPlugin> {
+        map.insert(plugin.name, (plugin.factory)());
+    }
+    map
+});
+
+pub fn start_logging_backend(backend: &str, rx: mpsc::Receiver<StructuredSystemLog>) {
+    if let Some(logger) = BACKENDS.get(backend) {
+        let logger_ref = logger.as_ref();
+        tokio::spawn(async move {
+            logger_ref.run(rx).await;
+        });
+    } else {
+        log::warn!("Unsupported logging mechanism: {}", backend);
+    }
+}

src/main.rs

@@ -1,6 +1,4 @@
-mod tls;
+use aralez::core;
-mod utils;
-mod web;
 
 #[global_allocator]
 static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
@@ -12,5 +10,5 @@ fn main() {
         std::process::exit(0);
     }
 
-    web::start::run();
+    core::start::run();
 }

src/tls/acme.rs

@@ -1,2 +0,0 @@
-pub mod account;
-pub mod order;

src/tls/acme/dns/cloudflare.rs

@@ -0,0 +1,75 @@
+use crate::tls::acme::lookup::lookup_wait;
+use crate::tls::acme::types::{DnsBackendPlugin, DnsProvider};
+use crate::utils::tools::Die;
+use log::info;
+use reqwest::Client;
+use serde_json::json;
+
+pub struct CloudflareProvider {
+    pub client: Client,
+    pub api_token: String,
+    pub zone_id: String,
+}
+
+impl CloudflareProvider {
+    pub fn new() -> Self {
+        let api_token = std::env::var("CLOUDFLARE_API_TOKEN").die("Environment variable CLOUDFLARE_API_TOKEN is required");
+        let zone_id = std::env::var("CLOUDFLARE_ZONE_ID").die("Environment variable CLOUDFLARE_ZONE_ID is required");
+
+        Self {
+            client: Client::new(),
+            api_token,
+            zone_id,
+        }
+    }
+}
+
+#[async_trait::async_trait]
+impl DnsProvider for CloudflareProvider {
+    async fn create_txt_record(&self, _domain: &str, name: &str, value: &str) -> Result<String, Box<dyn std::error::Error + Send + Sync>> {
+        let url = format!("https://api.cloudflare.com/client/v4/zones/{}/dns_records", self.zone_id);
+
+        let response = self
+            .client
+            .post(&url)
+            .bearer_auth(&self.api_token)
+            .json(&json!({
+                "type": "TXT",
+                "name": name,
+                "content": value,
+                "ttl": 120,
+            }))
+            .send()
+            .await?;
+
+        let res_json: serde_json::Value = response.json().await?;
+        if !res_json["success"].as_bool().unwrap_or(false) {
+            return Err(format!("Cloudflare API error: {:?}", res_json["errors"]).into());
+        }
+
+        let record_id = res_json["result"]["id"].as_str().ok_or("missing id")?.to_string();
+        info!("Created TXT record name: {}, id: {}", name, record_id);
+        lookup_wait(name, Some("1.1.1.1"), 60, value).await;
+        Ok(record_id)
+    }
+
+    async fn delete_txt_record(&self, record_id: &str, record_name: &str) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
+        let url = format!("https://api.cloudflare.com/client/v4/zones/{}/dns_records/{}", self.zone_id, record_id);
+
+        let response = self.client.delete(&url).bearer_auth(&self.api_token).send().await?;
+
+        let res_json: serde_json::Value = response.json().await?;
+        if !res_json["success"].as_bool().unwrap_or(false) {
+            return Err(format!("Cloudflare API error deleting record: {:?}", res_json["errors"]).into());
+        }
+        info!("Deleted TXT record name: {}, id: {}", record_name, record_id);
+        Ok(())
+    }
+}
+
+inventory::submit! {
+    DnsBackendPlugin {
+        name: "cloudflare",
+        factory: || Box::new(CloudflareProvider::new()),
+    }
+}

src/tls/acme/dns/digitalocean.rs

@@ -0,0 +1,71 @@
+use crate::tls::acme::lookup::lookup_wait;
+use crate::tls::acme::types::{DnsBackendPlugin, DnsProvider};
+use crate::utils::tools::Die;
+use async_trait::async_trait;
+use log::info;
+use serde_json::json;
+use std::env;
+
+pub struct DigitalOceanProvider {
+    token: String,
+    client: reqwest::Client,
+}
+
+impl DigitalOceanProvider {
+    pub fn new() -> Self {
+        let token = env::var("DIGITALOCEAN_TOKEN").die("Environment variable DIGITALOCEAN_TOKEN is required");
+
+        Self {
+            token,
+            client: reqwest::Client::new(),
+        }
+    }
+}
+
+#[async_trait]
+impl DnsProvider for DigitalOceanProvider {
+    async fn create_txt_record(&self, domain: &str, name: &str, value: &str) -> Result<String, Box<dyn std::error::Error + Send + Sync>> {
+        let relative_name = name.strip_suffix(&format!(".{}", domain)).unwrap_or(name);
+        let url = format!("https://api.digitalocean.com/v2/domains/{}/records", domain);
+        let res = self
+            .client
+            .post(&url)
+            .bearer_auth(&self.token)
+            .json(&json!({
+                "type": "TXT",
+                "name": relative_name,
+                "data": value,
+                "ttl": 30
+            }))
+            .send()
+            .await?;
+
+        if !res.status().is_success() {
+            let err_text = res.text().await?;
+            return Err(format!("DigitalOcean API error: {}", err_text).into());
+        }
+
+        let json: serde_json::Value = res.json().await?;
+        let record_id = json["domain_record"]["id"].as_i64().ok_or("Missing record ID in DigitalOcean response")?.to_string();
+        info!("Created TXT record name: {}, id: {}", name, record_id);
+        lookup_wait(name, Some("1.1.1.1"), 60, value).await;
+        Ok(record_id)
+    }
+
+    async fn delete_txt_record(&self, record_id: &str, domain: &str) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
+        let url = format!("https://api.digitalocean.com/v2/domains/{}/records/{}", domain, record_id);
+        let res = self.client.delete(&url).bearer_auth(&self.token).send().await?;
+        if !res.status().is_success() {
+            let err_text = res.text().await?;
+            return Err(format!("Failed to delete DigitalOcean record: {}", err_text).into());
+        }
+        Ok(())
+    }
+}
+
+inventory::submit! {
+    DnsBackendPlugin {
+        name: "digitalocean",
+        factory: || Box::new(DigitalOceanProvider::new()),
+    }
+}

src/tls/acme/dns/mod.rs

@@ -0,0 +1,3 @@
+pub mod cloudflare;
+pub mod digitalocean;
+pub mod route53;

src/tls/acme/dns/route53.rs

@@ -0,0 +1,130 @@
+// ------------------------ //
+// This file is vibecoded !
+// ------------------------ //
+
+use crate::tls::acme::lookup::lookup_wait;
+use crate::tls::acme::types::{DnsBackendPlugin, DnsProvider};
+use crate::utils::tools::Die;
+use aws_sdk_route53::Client;
+use aws_sdk_route53::types::{Change, ChangeAction, ChangeBatch, ResourceRecord, ResourceRecordSet, RrType};
+use log::info;
+use tokio::runtime::Handle;
+
+pub struct Route53Provider {
+    pub client: Client,
+    pub hosted_zone_id: String,
+}
+
+impl Route53Provider {
+    pub fn new() -> Self {
+        let hosted_zone_id = std::env::var("AWS_HOSTED_ZONE_ID").die("Environment variable AWS_HOSTED_ZONE_ID is required");
+
+        let config = if let Ok(handle) = Handle::try_current() {
+            // If we're inside a tokio runtime, we can block on it directly
+            handle.block_on(aws_config::load_from_env())
+        } else {
+            // If we're completely outside tokio, spin up a temporary current-thread runtime
+            tokio::runtime::Builder::new_current_thread()
+                .enable_all()
+                .build()
+                .die("Failed to create current-thread runtime")
+                .block_on(aws_config::load_from_env())
+        };
+
+        let client = Client::new(&config);
+        Self { client, hosted_zone_id }
+    }
+
+    pub async fn get_authoritative_ns_ip(&self) -> Option<String> {
+        // Query Route53 for the zone's details (includes assigned Name Servers)
+        let response = self.client.get_hosted_zone().id(&self.hosted_zone_id).send().await.ok()?;
+
+        // Pick the first name server assigned to this zone (e.g., "ns-1289.awsdns-29.org")
+        let ns_domain = response.delegation_set()?.name_servers().first()?;
+
+        // Resolve that nameserver's domain name to an IP address
+        let ips = tokio::net::lookup_host(format!("{}:53", ns_domain)).await.ok()?;
+
+        let ip = ips.into_iter().next()?.ip().to_string();
+        info!("Targeting Route53 authoritative NS {} ({}) for polling", ns_domain, ip);
+        Some(ip)
+    }
+}
+
+#[async_trait::async_trait]
+impl DnsProvider for Route53Provider {
+    async fn create_txt_record(&self, _domain: &str, name: &str, value: &str) -> Result<String, Box<dyn std::error::Error + Send + Sync>> {
+        // AWS Route53 requires TXT strings to be wrapped in double quotes
+        let formatted_value = format!("\"{}\"", value);
+
+        let change = Change::builder()
+            .action(ChangeAction::Upsert)
+            .resource_record_set(
+                ResourceRecordSet::builder()
+                    .name(name)
+                    .r#type(RrType::Txt)
+                    .ttl(60)
+                    .resource_records(ResourceRecord::builder().value(formatted_value).build()?)
+                    .build()?,
+            )
+            .build()?;
+
+        let change_batch = ChangeBatch::builder().changes(change).build()?;
+
+        let response = self
+            .client
+            .change_resource_record_sets()
+            .hosted_zone_id(&self.hosted_zone_id)
+            .change_batch(change_batch)
+            .send()
+            .await?;
+
+        let record_id = response.change_info().ok_or("Missing ChangeInfo in Route53 response")?.id().to_string();
+        info!("Created Route53 TXT record name: {}, change_id: {}", name, record_id);
+        let target_dns_ip = self.get_authoritative_ns_ip().await;
+        lookup_wait(name, target_dns_ip.as_deref(), 60, value).await;
+        Ok(record_id)
+    }
+
+    async fn delete_txt_record(&self, _record_id: &str, record_name: &str) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
+        // Since Route53 requires record value context to delete, we look up or pass existing TXT record values.
+        // For ACME cleanup, issuing a DELETE with wildcards/upsert strategy or direct deletion:
+        let list_res = self
+            .client
+            .list_resource_record_sets()
+            .hosted_zone_id(&self.hosted_zone_id)
+            .start_record_name(record_name)
+            .start_record_type(RrType::Txt)
+            .max_items(1)
+            .send()
+            .await?;
+
+        if let Some(record_set) = list_res.resource_record_sets().first() {
+            if record_set.name().trim_end_matches('.') == record_name.trim_end_matches('.') {
+                let change = Change::builder().action(ChangeAction::Delete).resource_record_set(record_set.clone()).build()?;
+
+                let change_batch = ChangeBatch::builder().changes(change).build()?;
+
+                self.client
+                    .change_resource_record_sets()
+                    .hosted_zone_id(&self.hosted_zone_id)
+                    .change_batch(change_batch)
+                    .send()
+                    .await?;
+
+                info!("Deleted Route53 TXT record name: {}", record_name);
+                return Ok(());
+            }
+        }
+
+        info!("Route53 TXT record name: {} already deleted or not found", record_name);
+        Ok(())
+    }
+}
+
+inventory::submit! {
+    DnsBackendPlugin {
+        name: "route53",
+        factory: || Box::new(Route53Provider::new()),
+    }
+}

src/tls/acme/http01.rs

@@ -1,44 +1,38 @@
+use crate::core::webserver;
 use crate::tls::acme::{account, order};
 use crate::utils::lazylock::CHALLENGES;
 use axum::body::Body;
 use axum::extract::State;
 use axum::http::{Response, StatusCode};
 use axum::response::IntoResponse;
-
 #[allow(clippy::needless_return)]
-pub async fn acme_create(State(state): State<crate::web::webserver::AppState>) -> impl IntoResponse {
+pub async fn acme_create(State(state): State<webserver::AppState>) -> impl IntoResponse {
     match account::load_or_create(state.cert_creds.as_str()).await {
         Ok(txt) => {
             return Response::builder()
                 .status(StatusCode::OK)
                 .header("Content-Type", "text/plain")
                 .body(Body::from(txt))
-                .unwrap()
+                .unwrap_or_else(|_| (StatusCode::INTERNAL_SERVER_ERROR, "Internal Server Error\n").into_response());
         }
         Err(e) => {
-            return Response::builder()
+            return (StatusCode::INTERNAL_SERVER_ERROR, format!("Failed to create account {}\n", e)).into_response();
-                .status(StatusCode::INTERNAL_SERVER_ERROR)
-                .body(Body::from(format!("Failed to create account: {}", e)))
-                .unwrap()
         }
     };
 }
 #[allow(clippy::needless_return)]
-pub async fn acme_order(State(state): State<crate::web::webserver::AppState>, axum::extract::Path(domain): axum::extract::Path<String>) -> impl IntoResponse {
+pub async fn acme_order(State(state): State<webserver::AppState>, axum::extract::Path(domain): axum::extract::Path<String>) -> impl IntoResponse {
     let domain_clean = domain.trim_matches('/');
-    match order::order(domain_clean, state.cert_creds.as_str(), state.certs_dir).await {
+    match order::order(domain_clean, state.cert_creds.as_str(), state.certs_dir, state.acme_dns_provider).await {
         Ok(txt) => {
             return Response::builder()
                 .status(StatusCode::OK)
                 .header("Content-Type", "text/plain")
                 .body(Body::from(txt))
-                .unwrap()
+                .unwrap_or_else(|_| (StatusCode::INTERNAL_SERVER_ERROR, "Internal Server Error\n").into_response());
         }
         Err(e) => {
-            return Response::builder()
+            return (StatusCode::INTERNAL_SERVER_ERROR, format!("Internal Server Error: {}\n", e)).into_response();
-                .status(StatusCode::INTERNAL_SERVER_ERROR)
-                .body(Body::from(format!("Failed to order a certificate: {}", e)))
-                .unwrap()
         }
     };
 }
@@ -49,12 +43,8 @@ pub async fn http01_challenge(axum::extract::Path(token): axum::extract::Path<St
                 .status(StatusCode::OK)
                 .header("Content-Type", "text/plain")
                 .body(Body::from(key_authorization.clone()))
-                .unwrap();
+                .unwrap_or_else(|_| (StatusCode::INTERNAL_SERVER_ERROR, "Internal Server Error\n").into_response());
         }
     }
-    Response::builder()
+    (StatusCode::NOT_FOUND, "Not found\n").into_response()
-        .status(StatusCode::NOT_FOUND)
-        .header("Content-Type", "text/plain")
-        .body(Body::from("Not found"))
-        .unwrap()
 }

src/tls/acme/lookup.rs

@@ -0,0 +1,46 @@
+use crate::utils::tools::Die;
+use hickory_resolver::TokioResolver;
+use hickory_resolver::config::{NameServerConfig, ResolverConfig, ResolverOpts};
+use hickory_resolver::net::runtime::TokioRuntimeProvider;
+use hickory_resolver::proto::rr::RData;
+use log::info;
+use std::net::IpAddr;
+use std::str::FromStr;
+use std::time::Duration;
+
+pub async fn lookup_wait(record_name: &str, dns_server_ip: Option<&str>, max_wait_secs: u64, expected_value: &str) -> bool {
+    let target_ip = dns_server_ip.and_then(|ip| IpAddr::from_str(ip).ok()).unwrap_or_else(|| IpAddr::from([1, 1, 1, 1]));
+    let name_server = NameServerConfig::udp(target_ip);
+    let config = ResolverConfig::from_name_servers(vec![name_server]);
+    let mut opts = ResolverOpts::default();
+    opts.cache_size = 0;
+
+    let resolver = TokioResolver::builder_with_config(config, TokioRuntimeProvider::default())
+        .with_options(opts)
+        .build()
+        .die("failed to build DNS resolver");
+
+    let start = std::time::Instant::now();
+    let poll_interval = Duration::from_secs(3);
+    while start.elapsed().as_secs() < max_wait_secs {
+        if let Ok(txt_lookup) = resolver.txt_lookup(record_name).await {
+            for record in txt_lookup.answers() {
+                if let RData::TXT(txt) = &record.data {
+                    for data in &txt.txt_data {
+                        if let Ok(txt_str) = std::str::from_utf8(data) {
+                            if txt_str == expected_value {
+                                tokio::time::sleep(Duration::from_secs(5)).await;
+                                info!("DNS record propagated successfully for {} : {}", record_name, txt_str);
+                                return true;
+                            }
+                        }
+                    }
+                }
+            }
+        } else {
+            info!("Waiting for TXT record {}", record_name);
+        }
+        tokio::time::sleep(poll_interval).await;
+    }
+    false
+}

src/tls/acme/mod.rs

@@ -0,0 +1,9 @@
+pub mod account;
+pub mod dns;
+pub mod http01;
+pub mod lookup;
+pub mod order;
+pub mod types;
+
+pub use account::*;
+pub use order::*;

src/tls/acme/order.rs

@@ -1,36 +1,38 @@
 use crate::tls::acme::account::get_account;
+use crate::tls::acme::types::get_provider;
 use crate::utils::lazylock::CHALLENGES;
-use crate::utils::parceyaml::DOMAINS;
+use crate::utils::lazylock::DOMAINS;
+use crate::utils::tools::Die;
+use base64::Engine;
+use base64::engine::general_purpose::URL_SAFE_NO_PAD;
 use instant_acme::{ChallengeType, Identifier, NewOrder, RetryPolicy};
 use log::{error, info};
 use pingora::prelude::sleep;
 use rcgen::{CertificateParams, DistinguishedName, KeyPair};
+use sha2::{Digest, Sha256};
 use std::fs;
 use std::time::Duration;
 use x509_parser::prelude::*;
 
-pub async fn refresh_order(certs_dir: String, autoconf_dir: String) {
+pub async fn refresh_order(certs_dir: String, autoconf_dir: String, provider: Option<String>) {
     let credsfile = autoconf_dir + "/acme_credentials.json";
     loop {
         for item in DOMAINS.iter() {
-            let _what = order(item.key(), credsfile.as_str(), certs_dir.clone()).await;
+            let _what = order(item.key(), credsfile.as_str(), certs_dir.clone(), provider.clone()).await;
         }
         sleep(Duration::from_secs(12 * 3600)).await;
     }
 }
-pub async fn order(domain: &str, credsfile: &str, certs_dir: String) -> Result<String, Box<dyn std::error::Error>> {
+pub async fn order(domain: &str, credsfile: &str, certs_dir: String, provider: Option<String>) -> Result<String, Box<dyn std::error::Error>> {
-    let crt = certs_dir.clone() + "/" + domain + ".crt";
+    let crt = format!("{}/{}.crt", certs_dir, domain);
-    let key = certs_dir.clone() + "/" + domain + ".key";
+    let key = format!("{}/{}.key", certs_dir, domain);
 
     if DOMAINS.get(domain).is_none() {
         DOMAINS.insert(domain.to_string(), true);
-        let mut newlist: Vec<String> = Vec::new();
+        let newlist: Vec<String> = DOMAINS.iter().map(|item| item.key().to_string()).collect();
-        for item in DOMAINS.iter() {
-            newlist.push(item.key().to_string());
-        }
         if let Ok(json_content) = serde_json::to_string_pretty(&newlist) {
             let autocfg_file = credsfile.replace("/acme_credentials.json", "/domains.json");
-            if let Err(err) = std::fs::write(&autocfg_file, json_content) {
+            if let Err(err) = fs::write(&autocfg_file, json_content) {
                 error!("Error Updating domains for certificates: {} : {}", domain, err);
                 return Err(Box::from(err));
             }
@@ -40,7 +42,6 @@ pub async fn order(domain: &str, credsfile: &str, certs_dir: String) -> Result<S
     if let Ok(expiry) = cert_expiry(crt.as_str()) {
         let now = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH)?.as_secs();
         if expiry > now + 30 * 24 * 3600 {
-            // println!("Fresh certificate exists. Not renewing !");
             return Ok("Fresh certificate exists. Not renewing ! \n".to_string());
         }
     };
@@ -49,14 +50,43 @@ pub async fn order(domain: &str, credsfile: &str, certs_dir: String) -> Result<S
     let mut order = account.new_order(&NewOrder::new(&[Identifier::Dns(domain.to_string())])).await?;
 
     let mut authorizations = order.authorizations();
+
     while let Some(auth) = authorizations.next().await {
         let mut auth = auth?;
-        let mut challenge_handle = auth.challenge(ChallengeType::Http01).ok_or("no http01 challenge found")?;
+        let domain_name = auth.identifier().to_string();
+        let (challenge_type, is_dns) = match &provider {
+            Some(_) => (ChallengeType::Dns01, true),
+            None => (ChallengeType::Http01, false),
+        };
+
+        let mut challenge_handle = auth.challenge(challenge_type).ok_or("Requested challenge type not offered by ACME server")?;
         let key_auth = challenge_handle.key_authorization();
         let key_auth_str = key_auth.as_str().to_string();
-        let token = key_auth_str.split('.').next().ok_or("invalid key authorization")?.to_string();
+
-        CHALLENGES.write().unwrap().insert(token, key_auth_str);
+        if is_dns {
-        challenge_handle.set_ready().await?;
+            let prov = provider.as_ref().die("Failed to get DNS provider");
+            let dns_provider = get_provider(prov.clone());
+            let dns_value = calculate_dns_value(&key_auth_str);
+            let clean_domain = domain_name.trim_start_matches("*.").to_string();
+            let record_name = format!("_acme-challenge.{}", clean_domain);
+
+            match dns_provider.create_txt_record(&clean_domain, &record_name, &dns_value).await {
+                Ok(record_id) => {
+                    let ready_res = challenge_handle.set_ready().await;
+                    let _ = dns_provider.delete_txt_record(&record_id, &record_name).await;
+                    ready_res?;
+                }
+                Err(e) => {
+                    eprintln!("Failed to create DNS record: {}", e);
+                    return Err(e);
+                }
+            }
+        } else {
+            let token = key_auth_str.split('.').next().ok_or("Invalid key authorization")?.to_string();
+            CHALLENGES.write().die("Failed to write challenge").insert(token, key_auth_str);
+            tokio::time::sleep(std::time::Duration::from_millis(100)).await;
+            challenge_handle.set_ready().await?;
+        }
     }
 
     let status = order.poll_ready(&RetryPolicy::default()).await?;
@@ -68,12 +98,9 @@ pub async fn order(domain: &str, credsfile: &str, certs_dir: String) -> Result<S
     let signing_request = params.serialize_request(&private_key)?;
     let csr_der = signing_request.der();
     order.finalize_csr(csr_der).await?;
-
-    // poll for certificate
     let cert_chain_pem = order.poll_certificate(&RetryPolicy::default()).await?;
-    CHALLENGES.write().unwrap().clear();
+    CHALLENGES.write().die("Challenges lock poisoned").clear();
     let private_key_pem = private_key.serialize_pem();
-
     fs::write(crt, cert_chain_pem)?;
     fs::write(key, private_key_pem)?;
     Ok("Certificate is successfully generated \n".to_string())
@@ -86,3 +113,8 @@ fn cert_expiry(path: &str) -> Result<u64, Box<dyn std::error::Error>> {
     let expiry = cert.validity().not_after.timestamp() as u64;
     Ok(expiry)
 }
+
+fn calculate_dns_value(key_auth: &str) -> String {
+    let hash = Sha256::digest(key_auth.as_bytes());
+    URL_SAFE_NO_PAD.encode(hash)
+}

src/tls/acme/types.rs

@@ -0,0 +1,32 @@
+use async_trait::async_trait;
+use std::collections::HashMap;
+use std::sync::LazyLock;
+
+pub struct DnsBackendPlugin {
+    pub name: &'static str,
+    pub factory: fn() -> Box<dyn DnsProvider>,
+}
+
+inventory::collect!(DnsBackendPlugin);
+
+static FACTORIES: LazyLock<HashMap<&'static str, fn() -> Box<dyn DnsProvider>>> = LazyLock::new(|| {
+    let mut map = HashMap::new();
+    for plugin in inventory::iter::<DnsBackendPlugin> {
+        map.insert(plugin.name, plugin.factory);
+    }
+    map
+});
+
+#[async_trait]
+pub trait DnsProvider: Send + Sync {
+    async fn create_txt_record(&self, domain: &str, name: &str, value: &str) -> Result<String, Box<dyn std::error::Error + Send + Sync>>;
+
+    async fn delete_txt_record(&self, record_id: &str, record_name: &str) -> Result<(), Box<dyn std::error::Error + Send + Sync>>;
+}
+
+pub fn get_provider(provider: String) -> Box<dyn DnsProvider> {
+    FACTORIES
+        .get(provider.as_str())
+        .map(|factory| factory())
+        .unwrap_or_else(|| panic!("Unknown DNS provider '{}'. Available providers: {:?}", provider, FACTORIES.keys().collect::<Vec<_>>()))
+}

src/tls/grades.rs

@@ -22,7 +22,7 @@ pub enum TlsGrade {
 }
 
 impl TlsGrade {
-    pub fn from_str(s: &str) -> Option<Self> {
+    pub fn parse(s: &str) -> Option<Self> {
         match s.to_ascii_lowercase().as_str() {
             "high" => Some(TlsGrade::High),
             "medium" => Some(TlsGrade::Medium),
@@ -39,7 +39,7 @@ pub fn prefer_h2<'a>(_ssl: &mut SslRef, alpn_in: &'a [u8]) -> Result<&'a [u8], A
 }
 
 pub fn set_tsl_grade(tls_settings: &mut TlsSettings, grade: &str) {
-    let config_grade = TlsGrade::from_str(grade);
+    let config_grade = TlsGrade::parse(grade);
     match config_grade {
         Some(TlsGrade::High) => {
             let _ = tls_settings.set_min_proto_version(Some(SslVersion::TLS1_2));

src/tls/load.rs

@@ -1,8 +1,9 @@
 use crate::tls::grades;
+use crate::utils::tools::Die;
 use dashmap::DashMap;
 use log::error;
 use pingora::tls::ssl::{NameType, SniError, SslAlert, SslContext, SslFiletype, SslMethod, SslRef};
-use rustls_pemfile::{read_one, Item};
+use rustls_pemfile::{Item, read_one};
 use serde::Deserialize;
 use std::collections::HashSet;
 use std::fs::File;
@@ -10,6 +11,7 @@ use std::io::BufReader;
 use x509_parser::extensions::GeneralName;
 use x509_parser::nom::Err as NomErr;
 use x509_parser::prelude::*;
+
 #[derive(Clone, Deserialize, Debug)]
 pub struct CertificateConfig {
     pub cert_path: String,
@@ -37,7 +39,7 @@ pub struct Certificates {
 
 impl Certificates {
     pub fn new(configs: &Vec<CertificateConfig>, _grade: &str) -> Option<Self> {
-        let default_cert = configs.first().expect("At least one TLS certificate required");
+        let default_cert = configs.first().die("At least one TLS certificate required");
         let mut cert_infos = Vec::new();
         let name_map: DashMap<String, SslContext> = DashMap::new();
         for config in configs {
@@ -54,7 +56,7 @@ impl Certificates {
                     cert_infos.push(cert)
                 }
                 None => {
-                    error!("Unable to load certificate info | public: {}, private: {}", &config.cert_path, &config.key_path);
+                    error!("Unable to load certificate info | public: {}, private: {}", config.cert_path, config.key_path);
                     return None;
                 }
             }

src/tls/mod.rs

@@ -1,3 +1,4 @@
 pub mod acme;
 pub mod grades;
 pub mod load;
+pub use load::*;

src/utils/deser.rs

@@ -0,0 +1,298 @@
+use crate::utils::hcclient::{HttpClientRequest, httpclient};
+use crate::utils::lazylock::{GLOBAL_PARAMS, MASTER_KEY, WORKERS};
+use crate::utils::tools::Die;
+use crate::utils::types::{Consul, Extraparams, Headers, Kubernetes, UpstreamsDashMap};
+use bytes::Bytes;
+use log::{error, info, warn};
+use noyalib::to_string;
+use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
+use std::ops::Deref;
+
+#[derive(Serialize, Deserialize, Clone, Debug)]
+pub struct UpstreamConfigDto {
+    pub paths: HashMap<String, PathConfigDto>,
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug)]
+pub struct PathConfigDto {
+    pub is_http2: bool,
+    pub healthcheck: bool,
+    pub is_ssl: bool,
+    pub to_https: bool,
+    pub rate_limit: isize,
+    pub x4xx_limit: u32,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub redirect_to: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub authorization: Option<HashMap<String, String>>,
+    pub servers: Vec<String>,
+    // #[serde(skip_serializing_if = "Option::is_none")]
+    // pub client_headers: Option<Vec<String>>,
+    // #[serde(skip_serializing_if = "Option::is_none")]
+    // pub server_headers: Option<Vec<String>>,
+}
+
+#[derive(Clone, Debug)]
+pub struct SendConfigDto {
+    pub upstreams: HashMap<String, UpstreamConfigDto>,
+    pub client_headers: Headers,
+    pub server_headers: Headers,
+    pub consul: Option<Consul>,
+    pub kubernetes: Option<Kubernetes>,
+    pub typecfg: String,
+    pub extraparams: Extraparams,
+}
+
+pub fn serialize_config(data: &UpstreamsDashMap) -> String {
+    let config = GLOBAL_PARAMS.read().die("Failed to read config");
+    let mut snapshot: HashMap<String, UpstreamConfigDto> = HashMap::new();
+
+    for outer_entry in data.iter() {
+        let domain = outer_entry.key().to_string();
+        let mut paths: HashMap<String, PathConfigDto> = HashMap::new();
+
+        for inner_entry in outer_entry.value().iter() {
+            let path = inner_entry.key().to_string();
+            let (vec_inner, _atomic_val) = inner_entry.value();
+
+            if let Some(first) = vec_inner.first() {
+                let servers = vec_inner.iter().map(|item| format!("{}:{}", item.address, item.port)).collect();
+                let mut auth = None;
+                if let Some(ath) = first.authorization.clone() {
+                    let mut a = HashMap::new();
+                    a.insert("type".to_string(), ath.auth_type.clone().to_string());
+                    a.insert("data".to_string(), ath.auth_cred.clone().to_string());
+                    auth = Some(a);
+                }
+                paths.insert(
+                    path,
+                    PathConfigDto {
+                        is_http2: first.is_http2,
+                        healthcheck: first.healthcheck,
+                        is_ssl: first.is_ssl,
+                        to_https: first.to_https,
+                        rate_limit: first.rate_limit,
+                        x4xx_limit: first.x4xx_limit,
+                        redirect_to: first.redirect_to.clone().as_ref().map(|s| s.to_string()),
+                        authorization: auth,
+                        servers,
+                    },
+                );
+            }
+        }
+
+        snapshot.insert(domain, UpstreamConfigDto { paths });
+    }
+    let payload = SendConfigDto {
+        upstreams: snapshot,
+        client_headers: config.client_headers.clone(),
+        server_headers: config.server_headers.clone(),
+        consul: config.consul.clone(),
+        kubernetes: config.kubernetes.clone(),
+        typecfg: config.typecfg.clone(),
+        extraparams: config.extraparams.clone(),
+    };
+    to_yaml(&payload)
+}
+
+#[derive(Serialize, Debug)]
+struct YamlAuth {
+    #[serde(rename = "type")]
+    auth_type: String,
+    data: String,
+}
+
+#[derive(Serialize)]
+struct YamlPath {
+    servers: Vec<String>,
+    #[serde(skip_serializing_if = "is_false")]
+    is_http2: bool,
+    #[serde(skip_serializing_if = "is_false")]
+    to_https: bool,
+    #[serde(skip_serializing_if = "is_false")]
+    is_ssl: bool,
+    #[serde(skip_serializing_if = "is_true")] // healthcheck true is default
+    healthcheck: bool,
+    #[serde(skip_serializing_if = "is_zero_isize")]
+    rate_limit: isize,
+    #[serde(skip_serializing_if = "is_zero_u32")]
+    x4xx_limit: u32,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    redirect_to: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    authorization: Option<YamlAuth>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    client_headers: Option<Vec<String>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    server_headers: Option<Vec<String>>,
+}
+
+#[derive(Serialize)]
+struct YamlUpstream {
+    paths: HashMap<String, YamlPath>,
+}
+
+#[derive(Serialize)]
+struct YamlConfig {
+    provider: String,
+    sticky_sessions: u64,
+    to_https: bool,
+    rate_limit: isize,
+    x4xx_limit: u32,
+    #[serde(skip_serializing_if = "Vec::is_empty")]
+    server_headers: Vec<String>,
+    #[serde(skip_serializing_if = "Vec::is_empty")]
+    client_headers: Vec<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    authorization: Option<YamlAuth>,
+    upstreams: HashMap<String, YamlUpstream>,
+}
+
+fn is_false(v: &bool) -> bool {
+    !v
+}
+fn is_true(v: &bool) -> bool {
+    *v
+}
+fn is_zero_isize(v: &isize) -> bool {
+    *v == 0
+}
+fn is_zero_u32(v: &u32) -> bool {
+    *v == 0
+}
+
+pub fn to_yaml(config: &SendConfigDto) -> String {
+    let server_headers: Vec<String> = config
+        .server_headers
+        .get("GLOBAL_SERVER_HEADERS")
+        .map(|paths| {
+            paths
+                .value()
+                .iter()
+                .flat_map(|inner| inner.value().iter().map(|(k, v)| format!("{}:{}", k, v)).collect::<Vec<_>>())
+                .collect()
+        })
+        .unwrap_or_default();
+
+    let client_headers: Vec<String> = config
+        .client_headers
+        .get("GLOBAL_CLIENT_HEADERS")
+        .map(|paths| {
+            paths
+                .value()
+                .iter()
+                .flat_map(|inner| inner.value().iter().map(|(k, v)| format!("{}:{}", k, v)).collect::<Vec<_>>())
+                .collect()
+        })
+        .unwrap_or_default();
+
+    let authorization = config.extraparams.authentication.as_ref().map(|auth| YamlAuth {
+        auth_type: auth.auth_type.to_string(),
+        data: auth.auth_cred.to_string(),
+    });
+
+    let upstreams: HashMap<String, YamlUpstream> = config
+        .upstreams
+        .iter()
+        .map(|(domain, upstream)| {
+            let paths = upstream
+                .paths
+                .iter()
+                .map(|(path, pcfg)| {
+                    let ch: Option<Vec<String>> = {
+                        if let Some(domain_ref) = config.client_headers.get(domain.as_str()) {
+                            if let Some(path_ref) = domain_ref.get(path.as_str()) {
+                                let collected: Vec<String> = path_ref.value().iter().map(|(k, v)| format!("{}:{}", k, v)).collect();
+                                if !collected.is_empty() { Some(collected) } else { None }
+                            } else {
+                                None
+                            }
+                        } else {
+                            None
+                        }
+                    };
+
+                    let sh: Option<Vec<String>> = {
+                        if let Some(domain_ref) = config.server_headers.get(domain.as_str()) {
+                            if let Some(path_ref) = domain_ref.get(path.as_str()) {
+                                let collected: Vec<String> = path_ref.value().iter().map(|(k, v)| format!("{}:{}", k, v)).collect();
+                                if !collected.is_empty() { Some(collected) } else { None }
+                            } else {
+                                None
+                            }
+                        } else {
+                            None
+                        }
+                    };
+
+                    let auth = pcfg.authorization.as_ref().map(|a| YamlAuth {
+                        auth_type: a.get("type").cloned().unwrap_or_default(),
+                        data: a.get("data").cloned().unwrap_or_default(),
+                    });
+
+                    (
+                        path.clone(),
+                        YamlPath {
+                            servers: pcfg.servers.clone(),
+                            is_http2: pcfg.is_http2,
+                            is_ssl: pcfg.is_ssl,
+                            healthcheck: pcfg.healthcheck,
+                            rate_limit: pcfg.rate_limit,
+                            x4xx_limit: pcfg.x4xx_limit,
+                            to_https: pcfg.to_https,
+                            redirect_to: pcfg.redirect_to.clone(),
+                            authorization: auth,
+                            client_headers: ch,
+                            server_headers: sh,
+                        },
+                    )
+                })
+                .collect();
+            (domain.clone(), YamlUpstream { paths })
+        })
+        .collect();
+
+    let yaml_config = YamlConfig {
+        provider: config.typecfg.clone(),
+        sticky_sessions: config.extraparams.sticky_sessions,
+        to_https: config.extraparams.to_https,
+        rate_limit: config.extraparams.rate_limit,
+        x4xx_limit: config.extraparams.x4xx_limit,
+        server_headers,
+        client_headers,
+        authorization,
+        upstreams,
+    };
+
+    to_string(&yaml_config).unwrap_or_default()
+}
+
+pub async fn send_to_worker(data: String) {
+    let masterkey = MASTER_KEY.get().die("Master key not set");
+    if let Some(workers) = WORKERS.get() {
+        for worker in workers {
+            let prefix = if worker.tls { "https://" } else { "http://" };
+            let worker_url = format!("{}{}:{}", prefix, worker.address, worker.port);
+            let status = httpclient(HttpClientRequest {
+                method: "POST",
+                tls: worker.tls,
+                host: worker.address.as_ref(),
+                path: "/workerconf",
+                address: worker.address.as_ref(),
+                port: worker.port,
+                url: worker_url.as_str(),
+                payload: Bytes::from(data.clone()),
+                headers: Some(vec![("API-KEY", masterkey.clone().die("Master key must be set in the cluster mode").deref())]),
+            })
+            .await;
+            if (200..500).contains(&status.2) {
+                info!("Successfully updated Worker {}, status {}", worker_url, status.2);
+            } else {
+                error!("Cannot connect to worker node, status {}", status.2);
+            }
+        }
+    } else {
+        warn!("Workers list has not been initialized yet.");
+    }
+}

src/utils/filewatch.rs

@@ -1,52 +0,0 @@
-use crate::utils::parceyaml::load_configuration;
-use crate::utils::structs::Configuration;
-use log::error;
-use notify::event::ModifyKind;
-use notify::{Config, Event, EventKind, RecommendedWatcher, RecursiveMode, Watcher};
-use pingora::prelude::sleep;
-use std::path::Path;
-use std::time::{Duration, Instant};
-use tokio::sync::mpsc::Sender;
-use tokio::task;
-
-pub async fn start(fp: String, toreturn: Sender<Configuration>) {
-    sleep(Duration::from_millis(50)).await; // For having nice logs :-)
-    let file_path = fp.as_str();
-    let parent_dir = Path::new(file_path).parent().unwrap();
-    let (local_tx, mut local_rx) = tokio::sync::mpsc::channel::<notify::Result<Event>>(1);
-
-    let _watcher_handle = task::spawn_blocking({
-        let parent_dir = parent_dir.to_path_buf(); // Move directory path into the closure
-        move || {
-            let mut watcher = RecommendedWatcher::new(
-                move |res| {
-                    let _ = local_tx.blocking_send(res);
-                },
-                Config::default(),
-            )
-            .unwrap();
-            watcher.watch(&parent_dir, RecursiveMode::Recursive).unwrap();
-            let (_rtx, mut rrx) = tokio::sync::mpsc::channel::<bool>(1);
-            let _ = rrx.blocking_recv();
-        }
-    });
-    let mut start = Instant::now();
-
-    while let Some(event) = local_rx.recv().await {
-        match event {
-            Ok(e) => match e.kind {
-                EventKind::Modify(ModifyKind::Data(_)) | EventKind::Create(..) | EventKind::Remove(..) => {
-                    if start.elapsed() > Duration::from_secs(2) {
-                        start = Instant::now();
-                        let snd = load_configuration(file_path, "filepath").await.0;
-                        if let Some(snd) = snd {
-                            toreturn.send(snd).await.unwrap();
-                        }
-                    }
-                }
-                _ => (),
-            },
-            Err(e) => error!("Watch error: {:?}", e),
-        }
-    }
-}

src/utils/fordebug.rs

@@ -8,12 +8,13 @@ pub static DEALLOC_COUNT: AtomicUsize = AtomicUsize::new(0);
 pub static ALLOC_BYTES: AtomicUsize = AtomicUsize::new(0);
 #[allow(dead_code)]
 unsafe impl GlobalAlloc for CountingAllocator {
+    #[allow(unsafe_op_in_unsafe_fn)]
     unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
         ALLOC_COUNT.fetch_add(1, Ordering::Relaxed);
         ALLOC_BYTES.fetch_add(layout.size(), Ordering::Relaxed);
         System.alloc(layout)
     }
-
+    #[allow(unsafe_op_in_unsafe_fn)]
     unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
         DEALLOC_COUNT.fetch_add(1, Ordering::Relaxed);
         System.dealloc(ptr, layout)
@@ -23,9 +24,9 @@ unsafe impl GlobalAlloc for CountingAllocator {
 // Uncomment following lines and comment allocator in main.rs
 // #[global_allocator]
 // pub static A: CountingAllocator = CountingAllocator;
-#[allow(dead_code)]
+// #[allow(dead_code)]
-fn for_example() {
+// fn for_example() {
-    let before = crate::utils::fordebug::ALLOC_COUNT.load(Ordering::Relaxed);
+//     let before = crate::utils::fordebug::ALLOC_COUNT.load(Ordering::Relaxed);
-    let after = crate::utils::fordebug::ALLOC_COUNT.load(Ordering::Relaxed);
+//     let after = crate::utils::fordebug::ALLOC_COUNT.load(Ordering::Relaxed);
-    println!("Allocations : {}", after - before);
+//     println!("Allocations : {}", after - before);
-}
+// }

src/utils/grpc.rs

@@ -1,23 +1,30 @@
 use bytes::Bytes;
 use http_body_util::Full;
 use hyper::Request;
-use hyper_util::client::legacy::connect::HttpConnector;
 use hyper_util::client::legacy::Client;
+use hyper_util::client::legacy::connect::HttpConnector;
 use hyper_util::rt::TokioExecutor;
+use log::error;
 
 pub async fn ping_grpc(addr: &str) -> bool {
     let connector = HttpConnector::new();
     let client = Client::builder(TokioExecutor::new()).http2_only(true).build(connector);
     let uri = format!("{}{}", addr, "/aralez.Probe/Ping");
     let body = Full::new(Bytes::from(vec![0, 0, 0, 0, 0]));
-    let request = Request::post(uri).header("content-type", "application/grpc").header("te", "trailers").body(body).unwrap();
+
-    match client.request(request).await {
+    match Request::post(uri.clone()).header("content-type", "application/grpc").header("te", "trailers").body(body) {
-        Ok(resp) => resp
+        Ok(request) => match client.request(request).await {
-            .headers()
+            Ok(resp) => resp
-            .get("content-type")
+                .headers()
-            .and_then(|v| v.to_str().ok())
+                .get("content-type")
-            .map(|v| v.starts_with("application/grpc"))
+                .and_then(|v| v.to_str().ok())
-            .unwrap_or(false),
+                .map(|v| v.starts_with("application/grpc"))
-        Err(_) => false,
+                .unwrap_or(false),
+            Err(_) => false,
+        },
+        Err(e) => {
+            error!("Failed to create request: {}", e);
+            false
+        }
     }
 }

src/utils/hcclient.rs

@@ -9,7 +9,30 @@ use std::time::Duration;
 
 pub static HC_CONNECTOR: LazyLock<Connector> = LazyLock::new(|| Connector::new(None));
 
-pub async fn httpclient(method: &str, tls: bool, host: &str, path: &str, address: &str, port: u16, url: String) -> (bool, bool) {
+pub struct HttpClientRequest<'a> {
+    pub method: &'a str,
+    pub tls: bool,
+    pub host: &'a str,
+    pub path: &'a str,
+    pub address: &'a str,
+    pub port: u16,
+    pub url: &'a str,
+    pub payload: Bytes,
+    pub headers: Option<Vec<(&'a str, &'a str)>>, // ← add this
+}
+
+pub async fn httpclient(req: HttpClientRequest<'_>) -> (bool, bool, u16) {
+    let HttpClientRequest {
+        method,
+        tls,
+        host,
+        path,
+        address,
+        port,
+        url,
+        payload,
+        headers,
+    } = req;
     let method = match method {
         "HEAD" => "HEAD",
         "GET" => "GET",
@@ -27,6 +50,7 @@ pub async fn httpclient(method: &str, tls: bool, host: &str, path: &str, address
     let mut is_h2 = false;
     peer.options.total_connection_timeout = Option::from(Duration::from_secs(5));
     peer.options.alpn = ALPN::H2H1;
+
     let (mut http_session, _) = match HC_CONNECTOR.get_http_session(&peer).await {
         Ok(s) => s,
         Err(e) => {
@@ -35,7 +59,7 @@ pub async fn httpclient(method: &str, tls: bool, host: &str, path: &str, address
             } else {
                 log::warn!("Fail to connect to addr: {}, tls {}, host {}", address, tls, host);
             }
-            return (false, false);
+            return (false, false, 500);
         }
     };
 
@@ -45,8 +69,8 @@ pub async fn httpclient(method: &str, tls: bool, host: &str, path: &str, address
             is_h2 = true;
         }
         None => {
-            if ping_grpc(url.as_str()).await {
+            if ping_grpc(url).await {
-                return (true, true);
+                return (true, true, 204);
             }
         }
     }
@@ -55,41 +79,41 @@ pub async fn httpclient(method: &str, tls: bool, host: &str, path: &str, address
         Ok(r) => r,
         Err(e) => {
             log::warn!("Failed to build request: {}", e);
-            return (false, false);
+            return (false, false, 500);
         }
     };
 
     req.insert_header("Host", host).ok();
-
+    let body_bytes = if method == "POST" {
+        req.insert_header("Content-Type", "application/json").ok();
+        req.insert_header("Content-Length", payload.len().to_string()).ok();
+        if let Some(headers) = headers {
+            for (k, v) in headers {
+                req.insert_header(k.to_owned(), v).ok();
+            }
+        }
+        payload
+    } else {
+        Bytes::new()
+    };
     if let Err(e) = http_session.write_request_header(Box::new(req)).await {
         log::warn!("Write header failed: {}", e);
-        return (false, false);
+        return (false, false, 500);
     }
-
+    if let Err(e) = http_session.write_request_body(body_bytes, true).await {
-    let status = if is_h2 {
+        log::warn!("Write body failed: {}", e);
-        if let Err(e) = http_session.write_request_body(Bytes::new(), true).await {
+        return (false, false, 500);
-            log::warn!("Write body failed: {}", e);
+    }
-            return (false, false);
+    let status = match http_session.read_response_header().await {
-        }
+        Ok(_) => http_session.response_header().map(|r| r.status.as_u16()).unwrap_or(500),
-        match http_session.read_response_header().await {
+        Err(e) => {
-            Ok(_) => http_session.response_header().map(|r| r.status.as_u16()).unwrap_or(500),
+            if !is_h2 && ping_grpc(url).await {
-            Err(e) => {
+                return (true, true, 204);
-                if ping_grpc(url.as_str()).await {
-                    return (true, true);
-                }
-                log::warn!("Health Check H2 read failed: {} - {}", host, e);
-                return (false, false);
-            }
-        }
-    } else {
-        match http_session.read_response_header().await {
-            Ok(_) => http_session.response_header().map(|r| r.status.as_u16()).unwrap_or(500),
-            Err(e) => {
-                log::warn!("Health Check H1 read failed: {} - {}", e, host);
-                return (false, false);
             }
+            log::warn!("Health Check read failed ({}) : {} - {}", if is_h2 { "H2" } else { "H1" }, host, e);
+            return (false, false, 500);
         }
     };
     HC_CONNECTOR.release_http_session(http_session, &peer, None).await;
-    ((200..500).contains(&status), is_h2)
+    ((200..500).contains(&status), is_h2, status)
 }

src/utils/healthcheck.rs

@@ -1,36 +1,54 @@
-use crate::utils::hcclient::httpclient;
+use crate::utils::deser::{send_to_worker, serialize_config};
-use crate::utils::lazylock::REVERSE_STORE;
+use crate::utils::hcclient::{HttpClientRequest, httpclient};
-use crate::utils::structs::{InnerMap, UpstreamsDashMap, UpstreamsIdMap};
+use crate::utils::lazylock::{IM_A_MASTER, NODE_STATUS, REVERSE_STORE};
 use crate::utils::tools::*;
+use crate::utils::types::{InnerMap, UpstreamsDashMap, UpstreamsIdMap};
+use bytes::Bytes;
 use dashmap::DashMap;
-use std::sync::atomic::AtomicUsize;
+use log::info;
 use std::sync::Arc;
+use std::sync::atomic::AtomicUsize;
 use std::time::Duration;
 use tokio::net::TcpStream;
 use tokio::time::{interval, timeout};
 use tokio_native_tls::native_tls::TlsConnector;
 
+const EMPTY_PAYLOAD: Bytes = Bytes::from_static(b"");
+
 pub async fn hc2(upslist: Arc<UpstreamsDashMap>, fullist: Arc<UpstreamsDashMap>, idlist: Arc<UpstreamsIdMap>, params: (&str, u64)) {
     let mut period = interval(Duration::from_secs(params.1));
+    if let Some(member) = NODE_STATUS.get() {
+        if let Some(mbr) = member.as_ref() {
+            match mbr.as_ref() {
+                "worker" => {
+                    info!("Disabling health-checks. Running in cluster mode as {}", mbr);
+                    return;
+                }
+                "master" => {
+                    info!("Disabling client/server routing. Running in cluster mode as {}", mbr);
+                }
+                _ => {}
+            }
+        }
+    }
     loop {
         tokio::select! {
             _ = period.tick() => {
-                let totest = build_upstreams(&fullist, params.0).await;
+                let totest = initiate_upstreams(&fullist, params.0).await;
                 if !compare_dashmaps(&totest, &upslist) {
                     clone_dashmap_into(&totest, &upslist);
                     clone_idmap_into(&totest, &idlist);
+                    if let Some(true) = IM_A_MASTER.get(){
+                        let binary_output = serialize_config(&totest);
+                        let _ = send_to_worker(binary_output).await;
+                    }
                     REVERSE_STORE.clear();
                 }
             }
         }
     }
 }
-
+pub(crate) async fn initiate_upstreams(fullist: &UpstreamsDashMap, method: &str) -> UpstreamsDashMap {
-pub async fn initiate_upstreams(fullist: UpstreamsDashMap) -> UpstreamsDashMap {
-    build_upstreams(&fullist, "HEAD").await
-}
-
-async fn build_upstreams(fullist: &UpstreamsDashMap, method: &str) -> UpstreamsDashMap {
     let totest: UpstreamsDashMap = DashMap::new();
     let fclone = clone_dashmap(fullist);
     for val in fclone.iter() {
@@ -42,16 +60,16 @@ async fn build_upstreams(fullist: &UpstreamsDashMap, method: &str) -> UpstreamsD
             let mut innervec = Vec::new();
 
             for upstream in path_entry.value().0.iter() {
-                let tls = if upstream.healthcheck.unwrap_or(true) {
+                let tls = if upstream.healthcheck {
                     detect_tls(upstream.address.as_ref(), &upstream.port, host).await
                 } else {
-                    false
+                    upstream.is_ssl
                 };
                 let mut scheme = InnerMap {
                     address: upstream.address.clone(),
                     port: upstream.port,
                     is_ssl: tls,
-                    is_http2: false,
+                    is_http2: upstream.is_http2,
                     to_https: upstream.to_https,
                     rate_limit: upstream.rate_limit,
                     x4xx_limit: upstream.x4xx_limit,
@@ -60,13 +78,24 @@ async fn build_upstreams(fullist: &UpstreamsDashMap, method: &str) -> UpstreamsD
                     authorization: upstream.authorization.clone(),
                 };
 
-                if scheme.healthcheck.unwrap_or(true) {
+                if scheme.healthcheck {
                     let link = if tls {
                         format!("https://{}:{}{}", upstream.address, upstream.port, path)
                     } else {
                         format!("http://{}:{}{}", upstream.address, upstream.port, path)
                     };
-                    let resp = httpclient(method, tls, host, path, upstream.address.as_ref(), upstream.port, link).await;
+                    let resp = httpclient(HttpClientRequest {
+                        method,
+                        tls,
+                        host,
+                        path,
+                        address: upstream.address.as_ref(),
+                        port: upstream.port,
+                        url: link.as_str(),
+                        payload: EMPTY_PAYLOAD,
+                        headers: None,
+                    })
+                    .await;
                     if resp.0 {
                         if resp.1 {
                             scheme.is_http2 = resp.1;
@@ -97,7 +126,7 @@ async fn detect_tls(ip: &str, port: &u16, sni: &str) -> bool {
             .danger_accept_invalid_certs(true)
             .danger_accept_invalid_hostnames(true)
             .build()
-            .unwrap(),
+            .die("Failed to create TLS connector"),
     );
     connector.connect(sni, stream).await.is_ok()
 }

src/utils/httpclient.rs

@@ -1,7 +1,7 @@
-use crate::utils::consul::ConsulService;
+use crate::ingress::consul::ConsulService;
-use crate::utils::kuberconsul::match_path;
+use crate::ingress::kuberconsul::match_path;
-use crate::utils::kubernetes::KubeEndpointSliceList;
+use crate::ingress::kubernetes::KubeEndpointSliceList;
-use crate::utils::structs::{GlobalServiceMapping, InnerMap};
+use crate::utils::types::{GlobalServiceMapping, InnerMap};
 use ahash::HashMap;
 use dashmap::DashMap;
 use pingora_core::connectors::http::Connector;
@@ -90,10 +90,10 @@ pub async fn for_consul(url: &str, token: Option<String>, conf: &GlobalServiceMa
                 is_ssl: false,
                 is_http2: false,
                 to_https: conf.to_https.unwrap_or(false),
-                rate_limit: conf.rate_limit,
+                rate_limit: conf.rate_limit.unwrap_or(0),
-                x4xx_limit: conf.x4xx_limit,
+                x4xx_limit: conf.x4xx_limit.unwrap_or(0),
                 redirect_to: conf.redirect_to.clone().map(Arc::<str>::from),
-                healthcheck: None,
+                healthcheck: true,
                 authorization: None,
             });
             inner_vec.push(to_add);
@@ -132,9 +132,9 @@ pub async fn for_kuber(url: &str, token: &str, conf: &GlobalServiceMapping) -> O
                                 is_ssl: false,
                                 is_http2: false,
                                 to_https: conf.to_https.unwrap_or(false),
-                                rate_limit: conf.rate_limit,
+                                rate_limit: conf.rate_limit.unwrap_or(0),
-                                x4xx_limit: conf.x4xx_limit,
+                                x4xx_limit: conf.x4xx_limit.unwrap_or(0),
-                                healthcheck: None,
+                                healthcheck: true,
                                 redirect_to: None,
                                 authorization: None,
                             });
@@ -154,7 +154,7 @@ pub async fn for_kuber(url: &str, token: &str, conf: &GlobalServiceMapping) -> O
 }
 
 pub async fn getfromapi(url: &str, token: Option<String>, provider: &str) -> Option<Vec<u8>> {
-    let (host, port, path, is_tls) = parse_url(&url).ok()?;
+    let (host, port, path, is_tls) = parse_url(url).ok()?;
 
     let mut peer = HttpPeer::new((host, port), is_tls, host.to_string());
     peer.options.total_connection_timeout = Some(Duration::from_secs(5));
@@ -213,11 +213,7 @@ pub async fn getfromapi(url: &str, token: Option<String>, provider: &str) -> Opt
 
     CONNECTOR.release_http_session(http_session.0, &peer, None).await;
 
-    if status == 200 && !body_bytes.is_empty() {
+    if status == 200 && !body_bytes.is_empty() { Some(body_bytes) } else { None }
-        Some(body_bytes)
-    } else {
-        None
-    }
 }
 
 fn parse_url(url: &str) -> Result<(&str, u16, &str, bool), &'static str> {

src/utils/lazylock.rs

@@ -1,8 +1,9 @@
+use crate::utils::types::{Configuration, WorkerNodes};
 use dashmap::DashMap;
 use moka::sync::Cache;
+use pingora_cache::MemCache;
 use pingora_cache::eviction::simple_lru::Manager;
 use pingora_cache::lock::CacheLock;
-use pingora_cache::MemCache;
 use pingora_limits::rate::Rate;
 use std::collections::HashMap;
 use std::net::IpAddr;
@@ -19,3 +20,9 @@ pub static CACHE_LOCK: LazyLock<CacheLock> = LazyLock::new(|| CacheLock::new(Dur
 pub static EVICTION: OnceLock<Manager> = OnceLock::new();
 pub static CACHE_TTL: OnceLock<u64> = OnceLock::new();
 pub static CHALLENGES: LazyLock<RwLock<HashMap<String, String>>> = LazyLock::new(|| RwLock::new(HashMap::new()));
+pub static DOMAINS: LazyLock<DashMap<String, bool>> = LazyLock::new(DashMap::new);
+pub static NODE_STATUS: OnceLock<Option<Arc<str>>> = OnceLock::new();
+pub static MASTER_KEY: OnceLock<Option<Arc<str>>> = OnceLock::new();
+pub static GLOBAL_PARAMS: LazyLock<RwLock<Configuration>> = LazyLock::new(|| RwLock::new(Configuration::default()));
+pub static IM_A_MASTER: OnceLock<bool> = OnceLock::new();
+pub static WORKERS: OnceLock<Vec<WorkerNodes>> = OnceLock::new();

src/utils/metrics.rs

@@ -1,9 +1,10 @@
 use crate::utils::lazylock::EVICTION;
+use crate::utils::tools::Die;
 use pingora_cache::eviction::EvictionManager;
 use pingora_http::Method;
 use pingora_http::StatusCode;
 use pingora_http::Version;
-use prometheus::{register_histogram, register_int_counter, register_int_counter_vec, register_int_gauge, Histogram, IntCounter, IntCounterVec, IntGauge};
+use prometheus::{Histogram, IntCounter, IntCounterVec, IntGauge, register_histogram, register_int_counter, register_int_counter_vec, register_int_gauge};
 use std::sync::Arc;
 use std::sync::LazyLock;
 use std::time::Duration;
@@ -16,19 +17,28 @@ pub struct MetricTypes {
     pub version: Version,
 }
 
-pub static OPEN_FILES: LazyLock<IntGauge> = LazyLock::new(|| register_int_gauge!("aralez_open_files", "Number of open file descriptors").unwrap());
+pub static OPEN_FILES: LazyLock<IntGauge> =
-pub static LOGGING_ERRORS: LazyLock<IntGauge> = LazyLock::new(|| register_int_gauge!("aralez_logging_errors", "Number of log errors").unwrap());
+    LazyLock::new(|| register_int_gauge!("aralez_open_files", "Number of open file descriptors").die("Failed to register OPEN_FILES metric"));
-pub static MEMORY_USAGE: LazyLock<IntGauge> = LazyLock::new(|| register_int_gauge!("aralez_memory_bytes", "Total memory allocated in bytes").unwrap());
+pub static LOGGING_ERRORS: LazyLock<IntGauge> =
-pub static ACTIVE_SESSIONS: LazyLock<IntGauge> = LazyLock::new(|| register_int_gauge!("aralez_active_sessions", "Current number of active sessions").unwrap());
+    LazyLock::new(|| register_int_gauge!("aralez_logging_errors", "Number of log errors").die("Failed to register LOGGING_ERRORS metric"));
-pub static REQUEST_COUNT: LazyLock<IntCounter> = LazyLock::new(|| register_int_counter!("aralez_requests_total", "Total number of requests handled by Aralez").unwrap());
+pub static MEMORY_USAGE: LazyLock<IntGauge> =
+    LazyLock::new(|| register_int_gauge!("aralez_memory_bytes", "Total memory allocated in bytes").die("Failed to register MEMORY_USAGE metric"));
+pub static ACTIVE_SESSIONS: LazyLock<IntGauge> =
+    LazyLock::new(|| register_int_gauge!("aralez_active_sessions", "Current number of active sessions").die("Failed to register ACTIVE_SESSIONS metric"));
+pub static REQUEST_COUNT: LazyLock<IntCounter> =
+    LazyLock::new(|| register_int_counter!("aralez_requests_total", "Total number of requests handled by Aralez").die("Failed to register REQUEST_COUNT metric"));
 
-pub static CACHE_SIZE_BYTES: LazyLock<IntGauge> = LazyLock::new(|| register_int_gauge!("aralez_cache_size_bytes", "Current cache size in bytes").unwrap());
+pub static CACHE_SIZE_BYTES: LazyLock<IntGauge> =
-pub static CACHE_ITEMS: LazyLock<IntGauge> = LazyLock::new(|| register_int_gauge!("aralez_cache_items", "Current number of cached objects").unwrap());
+    LazyLock::new(|| register_int_gauge!("aralez_cache_size_bytes", "Current cache size in bytes").die("Failed to register CACHE_SIZE_BYTES metric"));
-pub static CACHE_EVICTED_BYTES: LazyLock<IntGauge> = LazyLock::new(|| register_int_gauge!("aralez_cache_evicted_bytes_total", "Total bytes evicted from cache").unwrap());
+pub static CACHE_ITEMS: LazyLock<IntGauge> =
+    LazyLock::new(|| register_int_gauge!("aralez_cache_items", "Current number of cached objects").die("Failed to register CACHE_ITEMS metric"));
+pub static CACHE_EVICTED_BYTES: LazyLock<IntGauge> =
+    LazyLock::new(|| register_int_gauge!("aralez_cache_evicted_bytes_total", "Total bytes evicted from cache").die("Failed to register CACHE_EVICTED_BYTES metric"));
 
-pub static CACHE_EVICTED_ITEMS: LazyLock<IntGauge> = LazyLock::new(|| register_int_gauge!("aralez_cache_evicted_items_total", "Total cache items evicted").unwrap());
+pub static CACHE_EVICTED_ITEMS: LazyLock<IntGauge> =
+    LazyLock::new(|| register_int_gauge!("aralez_cache_evicted_items_total", "Total cache items evicted").die("Failed to register CACHE_EVICTED_ITEMS metric"));
 pub static RESPONSE_CODES: LazyLock<IntCounterVec> =
-    LazyLock::new(|| register_int_counter_vec!("aralez_responses_total", "Responses grouped by status code", &["status"]).unwrap());
+    LazyLock::new(|| register_int_counter_vec!("aralez_responses_total", "Responses grouped by status code", &["status"]).die("Failed to register RESPONSE_CODES metric"));
 
 pub static RESPONSE_LATENCY: LazyLock<Histogram> = LazyLock::new(|| {
     register_histogram!(
@@ -36,17 +46,20 @@ pub static RESPONSE_LATENCY: LazyLock<Histogram> = LazyLock::new(|| {
         "Response latency in seconds",
         vec![0.001, 0.005, 0.01, 0.025, 0.05, 0.075, 0.1, 0.25, 0.5, 1.0, 2.0, 5.0]
     )
-    .unwrap()
+    .die("Failed to register RESPONSE_LATENCY metric")
 });
 
-pub static REQUESTS_BY_METHOD: LazyLock<IntCounterVec> =
+pub static REQUESTS_BY_METHOD: LazyLock<IntCounterVec> = LazyLock::new(|| {
-    LazyLock::new(|| register_int_counter_vec!("aralez_requests_by_method_total", "Number of requests by HTTP method", &["method"]).unwrap());
+    register_int_counter_vec!("aralez_requests_by_method_total", "Number of requests by HTTP method", &["method"]).die("Failed to register REQUESTS_BY_METHOD metric")
+});
 
-pub static REQUESTS_BY_UPSTREAM: LazyLock<IntCounterVec> =
+pub static REQUESTS_BY_UPSTREAM: LazyLock<IntCounterVec> = LazyLock::new(|| {
-    LazyLock::new(|| register_int_counter_vec!("aralez_requests_by_upstream", "Number of requests by UPSTREAM server", &["upstream"]).unwrap());
+    register_int_counter_vec!("aralez_requests_by_upstream", "Number of requests by UPSTREAM server", &["upstream"]).die("Failed to register REQUESTS_BY_UPSTREAM metric")
+});
 
-pub static REQUESTS_BY_VERSION: LazyLock<IntCounterVec> =
+pub static REQUESTS_BY_VERSION: LazyLock<IntCounterVec> = LazyLock::new(|| {
-    LazyLock::new(|| register_int_counter_vec!("aralez_requests_by_version_total", "Number of requests by HTTP versions", &["version"]).unwrap());
+    register_int_counter_vec!("aralez_requests_by_version_total", "Number of requests by HTTP versions", &["version"]).die("Failed to register REQUESTS_BY_VERSION metric")
+});
 pub static HTTP_11_COUNT: LazyLock<IntCounter> = LazyLock::new(|| REQUESTS_BY_VERSION.with_label_values(&["HTTP/1.1"]));
 pub static HTTP_20_COUNT: LazyLock<IntCounter> = LazyLock::new(|| REQUESTS_BY_VERSION.with_label_values(&["HTTP/2.0"]));
 pub static HTTP_30_COUNT: LazyLock<IntCounter> = LazyLock::new(|| REQUESTS_BY_VERSION.with_label_values(&["HTTP/3.0"]));
@@ -117,13 +130,6 @@ pub fn calc_metrics(metric_types: &MetricTypes) {
 
     REQUESTS_BY_UPSTREAM.with_label_values(&[metric_types.upstream.as_ref()]).inc();
     RESPONSE_LATENCY.observe(metric_types.latency.as_secs_f64());
-
-    // if let Some(eviction) = EVICTION.get() {
-    //     CACHE_SIZE_BYTES.set(eviction.total_size() as i64);
-    //     CACHE_ITEMS.set(eviction.total_items() as i64);
-    //     CACHE_EVICTED_BYTES.set(eviction.evicted_size() as i64);
-    //     CACHE_EVICTED_ITEMS.set(eviction.evicted_items() as i64);
-    // }
 }
 
 pub(crate) fn get_memory_usage() -> usize {

src/utils/mod.rs

@@ -1,19 +1,16 @@
-pub mod auth;
-pub mod consul;
-pub mod discovery;
-mod filewatch;
 pub mod fordebug;
 pub mod grpc;
 pub mod hcclient;
 pub mod healthcheck;
 pub mod httpclient;
-pub mod jwt;
+// pub mod ingress;
-pub mod kuberconsul;
+pub mod deser;
-pub mod kubernetes;
-pub mod kubewatcher;
 pub mod lazylock;
 pub mod metrics;
 pub mod parceyaml;
 pub mod state;
-pub mod structs;
 pub mod tools;
+pub mod types;
+pub(crate) mod watch;
+
+pub use watch::*;

src/utils/parceyaml.rs

@@ -1,19 +1,17 @@
+use crate::utils::deser::{send_to_worker, serialize_config};
 use crate::utils::healthcheck;
-use crate::utils::lazylock::REVERSE_STORE;
+use crate::utils::lazylock::{DOMAINS, GLOBAL_PARAMS, IM_A_MASTER, MASTER_KEY, NODE_STATUS, REVERSE_STORE, WORKERS};
 use crate::utils::state::{is_first_run, mark_not_first_run};
-use crate::utils::structs::*;
+use crate::utils::tools::{Die, clone_dashmap_into};
-use crate::utils::tools::{clone_dashmap, clone_dashmap_into, print_upstreams};
+use crate::utils::types::*;
-use crate::web::logging::log_builder;
 use dashmap::DashMap;
 use log::{error, info, warn};
 use std::collections::HashMap;
 use std::path::Path;
+use std::sync::Arc;
 use std::sync::atomic::AtomicUsize;
-use std::sync::{Arc, LazyLock};
 use std::{env, fs};
 
-pub static DOMAINS: LazyLock<DashMap<String, bool>> = LazyLock::new(DashMap::new);
-
 pub async fn load_configuration(d: &str, kind: &str) -> (Option<Configuration>, String) {
     let mut conf_files = Vec::new();
     let yaml_data = match kind {
@@ -50,8 +48,8 @@ pub async fn load_configuration(d: &str, kind: &str) -> (Option<Configuration>,
                 return (None, err_msg);
             }
 
-            let mut confdir = Path::new(d).parent().unwrap().to_path_buf();
+            let mut confdir = Path::new(d).parent().die("Invalid configuration path").to_path_buf();
-            let mut autocfg = Path::new(d).parent().unwrap().to_path_buf();
+            let mut autocfg = Path::new(d).parent().die("Invalid configuration path").to_path_buf();
 
             autocfg.push("autoconfigs");
             if fs::metadata(autocfg.clone()).is_err() {
@@ -91,7 +89,7 @@ pub async fn load_configuration(d: &str, kind: &str) -> (Option<Configuration>,
             }
 
             info!("Reading upstreams from {}", d);
-            data // [2606:4700:2ff9::1]:443
+            data
         }
         "content" => {
             info!("Reading upstreams from API post body");
@@ -173,10 +171,10 @@ async fn populate_headers_and_auth(config: &mut Configuration, parsed: &Config)
     let server_global_headers: DashMap<Arc<str>, Vec<(String, Arc<str>)>> = DashMap::new();
     server_global_headers.insert(Arc::from("/"), sh);
     config.server_headers.insert(Arc::from("GLOBAL_SERVER_HEADERS"), server_global_headers);
-    config.extraparams.to_https = parsed.to_https;
+    config.extraparams.to_https = parsed.to_https.unwrap_or(false);
-    config.extraparams.sticky_sessions = parsed.sticky_sessions;
+    config.extraparams.sticky_sessions = parsed.sticky_sessions.unwrap_or(0);
-    config.extraparams.rate_limit = parsed.rate_limit;
+    config.extraparams.rate_limit = parsed.rate_limit.unwrap_or(0);
-    config.extraparams.x4xx_limit = parsed.x4xx_limit;
+    config.extraparams.x4xx_limit = parsed.x4xx_limit.unwrap_or(0);
 
     if let Some(rate) = &parsed.rate_limit {
         info!("Applied Global Rate Limit : {} request per second", rate);
@@ -226,12 +224,12 @@ async fn populate_file_upstreams(config: &mut Configuration, parsed: &Config) {
                             server_list.push(Arc::from(InnerMap {
                                 address: Arc::from(ip),
                                 port,
-                                is_ssl: false,
+                                is_ssl: path_config.is_ssl.unwrap_or(false),
-                                is_http2: false,
+                                is_http2: path_config.is_http2.unwrap_or(false),
                                 to_https: path_config.to_https.unwrap_or(false),
-                                rate_limit: path_config.rate_limit,
+                                rate_limit: path_config.rate_limit.unwrap_or(0),
-                                x4xx_limit: path_config.x4xx_limit,
+                                x4xx_limit: path_config.x4xx_limit.unwrap_or(0),
-                                healthcheck: path_config.healthcheck,
+                                healthcheck: path_config.healthcheck.unwrap_or(true),
                                 redirect_to: redirect_link,
                                 authorization: path_auth,
                             }));
@@ -242,30 +240,49 @@ async fn populate_file_upstreams(config: &mut Configuration, parsed: &Config) {
             }
             config.client_headers.insert(Arc::from(hostname.clone()), client_header_list);
             config.server_headers.insert(Arc::from(hostname.clone()), server_header_list);
+
             imtdashmap.insert(Arc::from(hostname.clone()), path_map);
         }
 
+        {
+            let mut config_guard = GLOBAL_PARAMS.write().die("Global config lock poisoned");
+            config_guard.client_headers = config.client_headers.clone();
+            config_guard.server_headers = config.server_headers.clone();
+            config_guard.extraparams = config.extraparams.clone();
+            config_guard.kubernetes = config.kubernetes.clone();
+            config_guard.consul = config.consul.clone();
+            config_guard.typecfg = config.typecfg.clone();
+        }
+
         if is_first_run() {
             clone_dashmap_into(&imtdashmap, &config.upstreams);
             mark_not_first_run();
         } else {
-            let y = clone_dashmap(&imtdashmap);
+            let r = healthcheck::initiate_upstreams(&imtdashmap, "HEAD").await;
-            let r = healthcheck::initiate_upstreams(y).await;
             clone_dashmap_into(&r, &config.upstreams);
         }
         info!("Upstream Config:");
         REVERSE_STORE.clear();
-        print_upstreams(&config.upstreams, &config.extraparams);
+
+        if let Some(true) = IM_A_MASTER.get() {
+            if !is_first_run() {
+                let binary_output = serialize_config(&config.upstreams);
+                let _ = send_to_worker(binary_output).await;
+            }
+        }
+        // print_upstreams(&config.upstreams, &config.extraparams);
     }
 }
 pub fn parce_main_config(path: &str) -> AppConfig {
-    let data = fs::read_to_string(path).unwrap();
+    let data = fs::read_to_string(path).die("Failed to read main config file");
-    let mut cfo: AppConfig = noyalib::from_str(&data).expect("Failed to parse main config file");
+    let mut cfo: AppConfig = noyalib::from_str(&data).die("Failed to parse main config file");
-    if let Ok(jwt_key) = env::var("JWT_KEY") {
+    if let Ok(jwt_key) = env::var("MASTER_KEY") {
+        cfo.master_key = Some(jwt_key);
+    } else if let Ok(jwt_key) = env::var("JWT_KEY") {
         cfo.master_key = Some(jwt_key);
     };
 
-    log_builder(&cfo, &cfo.log_file);
+    // log_builder(&cfo, &cfo.log_file);
     cfo.hc_method = cfo.hc_method.to_uppercase();
     if let Some((ip, port_str)) = cfo.config_address.rsplit_once(':') {
         if let Ok(port) = port_str.parse::<u16>() {
@@ -283,6 +300,39 @@ pub fn parce_main_config(path: &str) -> AppConfig {
     }
 
     cfo.proxy_tls_grade = parce_tls_grades(cfo.proxy_tls_grade.clone());
+    if let Some(member) = cfo.cluster_member.clone() {
+        NODE_STATUS.set(Some(Arc::from(member.as_str()))).die("Config can only be initialized once");
+        let mk = cfo.master_key.clone().die("In CLuster mode master key must be set");
+        MASTER_KEY.set(Some(Arc::from(mk.as_str()))).die("Config can only be initialized once");
+        if member == "master" {
+            IM_A_MASTER.set(true).die("Master status can only be initialized once");
+            let worker_str = cfo.worker_nodes.as_deref().die("At least one worker must be set in master mode");
+            let mut wks = Vec::new();
+            for worker in worker_str.split(',') {
+                let clean = worker.replace("//", "");
+                let wk_vec = clean.trim().split(':').collect::<Vec<&str>>();
+                let wk = WorkerNodes {
+                    address: Arc::from(wk_vec[1]),
+                    port: wk_vec[2].parse::<u16>().die("Invalid worker port number"),
+                    tls: match wk_vec[0] {
+                        "https" => true,
+                        "http" => false,
+                        _ => panic!("invalid protocol string"),
+                    },
+                    key: cfo.master_key.clone().map(|s| Arc::from(s)),
+                };
+                wks.push(wk);
+                // println!("{:?}", wk);
+                // if let Some((host, port_str)) = worker.trim().split_once(':') {
+                //     let port = port_str.parse::<u16>().die("Invalid worker port number");
+                //     wks.push((host.to_string(), port));
+                // } else {
+                //     panic!("Invalid worker format, expected host:port");
+                // }
+            }
+            WORKERS.set(wks).die("Workers list can only be initialized once");
+        }
+    }
     cfo
 }
 

src/utils/state.rs

@@ -1,3 +1,4 @@
+use crate::utils::tools::Die;
 use std::sync::{LazyLock, RwLock};
 
 #[derive(Debug)]
@@ -8,11 +9,11 @@ pub struct SharedState {
 pub static GLOBAL_STATE: LazyLock<RwLock<SharedState>> = LazyLock::new(|| RwLock::new(SharedState { first_run: true }));
 
 pub fn mark_not_first_run() {
-    let mut state = GLOBAL_STATE.write().unwrap();
+    let mut state = GLOBAL_STATE.write().die("Writing global state failed");
     state.first_run = false;
 }
 
 pub fn is_first_run() -> bool {
-    let state = GLOBAL_STATE.read().unwrap();
+    let state = GLOBAL_STATE.read().die("Writing global state failed");
     state.first_run
 }

src/utils/tools.rs

@@ -1,34 +1,32 @@
 use crate::tls::load;
 use crate::tls::load::CertificateConfig;
-use crate::utils::structs::{Extraparams, InnerMapForJson, UpstreamSnapshotForJson, UpstreamsDashMap, UpstreamsIdMap};
+use crate::utils::types::{Extraparams, InnerMapForJson, UpstreamSnapshotForJson, UpstreamsDashMap, UpstreamsIdMap};
 use dashmap::DashMap;
 use log::{error, info};
-use notify::{event::ModifyKind, Config, EventKind, RecommendedWatcher, RecursiveMode, Watcher};
 use privdrop::PrivDrop;
-use serde_json::{json, Value};
+use serde_json::{Value, json};
 use sha2::{Digest, Sha256};
-use std::any::type_name;
 use std::collections::{HashMap, HashSet};
-use std::fmt::Write;
+use std::fmt::{Debug, Write};
 use std::fs::OpenOptions;
 use std::io::Write as IoWrite;
 use std::net::SocketAddr;
 use std::net::TcpListener;
 use std::os::unix::fs::MetadataExt;
 use std::os::unix::fs::OpenOptionsExt;
+use std::panic::Location;
+use std::process::Command;
 use std::str::FromStr;
-use std::sync::atomic::{AtomicUsize, Ordering};
-use std::sync::mpsc::{channel, Sender};
 use std::sync::Arc;
-use std::time::{Duration, Instant};
+use std::sync::atomic::{AtomicUsize, Ordering};
-use std::{fs, process, thread, time};
+use std::{env, fs, process, thread, time};
 
 pub fn print_upstreams(upstreams: &UpstreamsDashMap, extraparams: &Extraparams) {
     let mut out = String::new();
     for host_entry in upstreams.iter() {
-        writeln!(out, "Hostname: {}", host_entry.key()).unwrap();
+        writeln!(out, "Hostname: {}", host_entry.key()).unwrap_or_default();
         for path_entry in host_entry.value().iter() {
-            writeln!(out, "    Path: {}", path_entry.key()).unwrap();
+            writeln!(out, "    Path: {}", path_entry.key()).unwrap_or_default();
             for f in path_entry.value().0.clone() {
                 writeln!(
                     out,
@@ -38,33 +36,15 @@ pub fn print_upstreams(upstreams: &UpstreamsDashMap, extraparams: &Extraparams)
                     f.is_ssl,
                     f.is_http2,
                     f.to_https,
-                    f.rate_limit.unwrap_or(extraparams.rate_limit.unwrap_or(0)),
+                    if f.rate_limit > 0 { f.rate_limit } else { extraparams.rate_limit },
-                    f.x4xx_limit.unwrap_or(extraparams.x4xx_limit.unwrap_or(0))
+                    if f.x4xx_limit > 0 { f.x4xx_limit } else { extraparams.x4xx_limit }
                 )
-                .unwrap();
+                .unwrap_or_default();
             }
         }
     }
     info!("\n{}", out.trim_end());
 }
-#[allow(dead_code)]
-pub fn typeoff<T>(_: T) {
-    let to = type_name::<T>();
-    println!("{:?}", to);
-}
-
-#[allow(dead_code)]
-pub fn string_to_bool(val: Option<&str>) -> Option<bool> {
-    match val {
-        Some(v) => match v {
-            "yes" => Some(true),
-            "true" => Some(true),
-            _ => Some(false),
-        },
-        None => Some(false),
-    }
-}
-
 pub fn clone_dashmap(original: &UpstreamsDashMap) -> UpstreamsDashMap {
     let new_map: UpstreamsDashMap = DashMap::new();
 
@@ -159,9 +139,9 @@ pub fn clone_idmap_into(original: &UpstreamsDashMap, cloned: &UpstreamsIdMap) {
                     x.port,
                     x.is_http2,
                     x.to_https,
-                    x.x4xx_limit.unwrap_or_default(),
+                    x.x4xx_limit,
-                    x.rate_limit.unwrap_or_default(),
+                    x.rate_limit,
-                    x.healthcheck.unwrap_or_default(),
+                    x.healthcheck,
                     x.authorization
                 )
                 .unwrap_or(());
@@ -182,9 +162,9 @@ pub fn clone_idmap_into(original: &UpstreamsDashMap, cloned: &UpstreamsIdMap) {
 pub fn listdir(dir: String) -> Vec<load::CertificateConfig> {
     let mut f = HashMap::new();
     let mut certificate_configs: Vec<load::CertificateConfig> = vec![];
-    let paths = fs::read_dir(dir).unwrap();
+    let paths = fs::read_dir(dir).die("listing certificates directory failed");
     for path in paths {
-        let path_str = path.unwrap().path().to_str().unwrap().to_owned();
+        let path_str = path.die("getting certs path").path().to_str().die("certs pat t &str").to_owned();
         if path_str.ends_with(".crt") {
             let name = path_str.replace(".crt", "");
             let mut inner = vec![];
@@ -209,33 +189,6 @@ pub fn listdir(dir: String) -> Vec<load::CertificateConfig> {
     certificate_configs
 }
 
-pub fn watch_folder(path: String, sender: Sender<Vec<CertificateConfig>>) -> notify::Result<()> {
-    let (tx, rx) = channel();
-    let mut watcher = RecommendedWatcher::new(tx, Config::default())?;
-    watcher.watch(path.as_ref(), RecursiveMode::Recursive)?;
-    info!("Watching for certificates in : {}", path);
-    let certificate_configs = listdir(path.clone());
-    sender.send(certificate_configs)?;
-    let mut start = Instant::now();
-    loop {
-        match rx.recv_timeout(Duration::from_secs(1)) {
-            Ok(Ok(event)) => match &event.kind {
-                EventKind::Modify(ModifyKind::Data(_)) | EventKind::Create(_) | EventKind::Remove(_) => {
-                    if start.elapsed() > Duration::from_secs(1) {
-                        start = Instant::now();
-                        let certificate_configs = listdir(path.clone());
-                        sender.send(certificate_configs)?;
-                        info!("Certificate changed: {:?}, {:?}", event.kind, event.paths);
-                    }
-                }
-                _ => {}
-            },
-            Ok(Err(e)) => error!("Watch error: {:?}", e),
-            Err(_) => {}
-        }
-    }
-}
-
 pub fn drop_priv(user: String, group: String, http_addr: String, tls_addr: Option<String>) {
     thread::sleep(time::Duration::from_millis(10));
     loop {
@@ -260,9 +213,9 @@ pub fn drop_priv(user: String, group: String, http_addr: String, tls_addr: Optio
 }
 
 pub fn check_priv(addr: &str) {
-    let port = SocketAddr::from_str(addr).map(|sa| sa.port()).expect("Failed to parse address port ");
+    let port = SocketAddr::from_str(addr).map(|sa| sa.port()).die("Failed to parse address port ");
     if port < 1024 {
-        let meta = std::fs::metadata("/proc/self").map(|m| m.uid()).unwrap();
+        let meta = std::fs::metadata("/proc/self").map(|m| m.uid()).die("Reading /proc/self");
         if meta != 0 {
             error!("Running on privileged port requires to start as ROOT");
             process::exit(1)
@@ -397,3 +350,55 @@ pub fn split_host_port(addr: &str, tls: bool) -> Option<(&str, u16, bool, &str)>
         }
     };
 }
+
+pub fn get_hostname() -> String {
+    if let Ok(host) = env::var("HOSTNAME").or_else(|_| env::var("COMPUTERNAME")) {
+        if !host.trim().is_empty() {
+            return host;
+        }
+    }
+    Command::new("hostname")
+        .output()
+        .ok()
+        .and_then(|output| String::from_utf8(output.stdout).ok())
+        .map(|s| s.trim().to_string())
+        .filter(|s| !s.is_empty())
+        .unwrap_or_else(|| "unknown".to_string())
+}
+
+// pub fn die(message: &str) -> ! {
+//     log::error!("{message}");
+//     process::exit(1);
+// }
+
+pub trait Die<T> {
+    fn die(self, message: &str) -> T;
+}
+
+impl<T, E: Debug> Die<T> for Result<T, E> {
+    #[track_caller]
+    fn die(self, message: &str) -> T {
+        match self {
+            Ok(value) => value,
+            Err(e) => {
+                let loc = Location::caller();
+                eprintln!("\x1b[1;31mERROR:\x1b[0m {message}: {e:?}: {}: {}", loc.file(), loc.line());
+                process::exit(1);
+            }
+        }
+    }
+}
+
+impl<T> Die<T> for Option<T> {
+    #[track_caller]
+    fn die(self, message: &str) -> T {
+        match self {
+            Some(value) => value,
+            None => {
+                let loc = Location::caller();
+                eprintln!("\x1b[1;31mERROR:\x1b[0m {message} at {}:{}", loc.file(), loc.line());
+                process::exit(1);
+            }
+        }
+    }
+}

src/utils/types.rs

@@ -1,21 +1,22 @@
 use dashmap::DashMap;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
-use std::sync::atomic::AtomicUsize;
 use std::sync::Arc;
+use std::sync::atomic::AtomicUsize;
 
 pub type UpstreamsDashMap = DashMap<Arc<str>, DashMap<Arc<str>, (Vec<Arc<InnerMap>>, AtomicUsize)>>;
 
 pub type UpstreamsIdMap = DashMap<String, Arc<InnerMap>>;
 pub type Headers = DashMap<Arc<str>, DashMap<Arc<str>, Vec<(String, Arc<str>)>>>;
 
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Debug, Default, Serialize)]
 pub struct Extraparams {
-    pub to_https: Option<bool>,
+    pub sticky_sessions: u64,
-    pub sticky_sessions: Option<u64>,
+    pub rate_limit: isize,
+    pub x4xx_limit: u32,
+    pub to_https: bool,
+    pub ssl_verify: bool,
     pub authentication: Option<Arc<InnerAuth>>,
-    pub rate_limit: Option<isize>,
-    pub x4xx_limit: Option<u32>,
 }
 
 #[derive(Debug, Default, Clone, Serialize, Deserialize)]
@@ -91,6 +92,8 @@ pub struct PathConfig {
     pub healthcheck: Option<bool>,
     pub redirect_to: Option<String>,
     pub authorization: Option<Auth>,
+    pub is_ssl: Option<bool>,
+    pub is_http2: Option<bool>,
 }
 #[derive(Debug, Default)]
 pub struct Configuration {
@@ -109,6 +112,8 @@ pub struct AppConfig {
     pub hc_method: String,
     pub upstreams_conf: String,
     pub log_level: String,
+    pub cache_enabled: Option<bool>,
+    pub cache_storage: Option<String>,
     pub cache_size_mb: Option<usize>,
     pub cache_ttl: Option<u64>,
     pub access_log: Option<String>,
@@ -131,12 +136,17 @@ pub struct AppConfig {
     pub runuser: Option<String>,
     pub rungroup: Option<String>,
     pub log_file: Option<String>,
+    pub log_pattern: Option<String>,
+    pub log_structured: Option<String>,
+    pub acme_dns_provider: Option<String>,
     pub tcp_keepalive_idle: Option<u64>,
     pub tcp_keepalive_interval: Option<u64>,
     pub tcp_keepalive_count: Option<usize>,
+    pub cluster_member: Option<String>,
+    pub worker_nodes: Option<String>,
 }
 
-#[derive(Debug, Default, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Default, Clone, PartialEq, Eq, Hash, Serialize)]
 pub struct InnerAuth {
     pub auth_type: Arc<str>,
     pub auth_cred: Arc<str>,
@@ -149,13 +159,20 @@ pub struct InnerMap {
     pub is_ssl: bool,
     pub is_http2: bool,
     pub to_https: bool,
-    pub rate_limit: Option<isize>,
+    pub rate_limit: isize,
-    pub x4xx_limit: Option<u32>,
+    pub x4xx_limit: u32,
-    pub healthcheck: Option<bool>,
+    pub healthcheck: bool,
     pub redirect_to: Option<Arc<str>>,
     pub authorization: Option<Arc<InnerAuth>>,
 }
 
+#[allow(dead_code)]
+impl Default for InnerMap {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 #[allow(dead_code)]
 impl InnerMap {
     pub fn new() -> Self {
@@ -181,12 +198,20 @@ pub struct InnerMapForJson {
     pub is_ssl: bool,
     pub is_http2: bool,
     pub to_https: bool,
-    pub rate_limit: Option<isize>,
+    pub rate_limit: isize,
-    pub x4xx_limit: Option<u32>,
+    pub x4xx_limit: u32,
-    pub healthcheck: Option<bool>,
+    pub healthcheck: bool,
 }
 #[derive(Debug, Default, Serialize, Deserialize)]
 pub struct UpstreamSnapshotForJson {
     pub backends: Vec<InnerMapForJson>,
     pub requests: usize,
 }
+
+#[derive(Debug)]
+pub struct WorkerNodes {
+    pub address: Arc<str>,
+    pub key: Option<Arc<str>>,
+    pub port: u16,
+    pub tls: bool,
+}

src/utils/watch.rs

@@ -0,0 +1,77 @@
+use crate::tls::CertificateConfig;
+use crate::utils::parceyaml::load_configuration;
+use crate::utils::tools::{Die, listdir};
+use crate::utils::types::Configuration;
+use log::{error, info};
+use notify::event::ModifyKind;
+use notify::{Config, Event, EventKind, RecommendedWatcher, RecursiveMode, Watcher};
+use pingora::prelude::sleep;
+use std::path::Path;
+use std::sync::mpsc::channel;
+use std::time::{Duration, Instant};
+use tokio::sync::mpsc::Sender;
+use tokio::task;
+
+pub async fn file_watch(fp: String, toreturn: Sender<Configuration>) {
+    sleep(Duration::from_millis(50)).await; // For having nice logs :-)
+    let file_path = fp.as_str();
+    let parent_dir = Path::new(file_path).parent().die("Get parent folder");
+    let (local_tx, mut local_rx) = tokio::sync::mpsc::channel::<notify::Result<Event>>(1);
+
+    let _watcher_handle = task::spawn_blocking({
+        let parent_dir = parent_dir.to_path_buf(); // Move directory path into the closure
+        move || {
+            let mut watcher = RecommendedWatcher::new(
+                move |res| {
+                    let _ = local_tx.blocking_send(res);
+                },
+                Config::default(),
+            )
+            .die("Initialize file watcher");
+            watcher.watch(&parent_dir, RecursiveMode::Recursive).die("");
+            let (_rtx, mut rrx) = tokio::sync::mpsc::channel::<bool>(1);
+            let _ = rrx.blocking_recv();
+        }
+    });
+    let mut start = Instant::now();
+
+    while let Some(event) = local_rx.recv().await {
+        match event {
+            Ok(e) => match e.kind {
+                EventKind::Modify(ModifyKind::Data(_)) | EventKind::Create(..) | EventKind::Remove(..) if start.elapsed() > Duration::from_secs(2) => {
+                    start = Instant::now();
+                    let snd = load_configuration(file_path, "filepath").await.0;
+                    if let Some(snd) = snd {
+                        toreturn.send(snd).await.die("Send to file watcher");
+                    }
+                }
+                _ => (),
+            },
+            Err(e) => error!("Watch error: {:?}", e),
+        }
+    }
+}
+pub fn folder_watch(path: String, sender: std::sync::mpsc::Sender<Vec<CertificateConfig>>) -> notify::Result<()> {
+    let (tx, rx) = channel();
+    let mut watcher = RecommendedWatcher::new(tx, Config::default())?;
+    watcher.watch(path.as_ref(), RecursiveMode::Recursive)?;
+    info!("Watching for certificates in : {}", path);
+    let certificate_configs = listdir(path.clone());
+    sender.send(certificate_configs)?;
+    let mut start = Instant::now();
+    loop {
+        match rx.recv_timeout(Duration::from_secs(1)) {
+            Ok(Ok(event)) => match &event.kind {
+                EventKind::Modify(ModifyKind::Data(_)) | EventKind::Create(_) | EventKind::Remove(_) if start.elapsed() > Duration::from_secs(1) => {
+                    start = Instant::now();
+                    let certificate_configs = listdir(path.clone());
+                    sender.send(certificate_configs)?;
+                    info!("Certificate changed: {:?}, {:?}", event.kind, event.paths);
+                }
+                _ => {}
+            },
+            Ok(Err(e)) => error!("Watch error: {:?}", e),
+            Err(_) => {}
+        }
+    }
+}

src/web/logging.rs

@@ -1,176 +0,0 @@
-use crate::utils::metrics::LOGGING_ERRORS;
-use crate::utils::structs::AppConfig;
-use log::{info, LevelFilter};
-use log4rs::append::rolling_file::policy::compound::roll::fixed_window::FixedWindowRoller;
-use log4rs::append::rolling_file::policy::compound::trigger::size::SizeTrigger;
-use log4rs::append::rolling_file::policy::compound::CompoundPolicy;
-use log4rs::append::rolling_file::RollingFileAppender;
-use log4rs::{
-    append::console::ConsoleAppender,
-    config::{Appender, Config as Log4rsConfig, Root},
-    encode::pattern::PatternEncoder,
-};
-use pingora_cache::CachePhase;
-use pingora_http::Version;
-use pingora_proxy::Session;
-use std::net::{IpAddr, Ipv4Addr};
-use std::sync::OnceLock;
-use tokio::sync::mpsc;
-
-#[derive(Debug)]
-pub struct LogMessage {
-    pub response_code: u16,
-    pub summary: String,
-    pub client_ip: IpAddr,
-    pub version: Version,
-    pub user_agent: String,
-    pub cache_status: CachePhase,
-}
-static LOG_SENDER: OnceLock<mpsc::Sender<LogMessage>> = OnceLock::new();
-static ACCESS_LOG: OnceLock<LogLevel> = OnceLock::new();
-const LOG_BUFFER: usize = 16384;
-
-pub fn log_builder(conf: &AppConfig, location: &Option<String>) {
-    let log_level = match conf.log_level.as_str() {
-        "info" => LevelFilter::Info,
-        "error" => LevelFilter::Error,
-        "warn" => LevelFilter::Warn,
-        "debug" => LevelFilter::Debug,
-        "trace" => LevelFilter::Trace,
-        "off" => LevelFilter::Off,
-        _ => {
-            println!("Error reading log level, defaulting to: INFO");
-            LevelFilter::Info
-        }
-    };
-
-    let pattern = "{d(%Y-%m-%d %H:%M:%S)} {l} {t} - {m}\n";
-
-    if let Some(location) = location {
-        let parts: Vec<&str> = location.splitn(4, ',').map(|s| s.trim()).collect();
-
-        let path = parts.get(0).expect("Syntax error, could not get path for log files");
-        let compress = parts.get(3).unwrap_or(&"No");
-        let size_mb: u64 = parts.get(1).and_then(|s| s.parse().ok()).unwrap_or(100);
-        let keep: u32 = parts.get(2).and_then(|s| s.parse().ok()).unwrap_or(5);
-
-        let pattern_str = match compress {
-            &"compress" => format!("{}.{{}}.gz", path),
-            _ => format!("{}.{{}}", path),
-        };
-
-        let roller = FixedWindowRoller::builder().build(pattern_str.as_str(), keep).unwrap();
-        let trigger = SizeTrigger::new(size_mb * 1024 * 1024);
-        let policy = CompoundPolicy::new(Box::new(trigger), Box::new(roller));
-
-        let file = RollingFileAppender::builder()
-            .encoder(Box::new(PatternEncoder::new(pattern)))
-            .build(path, Box::new(policy))
-            .unwrap();
-
-        let config = Log4rsConfig::builder()
-            .appender(Appender::builder().build("file", Box::new(file)))
-            .build(Root::builder().appender("file").build(log_level))
-            .unwrap();
-        log4rs::init_config(config).unwrap();
-        info!("Logging to: {}, Max file size: {}mb, Files to keep: {}, compression: {} ", path, size_mb, keep, compress);
-    } else {
-        let stdout = ConsoleAppender::builder().encoder(Box::new(PatternEncoder::new(pattern))).build();
-
-        let config = Log4rsConfig::builder()
-            .appender(Appender::builder().build("stdout", Box::new(stdout)))
-            .build(Root::builder().appender("stdout").build(log_level))
-            .unwrap();
-        log4rs::init_config(config).unwrap();
-        info!("No files are configured, logging to stdout");
-    }
-}
-
-pub fn init_access_log(level_str: &str) {
-    let level = LogLevel::from_str(level_str);
-    let _ = ACCESS_LOG.set(level);
-}
-
-#[derive(Debug)]
-pub enum LogLevel {
-    Access,
-    Error,
-    None,
-}
-
-impl LogLevel {
-    pub fn from_str(s: &str) -> Self {
-        match s {
-            "all" => LogLevel::Access,
-            "error" => LogLevel::Error,
-            _ => LogLevel::None,
-        }
-    }
-}
-
-pub fn access_log(response_code: u16, summary: &str, session: &Session) {
-    let level = ACCESS_LOG.get().unwrap_or(&LogLevel::None);
-
-    let should_log = match level {
-        LogLevel::Access => true,
-        LogLevel::None => false,
-        LogLevel::Error => !(100..=399).contains(&response_code),
-    };
-
-    if !should_log {
-        return;
-    }
-
-    let ip = session
-        .client_addr()
-        .and_then(|addr| addr.as_inet())
-        .map(|addr| addr.ip())
-        .unwrap_or(IpAddr::V4(Ipv4Addr::LOCALHOST));
-
-    let user_agent = session.req_header().headers.get("user-agent").and_then(|v| v.to_str().ok()).unwrap_or("-");
-    // let cache_status = match session.cache.phase() {
-    //     CachePhase::Hit => "Hit",
-    //     CachePhase::Miss => "Miss",
-    //     CachePhase::Expired => "Expired",
-    //     _ => "Disabled",
-    // };
-    let log = LogMessage {
-        response_code,
-        summary: summary.to_owned(),
-        client_ip: ip,
-        version: session.req_header().version,
-        user_agent: user_agent.to_owned(),
-        cache_status: session.cache.phase(),
-    };
-
-    if let Some(sender) = LOG_SENDER.get() {
-        let sender = sender;
-        if let Err(_) = sender.try_send(log) {
-            LOGGING_ERRORS.inc();
-        }
-    }
-}
-
-pub fn init_logging(enabled: Option<String>) {
-    if let Some(_) = enabled {
-        LOGGING_ERRORS.set(0);
-        info!("Enabling {:?} log, with buffer of {} messages", ACCESS_LOG.get().unwrap_or(&LogLevel::None), LOG_BUFFER);
-        let (ltx, lrx) = mpsc::channel(LOG_BUFFER);
-        LOG_SENDER.set(ltx).unwrap();
-        std::thread::spawn(move || log_receiver(lrx));
-    }
-}
-
-pub fn log_receiver(mut receiver: mpsc::Receiver<LogMessage>) {
-    while let Some(msg) = receiver.blocking_recv() {
-        info!(
-            "{}, {}, {}, client: {}, version: {:?}, useragent: {}",
-            msg.response_code,
-            msg.cache_status.as_str(),
-            msg.summary,
-            msg.client_ip,
-            msg.version,
-            msg.user_agent,
-        );
-    }
-}