fix(httpproxy): redirect from http to https

.devcontainer/.dockerignore

@@ -1,4 +1,5 @@
 .dockerignore
 devcontainer.json
+docker-compose.yml
 Dockerfile
 README.md

.devcontainer/Dockerfile

@@ -1,3 +1,2 @@
-FROM ghcr.io/qdm12/godevcontainer:v0.21-alpine
-RUN apk add wireguard-tools htop openssl tcpdump iptables
-RUN apk add nodejs npm && npm install markdownlint-cli2 --global && apk del npm
+FROM qmcgaw/godevcontainer
+RUN apk add wireguard-tools htop openssl

.devcontainer/README.md

@@ -2,47 +2,68 @@
 
 Development container that can be used with VSCode.
 
-It works on Linux, Windows (WSL2) and OSX.
+It works on Linux, Windows and OSX.
 
 ## Requirements
 
 - [VS code](https://code.visualstudio.com/download) installed
-- [VS code dev containers extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers) installed
+- [VS code remote containers extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers) installed
 - [Docker](https://www.docker.com/products/docker-desktop) installed and running
+    - If you don't use Linux or WSL 2, share your home directory `~/` and the directory of your project with Docker Desktop
+- [Docker Compose](https://docs.docker.com/compose/install/) installed
+- Ensure your host has the following and that they are accessible by Docker:
+    - `~/.ssh` directory
+    - `~/.gitconfig` file (can be empty)
 
 ## Setup
 
-1. Create the following files and directory on your host if you don't have them:
-
-    ```sh
-    touch ~/.gitconfig ~/.zsh_history
-    mkdir -p ~/.ssh
-    ```
-
-1. **For OSX hosts**: ensure the project directory and your home directory `~` are accessible by Docker.
 1. Open the command palette in Visual Studio Code (CTRL+SHIFT+P).
-1. Select `Dev-Containers: Open Folder in Container...` and choose the project directory.
+1. Select `Remote-Containers: Open Folder in Container...` and choose the project directory.
+1. For Docker running on Windows HyperV, if you want to use SSH keys, bind mount them at `/tmp/.ssh` by changing the `volumes` section in the [docker-compose.yml](docker-compose.yml).
 
 ## Customization
 
-For any customization to take effect, you should "rebuild and reopen":
+### Customize the image
 
-1. Open the command palette in Visual Studio Code (CTRL+SHIFT+P)
-2. Select `Dev-Containers: Rebuild Container`
+You can make changes to the [Dockerfile](Dockerfile) and then rebuild the image. For example, your Dockerfile could be:
 
-Changes you can make are notably:
+```Dockerfile
+FROM qmcgaw/godevcontainer
+USER root
+RUN apk add curl
+USER vscode
+```
 
-- Changes to the Docker image in [Dockerfile](Dockerfile)
-- Changes to VSCode **settings** and **extensions** in [devcontainer.json](devcontainer.json).
-- Change the entrypoint script by adding a bind mount in [devcontainer.json](devcontainer.json) of a shell script to `/root/.welcome.sh` to replace the [current welcome script](https://github.com/qdm12/godevcontainer/blob/master/shell/.welcome.sh). For example:
+Note that you may need to use `USER root` to build as root, and then change back to `USER vscode`.
 
-    ```json
-    // Welcome script
-    {
-        "source": "/yourpath/.welcome.sh",
-        "target": "/root/.welcome.sh",
-        "type": "bind"
-    },
+To rebuild the image, either:
+
+- With VSCode through the command palette, select `Remote-Containers: Rebuild and reopen in container`
+- With a terminal, go to this directory and `docker-compose build`
+
+### Customize VS code settings
+
+You can customize **settings** and **extensions** in the [devcontainer.json](devcontainer.json) definition file.
+
+### Entrypoint script
+
+You can bind mount a shell script to `/home/vscode/.welcome.sh` to replace the [current welcome script](shell/.welcome.sh).
+
+### Publish a port
+
+To access a port from your host to your development container, publish a port in [docker-compose.yml](docker-compose.yml).
+
+### Run other services
+
+1. Modify [docker-compose.yml](docker-compose.yml) to launch other services at the same time as this development container, such as a test database:
+
+    ```yml
+      database:
+        image: postgres
+        restart: always
+        environment:
+          POSTGRES_PASSWORD: password
     ```
 
-- More options are documented in the [devcontainer.json reference](https://containers.dev/implementors/json_reference/).
+1. In [devcontainer.json](devcontainer.json), change the line `"runServices": ["vscode"],` to `"runServices": ["vscode", "database"],`.
+1. In the VS code command palette, rebuild the container.

.devcontainer/devcontainer.json

@@ -1,111 +1,82 @@
-{
-    "name": "gluetun-dev",
-    // User defined settings
-    "containerEnv": {
-        "TZ": ""
-    },
-    // Fixed settings
-    "build": {
-        "dockerfile": "./Dockerfile"
-    },
-    "postCreateCommand": "~/.windows.sh && go mod download",
-    "capAdd": [
-        "NET_ADMIN", // Gluetun specific
-        "SYS_PTRACE" // for dlv Go debugging
-    ],
-    "securityOpt": [
-        "seccomp=unconfined" // for dlv Go debugging
-    ],
-    "mounts": [
-        // Zsh commands history persistence
-        {
-            "source": "${localEnv:HOME}/.zsh_history",
-            "target": "/root/.zsh_history",
-            "type": "bind"
-        },
-        // Git configuration file
-        {
-            "source": "${localEnv:HOME}/.gitconfig",
-            "target": "/root/.gitconfig",
-            "type": "bind"
-        },
-        // SSH directory for Linux, OSX and WSL
-        // On Linux and OSX, a symlink /mnt/ssh <-> ~/.ssh is
-        // created in the container. On Windows, files are copied
-        // from /mnt/ssh to ~/.ssh to fix permissions.
-        {
-            "source": "${localEnv:HOME}/.ssh",
-            "target": "/mnt/ssh",
-            "type": "bind"
-        },
-        // Docker socket to access the host Docker server
-        {
-            "source": "/var/run/docker.sock",
-            "target": "/var/run/docker.sock",
-            "type": "bind"
-        }
-    ],
-    "customizations": {
-        "vscode": {
-            "extensions": [
-                "golang.go",
-                "eamodio.gitlens", // IDE Git information
-                "davidanson.vscode-markdownlint",
-                "ms-azuretools.vscode-docker", // Docker integration and linting
-                "shardulm94.trailing-spaces", // Show trailing spaces
-                "Gruntfuggly.todo-tree", // Highlights TODO comments
-                "bierner.emojisense", // Emoji sense for markdown
-                "stkb.rewrap", // rewrap comments after n characters on one line
-                "vscode-icons-team.vscode-icons", // Better file extension icons
-                "github.vscode-pull-request-github", // Github interaction
-                "redhat.vscode-yaml", // Kubernetes, Drone syntax highlighting
-                "bajdzis.vscode-database", // Supports connections to mysql or postgres, over SSL, socked
-                "IBM.output-colorizer", // Colorize your output/test logs
-                "github.copilot" // AI code completion
-            ],
-            "settings": {
-                "files.eol": "\n",
-                "remote.extensionKind": {
-                    "ms-azuretools.vscode-docker": "workspace"
-                },
-                "go.useLanguageServer": true,
-                "[go]": {
-                    "editor.codeActionsOnSave": {
-                        "source.organizeImports": "explicit"
-                    }
-                },
-                "[go.mod]": {
-                    "editor.codeActionsOnSave": {
-                        "source.organizeImports": "explicit"
-                    }
-                },
-                "gopls": {
-                    "usePlaceholders": false,
-                    "staticcheck": true,
-                    "ui.diagnostic.analyses": {
-                        "ST1000": false
-                    },
-                    "formatting.gofumpt": true,
-                },
-                "go.lintTool": "golangci-lint",
-                "go.lintOnSave": "package",
-                "editor.formatOnSave": true,
-                "go.buildTags": "linux",
-                "go.toolsEnvVars": {
-                    "CGO_ENABLED": "0"
-                },
-                "go.testEnvVars": {
-                    "CGO_ENABLED": "1"
-                },
-                "go.testFlags": [
-                    "-v",
-                    "-race"
-                ],
-                "go.testTimeout": "10s",
-                "go.coverOnSingleTest": true,
-                "go.coverOnSingleTestFile": true,
-                "go.coverOnTestPackage": true
-            }
-        }
-    }
+{
+    "name": "gluetun-dev",
+    "dockerComposeFile": [
+        "docker-compose.yml"
+    ],
+    "service": "vscode",
+    "runServices": [
+        "vscode"
+    ],
+    "shutdownAction": "stopCompose",
+    "postCreateCommand": "source ~/.windows.sh && go mod download && go mod tidy",
+    "workspaceFolder": "/workspace",
+    "extensions": [
+        "golang.go",
+        "eamodio.gitlens", // IDE Git information
+        "davidanson.vscode-markdownlint",
+        "ms-azuretools.vscode-docker", // Docker integration and linting
+        "shardulm94.trailing-spaces", // Show trailing spaces
+        "Gruntfuggly.todo-tree", // Highlights TODO comments
+        "bierner.emojisense", // Emoji sense for markdown
+        "stkb.rewrap", // rewrap comments after n characters on one line
+        "vscode-icons-team.vscode-icons", // Better file extension icons
+        "github.vscode-pull-request-github", // Github interaction
+        "redhat.vscode-yaml", // Kubernetes, Drone syntax highlighting
+        "bajdzis.vscode-database", // Supports connections to mysql or postgres, over SSL, socked
+        "IBM.output-colorizer", // Colorize your output/test logs
+        "mohsen1.prettify-json", // Prettify JSON data
+        "github.copilot",
+    ],
+    "settings": {
+        "files.eol": "\n",
+        "remote.extensionKind": {
+            "ms-azuretools.vscode-docker": "workspace"
+        },
+        "editor.codeActionsOnSaveTimeout": 3000,
+        "go.useLanguageServer": true,
+        "[go]": {
+            "editor.formatOnSave": true,
+            "editor.codeActionsOnSave": {
+                "source.organizeImports": true,
+            },
+            // Optional: Disable snippets, as they conflict with completion ranking.
+            "editor.snippetSuggestions": "none"
+        },
+        "[go.mod]": {
+            "editor.formatOnSave": true,
+            "editor.codeActionsOnSave": {
+                "source.organizeImports": true,
+            },
+        },
+        "gopls": {
+            "usePlaceholders": false,
+            "staticcheck": true
+        },
+        "go.autocompleteUnimportedPackages": true,
+        "go.gotoSymbol.includeImports": true,
+        "go.gotoSymbol.includeGoroot": true,
+        "go.lintTool": "golangci-lint",
+        "go.buildOnSave": "workspace",
+        "go.lintOnSave": "workspace",
+        "go.vetOnSave": "workspace",
+        "editor.formatOnSave": true,
+        "go.toolsEnvVars": {
+            "GOFLAGS": "-tags=",
+            // "CGO_ENABLED": 1 // for the race detector
+        },
+        "gopls.env": {
+            "GOFLAGS": "-tags="
+        },
+        "go.testEnvVars": {
+            "": ""
+        },
+        "go.testFlags": [
+            "-v",
+            // "-race"
+        ],
+        "go.testTimeout": "10s",
+        "go.coverOnSingleTest": true,
+        "go.coverOnSingleTestFile": true,
+        "go.coverOnTestPackage": true
+    }
 }

.devcontainer/docker-compose.yml

@@ -0,0 +1,30 @@
+version: "3.7"
+
+services:
+  vscode:
+    build: .
+    devices:
+      - /dev/net/tun:/dev/net/tun
+    volumes:
+      - ../:/workspace
+      # Docker socket to access Docker server
+      - /var/run/docker.sock:/var/run/docker.sock
+      # Docker configuration
+      - ~/.docker:/root/.docker
+      # SSH directory for Linux, OSX and WSL
+      # On Linux and OSX, a symlink /mnt/ssh <-> ~/.ssh is
+      # created in the container. On Windows, files are copied
+      # from /mnt/ssh to ~/.ssh to fix permissions.
+      - ~/.ssh:/mnt/ssh
+      # Shell history persistence
+      - ~/.zsh_history:/root/.zsh_history
+    environment:
+      - TZ=
+    cap_add:
+      # For debugging with dlv
+      # - SYS_PTRACE
+      - NET_ADMIN
+    security_opt:
+      # For debugging with dlv
+      - seccomp:unconfined
+    entrypoint: zsh -c "while sleep 1000; do :; done"

.github/CONTRIBUTING.md

@@ -13,6 +13,6 @@ Contributions are [released](https://help.github.com/articles/github-terms-of-se
 
 ## Resources
 
-- [Gluetun guide on development](https://github.com/qdm12/gluetun-wiki/blob/main/contributing/development.md)
+- [Gluetun guide on development](https://github.com/qdm12/gluetun/wiki/Development)
 - [Using Pull Requests](https://help.github.com/articles/about-pull-requests/)
 - [How to Contribute to Open Source](https://opensource.guide/how-to-contribute/)

.github/ISSUE_TEMPLATE/bug.yml

@@ -7,18 +7,13 @@ body:
     attributes:
       value: |
         Thanks for taking the time to fill out this bug report!
-
-        ⚠️ Your issue will be instantly closed as not planned WITHOUT explanation if:
-        - you do not fill out **the title of the issue** ☝️
-        - you do not provide the **Gluetun version** as requested below
-        - you provide **less than 10 lines of logs** as requested below
   - type: dropdown
     id: urgent
     attributes:
       label: Is this urgent?
       description: |
         Is this a critical bug, or do you need this fixed urgently?
-        If this is urgent, note you can use one of the [image tags available](https://github.com/qdm12/gluetun-wiki/blob/main/setup/docker-image-tags.md) if that can help.
+        If this is urgent, note you can use one of the [image tags available](https://github.com/qdm12/gluetun/wiki/Docker-image-tags) if that can help.
       options:
         - "No"
         - "Yes"
@@ -50,7 +45,6 @@ body:
         - Cyberghost
         - ExpressVPN
         - FastestVPN
-        - Giganews
         - HideMyAss
         - IPVanish
         - IVPN
@@ -67,6 +61,7 @@ body:
         - VPNSecure.me
         - VPNUnlimited
         - VyprVPN
+        - WeVPN
         - Windscribe
     validations:
       required: true
@@ -80,7 +75,6 @@ body:
         - Portainer
         - Kubernetes
         - Podman
-        - Unraid
         - Other
     validations:
       required: true
@@ -90,7 +84,7 @@ body:
       label: What is the version of Gluetun
       description: |
         Copy paste the version line at the top of your logs.
-        It MUST be in the form `Running version latest built on 2020-03-13T01:30:06Z (commit d0f678c)`.
+        It should be in the form `Running version latest built on 2020-03-13T01:30:06Z (commit d0f678c)`.
     validations:
       required: true
   - type: textarea
@@ -103,7 +97,7 @@ body:
   - type: textarea
     id: logs
     attributes:
-      label: Share your logs (at least 10 lines)
+      label: Share your logs
       description: No sensitive information is logged out except when running with `LOG_LEVEL=debug`.
       render: plain text
     validations:

.github/ISSUE_TEMPLATE/config.yml

@@ -1,10 +1,6 @@
-blank_issues_enabled: false
 contact_links:
-  - name: Report a Wiki issue
-    url: https://github.com/qdm12/gluetun-wiki/issues/new/choose
-    about: Please create an issue on the gluetun-wiki repository.
   - name: Configuration help?
-    url: https://github.com/qdm12/gluetun/discussions/new/choose
+    url: https://github.com/qdm12/gluetun/discussions/new
     about: Please create a Github discussion.
   - name: Unraid template issue
     url: https://github.com/qdm12/gluetun/discussions/550

.github/ISSUE_TEMPLATE/provider.md

@@ -6,35 +6,12 @@ labels: ":bulb: New provider"
 
 ---
 
-Important notes:
+One of the following is required:
 
-- There is no need to support both OpenVPN and Wireguard for a provider, but it's better to support both if possible
-- We do **not** implement authentication to access servers information behind a login. This is way too time consuming unfortunately
-- If it's not possible to support a provider natively, you can still use the [the custom provider](https://github.com/qdm12/gluetun-wiki/blob/main/setup/providers/custom.md)
-
-## For Wireguard
-
-Wireguard can be natively supported ONLY if:
-
-- the `PrivateKey` field value is the same across all servers for one user account
-- the `Address` field value is:
-  - can be found in a structured (JSON etc.) list of servers publicly available; OR
-  - the same across all servers for one user account
-- the `PublicKey` field value is:
-  - can be found in a structured (JSON etc.) list of servers publicly available; OR
-  - the same across all servers for one user account
-- the `Endpoint` field value:
-  - can be found in a structured (JSON etc.) list of servers publicly available
-  - can be determined using a pattern, for example using country codes in hostnames
-
-If any of these conditions are not met, Wireguard cannot be natively supported or there is no advantage compared to using a custom Wireguard configuration file.
-
-If **all** of these conditions are met, please provide an answer for each of them.
-
-## For OpenVPN
-
-OpenVPN can be natively supported ONLY if one of the following can be provided, by preference in this order:
-
-- Publicly accessible URL to a structured (JSON etc.) list of servers **and attach** an example Openvpn configuration file for both TCP and UDP; OR
-- Publicly accessible URL to a zip file containing the Openvpn configuration files; OR
+- Publicly accessible URL to a zip file containing the Openvpn configuration files
+- Publicly accessible URL to a structured (JSON etc.) list of servers **and attach** an example Openvpn configuration file for both TCP and UDP
 - Publicly accessible URL to the list of servers **and attach** an example Openvpn configuration file for both TCP and UDP
+
+If the list of servers requires to login **or** is hidden behind an interactive configurator,
+you can only use a custom Openvpn configuration file.
+[The Wiki](https://github.com/qdm12/gluetun/wiki/Openvpn-file) describes how to do so.

.github/ISSUE_TEMPLATE/wiki issue.yml

@@ -0,0 +1,18 @@
+name: Wiki issue
+description: Report a Wiki issue
+title: "Wiki issue: "
+labels: ["📄 Wiki issue"]
+body:
+  - type: input
+    id: url
+    attributes:
+      label: "URL to the Wiki page"
+      placeholder: "https://github.com/qdm12/gluetun/wiki/OpenVPN-options"
+    validations:
+      required: true
+  - type: textarea
+    id: description
+    attributes:
+      label: "What's the issue?"
+    validations:
+      required: true

.github/labels.yml

@@ -1,154 +1,121 @@
-- name: "Status: 🗯️ Waiting for feedback"
-  color: "f7d692"
-- name: "Status: 🔴 Blocked"
-  color: "f7d692"
+# Temporary status
+- name: "🗯️ Waiting for feedback"
+  color: "aadefa"
+  description: ""
+- name: "🔴 Blocked"
+  color: "ff3f14"
   description: "Blocked by another issue or pull request"
-- name: "Status: 📌 Before next release"
-  color: "f7d692"
-  description: "Has to be done before the next release"
-- name: "Status: 🔒 After next release"
-  color: "f7d692"
+- name: "🔒 After next release"
+  color: "e8f274"
   description: "Will be done after the next release"
-- name: "Status: 🟡 Nearly resolved"
-  color: "f7d692"
-  description: "This might be resolved or is about to be resolved"
 
-- name: "Closed: ⚰️ Inactive"
-  color: "959a9c"
-  description: "No answer was received for weeks"
-- name: "Closed: 👥 Duplicate"
-  color: "959a9c"
-  description: "Issue duplicates an existing issue"
-- name: "Closed: 🗑️ Bad issue"
-  color: "959a9c"
-- name: "Closed: ☠️ cannot be done"
-  color: "959a9c"
-- name: "Closed: 🤖🍺 drunk AI"
-  color: "959a9c"
+# Priority
+- name: "🚨 Urgent"
+  color: "d5232f"
+  description: ""
+- name: "💤 Low priority"
+  color: "4285f4"
+  description: ""
 
-- name: "Priority: 🚨 Urgent"
-  color: "03adfc"
-- name: "Priority: 💤 Low priority"
-  color: "03adfc"
-
-- name: "Complexity: ☣️ Hard to do"
-  color: "ff9efc"
-- name: "Complexity: 🟩 Easy to do"
-  color: "ff9efc"
-
-- name: "Popularity: ❤️‍🔥 extreme"
-  color: "ffc7ea"
-- name: "Popularity: ❤️ high"
-  color: "ffc7ea"
+# Complexity
+- name: "☣️ Hard to do"
+  color: "7d0008"
+  description: ""
+- name: "🟩 Easy to do"
+  color: "34cf43"
+  description: ""
 
 # VPN providers
-- name: "☁️ AirVPN"
+- name: ":cloud: AirVPN"
   color: "cfe8d4"
-- name: "☁️ Custom"
+  description: ""
+- name: ":cloud: Cyberghost"
   color: "cfe8d4"
-- name: "☁️ Cyberghost"
+  description: ""
+- name: ":cloud: HideMyAss"
   color: "cfe8d4"
-- name: "☁️ Giganews"
+  description: ""
+- name: ":cloud: IPVanish"
   color: "cfe8d4"
-- name: "☁️ HideMyAss"
+  description: ""
+- name: ":cloud: IVPN"
   color: "cfe8d4"
-- name: "☁️ IPVanish"
+  description: ""
+- name: ":cloud: ExpressVPN"
   color: "cfe8d4"
-- name: "☁️ IVPN"
+  description: ""
+- name: ":cloud: FastestVPN"
   color: "cfe8d4"
-- name: "☁️ ExpressVPN"
+  description: ""
+- name: ":cloud: Mullvad"
   color: "cfe8d4"
-- name: "☁️ FastestVPN"
+  description: ""
+- name: ":cloud: NordVPN"
   color: "cfe8d4"
-- name: "☁️ Mullvad"
+  description: ""
+- name: ":cloud: Perfect Privacy"
   color: "cfe8d4"
-- name: "☁️ NordVPN"
+  description: ""
+- name: ":cloud: PIA"
   color: "cfe8d4"
-- name: "☁️ Perfect Privacy"
+  description: ""
+- name: ":cloud: Privado"
   color: "cfe8d4"
-- name: "☁️ PIA"
+  description: ""
+- name: ":cloud: PrivateVPN"
   color: "cfe8d4"
-- name: "☁️ Privado"
+  description: ""
+- name: ":cloud: ProtonVPN"
   color: "cfe8d4"
-- name: "☁️ PrivateVPN"
+- name: ":cloud: PureVPN"
   color: "cfe8d4"
-- name: "☁️ ProtonVPN"
+  description: ""
+- name: ":cloud: SlickVPN"
   color: "cfe8d4"
-- name: "☁️ PureVPN"
+  description: ""
+- name: ":cloud: Surfshark"
   color: "cfe8d4"
-- name: "☁️ SlickVPN"
+  description: ""
+- name: ":cloud: Torguard"
   color: "cfe8d4"
-- name: "☁️ Surfshark"
+  description: ""
+- name: ":cloud: VPNSecure.me"
   color: "cfe8d4"
-- name: "☁️ Torguard"
+- name: ":cloud: VPNUnlimited"
   color: "cfe8d4"
-- name: "☁️ VPNSecure.me"
+  description: ""
+- name: ":cloud: Vyprvpn"
   color: "cfe8d4"
-- name: "☁️ VPNUnlimited"
+  description: ""
+- name: ":cloud: WeVPN"
   color: "cfe8d4"
-- name: "☁️ Vyprvpn"
-  color: "cfe8d4"
-- name: "☁️ Windscribe"
+  description: ""
+- name: ":cloud: Windscribe"
   color: "cfe8d4"
+  description: ""
 
-- name: "Category: User error 🤦"
-  from_name: "Category: Config problem 📝"
+# Problem category
+- name: "Openvpn"
   color: "ffc7ea"
-- name: "Category: Healthcheck 🩺"
+  description: ""
+- name: "Wireguard"
   color: "ffc7ea"
-- name: "Category: Documentation ✒️"
-  description: "A problem with the readme or a code comment."
+  description: ""
+- name: "Unbound (DNS over TLS)"
   color: "ffc7ea"
-- name: "Category: Maintenance ⛓️"
-  description: "Anything related to code or other maintenance"
+  description: ""
+- name: "Firewall"
   color: "ffc7ea"
-- name: "Category: Logs 📚"
-  description: "Something to change in logs"
+  description: ""
+- name: "HTTP proxy"
   color: "ffc7ea"
-- name: "Category: Good idea 🎯"
-  description: "This is a good idea, judged by the maintainers"
+  description: ""
+- name: "Shadowsocks"
   color: "ffc7ea"
-- name: "Category: Motivated! 🙌"
-  description: "Your pumpness makes me pumped! The issue or PR shows great motivation!"
+  description: ""
+- name: "Healthcheck server"
   color: "ffc7ea"
-- name: "Category: Foolproof settings 👼"
-  color: "ffc7ea"
-- name: "Category: Label missing ❗"
-  color: "ffc7ea"
-- name: "Category: updater ♻️"
-  color: "ffc7ea"
-  description: "Concerns the code to update servers data"
-- name: "Category: New provider 🆕"
-  color: "ffc7ea"
-- name: "Category: OpenVPN 🔐"
-  color: "ffc7ea"
-- name: "Category: Wireguard 🔐"
-  color: "ffc7ea"
-- name: "Category: DNS 📠"
-  color: "ffc7ea"
-- name: "Category: Firewall ⛓️"
-  color: "ffc7ea"
-- name: "Category: MTU discovery 🔦"
-  color: "ffc7ea"
-- name: "Category: Routing 🛤️"
-  color: "ffc7ea"
-- name: "Category: IPv6 🛰️"
-  color: "ffc7ea"
-- name: "Category: VPN port forwarding 📥"
-  color: "ffc7ea"
-- name: "Category: HTTP proxy 🔁"
-  color: "ffc7ea"
-- name: "Category: Shadowsocks 🔁"
-  color: "ffc7ea"
-- name: "Category: control server ⚙️"
-  color: "ffc7ea"
-- name: "Category: kernel 🧠"
-  color: "ffc7ea"
-- name: "Category: public IP service 💬"
-  color: "ffc7ea"
-- name: "Category: servers storage 📦"
-  color: "ffc7ea"
-- name: "Category: Performance 🚀"
-  color: "ffc7ea"
-- name: "Category: Investigation 🔍"
+  description: ""
+- name: "Control server"
   color: "ffc7ea"
+  description: ""

.github/pull_request_template.md

@@ -1,12 +0,0 @@
-# Description
-
-<!-- Please describe the reason for the changes being proposed. -->
-
-# Issue
-
-<!-- Please link to the issue(s) this change relates to. -->
-
-# Assertions
-
-* [ ] I am aware that we do not accept manual changes to the servers.json file <!-- If this is your goal, please consult https://github.com/qdm12/gluetun-wiki/blob/main/setup/servers.md#update-using-the-command-line -->
-* [ ] I am aware that any changes to settings should be reflected in the [wiki](https://github.com/qdm12/gluetun-wiki/)

.github/workflows/ci-skip.yml

@@ -14,6 +14,8 @@ on:
       - go.mod
       - go.sum
   pull_request:
+    branches:
+      - master
     paths-ignore:
       - .github/workflows/ci.yml
       - cmd/**

.github/workflows/ci.yml

@@ -17,6 +17,8 @@ on:
       - go.mod
       - go.sum
   pull_request:
+    branches:
+      - master
     paths:
       - .github/workflows/ci.yml
       - cmd/**
@@ -37,7 +39,7 @@ jobs:
     env:
       DOCKER_BUILDKIT: "1"
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v3
 
       - uses: reviewdog/action-misspell@v1
         with:
@@ -45,8 +47,6 @@ jobs:
           level: error
           exclude: |
             ./internal/storage/servers.json
-            ./.golangci.yml
-            *.md
 
       - name: Linting
         run: docker build --target lint .
@@ -60,46 +60,13 @@ jobs:
       - name: Run tests in test container
         run: |
           touch coverage.txt
-          docker run --rm --cap-add=NET_ADMIN --device /dev/net/tun \
+          docker run --rm \
           -v "$(pwd)/coverage.txt:/tmp/gobuild/coverage.txt" \
           test-container
 
-      - name: Verify dev cross platform compatibility
-        run: docker build --target xcompile .
-
       - name: Build final image
         run: docker build -t final-image .
 
-  verify-private:
-    if: |
-      github.repository == 'qdm12/gluetun' &&
-      (
-        github.event_name == 'push' ||
-        github.event_name == 'release' ||
-        (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]')
-      )
-    needs: [verify]
-    runs-on: ubuntu-latest
-    environment: secrets
-    steps:
-      - uses: actions/checkout@v6
-
-      - run: docker build -t qmcgaw/gluetun .
-
-      - name: Setup Go for CI utility
-        uses: actions/setup-go@v6
-        with:
-          go-version-file: ci/go.mod
-
-      - name: Build utility
-        run: go build -C ./ci -o runner ./cmd/main.go
-
-      - name: Run Gluetun container with Mullvad configuration
-        run: echo -e "${{ secrets.MULLVAD_WIREGUARD_PRIVATE_KEY }}\n${{ secrets.MULLVAD_WIREGUARD_ADDRESS }}" | ./ci/runner mullvad
-
-      - name: Run Gluetun container with ProtonVPN configuration
-        run: echo -e "${{ secrets.PROTONVPN_WIREGUARD_PRIVATE_KEY }}" | ./ci/runner protonvpn
-
   codeql:
     runs-on: ubuntu-latest
     permissions:
@@ -107,15 +74,12 @@ jobs:
       contents: read
       security-events: write
     steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-go@v6
-        with:
-          go-version-file: go.mod
-      - uses: github/codeql-action/init@v4
+      - uses: actions/checkout@v3
+      - uses: github/codeql-action/init@v2
         with:
           languages: go
-      - uses: github/codeql-action/autobuild@v4
-      - uses: github/codeql-action/analyze@v4
+      - uses: github/codeql-action/autobuild@v2
+      - uses: github/codeql-action/analyze@v2
 
   publish:
     if: |
@@ -125,20 +89,20 @@ jobs:
         github.event_name == 'release' ||
         (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]')
       )
-    needs: [verify, verify-private, codeql]
+    needs: [verify, codeql]
     permissions:
       actions: read
       contents: read
       packages: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v3
 
       # extract metadata (tags, labels) for Docker
       # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v4
         with:
           flavor: |
             latest=${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }}
@@ -153,15 +117,15 @@ jobs:
             type=semver,pattern=v{{major}},enable=${{ !startsWith(github.ref, 'refs/tags/v0.') }}
             type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }}
 
-      - uses: docker/setup-qemu-action@v4
-      - uses: docker/setup-buildx-action@v4
+      - uses: docker/setup-qemu-action@v2
+      - uses: docker/setup-buildx-action@v2
 
-      - uses: docker/login-action@v4
+      - uses: docker/login-action@v2
         with:
           username: qmcgaw
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
-      - uses: docker/login-action@v4
+      - uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: qdm12
@@ -169,14 +133,10 @@ jobs:
 
       - name: Short commit
         id: shortcommit
-        run: |
-          # Use the PR head SHA if it exists, otherwise fallback to GITHUB_SHA
-          FULL_SHA="${{ github.event.pull_request.head.sha || github.sha }}"
-          SHORT_SHA=
-          echo "value=$(echo $FULL_SHA | cut -c1-7)" >> $GITHUB_OUTPUT
+        run: echo "::set-output name=value::$(git rev-parse --short HEAD)"
 
       - name: Build and push final image
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v4.0.0
         with:
           platforms: linux/amd64,linux/386,linux/arm64,linux/arm/v6,linux/arm/v7,linux/ppc64le
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/closed-issue.yml

@@ -1,25 +0,0 @@
-name: Closed issue
-on:
-  issues:
-    types: [closed]
-
-jobs:
-  comment:
-    permissions:
-      issues: write
-    runs-on: ubuntu-latest
-    steps:
-      - uses: peter-evans/create-or-update-comment@v5
-        with:
-          token: ${{ github.token }}
-          issue-number: ${{ github.event.issue.number }}
-          body: |
-            Closed issues are **NOT** monitored, so commenting here will likely NOT be seen.
-            If you think this is *still unresolved* and have **more information** to bring, please either
-            re-open this issue or create another issue.
-
-            ❤️😠 temporarily help the Gluetun community and fight the AI slop scam website `gluetun[dot]com` by setting `BORINGPOLL_GLUETUNCOM=on` on the latest image.
-            See [the option in the wiki for more information](https://github.com/qdm12/gluetun-wiki/blob/main/setup/options/others.md)
-
-            This is an automated comment setup because @qdm12 is the sole maintainer of this project
-            which became too popular to monitor closed issues.

.github/workflows/configs/mlc-config.json

@@ -1,14 +0,0 @@
-{
-  "ignorePatterns": [
-    {
-      "pattern": "^https://console.substack.com/p/console-72$"
-    }
-  ],
-  "timeout": "20s",
-  "retryOn429": false,
-  "fallbackRetryDelay": "30s",
-  "aliveStatusCodes": [
-    200,
-    429
-  ]
-}

.github/workflows/dockerhub-description.yml

@@ -0,0 +1,25 @@
+name: Docker Hub description
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - README.md
+      - .github/workflows/dockerhub-description.yml
+jobs:
+  docker-hub-description:
+    if: github.repository == 'qdm12/gluetun'
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: peter-evans/dockerhub-description@v3
+        with:
+          username: qmcgaw
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          repository: qmcgaw/gluetun
+          short-description: Lightweight Swiss-knife VPN client to connect to several VPN providers
+          readme-filepath: README.md

.github/workflows/labels.yml

@@ -11,7 +11,7 @@ jobs:
       issues: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
-      - uses: crazy-max/ghaction-github-labeler@v6
+      - uses: actions/checkout@v3
+      - uses: crazy-max/ghaction-github-labeler@v4
         with:
           yaml-file: .github/labels.yml

.github/workflows/markdown-skip.yml

@@ -1,21 +0,0 @@
-name: Markdown
-on:
-  push:
-    branches:
-      - master
-    paths-ignore:
-      - "**.md"
-      - .github/workflows/markdown.yml
-  pull_request:
-    paths-ignore:
-      - "**.md"
-      - .github/workflows/markdown.yml
-
-jobs:
-  markdown:
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-    steps:
-      - name: No trigger path triggered for required markdown workflow.
-        run: exit 0

.github/workflows/markdown.yml

@@ -1,47 +0,0 @@
-name: Markdown
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - "**.md"
-      - .github/workflows/markdown.yml
-  pull_request:
-    paths:
-      - "**.md"
-      - .github/workflows/markdown.yml
-
-jobs:
-  markdown:
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-    steps:
-      - uses: actions/checkout@v6
-
-      - uses: DavidAnson/markdownlint-cli2-action@v22
-        with:
-          globs: "**.md"
-          config: .markdownlint-cli2.jsonc
-
-      - uses: reviewdog/action-misspell@v1
-        with:
-          locale: "US"
-          level: error
-          pattern: |
-            *.md
-
-      - uses: gaurav-nelson/github-action-markdown-link-check@v1
-        with:
-          use-quiet-mode: yes
-          config-file: .github/workflows/configs/mlc-config.json
-
-      - uses: peter-evans/dockerhub-description@v5
-        if: github.repository == 'qdm12/gluetun' && github.event_name == 'push'
-        with:
-          username: qmcgaw
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-          repository: qmcgaw/gluetun
-          short-description: Lightweight Swiss-knife VPN client to connect to several VPN providers
-          readme-filepath: README.md

.github/workflows/opened-issue.yml

@@ -1,22 +0,0 @@
-name: Opened issue
-on:
-  issues:
-    types: [opened]
-
-jobs:
-  comment:
-    permissions:
-      issues: write
-    runs-on: ubuntu-latest
-    steps:
-      - uses: peter-evans/create-or-update-comment@v5
-        with:
-          token: ${{ github.token }}
-          issue-number: ${{ github.event.issue.number }}
-          body: |
-            @qdm12 is more or less the only maintainer of this project and works on it in his free time.
-            Please:
-            - **do not** ask for updates, be patient
-            - :+1: the issue to show your support instead of commenting
-            @qdm12 usually checks issues at least once a week, if this is a new urgent bug,
-            [revert to an older tagged container image](https://github.com/qdm12/gluetun-wiki/blob/main/setup/docker-image-tags.md)

.github/workflows/update-servers-list.yml

@@ -1,98 +0,0 @@
-name: Update servers list
-on:
-  workflow_dispatch:
-    inputs:
-      provider:
-        description: "VPN Provider to update"
-        required: true
-        default: "all"
-        type: choice
-        options:
-          - all
-          - airvpn
-          - cyberghost
-          - expressvpn
-          - fastestvpn
-          - giganews
-          - hidemyass
-          - ipvanish
-          - ivpn
-          - mullvad
-          - nordvpn
-          - perfect privacy
-          - privado
-          - private internet access
-          - privatevpn
-          - protonvpn
-          - purevpn
-          - slickvpn
-          - surfshark
-          - torguard
-          - vpnsecure
-          - vpn unlimited
-          - vyprvpn
-          - windscribe
-  schedule:
-    - cron: "11 3 1 */2 *" # Run at 03:11 on the 1st of every 2nd month
-jobs:
-  update-servers-list:
-    if: github.repository == 'qdm12/gluetun'
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: write
-      pull-requests: write
-    steps:
-      - uses: actions/checkout@v6
-
-      - uses: actions/setup-go@v6
-        with:
-          go-version-file: go.mod
-
-      - name: Update servers list
-        run: |
-          SELECTED_PROVIDER="${{ github.event.inputs.provider || 'all' }}"
-
-          if [ "$SELECTED_PROVIDER" = "all" ]; then
-            FLAGS="-all"
-          else
-            FLAGS="-providers $SELECTED_PROVIDER"
-          fi
-
-          go run ./cmd/gluetun/main.go update $FLAGS \
-            -maintainer \
-            -proton-email "${{ secrets.PROTON_EMAIL }}" \
-            -proton-password "${{ secrets.PROTON_PASSWORD }}"
-
-      - name: Check for changes
-        run: |
-          if git diff --exit-code internal/storage/servers.json >/dev/null; then
-            echo "Error: internal/storage/servers.json was not modified."
-            exit 1
-          fi
-
-      - name: Check no other file changes
-        run: |
-          if ! git diff --exit-code --quiet ':!internal/storage/servers.json'; then
-            echo "Error: Unexpected changes detected in files other than servers.json"
-            git status --short
-            exit 1
-          fi
-
-      - name: Create Pull Request
-        id: createpr
-        uses: peter-evans/create-pull-request@v8
-        with:
-          branch-suffix: timestamp
-          branch: bot/update-servers-list
-          base: master
-          delete-branch: true
-          title: "feat(providers/${{ github.event.inputs.provider || 'all' }}): servers data update"
-          body: |
-            This PR was automatically generated by the [Update servers list](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) workflow run.
-
-      # - name: Merge Pull Request
-      #   env:
-      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      #   run: |
-      #     gh pr merge ${{ steps.createpr.outputs.pull-request-number }} --auto -m -d

.gitignore

@@ -1,2 +1 @@
 scratch.txt
-.DS_Store

.golangci.yml

@@ -1,78 +1,40 @@
-version: "2"
+linters-settings:
+  misspell:
+    locale: US
 
-formatters:
-  enable:
-    - gci
-    - gofumpt
-    - goimports
-  exclusions:
-    generated: lax
-    paths:
-      - third_party$
-      - builtin$
-      - examples$
+issues:
+  exclude-rules:
+    - path: _test\.go
+      linters:
+        - dupl
+        - goerr113
+        - containedctx
+    - path: "internal\\/server\\/.+\\.go"
+      linters:
+        - dupl
+    - path: "internal\\/configuration\\/settings\\/.+\\.go"
+      linters:
+        - dupl
+    - text: "^mnd: Magic number: 0[0-9]{3}, in <argument> detected$"
+      source: "^.+= os\\.OpenFile\\(.+, .+, 0[0-9]{3}\\)"
+      linters:
+        - gomnd
+    - text: "^mnd: Magic number: 0[0-9]{3}, in <argument> detected$"
+      source: "^.+= os\\.MkdirAll\\(.+, 0[0-9]{3}\\)"
+      linters:
+        - gomnd
+    - linters:
+        - lll
+      source: "^//go:generate .+$"
+    - text: "returns interface \\(github\\.com\\/vishvananda\\/netlink\\.Link\\)"
+      linters:
+        - ireturn
+    - path: "internal\\/openvpn\\/pkcs8\\/descbc\\.go"
+      text: "newCipherDESCBCBlock returns interface \\(github\\.com\\/youmark\\/pkcs8\\.Cipher\\)"
+      linters:
+        - ireturn
 
 linters:
-  settings:
-    misspell:
-      locale: US
-    goconst:
-      ignore-string-values:
-        # commonly used settings strings
-        - "^disabled$"
-        # Firewall and routing strings
-        - "^(ACCEPT|DROP)$"
-        - "^--append$"
-        - "^--delete$"
-        - "^all$"
-        - "^(tcp|udp)$"
-        # Server route strings
-        - "^/status$"
-
-  exclusions:
-    generated: lax
-    presets:
-      - comments
-      - common-false-positives
-      - legacy
-      - std-error-handling
-    rules:
-      - linters:
-          - containedctx
-          - dupl
-          - err113
-          - maintidx
-        path: _test\.go
-      - linters:
-          - dupl
-        path: internal\/server\/.+\.go
-      - linters:
-          - ireturn
-        text: returns interface \(golang\.org\/x\/sys\/unix\.Sockaddr\)
-      - linters:
-          - ireturn
-        path: internal\/openvpn\/pkcs8\/descbc\.go
-        text: newCipherDESCBCBlock returns interface \(github\.com\/youmark\/pkcs8\.Cipher\)
-      - linters:
-          - revive
-        path: internal\/provider\/(common|utils)\/.+\.go
-        text: "var-naming: avoid (bad|meaningless) package names"
-      - linters:
-          - lll
-        source: "^// https://.+$"
-      - linters:
-          - mnd
-        source: "^	cleanups\\.Add.+$"
-        path: internal\/(wireguard|amneziawg)\/run\.go
-      - linters:
-          - err113
-          - mnd
-        path: ci\/.+\.go
-
-    paths:
-      - third_party$
-      - builtin$
-      - examples$
   enable:
     # - cyclop
     # - errorlint
@@ -81,19 +43,17 @@ linters:
     - bidichk
     - bodyclose
     - containedctx
-    - copyloopvar
     - decorder
     - dogsled
     - dupl
-    - dupword
     - durationcheck
-    - err113
     - errchkjson
     - errname
+    - execinquery
     - exhaustive
-    - fatcontext
+    - exportloopref
     - forcetypeassert
-    - gocheckcompilerdirectives
+    - gci
     - gochecknoglobals
     - gochecknoinits
     - gocognit
@@ -101,23 +61,21 @@ linters:
     - gocritic
     - gocyclo
     - godot
+    - goerr113
     - goheader
+    - goimports
+    - gomnd
     - gomoddirectives
     - goprintffuncname
     - gosec
-    - gosmopolitan
     - grouper
     - importas
     - interfacebloat
-    - intrange
     - ireturn
     - lll
     - maintidx
     - makezero
-    - mirror
     - misspell
-    - mnd
-    - musttag
     - nakedret
     - nestif
     - nilerr
@@ -125,7 +83,6 @@ linters:
     - noctx
     - nolintlint
     - nosprintfhostport
-    - paralleltest
     - prealloc
     - predeclared
     - promlinter
@@ -133,7 +90,7 @@ linters:
     - revive
     - rowserrcheck
     - sqlclosecheck
-    - tagalign
+    - tenv
     - thelper
     - tparallel
     - unconvert
@@ -141,4 +98,9 @@ linters:
     - usestdlibvars
     - wastedassign
     - whitespace
-    - zerologlint
+
+run:
+  skip-dirs:
+    - .devcontainer
+    - .github
+    - doc

.markdownlint-cli2.jsonc

@@ -1,9 +0,0 @@
-{
-  "config": {
-    "default": true,
-    "MD013": false,
-  },
-  "ignores": [
-    ".github/pull_request_template.md"
-  ]
-}

.vscode/extensions.json

@@ -1,8 +0,0 @@
-{
-  // This list should be kept to the strict minimum
-  // to develop this project.
-  "recommendations": [
-    "golang.go",
-    "davidanson.vscode-markdownlint",
-  ],
-}

.vscode/launch.json

@@ -0,0 +1,35 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Update a VPN provider servers data",
+            "type": "go",
+            "request": "launch",
+            "cwd": "${workspaceFolder}",
+            "program": "cmd/gluetun/main.go",
+            "args": [
+                "update",
+                "${input:updateMode}",
+                "-providers",
+                "${input:provider}"
+            ],
+        }
+    ],
+    "inputs": [
+        {
+            "id": "provider",
+            "type": "promptString",
+            "description": "Please enter a provider (or comma separated list of providers)",
+        },
+        {
+            "id": "updateMode",
+            "type": "pickString",
+            "description": "Update mode to use",
+            "options": [
+                "-maintainer",
+                "-enduser"
+            ],
+            "default": "-maintainer"
+        },
+    ]
+}

.vscode/settings.json

@@ -1,29 +0,0 @@
-{
-  // The settings should be kept to the strict minimum
-  // to develop this project.
-  "files.eol": "\n",
-  "editor.formatOnSave": true,
-  "go.buildTags": "linux",
-  "go.toolsEnvVars": {
-    "CGO_ENABLED": "0"
-  },
-  "go.testEnvVars": {
-    "CGO_ENABLED": "1"
-  },
-  "go.testFlags": [
-    "-v",
-    "-race"
-  ],
-  "go.testTimeout": "10s",
-  "go.coverOnSingleTest": true,
-  "go.coverOnSingleTestFile": true,
-  "go.coverOnTestPackage": true,
-  "go.useLanguageServer": true,
-  "[go]": {
-    "editor.codeActionsOnSave": {
-      "source.organizeImports": "explicit"
-    }
-  },
-  "go.lintTool": "golangci-lint",
-  "go.lintOnSave": "package"
-}

.vscode/tasks.json

@@ -1,51 +0,0 @@
-{
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "Update a VPN provider servers data",
-            "type": "shell",
-            "command": "go",
-            "args": [
-                "run",
-                "./cmd/gluetun/main.go",
-                "update",
-                "${input:updateMode}",
-                "-providers",
-                "${input:provider}"
-            ],
-        },
-        {
-            "label": "Add a Gluetun Github Git remote",
-            "type": "shell",
-            "command": "git",
-            "args": [
-                "remote",
-                "add",
-                "${input:githubRemoteUsername}",
-                "git@github.com:${input:githubRemoteUsername}/gluetun.git"
-            ],
-        }
-    ],
-    "inputs": [
-        {
-            "id": "provider",
-            "type": "promptString",
-            "description": "Please enter a provider (or comma separated list of providers)",
-        },
-        {
-            "id": "updateMode",
-            "type": "pickString",
-            "description": "Update mode to use",
-            "options": [
-                "-maintainer",
-                "-enduser"
-            ],
-            "default": "-maintainer"
-        },
-        {
-            "id": "githubRemoteUsername",
-            "type": "promptString",
-            "description": "Please enter a Github username",
-        },
-    ]
-}

AGENTS.md

@@ -1,195 +0,0 @@
-# AGENTS
-
-Guidance for coding agents working in this repository.
-
-## Scope and priorities
-
-- Keep changes minimal and targeted. Feel free to do light refactors that are relevant to the modifications.
-- Breaking changes:
-  - Do not introduce breaking usage behavior (cli flags, environment variables, etc.) unless explicitly agreed.
-  - Do not introduce breaking changes for the Go API in the `pkg/` directory.
-  - If a compatibility break seems beneficial, stop and ask for confirmation before implementing it.
-- Update or add tests when behavior changes.
-
-## Go coding conventions
-
-### General guidelines
-
-- Use explicit, descriptive variable names by default.
-  - Notable bad examples: `req`, `resp`, `cfg`, `v`
-  - Allowed short-name exceptions:
-    - indexes such as `i`, `j`
-    - `ctx` for `context.Context`
-    - `t` for `*testing.T` and `b` for `*testing.B`
-    - `ctrl` for `*gomock.Controller`
-    - `err` for `error`, `errs` for `[]error`
-    - `wg` for `*sync.WaitGroup`
-- Avoid using global variables except for:
-  - exported sentinel errors that are used outside the package boundaries
-  - regular expressions defined with `regexp.MustCompile`
-  - variables set by the build pipeline, such as `Version` and `BuildDate`
-- Constants
-  - Prefer defining them inline in a function if it's only used in that function, rather than at the package level.
-  - Each one should be defined right above where it's used, instead of having multiple defined at the same place in a `const ()` block
-  - If one is only used in a single production code function, define it right above it so it's more local for readability.
-  - Do not define constants when constants exist in other packages, for example `http.StatusBadRequest` or `log.LevelDebug`.
-- Structs
-  - Prefer defining them inline in a function if it's only used in that function, rather than at the package level.
-- Do not use the short if form, prefer the longer one
-- Follow modern Go, according to the Go version defined in go.mod. Prefer modern constructs when equivalent:
-  - Example: use `for i := range 5` rather than `for i := 0; i < 5; i++`.
-  - Example: use `new("string")` rather than helper wrappers such as `stringPtr("string")`.
-  - Example: no need to pin variables in for loops when using them in goroutines or subtests.
-- Use `New(...) *Item` constructor per package. Each package should ideally only have one constructor, although this is not a strict rule. The constructor should return a pointer to the struct, and not an interface.
-- Always prefer using context-aware functions, for example:
-  - `exec.CommandContext` rather than `exec.Command`
-  - `http.NewRequestWithContext` rather than `http.NewRequest`
-- Never export a symbol unless absolutely necessary.
-- Always use the most restrictive builtin types. For example prefer `uint` over `int` if it's only zero or positive. Prefer `uint16` is the max value is 65535.
-- Prefer using builtin types whenever possible AND do not define single field structs unless necessary
-- Prefer splitting a code line only when it triggers the `lll` linter, do not split a command or arguments list for each element
-- Use `netip` types instead of `net` types whenever possible
-- Use constants instead of variables whenever possible, especially function-local inline constants.
-- Do not use `time.Sleep`, prefer using a `time.Timer` with a `select` statement also listening on a context cancelation
-- `panic`:
-  - should only be used when a programming error is encountered and you should NOT return errors for programming errors (such as passing nil objects)
-  - Its counterpart `recover` should not really be used, except for testing a panic in test code (or use `assert.PanicsWithValue`).
-
-### Directory structure and file naming
-
-- Executable main packages with a single `main()` function must be in the `cmd` directory.
-  Prefer having top level logic and have a longer `main()` function rather than having an `internal/app` package.
-- Code lives by default in subpackages within the `internal` directory
-- Code needing to be imported by external Go modules must be in subpackages within the `pkg` directory
-- Example code especially using the `pkg` directory must be in `main` packages within the `examples` directory, each with a single `main.go` function.
-- If AND only if the repository is a Go library and not a Go application, you may have Go files at the root of the project to simplify import paths. Most of the code should still be in subpackages in the `internal` directory.
-- Interfaces should be defined in `interfaces.go` files for each package. If there are unexported interfaces which need to be mocked, which is rare, they should be defined in `interfaces_local.go` files.
-- Mock files are
-  - `mocks_generate_test.go` which only contains `//go:generate` directives for generating mocks, and no actual code
-  - `mocks_test.go` which contains the generated mocks from exported interfaces and no other code, and is ignored in coverage reports
-  - `mocks_local_test.go` (rare) which contains the generated mocks from unexported interfaces and no other code, and is ignored in coverage reports
-  - NEVER generate an exported mock in a non test file, prefer re-generating files across packages.
-- Package naming
-  - Your package name should be the same as the directory containing it, **except for the `main` package**
-  - Use single words for package names
-  - Do not use generic names for package names such as `utils` or `helpers`
-- Package nesting
-  - Try to avoid nesting packages by default
-  - You can nest packages if you have different implementations for the same interface (e.g. a store interface)
-  - You can nest packages if you start having a lot of Go files (more than 10) and it really does make sense to make subpackages
-
-### Linting
-
-The linter is `golangci-lint` with the configuration defined in `.golangci.yml`.
-
-To exclude code from linting, prefer using, when absolutely necessary, command comments `//nolint:<linter>`.
-This allows the `nolintlint` linter to detect and report unnecessary `//nolint` comments later.
-You can notably use `//nolint:lll` and, for good valid reasons, `//nolint:gosec`. Sometimes `//nolint:mnd` when it just doesn't make sense to extract a constant such as `n = n << 4`
-Always prefer placing `//nolint` comments on the same code line where the error comes from, and not above a code block.
-
-### Mocking
-
-Mocking works with the `go.uber.org/mock` library, and the `mockgen` tool.
-
-- Mocks from exported interfaces are generated using go generate commands in `mocks_generate_test.go` files, and stored in `mocks_test.go` files, using:
-
-    ```go
-    //go:generate mockgen -destination=mocks_test.go -package=$GOPACKAGE . InterfaceA,InterfaceB
-    ```
-
-- Mocks from unexported interfaces are generated using go generate commands in `mocks_generate_test.go` files, and stored in `mocks_local_test.go` files. The source file for unexported interfaces is `interfaces_local.go`. The go generate command is similar to:
-
-    ```go
-    //go:generate mockgen -destination=mocks_local_test.go -package $GOPACKAGE -source interfaces_local.go
-    ```
-
-- Mocks from external interfaces are generated using go generate commands in `mocks_generate_test.go` files, and stored in `mocks_<package-name>_test.go` files, using:
-
-    ```go
-    //go:generate mockgen -destination=mocks_<package-name>_test.go -package $GOPACKAGE module-name InterfaceA,InterfaceB
-    ```
-
-- Generated mocks usage in tests:
-  - Define mocks in the subtest, not in the parent test. You can also have a function returning the mocks as a field of the test case struct, which takes in the subtest `*testing.T` as argument, and call it in the subtest to get the mocks.
-  - **Never** use `gomock.Any()` as argument. Always use concrete, precise arguments. You might need to define a custom GoMock matcher for your argument in some very niche and corner cases.
-  - **Never** use `.AnyTimes()` on mocks. Always define the number of times a certain mock call should be called, with `.Times(3)` for example.
-  - **Always** set the `.Return(...)` on the mock if the function returns something.
-  - Avoid using **mock helpers** functions, prefer a bit of repetition than tight coupling and dependency
-
-### main.go
-
-- Make the program OS signal aware, so it attempts a graceful shutdown when interruped. Force quit the program on a second interrupt signal.
-
-### Formatting
-
-The Go formatter used is gofumpt.
-
-### Errors
-
-- Always prefer wrapping errors with some context with `fmt.Errorf("doing this: %w", err)`
-- In rare cases, you can just use `return err` notably:
-  - If the function is called **recursively**, since we don't wrap the wrapping multiple times for each recursion
-  - If the current function only statement is the call to another function, for example:
-
-      ```go
-      func (s *Struct) Fetch() error {
-        return fetch() // do not wrap the error
-      }
-      ```
-
-- When wrapping errors, use verbs ending in "ing" and no "failed to" or "cannot" to avoid redundancy. For example, use `fmt.Errorf("resolving host: %w", err)` rather than `fmt.Errorf("failed to resolve host: %w", err)`.
-- When wrapping an error, the context should NEVER contain variables injected as arguments in the function returning an error, to avoid repeating the same variable in multiple error messages.
-- Testing errors:
-  - If the error does not wrap a sentinel error, use `assert.ErrorContains` to check for error messages, rather than `assert.EqualError`, to avoid having to update tests for minor changes in error messages. And use `assert.NoError` to check for no error.
-  - If the error wraps a sentinel error, use `assert.ErrorIs` to check both for the sentinel error or an expected nil error. You can also check the error message with `assert.ErrorContains`
-
-### User program settings
-
-- For configuration structs, each field Go zero value (i.e. `0` for `int`, `nil` for `*string`) should be an INVALID value in the user sense. This is used to detect when a field is not set, in order to default it, merge it or override it. For example if `""` is not a valid value, the field should be of type `string`. Conversely, if `""` is a valid value, the field should be of type `*string` to distinguish between "not set" and "set to empty string". Notably, boolean fields are ALWAYS of type `*bool` for this reason, since both `true` and `false` are valid values.
-- Configuration reading and handling relies on the Go library github.com/qdm12/gosettings please use it whenever appropriate.
-  - Do not wrap errors coming from `reader.Reader` methods, since they already contain the necessary context.
-  - All keys passed to `reader.Reader` methods must be in environment variable format, i.e. uppercase with underscores. These get converted to lowercase and dashes for flags notably.
-- For each settings structs, define the following methods, which are usually unexported, but can be exported especially for the top level Settings struct, in this order:
-  - `func (s *Settings) setDefaults()` whichs sets defaults (using `gosettings.Default*` functions) on unset fields
-  - If the settings need to be patched at runtime, which is rarely the case, define `func (s *Settings) overrideWith(other Settings)` which overrides the settings with another settings struct, only for fields that are set in the other struct (using `gosettings.OverrideWith` functions).
-  - `func (s Settings) validate() error` which validates the settings, and returns an error if anything is invalid
-  - `func (s *Settings) read(r *reader.Reader) error` which reads the settings from a gosettings/reader.Reader (which can be from multiple sources, such as environment variables, cli flags, config files etc.)
-  - `func (s Settings) String() string` which uses `toLinesNode().String()` to return a string representation of the settings
-  - `func (s Settings) toLinesNode() *gotree.Node` which a github.com/qdm12/gotree `*Node` representing the settings
-
-### Testing
-
-- Use the github.com/stretchr/testify library for assertions
-- Most tests should be table tests with parallel subtests
-- Prefer map-based table tests of the form `map[string]struct{ ... }`, with the key as the test name.
-  Use underscores in test names, not spaces, to keep `go test` output searchable.
-- Use `testCases` for the table variable name, and `testCase` for each iterated case value.
-- Run all tests in parallel:
-  - call `t.Parallel()` in the top-level test
-  - call `t.Parallel()` in each subtest
-
-### Libraries to use
-
-- Logging: `github.com/qdm12/log`
-- Splash information at program start: `github.com/qdm12/gosplash`
-- Long running services (i.e. health server, http prod server, backup loop etc.): `github.com/qdm12/goservices`
-- String tree structures: `github.com/qdm12/gotree`
-
-### Extra rules
-
-- Do not use `http.DefaultClient`, use a custom `*http.Client` with a fixed timeout and share with dependency injections.
-- Do not check for injected dependencies being `nil`, prefer to just panic on a nil pointer. By default it's fine to panic if a developer injects a dependency `nil`. `nil` does not mean use a default.
-
-## Validation checklist
-
-Run the following before finishing changes:
-
-1. Go building `go build ./...`
-1. Go linting `golangci-lint run`
-1. Go unit tests `go test ./...`
-1. If a module is added or modified, run `go mod tidy`
-1. If an interface or mock command is modified, run `go generate -run mockgen ./...`
-
-If a Markdown file is modified and `markdownlint-cli2` is available, run `markdownlint-cli2 "**/*.md"`
-
-If a command is unavailable in the current environment, report it clearly and provide the exact command needed once available.

Dockerfile

@@ -1,19 +1,19 @@
-ARG ALPINE_VERSION=3.23
-ARG GO_ALPINE_VERSION=3.23
-ARG GO_VERSION=1.25
-ARG XCPUTRANSLATE_VERSION=v0.9.0
-ARG GOLANGCI_LINT_VERSION=v2.4.0
+ARG ALPINE_VERSION=3.17
+ARG GO_ALPINE_VERSION=3.17
+ARG GO_VERSION=1.20
+ARG XCPUTRANSLATE_VERSION=v0.6.0
+ARG GOLANGCI_LINT_VERSION=v1.52.2
 ARG MOCKGEN_VERSION=v1.6.0
 ARG BUILDPLATFORM=linux/amd64
 
-FROM --platform=${BUILDPLATFORM} ghcr.io/qdm12/xcputranslate:${XCPUTRANSLATE_VERSION} AS xcputranslate
-FROM --platform=${BUILDPLATFORM} ghcr.io/qdm12/binpot:golangci-lint-${GOLANGCI_LINT_VERSION} AS golangci-lint
-FROM --platform=${BUILDPLATFORM} ghcr.io/qdm12/binpot:mockgen-${MOCKGEN_VERSION} AS mockgen
+FROM --platform=${BUILDPLATFORM} qmcgaw/xcputranslate:${XCPUTRANSLATE_VERSION} AS xcputranslate
+FROM --platform=${BUILDPLATFORM} qmcgaw/binpot:golangci-lint-${GOLANGCI_LINT_VERSION} AS golangci-lint
+FROM --platform=${BUILDPLATFORM} qmcgaw/binpot:mockgen-${MOCKGEN_VERSION} AS mockgen
 
 FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION}-alpine${GO_ALPINE_VERSION} AS base
 COPY --from=xcputranslate /xcputranslate /usr/local/bin/xcputranslate
 # Note: findutils needed to have xargs support `-d` flag for mocks stage.
-RUN apk --update add git g++ findutils iptables
+RUN apk --update add git g++ findutils
 ENV CGO_ENABLED=0
 COPY --from=golangci-lint /bin /go/bin/golangci-lint
 COPY --from=mockgen /bin /go/bin/mockgen
@@ -32,7 +32,7 @@ ENTRYPOINT go test -race -coverpkg=./... -coverprofile=coverage.txt -covermode=a
 
 FROM --platform=${BUILDPLATFORM} base AS lint
 COPY .golangci.yml ./
-RUN golangci-lint run
+RUN golangci-lint run --timeout=10m
 
 FROM --platform=${BUILDPLATFORM} base AS mocks
 RUN git init && \
@@ -46,10 +46,6 @@ RUN git init && \
     git diff --exit-code && \
     rm -rf .git/
 
-FROM --platform=${BUILDPLATFORM} base AS xcompile
-RUN GOOS=darwin go build -o /dev/null ./...
-RUN GOOS=windows go build -o /dev/null ./...
-
 FROM --platform=${BUILDPLATFORM} base AS build
 ARG TARGETPLATFORM
 ARG VERSION=unknown
@@ -80,109 +76,40 @@ LABEL \
 ENV VPN_SERVICE_PROVIDER=pia \
     VPN_TYPE=openvpn \
     # Common VPN options
+    VPN_ENDPOINT_IP= \
+    VPN_ENDPOINT_PORT= \
     VPN_INTERFACE=tun0 \
     # OpenVPN
-    OPENVPN_ENDPOINT_IP= \
-    OPENVPN_ENDPOINT_PORT= \
     OPENVPN_PROTOCOL=udp \
     OPENVPN_USER= \
     OPENVPN_PASSWORD= \
     OPENVPN_USER_SECRETFILE=/run/secrets/openvpn_user \
     OPENVPN_PASSWORD_SECRETFILE=/run/secrets/openvpn_password \
-    OPENVPN_VERSION=2.6 \
+    OPENVPN_VERSION=2.5 \
     OPENVPN_VERBOSITY=1 \
     OPENVPN_FLAGS= \
     OPENVPN_CIPHERS= \
     OPENVPN_AUTH= \
-    OPENVPN_PROCESS_USER=root \
-    OPENVPN_MSSFIX= \
+    OPENVPN_PROCESS_USER= \
     OPENVPN_CUSTOM_CONFIG= \
     # Wireguard
-    WIREGUARD_ENDPOINT_IP= \
-    WIREGUARD_ENDPOINT_PORT= \
-    WIREGUARD_CONF_SECRETFILE=/run/secrets/wg0.conf \
     WIREGUARD_PRIVATE_KEY= \
-    WIREGUARD_PRIVATE_KEY_SECRETFILE=/run/secrets/wireguard_private_key \
     WIREGUARD_PRESHARED_KEY= \
-    WIREGUARD_PRESHARED_KEY_SECRETFILE=/run/secrets/wireguard_preshared_key \
     WIREGUARD_PUBLIC_KEY= \
-    WIREGUARD_ALLOWED_IPS= \
-    WIREGUARD_PERSISTENT_KEEPALIVE_INTERVAL=0 \
     WIREGUARD_ADDRESSES= \
-    WIREGUARD_ADDRESSES_SECRETFILE=/run/secrets/wireguard_addresses \
-    WIREGUARD_MTU= \
     WIREGUARD_IMPLEMENTATION=auto \
-    # Amnezia
-    AMNEZIAWG_ENDPOINT_IP= \
-    AMNEZIAWG_ENDPOINT_PORT= \
-    AMNEZIAWG_CONF_SECRETFILE=/run/secrets/wg0.conf \
-    AMNEZIAWG_PRIVATE_KEY= \
-    AMNEZIAWG_PRIVATE_KEY_SECRETFILE=/run/secrets/wireguard_private_key \
-    AMNEZIAWG_PRESHARED_KEY= \
-    AMNEZIAWG_PRESHARED_KEY_SECRETFILE=/run/secrets/wireguard_preshared_key \
-    AMNEZIAWG_PUBLIC_KEY= \
-    AMNEZIAWG_ALLOWED_IPS= \
-    AMNEZIAWG_PERSISTENT_KEEPALIVE_INTERVAL=0 \
-    AMNEZIAWG_ADDRESSES= \
-    AMNEZIAWG_ADDRESSES_SECRETFILE=/run/secrets/wireguard_addresses \
-    AMNEZIAWG_MTU= \
-    AMNEZIAWG_JC=0 \
-    AMNEZIAWG_JMIN=0 \
-    AMNEZIAWG_JMAX=0 \
-    AMNEZIAWG_S1=0 \
-    AMNEZIAWG_S2=0 \
-    AMNEZIAWG_S3=0 \
-    AMNEZIAWG_S4=0 \
-    AMNEZIAWG_H1= \
-    AMNEZIAWG_H2= \
-    AMNEZIAWG_H3= \
-    AMNEZIAWG_H4= \
-    AMNEZIAWG_I1= \
-    AMNEZIAWG_I2= \
-    AMNEZIAWG_I3= \
-    AMNEZIAWG_I4= \
-    AMNEZIAWG_I5= \
-    # Wireguard AmneziaWG userspace obfuscation (requires WIREGUARD_IMPLEMENTATION=amneziawg)
-    AMNEZIAWG_JC=0 \
-    AMNEZIAWG_JMIN=0 \
-    AMNEZIAWG_JMAX=0 \
-    AMNEZIAWG_S1=0 \
-    AMNEZIAWG_S2=0 \
-    AMNEZIAWG_S3=0 \
-    AMNEZIAWG_S4=0 \
-    AMNEZIAWG_H1= \
-    AMNEZIAWG_H2= \
-    AMNEZIAWG_H3= \
-    AMNEZIAWG_H4= \
-    AMNEZIAWG_I1= \
-    AMNEZIAWG_I2= \
-    AMNEZIAWG_I3= \
-    AMNEZIAWG_I4= \
-    AMNEZIAWG_I5= \
-    # VPN server port forwarding
-    VPN_PORT_FORWARDING=off \
-    VPN_PORT_FORWARDING_PROVIDER= \
-    VPN_PORT_FORWARDING_UP_COMMAND= \
-    VPN_PORT_FORWARDING_DOWN_COMMAND= \
-    VPN_PORT_FORWARDING_LISTENING_PORTS=0 \
-    VPN_PORT_FORWARDING_PORTS_COUNT=1 \
-    VPN_PORT_FORWARDING_STATUS_FILE="/tmp/gluetun/forwarded_port" \
-    # PMTUD
-    PMTUD_ICMP_ADDRESSES=1.1.1.1,8.8.8.8 \
-    PMTUD_TCP_ADDRESSES=1.1.1.1:443,8.8.8.8:443,1.1.1.1:53,8.8.8.8:53,[2606:4700:4700::1111]:53,[2001:4860:4860::8888]:53,[2606:4700:4700::1111]:443,[2001:4860:4860::8888]:443 \
     # VPN server filtering
     SERVER_REGIONS= \
     SERVER_COUNTRIES= \
     SERVER_CITIES= \
     SERVER_HOSTNAMES= \
-    SERVER_CATEGORIES= \
     # # Mullvad only:
     ISP= \
     OWNED_ONLY=no \
     # # Private Internet Access only:
     PRIVATE_INTERNET_ACCESS_OPENVPN_ENCRYPTION_PRESET= \
-    VPN_PORT_FORWARDING_USERNAME= \
-    VPN_PORT_FORWARDING_PASSWORD= \
+    VPN_PORT_FORWARDING=off \
+    VPN_PORT_FORWARDING_STATUS_FILE="/tmp/gluetun/forwarded_port" \
     # # Cyberghost only:
     OPENVPN_CERT= \
     OPENVPN_KEY= \
@@ -197,54 +124,46 @@ ENV VPN_SERVICE_PROVIDER=pia \
     SERVER_NUMBER= \
     # # PIA only:
     SERVER_NAMES= \
-    # # VPNUnlimited and ProtonVPN only:
-    STREAM_ONLY= \
-    FREE_ONLY= \
     # # ProtonVPN only:
-    SECURE_CORE_ONLY= \
-    TOR_ONLY= \
+    FREE_ONLY= \
     # # Surfshark only:
     MULTIHOP_ONLY= \
     # # VPN Secure only:
     PREMIUM_ONLY= \
-    # # PIA and ProtonVPN only:
-    PORT_FORWARD_ONLY= \
     # Firewall
-    FIREWALL_ENABLED_DISABLING_IT_SHOOTS_YOU_IN_YOUR_FOOT=on \
+    FIREWALL=on \
     FIREWALL_VPN_INPUT_PORTS= \
     FIREWALL_INPUT_PORTS= \
     FIREWALL_OUTBOUND_SUBNETS= \
-    FIREWALL_IPTABLES_LOG_LEVEL=info \
-    # IPv6
-    IPV6_CHECK_ADDRESSES=[2001:4860:4860::8888]:53,[2606:4700:4700::1111]:53 \
+    FIREWALL_DEBUG=off \
     # Logging
     LOG_LEVEL=info \
     # Health
     HEALTH_SERVER_ADDRESS=127.0.0.1:9999 \
-    HEALTH_TARGET_ADDRESSES=cloudflare.com:443,github.com:443 \
-    HEALTH_ICMP_TARGET_IPS=1.1.1.1,8.8.8.8 \
-    HEALTH_SMALL_CHECK_TYPE=icmp \
-    HEALTH_RESTART_VPN=on \
-    # DNS
-    DNS_UPSTREAM_RESOLVER_TYPE=DoT \
-    # Note: DNS_UPSTREAM_RESOLVERS defaults to cloudflare in code if DNS_UPSTREAM_PLAIN_ADDRESSES is empty
-    DNS_UPSTREAM_RESOLVERS= \
-    DNS_BLOCK_IPS= \
-    DNS_BLOCK_IP_PREFIXES= \
-    DNS_CACHING=on \
-    DNS_UPSTREAM_IPV6=off \
+    HEALTH_TARGET_ADDRESS=cloudflare.com:443 \
+    HEALTH_SUCCESS_WAIT_DURATION=5s \
+    HEALTH_VPN_DURATION_INITIAL=6s \
+    HEALTH_VPN_DURATION_ADDITION=5s \
+    # DNS over TLS
+    DOT=on \
+    DOT_PROVIDERS=cloudflare \
+    DOT_PRIVATE_ADDRESS=127.0.0.1/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16,169.254.0.0/16,::1/128,fc00::/7,fe80::/10,::ffff:7f00:1/104,::ffff:a00:0/104,::ffff:a9fe:0/112,::ffff:ac10:0/108,::ffff:c0a8:0/112 \
+    DOT_VERBOSITY=1 \
+    DOT_VERBOSITY_DETAILS=0 \
+    DOT_VALIDATION_LOGLEVEL=0 \
+    DOT_CACHING=on \
+    DOT_IPV6=off \
     BLOCK_MALICIOUS=on \
     BLOCK_SURVEILLANCE=off \
     BLOCK_ADS=off \
-    DNS_UNBLOCK_HOSTNAMES= \
-    DNS_REBINDING_PROTECTION_EXEMPT_HOSTNAMES= \
+    UNBLOCK= \
     DNS_UPDATE_PERIOD=24h \
-    DNS_UPSTREAM_PLAIN_ADDRESSES= \
+    DNS_ADDRESS=127.0.0.1 \
+    DNS_KEEP_NAMESERVER=off \
     # HTTP proxy
     HTTPPROXY= \
     HTTPPROXY_LOG=off \
     HTTPPROXY_LISTENING_ADDRESS=":8888" \
-    HTTPPROXY_STEALTH=off \
     HTTPPROXY_USER= \
     HTTPPROXY_PASSWORD= \
     HTTPPROXY_USER_SECRETFILE=/run/secrets/httpproxy_user \
@@ -257,23 +176,14 @@ ENV VPN_SERVICE_PROVIDER=pia \
     SHADOWSOCKS_PASSWORD_SECRETFILE=/run/secrets/shadowsocks_password \
     SHADOWSOCKS_CIPHER=chacha20-ietf-poly1305 \
     # Control server
-    HTTP_CONTROL_SERVER_LOG=on \
     HTTP_CONTROL_SERVER_ADDRESS=":8000" \
-    HTTP_CONTROL_SERVER_AUTH_CONFIG_FILEPATH=/gluetun/auth/config.toml \
-    HTTP_CONTROL_SERVER_AUTH_DEFAULT_ROLE="{}" \
     # Server data updater
     UPDATER_PERIOD=0 \
     UPDATER_MIN_RATIO=0.8 \
     UPDATER_VPN_SERVICE_PROVIDERS= \
-    UPDATER_PROTONVPN_EMAIL= \
-    UPDATER_PROTONVPN_PASSWORD= \
     # Public IP
     PUBLICIP_FILE="/tmp/gluetun/ip" \
-    PUBLICIP_ENABLED=on \
-    PUBLICIP_API=ipinfo,ifconfigco,ip2location,cloudflare \
-    PUBLICIP_API_TOKEN= \
-    # Storage
-    STORAGE_FILEPATH=/gluetun/servers.json \
+    PUBLICIP_PERIOD=12h \
     # Pprof
     PPROF_ENABLED=no \
     PPROF_BLOCK_PROFILE_RATE=0 \
@@ -281,21 +191,24 @@ ENV VPN_SERVICE_PROVIDER=pia \
     PPROF_HTTP_SERVER_ADDRESS=":6060" \
     # Extras
     VERSION_INFORMATION=on \
-    BORINGPOLL_GLUETUNCOM=off \
     TZ= \
-    PUID=1000 \
-    PGID=1000
+    PUID= \
+    PGID=
 ENTRYPOINT ["/gluetun-entrypoint"]
 EXPOSE 8000/tcp 8888/tcp 8388/tcp 8388/udp
-HEALTHCHECK --interval=5s --timeout=5s --start-period=10s --retries=3 CMD /gluetun-entrypoint healthcheck
+HEALTHCHECK --interval=5s --timeout=5s --start-period=10s --retries=1 CMD /gluetun-entrypoint healthcheck
 ARG TARGETPLATFORM
 RUN apk add --no-cache --update -l wget && \
-    apk add --no-cache --update -X "https://dl-cdn.alpinelinux.org/alpine/v3.17/main" openvpn\~2.5 && \
-    mv /usr/sbin/openvpn /usr/sbin/openvpn2.5 && \
+    apk add --no-cache --update -X "https://dl-cdn.alpinelinux.org/alpine/v3.12/main" openvpn==2.4.12-r0 && \
+    apk add --no-cache --update -X "https://dl-cdn.alpinelinux.org/alpine/v3.16/main" openssl\~1.1 && \
+    mv /usr/sbin/openvpn /usr/sbin/openvpn2.4 && \
     apk del openvpn && \
-    apk add --no-cache --update openvpn ca-certificates iptables iptables-legacy tzdata && \
-    mv /usr/sbin/openvpn /usr/sbin/openvpn2.6 && \
-    rm -rf /var/cache/apk/* /etc/openvpn/*.sh /usr/lib/openvpn/plugins/openvpn-plugin-down-root.so && \
+    apk add --no-cache --update openvpn ca-certificates iptables ip6tables unbound tzdata && \
+    mv /usr/sbin/openvpn /usr/sbin/openvpn2.5 && \
+    # Fix vulnerability issue
+    apk add --no-cache --update busybox && \
+    rm -rf /var/cache/apk/* /etc/unbound/* /usr/sbin/unbound-* /etc/openvpn/*.sh /usr/lib/openvpn/plugins/openvpn-plugin-down-root.so && \
     deluser openvpn && \
+    deluser unbound && \
     mkdir /gluetun
 COPY --from=build /tmp/gobuild/entrypoint /gluetun-entrypoint

README.md

@@ -1,10 +1,6 @@
 # Gluetun VPN client
 
-⚠️ This and [gluetun-wiki](https://github.com/qdm12/gluetun-wiki) are the only websites for Gluetun, other websites claiming to be official are scams ⚠️
-
-💁 You can optionally set `BORINGPOLL_GLUETUNCOM=on` to... [poll](./internal/boringpoll/boringpoll.go) that **scammy AI slop** website every few minutes so it costs them too much to keep it up. My gentle email reminders to take it down are being grossly ignored 🤷 This would make me very happy and serve this community.
-
-Lightweight swiss-army-knife-like VPN client to multiple VPN service providers
+Lightweight swiss-knife-like VPN client to multiple VPN service providers
 
 ![Title image](https://raw.githubusercontent.com/qdm12/gluetun/master/title.svg)
 
@@ -30,6 +26,7 @@ Lightweight swiss-army-knife-like VPN client to multiple VPN service providers
 [![GitHub issues](https://img.shields.io/github/issues/qdm12/gluetun.svg)](https://github.com/qdm12/gluetun/issues)
 [![GitHub closed issues](https://img.shields.io/github/issues-closed/qdm12/gluetun.svg)](https://github.com/qdm12/gluetun/issues?q=is%3Aissue+is%3Aclosed)
 
+[![Lines of code](https://img.shields.io/tokei/lines/github/qdm12/gluetun)](https://github.com/qdm12/gluetun)
 ![Code size](https://img.shields.io/github/languages/code-size/qdm12/gluetun)
 ![GitHub repo size](https://img.shields.io/github/repo-size/qdm12/gluetun)
 ![Go version](https://img.shields.io/github/go-mod/go-version/qdm12/gluetun)
@@ -38,19 +35,20 @@ Lightweight swiss-army-knife-like VPN client to multiple VPN service providers
 
 ## Quick links
 
-- [Setup](#setup)
-- [Features](#features)
+- [Setup](#Setup)
+- [Features](#Features)
 - Problem?
-  - Check the Wiki [common errors](https://github.com/qdm12/gluetun-wiki/tree/main/errors) and [faq](https://github.com/qdm12/gluetun-wiki/tree/main/faq)
+  - [Check the Wiki](https://github.com/qdm12/gluetun/wiki)
   - [Start a discussion](https://github.com/qdm12/gluetun/discussions)
   - [Fix the Unraid template](https://github.com/qdm12/gluetun/discussions/550)
 - Suggestion?
   - [Create an issue](https://github.com/qdm12/gluetun/issues)
+  - [Join the Slack channel](https://join.slack.com/t/qdm12/shared_invite/enQtOTE0NjcxNTM1ODc5LTYyZmVlOTM3MGI4ZWU0YmJkMjUxNmQ4ODQ2OTAwYzMxMTlhY2Q1MWQyOWUyNjc2ODliNjFjMDUxNWNmNzk5MDk)
 - Happy?
   - Sponsor me on [github.com/sponsors/qdm12](https://github.com/sponsors/qdm12)
   - Donate to [paypal.me/qmcgaw](https://www.paypal.me/qmcgaw)
   - Drop me [an email](mailto:quentin.mcgaw@gmail.com)
-- **Want to add a VPN provider?** check [the development page](https://github.com/qdm12/gluetun-wiki/blob/main/contributing/development.md) and [add a provider page](https://github.com/qdm12/gluetun-wiki/blob/main/contributing/add-a-provider.md)
+- **Want to add a VPN provider?** check [Development](https://github.com/qdm12/gluetun/wiki/Development) and [Add a provider](https://github.com/qdm12/gluetun/wiki/Add-a-provider)
 - Video:
 
   [![Video Gif](https://i.imgur.com/CetWunc.gif)](https://youtu.be/0F6I03LQcI4)
@@ -59,46 +57,45 @@ Lightweight swiss-army-knife-like VPN client to multiple VPN service providers
 
 ## Features
 
-- Based on Alpine 3.23 for a small Docker image of 43.1MB
-- Supports: **AirVPN**, **Cyberghost**, **ExpressVPN**, **FastestVPN**, **Giganews**, **HideMyAss**, **IPVanish**, **IVPN**, **Mullvad** (Wireguard only), **NordVPN**, **Perfect Privacy**, **Privado**, **Private Internet Access**, **PrivateVPN**, **ProtonVPN**, **PureVPN**,  **SlickVPN**, **Surfshark**, **TorGuard**, **VPNSecure.me**, **VPNUnlimited**, **Vyprvpn**, **Windscribe** servers
+- Based on Alpine 3.17 for a small Docker image of 42MB
+- Supports: **AirVPN**, **Cyberghost**, **ExpressVPN**, **FastestVPN**, **HideMyAss**, **IPVanish**, **IVPN**, **Mullvad**, **NordVPN**, **Perfect Privacy**, **Privado**, **Private Internet Access**, **PrivateVPN**, **ProtonVPN**, **PureVPN**,  **SlickVPN**, **Surfshark**, **TorGuard**, **VPNSecure.me**, **VPNUnlimited**, **Vyprvpn**, **WeVPN**, **Windscribe** servers
 - Supports OpenVPN for all providers listed
 - Supports Wireguard both kernelspace and userspace
-  - For **AirVPN**, **FastestVPN**, **Ivpn**, **Mullvad**, **NordVPN**, **Perfect privacy**, **ProtonVPN**, **Surfshark** and **Windscribe**
-  - For **Cyberghost**, **Private Internet Access**, **PrivateVPN**, **PureVPN**, **Torguard**, **VPN Unlimited** and **VyprVPN** using [the custom provider](https://github.com/qdm12/gluetun-wiki/blob/main/setup/providers/custom.md)
-  - For custom Wireguard configurations using [the custom provider](https://github.com/qdm12/gluetun-wiki/blob/main/setup/providers/custom.md)
+  - For **Mullvad**, **Ivpn**, **Surfshark** and **Windscribe**
+  - For **ProtonVPN**, **PureVPN**, **Torguard**, **VPN Unlimited** and **WeVPN** using [the custom provider](https://github.com/qdm12/gluetun/wiki/Custom-provider)
+  - For custom Wireguard configurations using [the custom provider](https://github.com/qdm12/gluetun/wiki/Custom-provider)
   - More in progress, see [#134](https://github.com/qdm12/gluetun/issues/134)
-- Supports AmneziaWG only with the custom provider for now
 - DNS over TLS baked in with service provider(s) of your choice
 - DNS fine blocking of malicious/ads/surveillance hostnames and IP addresses, with live update every 24 hours
 - Choose the vpn network protocol, `udp` or `tcp`
 - Built in firewall kill switch to allow traffic only with needed the VPN servers and LAN devices
-- Built in Shadowsocks proxy server (protocol based on SOCKS5 with an encryption layer, tunnels TCP+UDP)
+- Built in Shadowsocks proxy (protocol based on SOCKS5 with an encryption layer, tunnels TCP+UDP)
 - Built in HTTP proxy (tunnels HTTP and HTTPS through TCP)
-- [Connect other containers to it](https://github.com/qdm12/gluetun-wiki/blob/main/setup/connect-a-container-to-gluetun.md)
-- [Connect LAN devices to it](https://github.com/qdm12/gluetun-wiki/blob/main/setup/connect-a-lan-device-to-gluetun.md)
+- [Connect other containers to it](https://github.com/qdm12/gluetun/wiki/Connect-a-container-to-gluetun)
+- [Connect LAN devices to it](https://github.com/qdm12/gluetun/wiki/Connect-a-LAN-device-to-gluetun)
 - Compatible with amd64, i686 (32 bit), **ARM** 64 bit, ARM 32 bit v6 and v7, and even ppc64le 🎆
-- Custom VPN server side port forwarding for [Perfect Privacy](https://github.com/qdm12/gluetun-wiki/blob/main/setup/providers/perfect-privacy.md#vpn-server-port-forwarding), [Private Internet Access](https://github.com/qdm12/gluetun-wiki/blob/main/setup/providers/private-internet-access.md#vpn-server-port-forwarding), [PrivateVPN](https://github.com/qdm12/gluetun-wiki/blob/main/setup/providers/privatevpn.md#vpn-server-port-forwarding) and [ProtonVPN](https://github.com/qdm12/gluetun-wiki/blob/main/setup/providers/protonvpn.md#vpn-server-port-forwarding)
+- [Custom VPN server side port forwarding for Private Internet Access](https://github.com/qdm12/gluetun/wiki/Private-internet-access#vpn-server-port-forwarding)
 - Possibility of split horizon DNS by selecting multiple DNS over TLS providers
+- Unbound subprogram drops root privileges once launched
 - Can work as a Kubernetes sidecar container, thanks @rorph
 
 ## Setup
 
 🎉 There are now instructions specific to each VPN provider with examples to help you get started as quickly as possible!
 
-Go to the [Wiki](https://github.com/qdm12/gluetun-wiki)!
+Go to the [Wiki](https://github.com/qdm12/gluetun/wiki)!
 
-[🐛 Found a bug in the Wiki?!](https://github.com/qdm12/gluetun-wiki/issues/new/choose)
+[🐛 Found a bug in the Wiki?!](https://github.com/qdm12/gluetun/issues/new?assignees=&labels=%F0%9F%93%84+Wiki+issue&template=wiki+issue.yml&title=Wiki+issue%3A+)
 
 Here's a docker-compose.yml for the laziest:
 
 ```yml
----
+version: "3"
 services:
   gluetun:
     image: qmcgaw/gluetun
     # container_name: gluetun
-    # line above must be uncommented to allow external containers to connect.
-    # See https://github.com/qdm12/gluetun-wiki/blob/main/setup/connect-a-container-to-gluetun.md#external-container-to-gluetun
+    # line above must be uncommented to allow external containers to connect. See https://github.com/qdm12/gluetun/wiki/Connect-a-container-to-gluetun#external-container-to-gluetun
     cap_add:
       - NET_ADMIN
     devices:
@@ -110,7 +107,7 @@ services:
     volumes:
       - /yourpath:/gluetun
     environment:
-      # See https://github.com/qdm12/gluetun-wiki/tree/main/setup#setup
+      # See https://github.com/qdm12/gluetun/wiki
       - VPN_SERVICE_PROVIDER=ivpn
       - VPN_TYPE=openvpn
       # OpenVPN:
@@ -121,17 +118,13 @@ services:
       # - WIREGUARD_ADDRESSES=10.64.222.21/32
       # Timezone for accurate log times
       - TZ=
-      # Server list updater
-      # See https://github.com/qdm12/gluetun-wiki/blob/main/setup/servers.md#update-the-vpn-servers-list
+      # Server list updater. See https://github.com/qdm12/gluetun/wiki/Updating-Servers#periodic-update
       - UPDATER_PERIOD=
+      - UPDATER_VPN_SERVICE_PROVIDERS=
 ```
 
 🆕 Image also available as `ghcr.io/qdm12/gluetun`
 
-## Fun graphs
-
-[![Star History Chart](https://api.star-history.com/svg?repos=qdm12/gluetun&type=date&legend=top-left)](https://www.star-history.com/#qdm12/gluetun&type=date&legend=top-left)
-
 ## License
 
-[![MIT](https://img.shields.io/github/license/qdm12/gluetun)](https://github.com/qdm12/gluetun/blob/master/LICENSE)
+[![MIT](https://img.shields.io/github/license/qdm12/gluetun)](https://github.com/qdm12/gluetun/master/LICENSE)

ci/cmd/main.go

@@ -1,37 +0,0 @@
-package main
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"os/signal"
-
-	"github.com/qdm12/gluetun/ci/internal"
-	"github.com/qdm12/log"
-)
-
-func main() {
-	logger := log.New()
-	if len(os.Args) < 2 {
-		logger.Error("Usage: " + os.Args[0] + " <command>")
-		os.Exit(1)
-	}
-
-	ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt)
-
-	var err error
-	switch os.Args[1] {
-	case "mullvad":
-		err = internal.MullvadTest(ctx, logger)
-	case "protonvpn":
-		err = internal.ProtonVPNTest(ctx, logger)
-	default:
-		err = fmt.Errorf("unknown command: %s", os.Args[1])
-	}
-	stop()
-	if err != nil {
-		logger.Error(err.Error())
-		os.Exit(1)
-	}
-	logger.Info("test completed successfully")
-}

ci/go.mod

@@ -1,40 +0,0 @@
-module github.com/qdm12/gluetun/ci
-
-go 1.25.0
-
-require (
-	github.com/docker/docker v28.5.1+incompatible
-	github.com/opencontainers/image-spec v1.1.1
-)
-
-require (
-	github.com/Microsoft/go-winio v0.6.2 // indirect
-	github.com/containerd/errdefs v1.0.0 // indirect
-	github.com/containerd/errdefs/pkg v0.3.0 // indirect
-	github.com/containerd/log v0.1.0 // indirect
-	github.com/distribution/reference v0.6.0 // indirect
-	github.com/docker/go-connections v0.6.0 // indirect
-	github.com/docker/go-units v0.5.0 // indirect
-	github.com/fatih/color v1.13.0 // indirect
-	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/go-logr/logr v1.4.3 // indirect
-	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/mattn/go-colorable v0.1.9 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/moby/docker-image-spec v1.3.1 // indirect
-	github.com/moby/sys/atomicwriter v0.1.0 // indirect
-	github.com/moby/term v0.5.2 // indirect
-	github.com/morikuni/aec v1.0.0 // indirect
-	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
-	github.com/qdm12/log v0.1.0 // indirect
-	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
-	go.opentelemetry.io/otel v1.38.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0 // indirect
-	go.opentelemetry.io/otel/metric v1.38.0 // indirect
-	go.opentelemetry.io/otel/trace v1.38.0 // indirect
-	golang.org/x/sys v0.35.0 // indirect
-	golang.org/x/time v0.14.0 // indirect
-	gotest.tools/v3 v3.5.2 // indirect
-)

ci/go.sum

@@ -1,109 +0,0 @@
-github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c h1:udKWzYgxTojEKWjV8V+WSxDXJ4NFATAsZjh8iIbsQIg=
-github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
-github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
-github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
-github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM=
-github.com/cenkalti/backoff/v5 v5.0.3/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw=
-github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
-github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
-github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE=
-github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk=
-github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
-github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
-github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
-github.com/docker/docker v28.5.1+incompatible h1:Bm8DchhSD2J6PsFzxC35TZo4TLGR2PdW/E69rU45NhM=
-github.com/docker/docker v28.5.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
-github.com/docker/go-connections v0.6.0 h1:LlMG9azAe1TqfR7sO+NJttz1gy6KO7VJBh+pMmjSD94=
-github.com/docker/go-connections v0.6.0/go.mod h1:AahvXYshr6JgfUJGdDCs2b5EZG/vmaMAntpSFH5BFKE=
-github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
-github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
-github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
-github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
-github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
-github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
-github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
-github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
-github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
-github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
-github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 h1:8Tjv8EJ+pM1xP8mK6egEbD1OgnVTyacbefKhmbLhIhU=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2/go.mod h1:pkJQ2tZHJ0aFOVEEot6oZmaVEZcRme73eIFmhiVuRWs=
-github.com/mattn/go-colorable v0.1.9 h1:sqDoxXbdeALODt0DAeJCVp38ps9ZogZEAXjus69YV3U=
-github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
-github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
-github.com/moby/sys/atomicwriter v0.1.0 h1:kw5D/EqkBwsBFi0ss9v1VG3wIkVhzGvLklJ+w3A14Sw=
-github.com/moby/sys/atomicwriter v0.1.0/go.mod h1:Ul8oqv2ZMNHOceF643P6FKPXeCmYtlQMvpizfsSoaWs=
-github.com/moby/sys/sequential v0.6.0 h1:qrx7XFUd/5DxtqcoH1h438hF5TmOvzC/lspjy7zgvCU=
-github.com/moby/sys/sequential v0.6.0/go.mod h1:uyv8EUTrca5PnDsdMGXhZe6CCe8U/UiTWd+lL+7b/Ko=
-github.com/moby/term v0.5.2 h1:6qk3FJAFDs6i/q3W/pQ97SX192qKfZgGjCQqfCJkgzQ=
-github.com/moby/term v0.5.2/go.mod h1:d3djjFCrjnB+fl8NJux+EJzu0msscUP+f8it8hPkFLc=
-github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
-github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
-github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
-github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
-github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=
-github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/qdm12/log v0.1.0 h1:jYBd/xscHYpblzZAd2kjZp2YmuYHjAAfbTViJWxoPTw=
-github.com/qdm12/log v0.1.0/go.mod h1:Vchi5M8uBvHfPNIblN4mjXn/oSbiWguQIbsgF1zdQPI=
-github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
-github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
-go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
-go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG0FI8OiXhBfcRtqqHcZcka+gU3cskNuf05R18=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg=
-go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8=
-go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 h1:GqRJVj7UmLjCVyVJ3ZFLdPRmhDUp2zFmQe3RHIOsw24=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0/go.mod h1:ri3aaHSmCTVYu2AWv44YMauwAQc0aqI9gHKIcSbI1pU=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0 h1:aTL7F04bJHUlztTsNGJ2l+6he8c+y/b//eR0jjjemT4=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0/go.mod h1:kldtb7jDTeol0l3ewcmd8SDvx3EmIE7lyvqbasU3QC4=
-go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA=
-go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI=
-go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E=
-go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg=
-go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM=
-go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA=
-go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE=
-go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
-go.opentelemetry.io/proto/otlp v1.7.1 h1:gTOMpGDb0WTBOP8JaO72iL3auEZhVmAQg4ipjOVAtj4=
-go.opentelemetry.io/proto/otlp v1.7.1/go.mod h1:b2rVh6rfI/s2pHWNlB7ILJcRALpcNDzKhACevjI+ZnE=
-golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
-golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
-golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
-golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
-golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
-golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
-google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 h1:BIRfGDEjiHRrk0QKZe3Xv2ieMhtgRGeLcZQ0mIVn4EY=
-google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5/go.mod h1:j3QtIyytwqGr1JUDtYXwtMXWPKsEa5LtzIFN1Wn5WvE=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 h1:eaY8u2EuxbRv7c3NiGK0/NedzVsCcV6hDuU5qPX5EGE=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5/go.mod h1:M4/wBTSeyLxupu3W3tJtOgB14jILAS/XWPSSa3TAlJc=
-google.golang.org/grpc v1.75.0 h1:+TW+dqTd2Biwe6KKfhE5JpiYIBWq865PhKGSXiivqt4=
-google.golang.org/grpc v1.75.0/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ=
-google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc=
-google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q=
-gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA=

ci/internal/mullvad.go

@@ -1,27 +0,0 @@
-package internal
-
-import (
-	"context"
-	"fmt"
-)
-
-func MullvadTest(ctx context.Context, logger Logger) error {
-	expectedSecrets := []string{
-		"Wireguard private key",
-		"Wireguard address",
-	}
-	secrets, err := readSecrets(ctx, expectedSecrets, logger)
-	if err != nil {
-		return fmt.Errorf("reading secrets: %w", err)
-	}
-
-	env := []string{
-		"VPN_SERVICE_PROVIDER=mullvad",
-		"VPN_TYPE=wireguard",
-		"LOG_LEVEL=debug",
-		"SERVER_COUNTRIES=USA",
-		"WIREGUARD_PRIVATE_KEY=" + secrets[0],
-		"WIREGUARD_ADDRESSES=" + secrets[1],
-	}
-	return simpleTest(ctx, env, logger)
-}

ci/internal/protonvpn.go

@@ -1,25 +0,0 @@
-package internal
-
-import (
-	"context"
-	"fmt"
-)
-
-func ProtonVPNTest(ctx context.Context, logger Logger) error {
-	expectedSecrets := []string{
-		"Wireguard private key",
-	}
-	secrets, err := readSecrets(ctx, expectedSecrets, logger)
-	if err != nil {
-		return fmt.Errorf("reading secrets: %w", err)
-	}
-
-	env := []string{
-		"VPN_SERVICE_PROVIDER=protonvpn",
-		"VPN_TYPE=wireguard",
-		"LOG_LEVEL=debug",
-		"SERVER_COUNTRIES=United States",
-		"WIREGUARD_PRIVATE_KEY=" + secrets[0],
-	}
-	return simpleTest(ctx, env, logger)
-}

ci/internal/secrets.go

@@ -1,49 +0,0 @@
-package internal
-
-import (
-	"bufio"
-	"context"
-	"fmt"
-	"os"
-	"strings"
-)
-
-type Logger interface {
-	Info(msg string)
-	Infof(format string, args ...any)
-}
-
-func readSecrets(ctx context.Context, expectedSecrets []string,
-	logger Logger,
-) (lines []string, err error) {
-	scanner := bufio.NewScanner(os.Stdin)
-	lines = make([]string, 0, len(expectedSecrets))
-
-	for i := range expectedSecrets {
-		logger.Infof("🤫 reading %s from Stdin...", expectedSecrets[i])
-		if !scanner.Scan() {
-			break
-		}
-		lines = append(lines, strings.TrimSpace(scanner.Text()))
-		logger.Infof("🤫 %s secret read successfully", expectedSecrets[i])
-		if ctx.Err() != nil {
-			return nil, ctx.Err()
-		}
-	}
-
-	if err := scanner.Err(); err != nil {
-		return nil, fmt.Errorf("reading secrets from stdin: %w", err)
-	}
-
-	if len(lines) < len(expectedSecrets) {
-		return nil, fmt.Errorf("expected %d secrets via Stdin, but only received %d",
-			len(expectedSecrets), len(lines))
-	}
-	for i, line := range lines {
-		if line == "" {
-			return nil, fmt.Errorf("secret on line %d/%d was empty", i+1, len(lines))
-		}
-	}
-
-	return lines, nil
-}

ci/internal/simple.go

@@ -1,134 +0,0 @@
-package internal
-
-import (
-	"bufio"
-	"context"
-	"fmt"
-	"io"
-	"regexp"
-	"time"
-
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/network"
-	"github.com/docker/docker/client"
-	v1 "github.com/opencontainers/image-spec/specs-go/v1"
-)
-
-func ptrTo[T any](v T) *T { return &v }
-
-func simpleTest(ctx context.Context, env []string, logger Logger) error {
-	const timeout = 60 * time.Second
-	ctx, cancel := context.WithTimeout(ctx, timeout)
-	defer cancel()
-
-	client, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
-	if err != nil {
-		return fmt.Errorf("creating Docker client: %w", err)
-	}
-	defer client.Close()
-
-	config := &container.Config{
-		Image:       "qmcgaw/gluetun",
-		StopTimeout: ptrTo(3),
-		Env:         env,
-	}
-	hostConfig := &container.HostConfig{
-		AutoRemove: true,
-		CapAdd:     []string{"NET_ADMIN", "NET_RAW"},
-	}
-	networkConfig := (*network.NetworkingConfig)(nil)
-	platform := (*v1.Platform)(nil)
-	const containerName = "" // auto-generated name
-
-	response, err := client.ContainerCreate(ctx, config, hostConfig, networkConfig, platform, containerName)
-	if err != nil {
-		return fmt.Errorf("creating container: %w", err)
-	}
-	for _, warning := range response.Warnings {
-		fmt.Println("Warning during container creation:", warning)
-	}
-	containerID := response.ID
-	defer stopContainer(client, containerID)
-
-	beforeStartTime := time.Now()
-
-	err = client.ContainerStart(ctx, containerID, container.StartOptions{})
-	if err != nil {
-		return fmt.Errorf("starting container: %w", err)
-	}
-
-	return waitForLogLine(ctx, client, containerID, beforeStartTime, logger)
-}
-
-func stopContainer(client *client.Client, containerID string) {
-	const stopTimeout = 5 * time.Second // must be higher than 3s, see above [container.Config]'s StopTimeout field
-	stopCtx, stopCancel := context.WithTimeout(context.Background(), stopTimeout)
-	defer stopCancel()
-
-	err := client.ContainerStop(stopCtx, containerID, container.StopOptions{})
-	if err != nil {
-		fmt.Println("failed to stop container:", err)
-	}
-}
-
-var successRegexp = regexp.MustCompile(`^.+Public IP address is .+$`)
-
-func waitForLogLine(ctx context.Context, client *client.Client, containerID string,
-	beforeStartTime time.Time, logger Logger,
-) error {
-	logOptions := container.LogsOptions{
-		ShowStdout: true,
-		Follow:     true,
-		Since:      beforeStartTime.Format(time.RFC3339Nano),
-	}
-
-	reader, err := client.ContainerLogs(ctx, containerID, logOptions)
-	if err != nil {
-		return fmt.Errorf("error getting container logs: %w", err)
-	}
-	defer reader.Close()
-
-	var linesSeen []string
-	scanner := bufio.NewScanner(reader)
-	for ctx.Err() == nil {
-		if scanner.Scan() {
-			line := scanner.Text()
-			if len(line) > 8 { // remove Docker log prefix
-				line = line[8:]
-			}
-			linesSeen = append(linesSeen, line)
-			if successRegexp.MatchString(line) {
-				fmt.Println("✅ Success line logged")
-				return nil
-			}
-			continue
-		}
-		err := scanner.Err()
-		if err != nil && err != io.EOF {
-			logSeenLines(logger, linesSeen)
-			return fmt.Errorf("reading log stream: %w", err)
-		}
-
-		// The scanner is either done or cannot read because of EOF
-		logger.Info("the log scanner stopped")
-		logSeenLines(logger, linesSeen)
-
-		// Check if the container is still running
-		inspect, err := client.ContainerInspect(ctx, containerID)
-		if err != nil {
-			return fmt.Errorf("inspecting container: %w", err)
-		}
-		if !inspect.State.Running {
-			return fmt.Errorf("container stopped unexpectedly while waiting for log line. Exit code: %d", inspect.State.ExitCode)
-		}
-	}
-
-	return ctx.Err()
-}
-
-func logSeenLines(logger Logger, lines []string) {
-	fmt.Println("Logs seen so far:")
-	for _, line := range lines {
-		fmt.Println("  " + line)
-	}
-}

cmd/gluetun/main.go

@@ -4,11 +4,8 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"io/fs"
 	"net/http"
-	"net/netip"
 	"os"
-	"os/exec"
 	"os/signal"
 	"strings"
 	"syscall"
@@ -16,17 +13,15 @@ import (
 	_ "time/tzdata"
 
 	_ "github.com/breml/rootcerts"
-	"github.com/qdm12/dns/v2/pkg/doh"
-	dnsprovider "github.com/qdm12/dns/v2/pkg/provider"
+	"github.com/qdm12/dns/pkg/unbound"
 	"github.com/qdm12/gluetun/internal/alpine"
-	"github.com/qdm12/gluetun/internal/boringpoll"
 	"github.com/qdm12/gluetun/internal/cli"
-	"github.com/qdm12/gluetun/internal/command"
 	"github.com/qdm12/gluetun/internal/configuration/settings"
+	"github.com/qdm12/gluetun/internal/configuration/sources/env"
 	"github.com/qdm12/gluetun/internal/configuration/sources/files"
+	mux "github.com/qdm12/gluetun/internal/configuration/sources/merge"
 	"github.com/qdm12/gluetun/internal/configuration/sources/secrets"
 	"github.com/qdm12/gluetun/internal/constants"
-	copenvpn "github.com/qdm12/gluetun/internal/constants/openvpn"
 	"github.com/qdm12/gluetun/internal/dns"
 	"github.com/qdm12/gluetun/internal/firewall"
 	"github.com/qdm12/gluetun/internal/healthcheck"
@@ -39,6 +34,7 @@ import (
 	"github.com/qdm12/gluetun/internal/pprof"
 	"github.com/qdm12/gluetun/internal/provider"
 	"github.com/qdm12/gluetun/internal/publicip"
+	"github.com/qdm12/gluetun/internal/publicip/ipinfo"
 	"github.com/qdm12/gluetun/internal/routing"
 	"github.com/qdm12/gluetun/internal/server"
 	"github.com/qdm12/gluetun/internal/shadowsocks"
@@ -48,14 +44,14 @@ import (
 	"github.com/qdm12/gluetun/internal/updater/resolver"
 	"github.com/qdm12/gluetun/internal/updater/unzip"
 	"github.com/qdm12/gluetun/internal/vpn"
-	"github.com/qdm12/gosettings/reader"
-	"github.com/qdm12/gosettings/reader/sources/env"
+	"github.com/qdm12/golibs/command"
 	"github.com/qdm12/goshutdown"
 	"github.com/qdm12/goshutdown/goroutine"
 	"github.com/qdm12/goshutdown/group"
 	"github.com/qdm12/goshutdown/order"
 	"github.com/qdm12/gosplash"
 	"github.com/qdm12/log"
+	"github.com/qdm12/updated/pkg/dnscrypto"
 )
 
 //nolint:gochecknoglobals
@@ -84,32 +80,23 @@ func main() {
 	netLinkDebugLogger := logger.New(log.SetComponent("netlink"))
 	netLinker := netlink.New(netLinkDebugLogger)
 	cli := cli.New()
-	cmder := command.New()
+	cmder := command.NewCmder()
 
-	reader := reader.New(reader.Settings{
-		Sources: []reader.Source{
-			secrets.New(logger),
-			files.New(logger),
-			env.New(env.Settings{}),
-		},
-		HandleDeprecatedKey: func(source, deprecatedKey, currentKey string) {
-			logger.Warn("You are using the old " + source + " " + deprecatedKey +
-				", please consider changing it to " + currentKey)
-		},
-	})
+	envReader := env.New(logger)
+	filesReader := files.New()
+	secretsReader := secrets.New()
+	muxReader := mux.New(envReader, filesReader, secretsReader)
 
 	errorCh := make(chan error)
 	go func() {
-		errorCh <- _main(ctx, buildInfo, args, logger, reader, tun, netLinker, cmder, cli)
+		errorCh <- _main(ctx, buildInfo, args, logger, muxReader, tun, netLinker, cmder, cli)
 	}()
 
-	// Wait for OS signal or run error
 	var err error
 	select {
-	case receivedSignal := <-signalCh:
-		signal.Stop(signalCh)
+	case signal := <-signalCh:
 		fmt.Println("")
-		logger.Warn("Caught OS signal " + receivedSignal.String() + ", shutting down")
+		logger.Warn("Caught OS signal " + signal.String() + ", shutting down")
 		cancel()
 	case err = <-errorCh:
 		close(errorCh)
@@ -120,14 +107,15 @@ func main() {
 		cancel()
 	}
 
-	// Shutdown timed sequence, and force exit on second OS signal
 	const shutdownGracePeriod = 5 * time.Second
 	timer := time.NewTimer(shutdownGracePeriod)
 	select {
 	case shutdownErr := <-errorCh:
-		timer.Stop()
+		if !timer.Stop() {
+			<-timer.C
+		}
 		if shutdownErr != nil {
-			logger.Warnf("Shutdown failed: %s", shutdownErr)
+			logger.Warnf("Shutdown not completed gracefully: %s", shutdownErr)
 			os.Exit(1)
 		}
 
@@ -139,39 +127,39 @@ func main() {
 	case <-timer.C:
 		logger.Warn("Shutdown timed out")
 		os.Exit(1)
+	case signal := <-signalCh:
+		logger.Warn("Caught OS signal " + signal.String() + ", forcing shut down")
+		os.Exit(1)
 	}
 }
 
-var errCommandUnknown = errors.New("command is unknown")
+var (
+	errCommandUnknown = errors.New("command is unknown")
+)
 
 //nolint:gocognit,gocyclo,maintidx
 func _main(ctx context.Context, buildInfo models.BuildInformation,
-	args []string, logger log.LoggerInterface, reader *reader.Reader,
-	tun Tun, netLinker netLinker, cmder RunStarter,
-	cli clier,
-) error {
+	args []string, logger log.LoggerInterface, source Source,
+	tun Tun, netLinker netLinker, cmder command.RunStarter,
+	cli clier) error {
 	if len(args) > 1 { // cli operation
 		switch args[1] {
 		case "healthcheck":
-			return cli.HealthCheck(ctx, reader, logger)
+			return cli.HealthCheck(ctx, source, logger)
 		case "clientkey":
 			return cli.ClientKey(args[2:])
 		case "openvpnconfig":
-			return cli.OpenvpnConfig(logger, reader, netLinker)
+			return cli.OpenvpnConfig(logger, source, netLinker)
 		case "update":
 			return cli.Update(ctx, args[2:], logger)
 		case "format-servers":
 			return cli.FormatServers(args[2:])
-		case "genkey":
-			return cli.GenKey(args[2:])
 		default:
 			return fmt.Errorf("%w: %s", errCommandUnknown, args[1])
 		}
 	}
 
-	defer fmt.Println(gluetunLogo)
-
-	announcementExp, err := time.Parse(time.RFC3339, "2026-04-30T00:00:00Z")
+	announcementExp, err := time.Parse(time.RFC3339, "2021-02-15T00:00:00Z")
 	if err != nil {
 		return err
 	}
@@ -181,8 +169,8 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
 		Emails:       []string{"quentin.mcgaw@gmail.com"},
 		Version:      buildInfo.Version,
 		Commit:       buildInfo.Commit,
-		Created:      buildInfo.Created,
-		Announcement: "Set BORINGPOLL_GLUETUNCOM=on to help combat AI slop and shutdown that scam website",
+		BuildDate:    buildInfo.Created,
+		Announcement: "Large settings parsing refactoring merged on 2022-01-06, please report any issue!",
 		AnnounceExp:  announcementExp,
 		// Sponsor information
 		PaypalUser:    "qmcgaw",
@@ -192,24 +180,22 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
 		fmt.Println(line)
 	}
 
-	var allSettings settings.Settings
-	err = allSettings.Read(reader, logger)
+	allSettings, err := source.Read()
 	if err != nil {
 		return err
 	}
-	allSettings.SetDefaults()
 
 	// Note: no need to validate minimal settings for the firewall:
-	// - global log level is parsed below
+	// - global log level is parsed from source
 	// - firewall Debug and Enabled are booleans parsed from source
-	logLevel, err := log.ParseLevel(allSettings.Log.Level)
-	if err != nil {
-		return fmt.Errorf("log level: %w", err)
-	}
-	logger.Patch(log.SetLevel(logLevel))
-	netLinker.PatchLoggerLevel(logLevel)
+
+	logger.Patch(log.SetLevel(*allSettings.Log.Level))
+	netLinker.PatchLoggerLevel(*allSettings.Log.Level)
 
 	routingLogger := logger.New(log.SetComponent("routing"))
+	if *allSettings.Firewall.Debug { // To remove in v4
+		routingLogger.Patch(log.SetLevel(log.LevelDebug))
+	}
 	routingConf := routing.New(netLinker, routingLogger)
 
 	defaultRoutes, err := routingConf.DefaultRoutes()
@@ -222,11 +208,11 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
 		return err
 	}
 
-	iptablesLogLevel, _ := log.ParseLevel(allSettings.Firewall.Iptables.LogLevel)
-	iptablesLogger := logger.New(log.SetComponent("iptables"), log.SetLevel(iptablesLogLevel))
-
 	firewallLogger := logger.New(log.SetComponent("firewall"))
-	firewallConf, err := firewall.NewConfig(ctx, firewallLogger, iptablesLogger, cmder,
+	if *allSettings.Firewall.Debug { // To remove in v4
+		firewallLogger.Patch(log.SetLevel(log.LevelDebug))
+	}
+	firewallConf, err := firewall.NewConfig(ctx, firewallLogger, cmder,
 		defaultRoutes, localNetworks)
 	if err != nil {
 		return err
@@ -237,28 +223,21 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
 		if err != nil {
 			return err
 		}
-		err = netLinker.FlushConntrack()
-		if err != nil {
-			logger.Warnf("flushing conntrack failed: %s", err)
-		}
 	}
 
 	// TODO run this in a loop or in openvpn to reload from file without restarting
 	storageLogger := logger.New(log.SetComponent("storage"))
-	storage, err := storage.New(storageLogger, *allSettings.Storage.Filepath)
+	storage, err := storage.New(storageLogger, constants.ServersData)
 	if err != nil {
 		return err
 	}
 
-	ipv6SupportLevel, err := netLinker.FindIPv6SupportLevel(ctx,
-		allSettings.IPv6.CheckAddresses, firewallConf)
+	ipv6Supported, err := netLinker.IsIPv6Supported()
 	if err != nil {
 		return fmt.Errorf("checking for IPv6 support: %w", err)
 	}
-	ipv6Supported := ipv6SupportLevel == netlink.IPv6Supported ||
-		ipv6SupportLevel == netlink.IPv6Internet
 
-	err = allSettings.Validate(storage, ipv6Supported, logger)
+	err = allSettings.Validate(storage, ipv6Supported)
 	if err != nil {
 		return err
 	}
@@ -271,22 +250,26 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
 
 	puid, pgid := int(*allSettings.System.PUID), int(*allSettings.System.PGID)
 
-	const clientTimeout = 35 * time.Second
+	const clientTimeout = 15 * time.Second
 	httpClient := &http.Client{Timeout: clientTimeout}
 	// Create configurators
 	alpineConf := alpine.New()
 	ovpnConf := openvpn.New(
 		logger.New(log.SetComponent("openvpn configurator")),
 		cmder, puid, pgid)
-	ovpnVersion := ovpnConf.Version26
-	if allSettings.VPN.OpenVPN.Version == copenvpn.Openvpn25 {
-		ovpnVersion = ovpnConf.Version25
-	}
+	dnsCrypto := dnscrypto.New(httpClient, "", "")
+	const cacertsPath = "/etc/ssl/certs/ca-certificates.crt"
+	dnsConf := unbound.NewConfigurator(nil, cmder, dnsCrypto,
+		"/etc/unbound", "/usr/sbin/unbound", cacertsPath)
 
 	err = printVersions(ctx, logger, []printVersionElement{
 		{name: "Alpine", getVersion: alpineConf.Version},
-		{name: "OpenVPN", getVersion: ovpnVersion},
-		{name: "Firewall", getVersion: firewallConf.Version},
+		{name: "OpenVPN 2.4", getVersion: ovpnConf.Version24},
+		{name: "OpenVPN 2.5", getVersion: ovpnConf.Version25},
+		{name: "Unbound", getVersion: dnsConf.Version},
+		{name: "IPtables", getVersion: func(ctx context.Context) (version string, err error) {
+			return firewall.Version(ctx, cmder)
+		}},
 	})
 	if err != nil {
 		return err
@@ -298,13 +281,10 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
 		logger.Warn(warning)
 	}
 
-	const permission = fs.FileMode(0o644)
-	err = os.MkdirAll("/tmp/gluetun", permission)
-	if err != nil {
+	if err := os.MkdirAll("/tmp/gluetun", 0644); err != nil {
 		return err
 	}
-	err = os.MkdirAll("/gluetun", permission)
-	if err != nil {
+	if err := os.MkdirAll("/gluetun", 0644); err != nil {
 		return err
 	}
 
@@ -316,8 +296,15 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
 	if nonRootUsername != defaultUsername {
 		logger.Info("using existing username " + nonRootUsername + " corresponding to user id " + fmt.Sprint(puid))
 	}
+	// set it for Unbound
+	// TODO remove this when migrating to qdm12/dns v2
+	allSettings.DNS.DoT.Unbound.Username = nonRootUsername
 	allSettings.VPN.OpenVPN.ProcessUser = nonRootUsername
 
+	if err := os.Chown("/etc/unbound", puid, pgid); err != nil {
+		return err
+	}
+
 	if err := routingConf.Setup(); err != nil {
 		if strings.Contains(err.Error(), "operation not permitted") {
 			logger.Warn("💡 Tip: Are you passing NET_ADMIN capability to gluetun?")
@@ -344,15 +331,11 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
 	}
 
 	const tunDevice = "/dev/net/tun"
-	err = tun.Check(tunDevice)
-	if err != nil {
-		if !errors.Is(err, os.ErrNotExist) {
-			return fmt.Errorf("checking TUN device: %w (see the Wiki errors/tun page)", err)
-		}
+	if err := tun.Check(tunDevice); err != nil {
 		logger.Info(err.Error() + "; creating it...")
 		err = tun.Create(tunDevice)
 		if err != nil {
-			return fmt.Errorf("creating tun device: %w", err)
+			return err
 		}
 	}
 
@@ -376,8 +359,7 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
 	}
 	defaultGroupOptions := []group.Option{
 		group.OptionTimeout(defaultShutdownTimeout),
-		group.OptionOnSuccess(defaultShutdownOnSuccess),
-	}
+		group.OptionOnSuccess(defaultShutdownOnSuccess)}
 
 	controlGroupHandler := goshutdown.NewGroupHandler("control", defaultGroupOptions...)
 	tickersGroupHandler := goshutdown.NewGroupHandler("tickers", defaultGroupOptions...)
@@ -394,72 +376,52 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
 
 	portForwardLogger := logger.New(log.SetComponent("port forwarding"))
 	portForwardLooper := portforward.NewLoop(allSettings.VPN.Provider.PortForwarding,
-		routingConf, httpClient, firewallConf, portForwardLogger, cmder, puid, pgid)
-	portForwardRunError, err := portForwardLooper.Start(ctx)
-	if err != nil {
-		return fmt.Errorf("starting port forwarding loop: %w", err)
-	}
-
-	dnsLogger := logger.New(log.SetComponent("dns"))
-	dnsLooper, err := dns.NewLoop(allSettings.DNS, httpClient,
-		dnsLogger, localNetworksToPrefixes(localNetworks))
-	if err != nil {
-		return fmt.Errorf("creating DNS loop: %w", err)
-	}
+		httpClient, firewallConf, portForwardLogger, puid, pgid)
+	portForwardHandler, portForwardCtx, portForwardDone := goshutdown.NewGoRoutineHandler(
+		"port forwarding", goroutine.OptionTimeout(time.Second))
+	go portForwardLooper.Run(portForwardCtx, portForwardDone)
 
+	unboundLogger := logger.New(log.SetComponent("dns over tls"))
+	unboundLooper := dns.NewLoop(dnsConf, allSettings.DNS, httpClient,
+		unboundLogger)
 	dnsHandler, dnsCtx, dnsDone := goshutdown.NewGoRoutineHandler(
-		"dns", goroutine.OptionTimeout(defaultShutdownTimeout))
-	// wait for dnsLooper.Restart or its ticker launched with RunRestartTicker
-	go dnsLooper.Run(dnsCtx, dnsDone)
+		"unbound", goroutine.OptionTimeout(defaultShutdownTimeout))
+	// wait for unboundLooper.Restart or its ticker launched with RunRestartTicker
+	go unboundLooper.Run(dnsCtx, dnsDone)
 	otherGroupHandler.Add(dnsHandler)
 
 	dnsTickerHandler, dnsTickerCtx, dnsTickerDone := goshutdown.NewGoRoutineHandler(
 		"dns ticker", goroutine.OptionTimeout(defaultShutdownTimeout))
-	go dnsLooper.RunRestartTicker(dnsTickerCtx, dnsTickerDone)
+	go unboundLooper.RunRestartTicker(dnsTickerCtx, dnsTickerDone)
 	controlGroupHandler.Add(dnsTickerHandler)
 
-	publicIPLooper, err := publicip.NewLoop(allSettings.PublicIP, puid, pgid, httpClient,
-		logger.New(log.SetComponent("ip getter")))
-	if err != nil {
-		return fmt.Errorf("creating public ip loop: %w", err)
-	}
-	publicIPRunError, err := publicIPLooper.Start(ctx)
-	if err != nil {
-		return fmt.Errorf("starting public ip loop: %w", err)
-	}
+	ipFetcher := ipinfo.New(httpClient)
+	publicIPLooper := publicip.NewLoop(ipFetcher,
+		logger.New(log.SetComponent("ip getter")),
+		allSettings.PublicIP, puid, pgid)
+	pubIPHandler, pubIPCtx, pubIPDone := goshutdown.NewGoRoutineHandler(
+		"public IP", goroutine.OptionTimeout(defaultShutdownTimeout))
+	go publicIPLooper.Run(pubIPCtx, pubIPDone)
+	otherGroupHandler.Add(pubIPHandler)
 
-	healthLogger := logger.New(log.SetComponent("healthcheck"))
-	healthcheckServer := healthcheck.NewServer(allSettings.Health, healthLogger)
-	healthServerHandler, healthServerCtx, healthServerDone := goshutdown.NewGoRoutineHandler(
-		"HTTP health server", goroutine.OptionTimeout(defaultShutdownTimeout))
-	go healthcheckServer.Run(healthServerCtx, healthServerDone)
-	healthChecker := healthcheck.NewChecker(healthLogger)
+	pubIPTickerHandler, pubIPTickerCtx, pubIPTickerDone := goshutdown.NewGoRoutineHandler(
+		"public IP", goroutine.OptionTimeout(defaultShutdownTimeout))
+	go publicIPLooper.RunRestartTicker(pubIPTickerCtx, pubIPTickerDone)
+	tickersGroupHandler.Add(pubIPTickerHandler)
 
-	// Note: we use a separate DoH dialer for the VPN servers data updater, separate from the
-	// main DNS local server to make sure no request is blocked by filters.
-	dohDialer, err := doh.New(doh.Settings{
-		UpstreamResolvers: []dnsprovider.Provider{dnsprovider.Cloudflare(), dnsprovider.Google()},
-	})
-	if err != nil {
-		return fmt.Errorf("creating updater DoH dialer: %w", err)
-	}
 	updaterLogger := logger.New(log.SetComponent("updater"))
 
 	unzipper := unzip.New(httpClient)
-	parallelResolver := resolver.NewParallelResolver(dohDialer)
+	parallelResolver := resolver.NewParallelResolver(allSettings.Updater.DNSAddress)
 	openvpnFileExtractor := extract.New()
 	providers := provider.NewProviders(storage, time.Now, updaterLogger,
-		httpClient, unzipper, parallelResolver, publicIPLooper.Fetcher(),
-		openvpnFileExtractor, allSettings.Updater)
-
-	boringPollLogger := logger.New(log.SetComponent("boring poll"))
-	boringPoll := boringpoll.New(httpClient, boringPollLogger, allSettings.BoringPoll)
+		httpClient, unzipper, parallelResolver, ipFetcher, openvpnFileExtractor)
 
 	vpnLogger := logger.New(log.SetComponent("vpn"))
-	vpnLooper := vpn.NewLoop(allSettings.VPN, ipv6SupportLevel, allSettings.Firewall.VPNInputPorts,
-		providers, storage, boringPoll, allSettings.Health, healthChecker, healthcheckServer,
-		ovpnConf, netLinker, firewallConf, routingConf, portForwardLooper, cmder, publicIPLooper,
-		dnsLooper, vpnLogger, httpClient, buildInfo, *allSettings.Version.Enabled)
+	vpnLooper := vpn.NewLoop(allSettings.VPN, ipv6Supported, allSettings.Firewall.VPNInputPorts,
+		providers, storage, ovpnConf, netLinker, firewallConf, routingConf, portForwardLooper,
+		cmder, publicIPLooper, unboundLooper, vpnLogger, httpClient,
+		buildInfo, *allSettings.Version.Enabled)
 	vpnHandler, vpnCtx, vpnDone := goshutdown.NewGoRoutineHandler(
 		"vpn", goroutine.OptionTimeout(time.Second))
 	go vpnLooper.Run(vpnCtx, vpnDone)
@@ -492,12 +454,14 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
 	go shadowsocksLooper.Run(shadowsocksCtx, shadowsocksDone)
 	otherGroupHandler.Add(shadowsocksHandler)
 
+	controlServerAddress := *allSettings.ControlServer.Address
+	controlServerLogging := *allSettings.ControlServer.Log
 	httpServerHandler, httpServerCtx, httpServerDone := goshutdown.NewGoRoutineHandler(
 		"http server", goroutine.OptionTimeout(defaultShutdownTimeout))
-	httpServer, err := server.New(httpServerCtx, allSettings.ControlServer,
+	httpServer, err := server.New(httpServerCtx, controlServerAddress, controlServerLogging,
 		logger.New(log.SetComponent("http server")),
-		buildInfo, vpnLooper, portForwardLooper, dnsLooper, updaterLooper, publicIPLooper,
-		storage, ipv6SupportLevel.IsSupported())
+		buildInfo, vpnLooper, portForwardLooper, unboundLooper, updaterLooper, publicIPLooper,
+		storage, ipv6Supported)
 	if err != nil {
 		return fmt.Errorf("setting up control server: %w", err)
 	}
@@ -506,36 +470,24 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
 	<-httpServerReady
 	controlGroupHandler.Add(httpServerHandler)
 
+	healthLogger := logger.New(log.SetComponent("healthcheck"))
+	healthcheckServer := healthcheck.NewServer(allSettings.Health, healthLogger, vpnLooper)
+	healthServerHandler, healthServerCtx, healthServerDone := goshutdown.NewGoRoutineHandler(
+		"HTTP health server", goroutine.OptionTimeout(defaultShutdownTimeout))
+	go healthcheckServer.Run(healthServerCtx, healthServerDone)
+
 	orderHandler := goshutdown.NewOrderHandler("gluetun",
 		order.OptionTimeout(totalShutdownTimeout),
 		order.OptionOnSuccess(defaultShutdownOnSuccess),
 		order.OptionOnFailure(defaultShutdownOnFailure))
 	orderHandler.Append(controlGroupHandler, tickersGroupHandler, healthServerHandler,
-		vpnHandler, otherGroupHandler)
+		vpnHandler, portForwardHandler, otherGroupHandler)
 
 	// Start VPN for the first time in a blocking call
 	// until the VPN is launched
 	_, _ = vpnLooper.ApplyStatus(ctx, constants.Running) // TODO option to disable with variable
 
-	select {
-	case <-ctx.Done():
-		stoppers := []interface {
-			String() string
-			Stop() error
-		}{
-			portForwardLooper, publicIPLooper,
-		}
-		for _, stopper := range stoppers {
-			err := stopper.Stop()
-			if err != nil {
-				logger.Error(fmt.Sprintf("stopping %s: %s", stopper, err))
-			}
-		}
-	case err := <-portForwardRunError:
-		logger.Errorf("port forwarding loop crashed: %s", err)
-	case err := <-publicIPRunError:
-		logger.Errorf("public IP loop crashed: %s", err)
-	}
+	<-ctx.Done()
 
 	return orderHandler.Shutdown(context.Background())
 }
@@ -550,8 +502,7 @@ type infoer interface {
 }
 
 func printVersions(ctx context.Context, logger infoer,
-	elements []printVersionElement,
-) (err error) {
+	elements []printVersionElement) (err error) {
 	const timeout = 5 * time.Second
 	ctx, cancel := context.WithTimeout(ctx, timeout)
 	defer cancel()
@@ -567,64 +518,52 @@ func printVersions(ctx context.Context, logger infoer,
 	return nil
 }
 
-func localNetworksToPrefixes(localNetworks []routing.LocalNetwork) (prefixes []netip.Prefix) {
-	prefixes = make([]netip.Prefix, len(localNetworks))
-	for i, localNetwork := range localNetworks {
-		prefixes[i] = localNetwork.IPNet
-	}
-	return prefixes
-}
-
 type netLinker interface {
 	Addresser
 	Router
 	Ruler
 	Linker
 	IsWireguardSupported() (ok bool, err error)
-	FindIPv6SupportLevel(ctx context.Context,
-		checkAddresses []netip.AddrPort, firewall netlink.Firewall,
-	) (level netlink.IPv6SupportLevel, err error)
-	FlushConntrack() error
+	IsIPv6Supported() (ok bool, err error)
 	PatchLoggerLevel(level log.Level)
 }
 
 type Addresser interface {
-	AddrList(linkIndex uint32, family uint8) (
-		addresses []netip.Prefix, err error)
-	AddrReplace(linkIndex uint32, addr netip.Prefix) error
+	AddrList(link netlink.Link, family int) (
+		addresses []netlink.Addr, err error)
+	AddrAdd(link netlink.Link, addr *netlink.Addr) error
 }
 
 type Router interface {
-	RouteList(family uint8) (routes []netlink.Route, err error)
-	RouteAdd(route netlink.Route) error
-	RouteDel(route netlink.Route) error
-	RouteReplace(route netlink.Route) error
+	RouteList(link netlink.Link, family int) (
+		routes []netlink.Route, err error)
+	RouteAdd(route *netlink.Route) error
+	RouteDel(route *netlink.Route) error
+	RouteReplace(route *netlink.Route) error
 }
 
 type Ruler interface {
-	RuleList(family uint8) (rules []netlink.Rule, err error)
-	RuleAdd(rule netlink.Rule) error
-	RuleDel(rule netlink.Rule) error
+	RuleList(family int) (rules []netlink.Rule, err error)
+	RuleAdd(rule *netlink.Rule) error
+	RuleDel(rule *netlink.Rule) error
 }
 
 type Linker interface {
 	LinkList() (links []netlink.Link, err error)
 	LinkByName(name string) (link netlink.Link, err error)
-	LinkByIndex(index uint32) (link netlink.Link, err error)
-	LinkAdd(link netlink.Link) (linkIndex uint32, err error)
-	LinkDel(linkIndex uint32) (err error)
-	LinkSetUp(linkIndex uint32) (err error)
-	LinkSetDown(linkIndex uint32) (err error)
-	LinkSetMTU(linkIndex, mtu uint32) error
+	LinkByIndex(index int) (link netlink.Link, err error)
+	LinkAdd(link netlink.Link) (err error)
+	LinkDel(link netlink.Link) (err error)
+	LinkSetUp(link netlink.Link) (err error)
+	LinkSetDown(link netlink.Link) (err error)
 }
 
 type clier interface {
 	ClientKey(args []string) error
 	FormatServers(args []string) error
-	OpenvpnConfig(logger cli.OpenvpnConfigLogger, reader *reader.Reader, ipv6Checker cli.IPv6Checker) error
-	HealthCheck(ctx context.Context, reader *reader.Reader, warner cli.Warner) error
+	OpenvpnConfig(logger cli.OpenvpnConfigLogger, source cli.Source, ipv6Checker cli.IPv6Checker) error
+	HealthCheck(ctx context.Context, source cli.Source, warner cli.Warner) error
 	Update(ctx context.Context, args []string, logger cli.UpdaterLogger) error
-	GenKey(args []string) error
 }
 
 type Tun interface {
@@ -632,41 +571,8 @@ type Tun interface {
 	Create(tunDevice string) error
 }
 
-type RunStarter interface {
-	Run(cmd *exec.Cmd) (output string, err error)
-	Start(cmd *exec.Cmd) (stdoutLines, stderrLines <-chan string,
-		waitError <-chan error, err error)
-	RunAndLog(ctx context.Context, commandString string,
-		logger command.Logger) (err error)
+type Source interface {
+	Read() (settings settings.Settings, err error)
+	ReadHealth() (health settings.Health, err error)
+	String() string
 }
-
-const gluetunLogo = `                         @@@
-                         @@@@
-                        @@@@@@
-                       @@@@.@@                       @@@@@@@@@@
-                       @@@@.@@@                   @@@@@@@@==@@@@
-                      @@@.@..@@                @@@@@@@=@..==@@@@
-            @@@@      @@@.@@.@@              @@@@@@===@@@@.=@@@
-           @...-@@   @@@@.@@.@@@  @@@     @@@@@@=======@@@=@@@@
-           @@@@@@@@  @@@.-%@.+@@@@@@@@  @@@@@%============@@@@
-                     @@@.--@..@@@@.-@@@@@@@==============@@@@
-              @@@@  @@@-@--@@.@@.---@@@@@==============#@@@@@
-              @@@   @@@.@@-@@.@@--@@@@@===============@@@@@@
-                   @@@@.@--@@@@@@@@@@================@@@@@@@
-                   @@@..--@@*@@@@@@================@@@@+*@@
-                   @@@.---@@.@@@@=================@@@@--@@
-                  @@@-.---@@@@@@================@@@@*--@@@
-                  @@@.:-#@@@@@@===============*@@@@.---@@
-                  @@@.-------.@@@============@@@@@@.--@@@
-                 @@@..--------:@@@=========@@@@@@@@.--@@@
-                 @@@.-@@@@@@@@@@@========@@@@@  @@@.--@@
-                 @@.@@@@===============@@@@@ @@@@@@---@@@@@@
-                @@@@@@@==============@@@@@@@@@@@@*@---@@@@@@@@
-                @@@@@@=============@@@@@ @@@...------------.*@@@
-                @@@@%===========@@@@@@ @@@..------@@@@.-----.-@@@
-                @@@@@@.=======@@@@@@  @@@.-------@@@@@@-.------=@@
-               @@@@@@@@@===@@@@@@     @@.------@@@@   @@@@.-----@@@
-               @@@==@@@=@@@@@@@      @@@.-@@@@@@@       @@@@@@@--@@
-               @@@@@@@@@@@@@         @@@@@@@@                @@@@@@@
-                @@@@@@@@             @@@@                       @@@@
-                                                                       `

go.mod

@@ -1,68 +1,50 @@
 module github.com/qdm12/gluetun
 
-go 1.25.0
+go 1.20
 
 require (
-	github.com/ProtonMail/go-srp v0.0.7
-	github.com/amnezia-vpn/amneziawg-go v0.2.16
-	github.com/breml/rootcerts v0.3.4
-	github.com/fatih/color v1.18.0
+	github.com/breml/rootcerts v0.2.10
+	github.com/fatih/color v1.15.0
 	github.com/golang/mock v1.6.0
-	github.com/jsimonetti/rtnetlink v1.4.2
-	github.com/klauspost/compress v1.18.4
-	github.com/klauspost/pgzip v1.2.6
-	github.com/mdlayher/genetlink v1.3.2
-	github.com/mdlayher/netlink v1.9.0
-	github.com/pelletier/go-toml/v2 v2.2.4
-	github.com/qdm12/dns/v2 v2.0.0-rc9.0.20260421173011-9de8e7fdbe3a
-	github.com/qdm12/gosettings v0.4.4
+	github.com/qdm12/dns v1.11.0
+	github.com/qdm12/golibs v0.0.0-20210822203818-5c568b0777b6
 	github.com/qdm12/goshutdown v0.3.0
-	github.com/qdm12/gosplash v0.2.1-0.20260305164749-b713de4fee6c
-	github.com/qdm12/gotree v0.3.0
+	github.com/qdm12/gosplash v0.1.0
+	github.com/qdm12/gotree v0.2.0
+	github.com/qdm12/govalid v0.1.0
 	github.com/qdm12/log v0.1.0
-	github.com/qdm12/ss-server v0.6.0
-	github.com/stretchr/testify v1.11.1
-	github.com/ti-mo/netfilter v0.5.3
-	github.com/ulikunitz/xz v0.5.15
+	github.com/qdm12/ss-server v0.4.0
+	github.com/qdm12/updated v0.0.0-20210603204757-205acfe6937e
+	github.com/stretchr/testify v1.8.2
+	github.com/vishvananda/netlink v1.2.1-beta.2
 	github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a
-	golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c
-	golang.org/x/net v0.51.0
-	golang.org/x/sys v0.42.0
-	golang.org/x/text v0.35.0
-	golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173
-	golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6
-	gopkg.in/ini.v1 v1.67.1
+	golang.org/x/exp v0.0.0-20230519143937-03e91628a987
+	golang.org/x/net v0.10.0
+	golang.org/x/sys v0.8.0
+	golang.org/x/text v0.9.0
+	golang.zx2c4.com/wireguard v0.0.0-20230325221338-052af4a8072b
+	golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230215201556-9c5414ab4bde
+	inet.af/netaddr v0.0.0-20220811202034-502d2d690317
 )
 
 require (
-	github.com/ProtonMail/bcrypt v0.0.0-20211005172633-e235017c1baf // indirect
-	github.com/ProtonMail/go-crypto v1.3.0-proton // indirect
-	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/cloudflare/circl v1.6.1 // indirect
-	github.com/cronokirby/saferith v0.33.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/google/go-cmp v0.7.0 // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/josharian/native v1.0.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mdlayher/socket v0.5.1 // indirect
-	github.com/miekg/dns v1.1.62 // indirect
-	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
+	github.com/mattn/go-isatty v0.0.17 // indirect
+	github.com/mdlayher/genetlink v1.2.0 // indirect
+	github.com/mdlayher/netlink v1.6.2 // indirect
+	github.com/mdlayher/socket v0.2.3 // indirect
+	github.com/miekg/dns v1.1.40 // indirect
+	github.com/mr-tron/base58 v1.2.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_golang v1.20.5 // indirect
-	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.60.1 // indirect
-	github.com/prometheus/procfs v0.15.1 // indirect
-	github.com/qdm12/goservices v0.1.1-0.20251104135713-6bee97bd4978 // indirect
 	github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 // indirect
-	golang.org/x/crypto v0.48.0 // indirect
-	golang.org/x/mod v0.33.0 // indirect
-	golang.org/x/sync v0.20.0 // indirect
-	golang.org/x/tools v0.42.0 // indirect
+	github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // indirect
+	go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect
+	go4.org/unsafe/assume-no-moving-gc v0.0.0-20230221090011-e4bae7ad2296 // indirect
+	golang.org/x/crypto v0.6.0 // indirect
+	golang.org/x/sync v0.1.0 // indirect
 	golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
-	google.golang.org/protobuf v1.35.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	kernel.org/pub/linux/libs/security/libcap/cap v1.2.70 // indirect
-	kernel.org/pub/linux/libs/security/libcap/psx v1.2.70 // indirect
 )

go.sum

@@ -1,203 +1,243 @@
-github.com/ProtonMail/bcrypt v0.0.0-20210511135022-227b4adcab57/go.mod h1:HecWFHognK8GfRDGnFQbW/LiV7A3MX3gZVs45vk5h8I=
-github.com/ProtonMail/bcrypt v0.0.0-20211005172633-e235017c1baf h1:yc9daCCYUefEs69zUkSzubzjBbL+cmOXgnmt9Fyd9ug=
-github.com/ProtonMail/bcrypt v0.0.0-20211005172633-e235017c1baf/go.mod h1:o0ESU9p83twszAU8LBeJKFAAMX14tISa0yk4Oo5TOqo=
-github.com/ProtonMail/go-crypto v0.0.0-20230321155629-9a39f2531310/go.mod h1:8TI4H3IbrackdNgv+92dI+rhpCaLqM0IfpgCgenFvRE=
-github.com/ProtonMail/go-crypto v1.3.0-proton h1:tAQKQRZX/73VmzK6yHSCaRUOvS/3OYSQzhXQsrR7yUM=
-github.com/ProtonMail/go-crypto v1.3.0-proton/go.mod h1:9whxjD8Rbs29b4XWbB8irEcE8KHMqaR2e7GWU1R+/PE=
-github.com/ProtonMail/go-srp v0.0.7 h1:Sos3Qk+th4tQR64vsxGIxYpN3rdnG9Wf9K4ZloC1JrI=
-github.com/ProtonMail/go-srp v0.0.7/go.mod h1:giCp+7qRnMIcCvI6V6U3S1lDDXDQYx2ewJ6F/9wdlJk=
-github.com/amnezia-vpn/amneziawg-go v0.2.16 h1:XY6HOq/xtqH8ZXMncRWkjFs85EKdN10NLNnw23kTpE0=
-github.com/amnezia-vpn/amneziawg-go v0.2.16/go.mod h1:nRkPpIzjCxMW8pZKXTRkpqAQVlmFJdVOGkeQSC7wbms=
-github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
-github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/breml/rootcerts v0.3.4 h1:9i7WNl/ctd9OEAOaTfLy//Wrlfxq/tRQ7v4okYFN9Ys=
-github.com/breml/rootcerts v0.3.4/go.mod h1:S/PKh+4d1HUn4HQovEB8hPJZO6pUZYrIhmXBhsegfXw=
-github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
-github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
-github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cilium/ebpf v0.12.3 h1:8ht6F9MquybnY97at+VDZb3eQQr8ev79RueWeVaEcG4=
-github.com/cilium/ebpf v0.12.3/go.mod h1:TctK1ivibvI3znr66ljgi4hqOT8EYQjz1KWBfb1UVgM=
-github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I=
-github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
-github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
-github.com/cronokirby/saferith v0.33.0 h1:TgoQlfsD4LIwx71+ChfRcIpjkw+RPOapDEVxa+LhwLo=
-github.com/cronokirby/saferith v0.33.0/go.mod h1:QKJhjoqUtBsXCAVEjw38mFqoi7DebT7kthcD7UzbnoA=
+github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
+github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs=
+github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
+github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
+github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
+github.com/breml/rootcerts v0.2.10 h1:UGVZ193UTSUASpGtg6pbDwzOd7XQP+at0Ssg1/2E4h8=
+github.com/breml/rootcerts v0.2.10/go.mod h1:24FDtzYMpqIeYC7QzaE8VPRQaFZU5TIUDlyk8qwjD88=
+github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
-github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
+github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
+github.com/dvyukov/go-fuzz v0.0.0-20210103155950-6a8e9d1f2415/go.mod h1:11Gm+ccJnvAhCNLlf5+cS9KjtbaD5I5zaZpFMsTHWTw=
+github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
+github.com/fatih/color v1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
+github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
+github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
+github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
+github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
+github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
+github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI=
+github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
+github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
+github.com/go-openapi/errors v0.17.2/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
+github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
+github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
+github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
+github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA=
+github.com/go-openapi/runtime v0.17.2/go.mod h1:QO936ZXeisByFmZEO1IS1Dqhtf4QV1sYYFtIq6Ld86Q=
+github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
+github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
+github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
+github.com/go-openapi/validate v0.17.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4=
+github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
 github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
 github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
-github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
-github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
-github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
-github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
-github.com/jsimonetti/rtnetlink v1.4.2 h1:Df9w9TZ3npHTyDn0Ev9e1uzmN2odmXd0QX+J5GTEn90=
-github.com/jsimonetti/rtnetlink v1.4.2/go.mod h1:92s6LJdE+1iOrw+F2/RO7LYI2Qd8pPpFNNUYW06gcoM=
-github.com/klauspost/compress v1.18.4 h1:RPhnKRAQ4Fh8zU2FY/6ZFDwTVTxgJ/EMydqSTzE9a2c=
-github.com/klauspost/compress v1.18.4/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4=
-github.com/klauspost/pgzip v1.2.6 h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU=
-github.com/klauspost/pgzip v1.2.6/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
-github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
+github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gotify/go-api-client/v2 v2.0.4/go.mod h1:VKiah/UK20bXsr0JObE1eBVLW44zbBouzjuri9iwjFU=
+github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
+github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/josharian/native v1.0.0 h1:Ts/E8zCSEsG17dUqv7joXJFybuMLjQfWE04tsBODTxk=
+github.com/josharian/native v1.0.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
+github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kyokomi/emoji v2.2.4+incompatible/go.mod h1:mZ6aGCD7yk8j6QY6KICwnZ2pxoszVseX1DNoGtU2tBA=
+github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
-github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mdlayher/genetlink v1.3.2 h1:KdrNKe+CTu+IbZnm/GVUMXSqBBLqcGpRDa0xkQy56gw=
-github.com/mdlayher/genetlink v1.3.2/go.mod h1:tcC3pkCrPUGIKKsCsp0B3AdaaKuHtaxoJRz3cc+528o=
-github.com/mdlayher/netlink v1.9.0 h1:G8+GLq2x3v4D4MVIqDdNUhTUC7TKiCy/6MDkmItfKco=
-github.com/mdlayher/netlink v1.9.0/go.mod h1:YBnl5BXsCoRuwBjKKlZ+aYmEoq0r12FDA/3JC+94KDg=
-github.com/mdlayher/socket v0.5.1 h1:VZaqt6RkGkt2OE9l3GcC6nZkqD3xKeQLyfleW/uBcos=
-github.com/mdlayher/socket v0.5.1/go.mod h1:TjPLHI1UgwEv5J1B5q0zTZq12A/6H7nKmtTanQE37IQ=
-github.com/miekg/dns v1.1.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ=
-github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ=
+github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
+github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mdlayher/genetlink v1.2.0 h1:4yrIkRV5Wfk1WfpWTcoOlGmsWgQj3OtQN9ZsbrE+XtU=
+github.com/mdlayher/genetlink v1.2.0/go.mod h1:ra5LDov2KrUCZJiAtEvXXZBxGMInICMXIwshlJ+qRxQ=
+github.com/mdlayher/netlink v1.6.0/go.mod h1:0o3PlBmGst1xve7wQ7j/hwpNaFaH4qCRyWCdcZk8/vA=
+github.com/mdlayher/netlink v1.6.2 h1:D2zGSkvYsJ6NreeED3JiVTu1lj2sIYATqSaZlhPzUgQ=
+github.com/mdlayher/netlink v1.6.2/go.mod h1:O1HXX2sIWSMJ3Qn1BYZk1yZM+7iMki/uYGGiwGyq/iU=
+github.com/mdlayher/socket v0.1.1/go.mod h1:mYV5YIZAfHh4dzDVzI8x8tWLWCliuX8Mon5Awbj+qDs=
+github.com/mdlayher/socket v0.2.3 h1:XZA2X2TjdOwNoNPVPclRCURoX/hokBY8nkTmRZFEheM=
+github.com/mdlayher/socket v0.2.3/go.mod h1:bz12/FozYNH/VbvC3q7TRIK/Y6dH1kCKsXaUeXi/FmY=
+github.com/miekg/dns v1.1.40 h1:pyyPFfGMnciYUk/mXpKkVmeMQjfXqt3FAJ2hy7tPiLA=
+github.com/miekg/dns v1.1.40/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
 github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721 h1:RlZweED6sbSArvlE924+mUcZuXKLBHA35U7LN621Bws=
-github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721/go.mod h1:Ickgr2WtCLZ2MDGd4Gr0geeCH5HybhRJbonOgQpvSxc=
-github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
-github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
-github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o=
+github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
+github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
+github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo=
+github.com/phayes/permbits v0.0.0-20190612203442-39d7c581d2ee/go.mod h1:3uODdxMgOaPYeWU7RzZLxVtJHZ/x1f/iHkBZuKJDzuY=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
-github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
-github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
-github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
-github.com/prometheus/common v0.60.1 h1:FUas6GcOw66yB/73KC+BOZoFJmbo/1pojoILArPAaSc=
-github.com/prometheus/common v0.60.1/go.mod h1:h0LYf1R1deLSKtD4Vdg8gy4RuOvENW2J/h19V5NADQw=
-github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
-github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
-github.com/qdm12/dns/v2 v2.0.0-rc9.0.20260421173011-9de8e7fdbe3a h1:TE157yPQmAbVruH0MWCQzs0vTT/6t96DkoWUXd6PVuc=
-github.com/qdm12/dns/v2 v2.0.0-rc9.0.20260421173011-9de8e7fdbe3a/go.mod h1:98foWgXJZ+g8gJIuO+fdO+oWpFei5WShMFTeN4Im2lE=
-github.com/qdm12/goservices v0.1.1-0.20251104135713-6bee97bd4978 h1:TRGpCU1l0lNwtogEUSs5U+RFceYxkAJUmrGabno7J5c=
-github.com/qdm12/goservices v0.1.1-0.20251104135713-6bee97bd4978/go.mod h1:D1Po4CRQLYjccnAR2JsVlN1sBMgQrcNLONbvyuzcdTg=
-github.com/qdm12/gosettings v0.4.4 h1:SM6tOZDf6k8qbjWU8KWyBF4mWIixfsKCfh9DGRLHlj4=
-github.com/qdm12/gosettings v0.4.4/go.mod h1:CPrt2YC4UsURTrslmhxocVhMCW03lIrqdH2hzIf5prg=
+github.com/qdm12/dns v1.11.0 h1:jpcD5DZXXQSQe5a263PL09ghukiIdptvXFOZvyKEm6Q=
+github.com/qdm12/dns v1.11.0/go.mod h1:FmQsNOUcrrZ4UFzWAiED56AKXeNgaX3ySbmPwEfNjjE=
+github.com/qdm12/golibs v0.0.0-20210603202746-e5494e9c2ebb/go.mod h1:15RBzkun0i8XB7ADIoLJWp9ITRgsz3LroEI2FiOXLRg=
+github.com/qdm12/golibs v0.0.0-20210723175634-a75ca7fd74c2/go.mod h1:6aRbg4Z/bTbm9JfxsGXfWKHi7zsOvPfUTK1S5HuAFKg=
+github.com/qdm12/golibs v0.0.0-20210822203818-5c568b0777b6 h1:bge5AL7cjHJMPz+5IOz5yF01q/l8No6+lIEBieA8gMg=
+github.com/qdm12/golibs v0.0.0-20210822203818-5c568b0777b6/go.mod h1:6aRbg4Z/bTbm9JfxsGXfWKHi7zsOvPfUTK1S5HuAFKg=
 github.com/qdm12/goshutdown v0.3.0 h1:pqBpJkdwlZlfTEx4QHtS8u8CXx6pG0fVo6S1N0MpSEM=
 github.com/qdm12/goshutdown v0.3.0/go.mod h1:EqZ46No00kCTZ5qzdd3qIzY6ayhMt24QI8Mh8LVQYmM=
-github.com/qdm12/gosplash v0.2.1-0.20260305164749-b713de4fee6c h1:l8qz53IqEXRGK0X62gWwipG077Fz5eNM7qe4mUbAr/Q=
-github.com/qdm12/gosplash v0.2.1-0.20260305164749-b713de4fee6c/go.mod h1:vgRg8Skq9+RNp1THecwMI7SGsnIwO/NPMfYenNTgpAc=
-github.com/qdm12/gotree v0.3.0 h1:Q9f4C571EFK7ZEsPkEL2oGZX7I+ZhVxhh1ZSydW+5yI=
-github.com/qdm12/gotree v0.3.0/go.mod h1:iz06uXmRR4Aq9v6tX7mosXStO/yGHxRA1hbyD0UVeYw=
+github.com/qdm12/gosplash v0.1.0 h1:Sfl+zIjFZFP7b0iqf2l5UkmEY97XBnaKkH3FNY6Gf7g=
+github.com/qdm12/gosplash v0.1.0/go.mod h1:+A3fWW4/rUeDXhY3ieBzwghKdnIPFJgD8K3qQkenJlw=
+github.com/qdm12/gotree v0.2.0 h1:+58ltxkNLUyHtATFereAcOjBVfY6ETqRex8XK90Fb/c=
+github.com/qdm12/gotree v0.2.0/go.mod h1:1SdFaqKZuI46U1apbXIf25pDMNnrPuYLEqMF/qL4lY4=
+github.com/qdm12/govalid v0.1.0 h1:UIFVmuaAg0Q+h0GeyfcFEZ5sQ5KJPvRQwycC1/cqDN8=
+github.com/qdm12/govalid v0.1.0/go.mod h1:CyS/OEQdOvunBgrtIsW93fjd4jBkwZPBjGSpxq3NwA4=
 github.com/qdm12/log v0.1.0 h1:jYBd/xscHYpblzZAd2kjZp2YmuYHjAAfbTViJWxoPTw=
 github.com/qdm12/log v0.1.0/go.mod h1:Vchi5M8uBvHfPNIblN4mjXn/oSbiWguQIbsgF1zdQPI=
-github.com/qdm12/ss-server v0.6.0 h1:OaOdCIBXx0z3DGHPT6Th0v88vGa3MtAS4oRgUsDHGZE=
-github.com/qdm12/ss-server v0.6.0/go.mod h1:0BO/zEmtTiLDlmQEcjtoHTC+w+cWxwItjBuGP6TWM78=
+github.com/qdm12/ss-server v0.4.0 h1:lMMYfDGc9P86Lyvd3+p8lK4hhgHUKDzjZC91FqJYkDU=
+github.com/qdm12/ss-server v0.4.0/go.mod h1:AY0p4huvPUPW+/CiWsJcDgT6sneDryk26VXSccPNCxY=
+github.com/qdm12/updated v0.0.0-20210603204757-205acfe6937e h1:4q+uFLawkaQRq3yARYLsjJPZd2wYwxn4g6G/5v0xW1g=
+github.com/qdm12/updated v0.0.0-20210603204757-205acfe6937e/go.mod h1:UvJRGkZ9XL3/D7e7JiTTVLm1F3Cymd3/gFpD6frEpBo=
 github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 h1:f/FNXud6gA3MNr8meMVVGxhp+QBTqY91tM8HjEuMjGg=
 github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3/go.mod h1:HgjTstvQsPGkxUsCd2KWxErBblirPizecHcpD3ffK+s=
-github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
-github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
+github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
+github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
-github.com/ti-mo/netfilter v0.5.3 h1:ikzduvnaUMwre5bhbNwWOd6bjqLMVb33vv0XXbK0xGQ=
-github.com/ti-mo/netfilter v0.5.3/go.mod h1:08SyBCg6hu1qyQk4s3DjjJKNrm3RTb32nm6AzyT972E=
-github.com/ulikunitz/xz v0.5.15 h1:9DNdB5s+SgV3bQ2ApL10xRc35ck0DuIX/isZvIk+ubY=
-github.com/ulikunitz/xz v0.5.15/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
+github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/vishvananda/netlink v1.2.1-beta.2 h1:Llsql0lnQEbHj0I1OuKyp8otXp0r3q0mPkuhwHfStVs=
+github.com/vishvananda/netlink v1.2.1-beta.2/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho=
+github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae h1:4hwBBUfQCFe3Cym0ZtKyq7L16eZUtYKs+BaHDN6mAns=
+github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
+github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4=
+github.com/yl2chen/cidranger v1.0.2/go.mod h1:9U1yz7WPYDwf0vpNWFaeRh0bjwz5RVgRy/9UEQfHl0g=
 github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a h1:fZHgsYlfvtyqToslyjUt3VOPF4J7aK/3MPcK7xp3PDk=
 github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a/go.mod h1:ul22v+Nro/R083muKhosV54bj5niojjWZvU8xrevuH4=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
-go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
+go4.org/intern v0.0.0-20210108033219-3eb7198706b2/go.mod h1:vLqJ+12kCw61iCWsPto0EOHhBS+o4rO5VIucbc9g2Cc=
+go4.org/intern v0.0.0-20211027215823-ae77deb06f29 h1:UXLjNohABv4S58tHmeuIZDO6e3mHpW2Dx33gaNt03LE=
+go4.org/intern v0.0.0-20211027215823-ae77deb06f29/go.mod h1:cS2ma+47FKrLPdXFpr7CuxiTW3eyJbWew4qx0qtQWDA=
+go4.org/unsafe/assume-no-moving-gc v0.0.0-20201222175341-b30ae309168e/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
+go4.org/unsafe/assume-no-moving-gc v0.0.0-20201222180813-1025295fd063/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
+go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
+go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
+go4.org/unsafe/assume-no-moving-gc v0.0.0-20230221090011-e4bae7ad2296 h1:QJ/xcIANMLApehfgPCHnfK1hZiaMmbaTVmPv7DAoTbo=
+go4.org/unsafe/assume-no-moving-gc v0.0.0-20230221090011-e4bae7ad2296/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
+golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
-golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts=
-golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos=
-golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c h1:7dEasQXItcW1xKJ2+gg5VOiBnqWrJc+rq0DPKyvvdbY=
-golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c/go.mod h1:NQtJDoLvd6faHhE7m4T/1IY708gDefGGjR/iUW8yQQ8=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
+golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
+golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
+golang.org/x/exp v0.0.0-20230519143937-03e91628a987 h1:3xJIFvzUFbu4ls0BTBYcgbCGhA63eAOEMxIHugyXJqA=
+golang.org/x/exp v0.0.0-20230519143937-03e91628a987/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
-golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
+golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
-golang.org/x/net v0.51.0 h1:94R/GTO7mt3/4wIKpcR5gkGmRLOuE/2hNGeWq/GBIFo=
-golang.org/x/net v0.51.0/go.mod h1:aamm+2QF5ogm02fjy5Bb7CQ0WMt1/WVM7FtyaTLlA9Y=
+golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220923203811-8be639271d50/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
-golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
-golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
-golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
-golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY=
-golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k=
-golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeunTOisW56dUokqW/FOteYJJ/yg=
 golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI=
-golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 h1:/jFs0duh4rdb8uIfPMv78iAJGcPKDeqAFnaLBropIC4=
-golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173/go.mod h1:tkCQ4FQXmpAgYVh++1cq16/dH4QJtmvpRv19DWGAHSA=
-golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6 h1:CawjfCvYQH2OU3/TnxLx97WDSUDRABfT18pCOYwc2GE=
-golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6/go.mod h1:3rxYc4HtVcSG9gVaTs2GEBdehh+sYPOwKtyUWEOTb80=
-google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
-google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+golang.zx2c4.com/wireguard v0.0.0-20230325221338-052af4a8072b h1:J1CaxgLerRR5lgx3wnr6L04cJFbWoceSK9JWBdglINo=
+golang.zx2c4.com/wireguard v0.0.0-20230325221338-052af4a8072b/go.mod h1:tqur9LnfstdR9ep2LaJT4lFUl0EjlHtge+gAjmsHUG4=
+golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230215201556-9c5414ab4bde h1:ybF7AMzIUikL9x4LgwEmzhXtzRpKNqngme1VGDWz+Nk=
+golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230215201556-9c5414ab4bde/go.mod h1:mQqgjkW8GQQcJQsbBvK890TKqUK1DfKWkuBGbOkuMHQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/ini.v1 v1.67.1 h1:tVBILHy0R6e4wkYOn3XmiITt/hEVH4TFMYvAX2Ytz6k=
-gopkg.in/ini.v1 v1.67.1/go.mod h1:x/cyOwCgZqOkJoDIJ3c1KNHMo10+nLGAhh+kn3Zizss=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98=
+gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g=
+gopkg.in/src-d/go-git.v4 v4.13.1/go.mod h1:nx5NYcxdKxq5fpltdHnPa2Exj4Sx0EclMWZQbYDu2z8=
+gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gvisor.dev/gvisor v0.0.0-20231202080848-1f7806d17489 h1:ze1vwAdliUAr68RQ5NtufWaXaOg8WUO2OACzEV+TNdE=
-gvisor.dev/gvisor v0.0.0-20231202080848-1f7806d17489/go.mod h1:10sU+Uh5KKNv1+2x2A0Gvzt8FjD3ASIhorV3YsauXhk=
-kernel.org/pub/linux/libs/security/libcap/cap v1.2.70 h1:QnLPkuDWWbD5C+3DUA2IUXai5TK6w2zff+MAGccqdsw=
-kernel.org/pub/linux/libs/security/libcap/cap v1.2.70/go.mod h1:/iBwcj9nbLejQitYvUm9caurITQ6WyNHibJk6Q9fiS4=
-kernel.org/pub/linux/libs/security/libcap/psx v1.2.70 h1:HsB2G/rEQiYyo1bGoQqHZ/Bvd6x1rERQTNdPr1FyWjI=
-kernel.org/pub/linux/libs/security/libcap/psx v1.2.70/go.mod h1:+l6Ee2F59XiJ2I6WR5ObpC1utCQJZ/VLsEbQCD8RG24=
+gvisor.dev/gvisor v0.0.0-20221203005347-703fd9b7fbc0 h1:Wobr37noukisGxpKo5jAsLREcpj61RxrWYzD8uwveOY=
+inet.af/netaddr v0.0.0-20210511181906-37180328850c/go.mod h1:z0nx+Dh+7N7CC8V5ayHtHGpZpxLQZZxkIaaz6HN65Ls=
+inet.af/netaddr v0.0.0-20220811202034-502d2d690317 h1:U2fwK6P2EqmopP/hFLTOAjWTki0qgd4GMJn5X8wOleU=
+inet.af/netaddr v0.0.0-20220811202034-502d2d690317/go.mod h1:OIezDfdzOgFhuw4HuWapWq2e9l0H9tK4F1j+ETRtF3k=

internal/alpine/users.go

@@ -3,13 +3,14 @@ package alpine
 import (
 	"errors"
 	"fmt"
-	"io/fs"
 	"os"
 	"os/user"
 	"strconv"
 )
 
-var ErrUserAlreadyExists = errors.New("user already exists")
+var (
+	ErrUserAlreadyExists = errors.New("user already exists")
+)
 
 // CreateUser creates a user in Alpine with the given UID.
 func (a *Alpine) CreateUser(username string, uid int) (createdUsername string, err error) {
@@ -38,8 +39,7 @@ func (a *Alpine) CreateUser(username string, uid int) (createdUsername string, e
 			ErrUserAlreadyExists, username, u.Uid, uid)
 	}
 
-	const permission = fs.FileMode(0o644)
-	file, err := os.OpenFile(a.passwdPath, os.O_APPEND|os.O_WRONLY, permission)
+	file, err := os.OpenFile(a.passwdPath, os.O_APPEND|os.O_WRONLY, 0644)
 	if err != nil {
 		return "", err
 	}

internal/amneziawg/constructor.go

@@ -1,22 +0,0 @@
-package amneziawg
-
-type Amneziawg struct {
-	logger   Logger
-	settings Settings
-	netlink  NetLinker
-}
-
-func New(settings Settings, netlink NetLinker,
-	logger Logger,
-) (a *Amneziawg, err error) {
-	settings.SetDefaults()
-	if err := settings.Check(); err != nil {
-		return nil, err
-	}
-
-	return &Amneziawg{
-		logger:   logger,
-		settings: settings,
-		netlink:  netlink,
-	}, nil
-}

internal/amneziawg/constructor_test.go

@@ -1,86 +0,0 @@
-package amneziawg
-
-import (
-	"net/netip"
-	"testing"
-
-	"github.com/qdm12/gluetun/internal/wireguard"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"golang.zx2c4.com/wireguard/device"
-)
-
-func Test_New(t *testing.T) {
-	t.Parallel()
-
-	const validKeyString = "oMNSf/zJ0pt1ciy+qIRk8Rlyfs9accwuRLnKd85Yl1Q="
-	logger := NewMockLogger(nil)
-	netLinker := NewMockNetLinker(nil)
-
-	testCases := map[string]struct {
-		settings  Settings
-		amneziawg *Amneziawg
-		err       error
-	}{
-		"bad_settings": {
-			settings: Settings{
-				Wireguard: wireguard.Settings{
-					PrivateKey: "",
-				},
-			},
-			err: wireguard.ErrPrivateKeyMissing,
-		},
-		"minimal valid settings": {
-			settings: Settings{
-				Wireguard: wireguard.Settings{
-					PrivateKey: validKeyString,
-					PublicKey:  validKeyString,
-					Endpoint:   netip.AddrPortFrom(netip.AddrFrom4([4]byte{1, 2, 3, 4}), 0),
-					Addresses: []netip.Prefix{
-						netip.PrefixFrom(netip.AddrFrom4([4]byte{5, 6, 7, 8}), 32),
-					},
-					FirewallMark: 100,
-				},
-			},
-			amneziawg: &Amneziawg{
-				logger:  logger,
-				netlink: netLinker,
-				settings: Settings{
-					Wireguard: wireguard.Settings{
-						InterfaceName: "wg0",
-						PrivateKey:    validKeyString,
-						PublicKey:     validKeyString,
-						Endpoint:      netip.AddrPortFrom(netip.AddrFrom4([4]byte{1, 2, 3, 4}), 51820),
-						Addresses: []netip.Prefix{
-							netip.PrefixFrom(netip.AddrFrom4([4]byte{5, 6, 7, 8}), 32),
-						},
-						AllowedIPs: []netip.Prefix{
-							netip.MustParsePrefix("0.0.0.0/0"),
-						},
-						FirewallMark:   100,
-						MTU:            device.DefaultMTU,
-						IPv6:           ptrTo(false),
-						Implementation: "auto",
-					},
-				},
-			},
-		},
-	}
-
-	for name, testCase := range testCases {
-		t.Run(name, func(t *testing.T) {
-			t.Parallel()
-
-			wireguard, err := New(testCase.settings, netLinker, logger)
-
-			if testCase.err != nil {
-				require.Error(t, err)
-				assert.Equal(t, testCase.err.Error(), err.Error())
-			} else {
-				assert.NoError(t, err)
-			}
-
-			assert.Equal(t, testCase.amneziawg, wireguard)
-		})
-	}
-}

internal/amneziawg/helpers_test.go

@@ -1,5 +0,0 @@
-package amneziawg
-
-func ptrTo[T any](v T) *T {
-	return &v
-}

internal/amneziawg/log.go

@@ -1,11 +0,0 @@
-package amneziawg
-
-//go:generate mockgen -destination=log_mock_test.go -package amneziawg . Logger
-
-type Logger interface {
-	Debug(s string)
-	Debugf(format string, args ...interface{})
-	Info(s string)
-	Error(s string)
-	Errorf(format string, args ...interface{})
-}

internal/amneziawg/log_mock_test.go

@@ -1,104 +0,0 @@
-// Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/qdm12/gluetun/internal/amneziawg (interfaces: Logger)
-
-// Package amneziawg is a generated GoMock package.
-package amneziawg
-
-import (
-	reflect "reflect"
-
-	gomock "github.com/golang/mock/gomock"
-)
-
-// MockLogger is a mock of Logger interface.
-type MockLogger struct {
-	ctrl     *gomock.Controller
-	recorder *MockLoggerMockRecorder
-}
-
-// MockLoggerMockRecorder is the mock recorder for MockLogger.
-type MockLoggerMockRecorder struct {
-	mock *MockLogger
-}
-
-// NewMockLogger creates a new mock instance.
-func NewMockLogger(ctrl *gomock.Controller) *MockLogger {
-	mock := &MockLogger{ctrl: ctrl}
-	mock.recorder = &MockLoggerMockRecorder{mock}
-	return mock
-}
-
-// EXPECT returns an object that allows the caller to indicate expected use.
-func (m *MockLogger) EXPECT() *MockLoggerMockRecorder {
-	return m.recorder
-}
-
-// Debug mocks base method.
-func (m *MockLogger) Debug(arg0 string) {
-	m.ctrl.T.Helper()
-	m.ctrl.Call(m, "Debug", arg0)
-}
-
-// Debug indicates an expected call of Debug.
-func (mr *MockLoggerMockRecorder) Debug(arg0 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debug", reflect.TypeOf((*MockLogger)(nil).Debug), arg0)
-}
-
-// Debugf mocks base method.
-func (m *MockLogger) Debugf(arg0 string, arg1 ...interface{}) {
-	m.ctrl.T.Helper()
-	varargs := []interface{}{arg0}
-	for _, a := range arg1 {
-		varargs = append(varargs, a)
-	}
-	m.ctrl.Call(m, "Debugf", varargs...)
-}
-
-// Debugf indicates an expected call of Debugf.
-func (mr *MockLoggerMockRecorder) Debugf(arg0 interface{}, arg1 ...interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	varargs := append([]interface{}{arg0}, arg1...)
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debugf", reflect.TypeOf((*MockLogger)(nil).Debugf), varargs...)
-}
-
-// Error mocks base method.
-func (m *MockLogger) Error(arg0 string) {
-	m.ctrl.T.Helper()
-	m.ctrl.Call(m, "Error", arg0)
-}
-
-// Error indicates an expected call of Error.
-func (mr *MockLoggerMockRecorder) Error(arg0 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Error", reflect.TypeOf((*MockLogger)(nil).Error), arg0)
-}
-
-// Errorf mocks base method.
-func (m *MockLogger) Errorf(arg0 string, arg1 ...interface{}) {
-	m.ctrl.T.Helper()
-	varargs := []interface{}{arg0}
-	for _, a := range arg1 {
-		varargs = append(varargs, a)
-	}
-	m.ctrl.Call(m, "Errorf", varargs...)
-}
-
-// Errorf indicates an expected call of Errorf.
-func (mr *MockLoggerMockRecorder) Errorf(arg0 interface{}, arg1 ...interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	varargs := append([]interface{}{arg0}, arg1...)
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Errorf", reflect.TypeOf((*MockLogger)(nil).Errorf), varargs...)
-}
-
-// Info mocks base method.
-func (m *MockLogger) Info(arg0 string) {
-	m.ctrl.T.Helper()
-	m.ctrl.Call(m, "Info", arg0)
-}
-
-// Info indicates an expected call of Info.
-func (mr *MockLoggerMockRecorder) Info(arg0 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Info", reflect.TypeOf((*MockLogger)(nil).Info), arg0)
-}

internal/amneziawg/netlinker.go

@@ -1,36 +0,0 @@
-package amneziawg
-
-import (
-	"net/netip"
-
-	"github.com/qdm12/gluetun/internal/netlink"
-)
-
-//go:generate mockgen -destination=netlinker_mock_test.go -package amneziawg . NetLinker
-
-type NetLinker interface {
-	AddrReplace(linkIndex uint32, addr netip.Prefix) error
-	Router
-	Ruler
-	Linker
-	IsWireguardSupported() (ok bool, err error)
-}
-
-type Router interface {
-	RouteList(family uint8) (routes []netlink.Route, err error)
-	RouteAdd(route netlink.Route) error
-}
-
-type Ruler interface {
-	RuleAdd(rule netlink.Rule) error
-	RuleDel(rule netlink.Rule) error
-}
-
-type Linker interface {
-	LinkAdd(link netlink.Link) (linkIndex uint32, err error)
-	LinkList() (links []netlink.Link, err error)
-	LinkByName(name string) (link netlink.Link, err error)
-	LinkSetUp(linkIndex uint32) error
-	LinkSetDown(linkIndex uint32) error
-	LinkDel(linkIndex uint32) error
-}

internal/amneziawg/netlinker_mock_test.go

@@ -1,209 +0,0 @@
-// Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/qdm12/gluetun/internal/amneziawg (interfaces: NetLinker)
-
-// Package amneziawg is a generated GoMock package.
-package amneziawg
-
-import (
-	netip "net/netip"
-	reflect "reflect"
-
-	gomock "github.com/golang/mock/gomock"
-	netlink "github.com/qdm12/gluetun/internal/netlink"
-)
-
-// MockNetLinker is a mock of NetLinker interface.
-type MockNetLinker struct {
-	ctrl     *gomock.Controller
-	recorder *MockNetLinkerMockRecorder
-}
-
-// MockNetLinkerMockRecorder is the mock recorder for MockNetLinker.
-type MockNetLinkerMockRecorder struct {
-	mock *MockNetLinker
-}
-
-// NewMockNetLinker creates a new mock instance.
-func NewMockNetLinker(ctrl *gomock.Controller) *MockNetLinker {
-	mock := &MockNetLinker{ctrl: ctrl}
-	mock.recorder = &MockNetLinkerMockRecorder{mock}
-	return mock
-}
-
-// EXPECT returns an object that allows the caller to indicate expected use.
-func (m *MockNetLinker) EXPECT() *MockNetLinkerMockRecorder {
-	return m.recorder
-}
-
-// AddrReplace mocks base method.
-func (m *MockNetLinker) AddrReplace(arg0 uint32, arg1 netip.Prefix) error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "AddrReplace", arg0, arg1)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// AddrReplace indicates an expected call of AddrReplace.
-func (mr *MockNetLinkerMockRecorder) AddrReplace(arg0, arg1 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddrReplace", reflect.TypeOf((*MockNetLinker)(nil).AddrReplace), arg0, arg1)
-}
-
-// IsWireguardSupported mocks base method.
-func (m *MockNetLinker) IsWireguardSupported() (bool, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "IsWireguardSupported")
-	ret0, _ := ret[0].(bool)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// IsWireguardSupported indicates an expected call of IsWireguardSupported.
-func (mr *MockNetLinkerMockRecorder) IsWireguardSupported() *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsWireguardSupported", reflect.TypeOf((*MockNetLinker)(nil).IsWireguardSupported))
-}
-
-// LinkAdd mocks base method.
-func (m *MockNetLinker) LinkAdd(arg0 netlink.Link) (uint32, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "LinkAdd", arg0)
-	ret0, _ := ret[0].(uint32)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// LinkAdd indicates an expected call of LinkAdd.
-func (mr *MockNetLinkerMockRecorder) LinkAdd(arg0 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkAdd", reflect.TypeOf((*MockNetLinker)(nil).LinkAdd), arg0)
-}
-
-// LinkByName mocks base method.
-func (m *MockNetLinker) LinkByName(arg0 string) (netlink.Link, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "LinkByName", arg0)
-	ret0, _ := ret[0].(netlink.Link)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// LinkByName indicates an expected call of LinkByName.
-func (mr *MockNetLinkerMockRecorder) LinkByName(arg0 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkByName", reflect.TypeOf((*MockNetLinker)(nil).LinkByName), arg0)
-}
-
-// LinkDel mocks base method.
-func (m *MockNetLinker) LinkDel(arg0 uint32) error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "LinkDel", arg0)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// LinkDel indicates an expected call of LinkDel.
-func (mr *MockNetLinkerMockRecorder) LinkDel(arg0 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkDel", reflect.TypeOf((*MockNetLinker)(nil).LinkDel), arg0)
-}
-
-// LinkList mocks base method.
-func (m *MockNetLinker) LinkList() ([]netlink.Link, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "LinkList")
-	ret0, _ := ret[0].([]netlink.Link)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// LinkList indicates an expected call of LinkList.
-func (mr *MockNetLinkerMockRecorder) LinkList() *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkList", reflect.TypeOf((*MockNetLinker)(nil).LinkList))
-}
-
-// LinkSetDown mocks base method.
-func (m *MockNetLinker) LinkSetDown(arg0 uint32) error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "LinkSetDown", arg0)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// LinkSetDown indicates an expected call of LinkSetDown.
-func (mr *MockNetLinkerMockRecorder) LinkSetDown(arg0 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkSetDown", reflect.TypeOf((*MockNetLinker)(nil).LinkSetDown), arg0)
-}
-
-// LinkSetUp mocks base method.
-func (m *MockNetLinker) LinkSetUp(arg0 uint32) error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "LinkSetUp", arg0)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// LinkSetUp indicates an expected call of LinkSetUp.
-func (mr *MockNetLinkerMockRecorder) LinkSetUp(arg0 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkSetUp", reflect.TypeOf((*MockNetLinker)(nil).LinkSetUp), arg0)
-}
-
-// RouteAdd mocks base method.
-func (m *MockNetLinker) RouteAdd(arg0 netlink.Route) error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "RouteAdd", arg0)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// RouteAdd indicates an expected call of RouteAdd.
-func (mr *MockNetLinkerMockRecorder) RouteAdd(arg0 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RouteAdd", reflect.TypeOf((*MockNetLinker)(nil).RouteAdd), arg0)
-}
-
-// RouteList mocks base method.
-func (m *MockNetLinker) RouteList(arg0 byte) ([]netlink.Route, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "RouteList", arg0)
-	ret0, _ := ret[0].([]netlink.Route)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// RouteList indicates an expected call of RouteList.
-func (mr *MockNetLinkerMockRecorder) RouteList(arg0 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RouteList", reflect.TypeOf((*MockNetLinker)(nil).RouteList), arg0)
-}
-
-// RuleAdd mocks base method.
-func (m *MockNetLinker) RuleAdd(arg0 netlink.Rule) error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "RuleAdd", arg0)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// RuleAdd indicates an expected call of RuleAdd.
-func (mr *MockNetLinkerMockRecorder) RuleAdd(arg0 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RuleAdd", reflect.TypeOf((*MockNetLinker)(nil).RuleAdd), arg0)
-}
-
-// RuleDel mocks base method.
-func (m *MockNetLinker) RuleDel(arg0 netlink.Rule) error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "RuleDel", arg0)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// RuleDel indicates an expected call of RuleDel.
-func (mr *MockNetLinkerMockRecorder) RuleDel(arg0 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RuleDel", reflect.TypeOf((*MockNetLinker)(nil).RuleDel), arg0)
-}

internal/amneziawg/run.go

@@ -1,133 +0,0 @@
-package amneziawg
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"net"
-
-	amneziaconn "github.com/amnezia-vpn/amneziawg-go/conn"
-	amneziadevice "github.com/amnezia-vpn/amneziawg-go/device"
-	amneziatun "github.com/amnezia-vpn/amneziawg-go/tun"
-	"github.com/qdm12/gluetun/internal/cleanup"
-	"github.com/qdm12/gluetun/internal/wireguard"
-)
-
-var (
-	errTunNameMismatch = errors.New("TUN device name is mismatching")
-	errDeviceWaited    = errors.New("device waited for")
-)
-
-// Run runs the amneziawg interface and waits until the context is done, then it cleans up the
-// interface and returns any error that occurred during setup or waiting. It sends an error to
-// waitError if any error occurs during setup or waiting, otherwise it sends nil when the context
-// is done. It sends a signal to ready when the setup is complete and the interface is ready to use.
-// See https://github.com/amnezia-vpn/amneziawg-go/blob/master/main.go
-func (a *Amneziawg) Run(ctx context.Context, waitError chan<- error, ready chan<- struct{}) {
-	setup := func(ctx context.Context, cleanups *cleanup.Cleanups) (
-		linkIndex uint32, waitAndCleanup func() error, err error,
-	) {
-		return setupUserspace(ctx, a.settings.Wireguard.InterfaceName,
-			a.netlink, a.settings.Wireguard.MTU, cleanups, a.logger, a.settings)
-	}
-
-	wireguard.Run(ctx, waitError, ready, setup, a.settings.Wireguard, a.netlink, a.logger)
-}
-
-func setupUserspace(ctx context.Context,
-	interfaceName string, netLinker NetLinker, mtu uint32,
-	cleanups *cleanup.Cleanups, logger Logger,
-	settings Settings,
-) (
-	linkIndex uint32, waitAndCleanup func() error, err error,
-) {
-	tun, err := amneziatun.CreateTUN(interfaceName, int(mtu))
-	if err != nil {
-		return 0, nil, fmt.Errorf("creating TUN device: %w", err)
-	}
-
-	cleanups.Add("closing TUN device", 7, tun.Close)
-
-	tunName, err := tun.Name()
-	if err != nil {
-		return 0, nil, fmt.Errorf("getting created TUN device name: %w", err)
-	} else if tunName != interfaceName {
-		return 0, nil, fmt.Errorf("%w: expected %q and got %q",
-			errTunNameMismatch, interfaceName, tunName)
-	}
-
-	link, err := netLinker.LinkByName(interfaceName)
-	if err != nil {
-		return 0, nil, fmt.Errorf("finding link %s: %w", interfaceName, err)
-	}
-	cleanups.Add("deleting link", 5, func() error {
-		return netLinker.LinkDel(link.Index)
-	})
-
-	bind := amneziaconn.NewDefaultBind()
-	cleanups.Add("closing bind", 7, bind.Close)
-
-	deviceLogger := amneziadevice.Logger{
-		Verbosef: logger.Debugf,
-		Errorf:   logger.Errorf,
-	}
-	device := amneziadevice.NewDevice(tun, bind, &deviceLogger)
-
-	cleanups.Add("closing Wireguard device", 6, func() error {
-		device.Close()
-		return nil
-	})
-
-	uapiFile, err := wireguard.UAPIOpen(interfaceName)
-	if err != nil {
-		return 0, nil, fmt.Errorf("opening UAPI socket: %w", err)
-	}
-	cleanups.Add("closing UAPI file", 3, uapiFile.Close)
-
-	uapiListener, err := wireguard.UAPIListen(interfaceName, uapiFile)
-	if err != nil {
-		return 0, nil, fmt.Errorf("listening on UAPI socket: %w", err)
-	}
-	cleanups.Add("closing UAPI listener", 2, uapiListener.Close)
-
-	uapiConfig := settings.uapiConfig()
-	err = device.IpcSet(uapiConfig)
-	if err != nil {
-		return 0, nil, fmt.Errorf("setting amneziawg uapi config: %w", err)
-	}
-
-	// acceptAndHandle exits when uapiListener is closed
-	uapiAcceptErrorCh := make(chan error)
-	go acceptAndHandle(uapiListener, device, uapiAcceptErrorCh)
-	waitAndCleanup = func() error {
-		select {
-		case <-ctx.Done():
-			err = ctx.Err()
-		case err = <-uapiAcceptErrorCh:
-			close(uapiAcceptErrorCh)
-		case <-device.Wait():
-			err = errDeviceWaited
-		}
-
-		cleanups.Cleanup(logger)
-
-		<-uapiAcceptErrorCh // wait for acceptAndHandle to exit
-
-		return err
-	}
-
-	return link.Index, waitAndCleanup, nil
-}
-
-func acceptAndHandle(uapi net.Listener, device *amneziadevice.Device,
-	uapiAcceptErrorCh chan<- error,
-) {
-	for { // stopped by uapiFile.Close()
-		conn, err := uapi.Accept()
-		if err != nil {
-			uapiAcceptErrorCh <- err
-			return
-		}
-		go device.IpcHandle(conn)
-	}
-}

internal/amneziawg/settings.go

@@ -1,69 +0,0 @@
-package amneziawg
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/qdm12/gluetun/internal/wireguard"
-)
-
-type Settings struct {
-	Wireguard       wireguard.Settings
-	JunkPacketCount uint16
-	JunkPacketMin   uint16
-	JunkPacketMax   uint16
-	PaddingS1       uint16
-	PaddingS2       uint16
-	PaddingS3       uint16
-	PaddingS4       uint16
-	HeaderH1        string
-	HeaderH2        string
-	HeaderH3        string
-	HeaderH4        string
-	InitPacketI1    string
-	InitPacketI2    string
-	InitPacketI3    string
-	InitPacketI4    string
-	InitPacketI5    string
-}
-
-func (s Settings) uapiConfig() string {
-	uintFields := map[string]uint16{
-		"jc":   s.JunkPacketCount,
-		"jmin": s.JunkPacketMin,
-		"jmax": s.JunkPacketMax,
-		"s1":   s.PaddingS1,
-		"s2":   s.PaddingS2,
-		"s3":   s.PaddingS3,
-		"s4":   s.PaddingS4,
-	}
-	stringFields := map[string]string{
-		"h1": s.HeaderH1,
-		"h2": s.HeaderH2,
-		"h3": s.HeaderH3,
-		"h4": s.HeaderH4,
-		"i1": s.InitPacketI1,
-		"i2": s.InitPacketI2,
-		"i3": s.InitPacketI3,
-		"i4": s.InitPacketI4,
-		"i5": s.InitPacketI5,
-	}
-	lines := make([]string, 0, len(uintFields)+len(stringFields))
-
-	for key, val := range uintFields {
-		lines = append(lines, fmt.Sprintf("%s=%d", key, val))
-	}
-
-	for key, val := range stringFields {
-		lines = append(lines, key+"="+val)
-	}
-	return strings.Join(lines, "\n")
-}
-
-func (s *Settings) SetDefaults() {
-	s.Wireguard.SetDefaults()
-}
-
-func (s *Settings) Check() error {
-	return s.Wireguard.Check()
-}

internal/boringpoll/boringpoll.go

@@ -1,189 +0,0 @@
-package boringpoll
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"math/rand"
-	"net/http"
-	"sync"
-	"time"
-
-	"github.com/qdm12/gluetun/internal/configuration/settings"
-)
-
-type BoringPoll struct {
-	// Injected dependencies
-	client *http.Client
-	logger Logger
-
-	// Internal state
-	urlToData map[string]*urlData
-
-	// Internal signals and channels
-	cancel context.CancelFunc
-	done   *sync.WaitGroup
-	mutex  sync.Mutex
-}
-
-type urlData struct{}
-
-func New(client *http.Client, logger Logger, settings settings.BoringPoll) *BoringPoll {
-	urlToData := make(map[string]*urlData)
-	if *settings.GluetunCom {
-		urlToData["https://gluetun.com/wp-json"] = &urlData{}
-	}
-	return &BoringPoll{
-		client:    client,
-		logger:    logger,
-		urlToData: urlToData,
-	}
-}
-
-func (b *BoringPoll) Start() (runError <-chan error, err error) {
-	b.mutex.Lock()
-	defer b.mutex.Unlock()
-
-	if len(b.urlToData) == 0 {
-		return nil, nil //nolint:nilnil
-	}
-
-	const minPeriod = time.Minute
-	const maxPeriod = 5 * time.Minute
-	const logEveryBytes = 100 * 1000 * 1000 // 100 IEC MB
-
-	var ready, done sync.WaitGroup
-	b.done = &done
-	ready.Add(len(b.urlToData))
-	done.Add(len(b.urlToData))
-	ctx, cancel := context.WithCancel(context.Background())
-	b.cancel = cancel
-	for url := range b.urlToData {
-		go func(url string) {
-			defer done.Done()
-
-			b.logger.Infof("running against %s periodically between %s and %s "+
-				"and will log every %s downloaded",
-				url, minPeriod, maxPeriod, byteCountSI(logEveryBytes))
-			totalDownloaded := uint64(0)
-			lastDownloaded := uint64(0)
-			consecutiveFails := 0
-			const maxConsecutiveErrs = 3
-			const coolDownTimeout = time.Hour
-			timer := time.NewTimer(time.Hour)
-			var err error
-
-			ready.Done()
-			for {
-				timeout := minPeriod + time.Duration(rand.Int63n(int64(maxPeriod-minPeriod))) //nolint:gosec
-				if consecutiveFails >= maxConsecutiveErrs {
-					b.logger.Debugf("pausing poll to %s for %s due to %d consecutive errors, last error: %s",
-						url, coolDownTimeout, consecutiveFails, err)
-					timeout = coolDownTimeout
-				}
-				timer.Reset(timeout)
-				select {
-				case <-ctx.Done():
-					timer.Stop()
-					totalDownloaded += lastDownloaded
-					if totalDownloaded > 0 {
-						b.logger.Infof("stopping poll to %s, downloaded %s!", url, byteCountSI(totalDownloaded))
-					}
-					return
-				case <-timer.C:
-				}
-				var n int64
-				n, err = fetchURL(ctx, b.client, url)
-				if err != nil {
-					consecutiveFails++
-					continue
-				}
-				consecutiveFails = 0
-				totalDownloaded += uint64(n) //nolint:gosec
-				lastDownloaded += uint64(n)  //nolint:gosec
-				if lastDownloaded >= logEveryBytes {
-					b.logger.Infof("thanks for helping! You have downloaded %s from %s so far!",
-						byteCountSI(totalDownloaded), url)
-					lastDownloaded = 0
-				}
-			}
-		}(url)
-	}
-	return nil, nil //nolint:nilnil
-}
-
-func fetchURL(ctx context.Context, client *http.Client, url string) (downloaded int64, err error) {
-	const requestTimeout = 10 * time.Second
-	ctx, cancel := context.WithTimeout(ctx, requestTimeout)
-	defer cancel()
-	request, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
-	if err != nil {
-		cancel()
-		return 0, err
-	}
-	request.Header.Set("Cache-Control", "no-cache, no-store, must-revalidate")
-	request.Header.Set("Pragma", "no-cache")
-	request.Header.Set("Expires", "0")
-	request.Header.Set("User-Agent", getRandomUserAgent())
-
-	response, err := client.Do(request)
-	if err != nil {
-		return 0, err
-	}
-	downloaded, err = io.Copy(io.Discard, response.Body)
-	_ = response.Body.Close()
-	if err != nil {
-		return 0, err
-	}
-	return downloaded, nil
-}
-
-func getRandomUserAgent() string {
-	//nolint:lll
-	userAgents := [...]string{
-		"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36",
-		"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36",
-		"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36",
-		"Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:122.0) Gecko/20100101 Firefox/122.0",
-		"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.2.1 Safari/605.1.15",
-		"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Edge/121.0.0.0 Safari/537.36",
-		"Mozilla/5.0 (iPhone; CPU iPhone OS 17_2_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.2 Mobile/15E148 Safari/604.1",
-		"Mozilla/5.0 (iPad; CPU OS 17_2_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.2 Mobile/15E148 Safari/604.1",
-		"Mozilla/5.0 (Android 14; Mobile; rv:122.0) Gecko/122.0 Firefox/122.0",
-		"Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Mobile Safari/537.36",
-		"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36 OPR/106.0.0.0",
-		"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36 OPR/106.0.0.0",
-		"Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)",
-		"Mozilla/5.0 (compatible; bingbot/2.0; +http://www.bing.com/bingbot.htm)",
-	}
-	return userAgents[rand.Intn(len(userAgents))] //nolint:gosec
-}
-
-func (b *BoringPoll) Stop() error {
-	b.mutex.Lock()
-	defer b.mutex.Unlock()
-
-	if b.cancel == nil {
-		return nil
-	}
-	b.cancel()
-	b.done.Wait()
-	b.cancel = nil
-	b.done = nil
-	return nil
-}
-
-func byteCountSI(b uint64) string {
-	const unit = 1000
-	if b < unit {
-		return fmt.Sprintf("%dB", b)
-	}
-
-	div, exp := uint64(unit), 0
-	for n := b / unit; n >= unit; n /= unit {
-		div *= unit
-		exp++
-	}
-
-	return fmt.Sprintf("%.1f%cB", float64(b)/float64(div), "kMGTPE"[exp])
-}

internal/boringpoll/interfaces.go

@@ -1,6 +0,0 @@
-package boringpoll
-
-type Logger interface {
-	Infof(format string, args ...any)
-	Debugf(format string, args ...any)
-}

internal/cleanup/cleanup.go

@@ -1,51 +0,0 @@
-package cleanup
-
-import "sort"
-
-type Cleanups []cleanup
-
-type cleanup struct {
-	operation  string
-	orderIndex uint
-	cleanup    func() error
-	done       bool
-}
-
-// Add adds a cleanup function to the list of cleanups, with a description of the
-// operation being cleaned up, and an order index that determines the order in which
-// the cleanup functions are run. The lower the order index, the earlier the cleanup
-// function is run.
-func (c *Cleanups) Add(operation string, orderIndex uint,
-	cleanupFunc func() error,
-) {
-	closer := cleanup{
-		operation:  operation,
-		orderIndex: orderIndex,
-		cleanup:    cleanupFunc,
-	}
-	*c = append(*c, closer)
-}
-
-// Cleanup runs the cleanup functions in the order of their orderIndex,
-// and logs any error that occurs during cleanup.
-// It can also be re-called in case a cleanup fails, and already cleaned up
-// functions will not be re-run.
-func (c *Cleanups) Cleanup(logger Logger) {
-	closers := *c
-
-	sort.Slice(closers, func(i, j int) bool {
-		return closers[i].orderIndex < closers[j].orderIndex
-	})
-
-	for i, closer := range closers {
-		if closer.done {
-			continue
-		}
-		closers[i].done = true
-		logger.Debug(closer.operation + "...")
-		err := closer.cleanup()
-		if err != nil {
-			logger.Error("failed " + closer.operation + ": " + err.Error())
-		}
-	}
-}

internal/cleanup/cleanup_test.go

@@ -1,57 +0,0 @@
-package cleanup
-
-import (
-	"errors"
-	"testing"
-
-	"github.com/golang/mock/gomock"
-	"github.com/stretchr/testify/assert"
-)
-
-func Test_Cleanups(t *testing.T) {
-	t.Parallel()
-
-	ctrl := gomock.NewController(t)
-
-	var ACloseCalled, BCloseCalled, CCloseCalled bool
-	var (
-		AErr error
-		BErr = errors.New("B failed")
-		CErr = errors.New("C failed")
-	)
-
-	var cleanups Cleanups
-	cleanups.Add("cleaning up A", 5, func() error {
-		ACloseCalled = true
-		return AErr
-	})
-
-	cleanups.Add("cleaning up B", 3, func() error {
-		BCloseCalled = true
-		return BErr
-	})
-
-	cleanups.Add("cleaning up C", 2, func() error {
-		CCloseCalled = true
-		return CErr
-	})
-
-	logger := NewMockLogger(ctrl)
-	prevCall := logger.EXPECT().Debug("cleaning up C...")
-	prevCall = logger.EXPECT().Error("failed cleaning up C: C failed").After(prevCall)
-	prevCall = logger.EXPECT().Debug("cleaning up B...").After(prevCall)
-	prevCall = logger.EXPECT().Error("failed cleaning up B: B failed").After(prevCall)
-	logger.EXPECT().Debug("cleaning up A...").After(prevCall)
-
-	cleanups.Cleanup(logger)
-
-	cleanups.Cleanup(logger) // run twice should not close already closed
-
-	for _, cleanup := range cleanups {
-		assert.True(t, cleanup.done)
-	}
-
-	assert.True(t, ACloseCalled)
-	assert.True(t, BCloseCalled)
-	assert.True(t, CCloseCalled)
-}

internal/cleanup/interfaces.go

@@ -1,6 +0,0 @@
-package cleanup
-
-type Logger interface {
-	Debug(string)
-	Error(string)
-}

internal/cleanup/mocks_generate_test.go

@@ -1,3 +0,0 @@
-package cleanup
-
-//go:generate mockgen -destination=mocks_test.go -package=$GOPACKAGE . Logger

internal/cleanup/mocks_test.go

@@ -1,58 +0,0 @@
-// Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/qdm12/gluetun/internal/cleanup (interfaces: Logger)
-
-// Package cleanup is a generated GoMock package.
-package cleanup
-
-import (
-	reflect "reflect"
-
-	gomock "github.com/golang/mock/gomock"
-)
-
-// MockLogger is a mock of Logger interface.
-type MockLogger struct {
-	ctrl     *gomock.Controller
-	recorder *MockLoggerMockRecorder
-}
-
-// MockLoggerMockRecorder is the mock recorder for MockLogger.
-type MockLoggerMockRecorder struct {
-	mock *MockLogger
-}
-
-// NewMockLogger creates a new mock instance.
-func NewMockLogger(ctrl *gomock.Controller) *MockLogger {
-	mock := &MockLogger{ctrl: ctrl}
-	mock.recorder = &MockLoggerMockRecorder{mock}
-	return mock
-}
-
-// EXPECT returns an object that allows the caller to indicate expected use.
-func (m *MockLogger) EXPECT() *MockLoggerMockRecorder {
-	return m.recorder
-}
-
-// Debug mocks base method.
-func (m *MockLogger) Debug(arg0 string) {
-	m.ctrl.T.Helper()
-	m.ctrl.Call(m, "Debug", arg0)
-}
-
-// Debug indicates an expected call of Debug.
-func (mr *MockLoggerMockRecorder) Debug(arg0 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debug", reflect.TypeOf((*MockLogger)(nil).Debug), arg0)
-}
-
-// Error mocks base method.
-func (m *MockLogger) Error(arg0 string) {
-	m.ctrl.T.Helper()
-	m.ctrl.Call(m, "Error", arg0)
-}
-
-// Error indicates an expected call of Error.
-func (mr *MockLoggerMockRecorder) Error(arg0 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Error", reflect.TypeOf((*MockLogger)(nil).Error), arg0)
-}

internal/cli/clientkey.go

@@ -6,12 +6,13 @@ import (
 	"io"
 	"os"
 	"strings"
+
+	"github.com/qdm12/gluetun/internal/configuration/sources/files"
 )
 
 func (c *CLI) ClientKey(args []string) error {
 	flagSet := flag.NewFlagSet("clientkey", flag.ExitOnError)
-	const openVPNClientKeyPath = "/gluetun/client.key" // TODO deduplicate?
-	filepath := flagSet.String("path", openVPNClientKeyPath, "file path to the client.key file")
+	filepath := flagSet.String("path", files.OpenVPNClientKeyPath, "file path to the client.key file")
 	if err := flagSet.Parse(args); err != nil {
 		return err
 	}
@@ -27,6 +28,9 @@ func (c *CLI) ClientKey(args []string) error {
 	if err := file.Close(); err != nil {
 		return err
 	}
+	if err != nil {
+		return err
+	}
 	s := string(data)
 	s = strings.ReplaceAll(s, "\n", "")
 	s = strings.ReplaceAll(s, "\r", "")

internal/cli/formatservers.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"flag"
 	"fmt"
-	"io/fs"
 	"os"
 	"path/filepath"
 	"strings"
@@ -17,13 +16,13 @@ import (
 )
 
 var (
+	ErrFormatNotRecognized       = errors.New("format is not recognized")
 	ErrProviderUnspecified       = errors.New("VPN provider to format was not specified")
 	ErrMultipleProvidersToFormat = errors.New("more than one VPN provider to format were specified")
 )
 
 func addProviderFlag(flagSet *flag.FlagSet, providerToFormat map[string]*bool,
-	provider string, titleCaser cases.Caser,
-) {
+	provider string, titleCaser cases.Caser) {
 	boolPtr, ok := providerToFormat[provider]
 	if !ok {
 		panic(fmt.Sprintf("unknown provider in format map: %s", provider))
@@ -34,27 +33,24 @@ func addProviderFlag(flagSet *flag.FlagSet, providerToFormat map[string]*bool,
 func (c *CLI) FormatServers(args []string) error {
 	var format, output string
 	allProviders := providers.All()
-	allProviderFlags := make([]string, len(allProviders))
-	for i, provider := range allProviders {
-		allProviderFlags[i] = strings.ReplaceAll(provider, " ", "-")
-	}
-
 	providersToFormat := make(map[string]*bool, len(allProviders))
-	for _, provider := range allProviderFlags {
+	for _, provider := range allProviders {
 		providersToFormat[provider] = new(bool)
 	}
-	flagSet := flag.NewFlagSet("format-servers", flag.ExitOnError)
-	flagSet.StringVar(&format, "format", "markdown", "Format to use which can be: 'markdown' or 'json'")
+	flagSet := flag.NewFlagSet("markdown", flag.ExitOnError)
+	flagSet.StringVar(&format, "format", "markdown", "Format to use which can be: 'markdown'")
 	flagSet.StringVar(&output, "output", "/dev/stdout", "Output file to write the formatted data to")
 	titleCaser := cases.Title(language.English)
-	for _, provider := range allProviderFlags {
+	for _, provider := range allProviders {
 		addProviderFlag(flagSet, providersToFormat, provider, titleCaser)
 	}
 	if err := flagSet.Parse(args); err != nil {
 		return err
 	}
 
-	// Note the format is validated by storage.Format
+	if format != "markdown" {
+		return fmt.Errorf("%w: %s", ErrFormatNotRecognized, format)
+	}
 
 	// Verify only one provider is set to be formatted.
 	var providers []string
@@ -72,13 +68,7 @@ func (c *CLI) FormatServers(args []string) error {
 			ErrMultipleProvidersToFormat, len(providers),
 			strings.Join(providers, ", "))
 	}
-
-	var providerToFormat string
-	for _, providerToFormat = range allProviders {
-		if strings.ReplaceAll(providerToFormat, " ", "-") == providers[0] {
-			break
-		}
-	}
+	providerToFormat := providers[0]
 
 	logger := newNoopLogger()
 	storage, err := storage.New(logger, constants.ServersData)
@@ -86,14 +76,10 @@ func (c *CLI) FormatServers(args []string) error {
 		return fmt.Errorf("creating servers storage: %w", err)
 	}
 
-	formatted, err := storage.Format(providerToFormat, format)
-	if err != nil {
-		return fmt.Errorf("formatting servers: %w", err)
-	}
+	formatted := storage.FormatToMarkdown(providerToFormat)
 
 	output = filepath.Clean(output)
-	const permission = fs.FileMode(0o644)
-	file, err := os.OpenFile(output, os.O_TRUNC|os.O_WRONLY|os.O_CREATE, permission)
+	file, err := os.OpenFile(output, os.O_TRUNC|os.O_WRONLY|os.O_CREATE, 0644)
 	if err != nil {
 		return fmt.Errorf("opening output file: %w", err)
 	}

internal/cli/genkey.go

@@ -1,66 +0,0 @@
-package cli
-
-import (
-	"crypto/rand"
-	"flag"
-	"fmt"
-)
-
-func (c *CLI) GenKey(args []string) (err error) {
-	flagSet := flag.NewFlagSet("genkey", flag.ExitOnError)
-	err = flagSet.Parse(args)
-	if err != nil {
-		return fmt.Errorf("parsing flags: %w", err)
-	}
-
-	const keyLength = 128 / 8
-	keyBytes := make([]byte, keyLength)
-
-	_, _ = rand.Read(keyBytes)
-
-	key := base58Encode(keyBytes)
-	fmt.Println(key)
-
-	return nil
-}
-
-func base58Encode(data []byte) string {
-	const alphabet = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"
-	const radix = 58
-
-	zcount := 0
-	for zcount < len(data) && data[zcount] == 0 {
-		zcount++
-	}
-
-	// integer simplification of ceil(log(256)/log(58))
-	ceilLog256Div58 := (len(data)-zcount)*555/406 + 1 //nolint:mnd
-	size := zcount + ceilLog256Div58
-
-	output := make([]byte, size)
-
-	high := size - 1
-	for _, b := range data {
-		i := size - 1
-		for carry := uint32(b); i > high || carry != 0; i-- {
-			carry += 256 * uint32(output[i]) //nolint:mnd
-			output[i] = byte(carry % radix)
-			carry /= radix
-		}
-		high = i
-	}
-
-	// Determine the additional "zero-gap" in the output buffer
-	additionalZeroGapEnd := zcount
-	for additionalZeroGapEnd < size && output[additionalZeroGapEnd] == 0 {
-		additionalZeroGapEnd++
-	}
-
-	val := output[additionalZeroGapEnd-zcount:]
-	size = len(val)
-	for i := range val {
-		output[i] = alphabet[val[i]]
-	}
-
-	return string(output[:size])
-}

internal/cli/healthcheck.go

@@ -6,15 +6,12 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/qdm12/gluetun/internal/configuration/settings"
 	"github.com/qdm12/gluetun/internal/healthcheck"
-	"github.com/qdm12/gosettings/reader"
 )
 
-func (c *CLI) HealthCheck(ctx context.Context, reader *reader.Reader, _ Warner) (err error) {
+func (c *CLI) HealthCheck(ctx context.Context, source Source, _ Warner) error {
 	// Extract the health server port from the configuration.
-	var config settings.Health
-	err = config.Read(reader)
+	config, err := source.ReadHealth()
 	if err != nil {
 		return err
 	}

internal/cli/noopfirewall.go

@@ -1,14 +0,0 @@
-package cli
-
-import (
-	"context"
-	"net/netip"
-)
-
-type noopFirewall struct{}
-
-func (f *noopFirewall) AcceptOutput(_ context.Context, _, _ string, _ netip.Addr,
-	_ uint16, _ bool,
-) (err error) {
-	return nil
-}

internal/cli/nooplogger.go

@@ -1,10 +1,16 @@
 package cli
 
+import "github.com/qdm12/golibs/logging"
+
 type noopLogger struct{}
 
 func newNoopLogger() *noopLogger {
 	return new(noopLogger)
 }
 
-func (l *noopLogger) Info(string) {}
-func (l *noopLogger) Warn(string) {}
+func (l *noopLogger) Debug(string)             {}
+func (l *noopLogger) Info(string)              {}
+func (l *noopLogger) Warn(string)              {}
+func (l *noopLogger) Error(string)             {}
+func (l *noopLogger) PatchLevel(logging.Level) {}
+func (l *noopLogger) PatchPrefix(string)       {}

internal/cli/openvpnconfig.go

@@ -8,15 +8,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/qdm12/gluetun/internal/configuration/settings"
 	"github.com/qdm12/gluetun/internal/constants"
-	"github.com/qdm12/gluetun/internal/models"
-	"github.com/qdm12/gluetun/internal/netlink"
 	"github.com/qdm12/gluetun/internal/openvpn/extract"
 	"github.com/qdm12/gluetun/internal/provider"
+	"github.com/qdm12/gluetun/internal/publicip/ipinfo"
 	"github.com/qdm12/gluetun/internal/storage"
 	"github.com/qdm12/gluetun/internal/updater/resolver"
-	"github.com/qdm12/gosettings/reader"
 )
 
 type OpenvpnConfigLogger interface {
@@ -35,40 +32,31 @@ type ParallelResolver interface {
 }
 
 type IPFetcher interface {
-	String() string
-	CanFetchAnyIP() bool
-	FetchInfo(ctx context.Context, ip netip.Addr) (data models.PublicIP, err error)
+	FetchMultiInfo(ctx context.Context, ips []netip.Addr) (data []ipinfo.Response, err error)
 }
 
 type IPv6Checker interface {
-	FindIPv6SupportLevel(ctx context.Context,
-		checkAddresses []netip.AddrPort, firewall netlink.Firewall,
-	) (level netlink.IPv6SupportLevel, err error)
+	IsIPv6Supported() (supported bool, err error)
 }
 
-func (c *CLI) OpenvpnConfig(logger OpenvpnConfigLogger, reader *reader.Reader,
-	ipv6Checker IPv6Checker,
-) error {
+func (c *CLI) OpenvpnConfig(logger OpenvpnConfigLogger, source Source,
+	ipv6Checker IPv6Checker) error {
 	storage, err := storage.New(logger, constants.ServersData)
 	if err != nil {
 		return err
 	}
 
-	var allSettings settings.Settings
-	err = allSettings.Read(reader, logger)
+	allSettings, err := source.Read()
 	if err != nil {
 		return err
 	}
-	allSettings.SetDefaults()
 
-	ipv6SupportLevel, err := ipv6Checker.FindIPv6SupportLevel(context.Background(),
-		allSettings.IPv6.CheckAddresses, &noopFirewall{})
+	ipv6Supported, err := ipv6Checker.IsIPv6Supported()
 	if err != nil {
 		return fmt.Errorf("checking for IPv6 support: %w", err)
 	}
 
-	err = allSettings.Validate(storage, ipv6SupportLevel.IsSupported(), logger)
-	if err != nil {
+	if err = allSettings.Validate(storage, ipv6Supported); err != nil {
 		return fmt.Errorf("validating settings: %w", err)
 	}
 
@@ -81,16 +69,16 @@ func (c *CLI) OpenvpnConfig(logger OpenvpnConfigLogger, reader *reader.Reader,
 	openvpnFileExtractor := extract.New()
 
 	providers := provider.NewProviders(storage, time.Now, warner, client,
-		unzipper, parallelResolver, ipFetcher, openvpnFileExtractor, allSettings.Updater)
-	providerConf := providers.Get(allSettings.VPN.Provider.Name)
+		unzipper, parallelResolver, ipFetcher, openvpnFileExtractor)
+	providerConf := providers.Get(*allSettings.VPN.Provider.Name)
 	connection, err := providerConf.GetConnection(
-		allSettings.VPN.Provider.ServerSelection, ipv6SupportLevel == netlink.IPv6Internet)
+		allSettings.VPN.Provider.ServerSelection, ipv6Supported)
 	if err != nil {
 		return err
 	}
 
 	lines := providerConf.OpenVPNConfig(connection,
-		allSettings.VPN.OpenVPN, ipv6SupportLevel.IsSupported())
+		allSettings.VPN.OpenVPN, ipv6Supported)
 
 	fmt.Println(strings.Join(lines, "\n"))
 	return nil

internal/cli/update.go

@@ -6,18 +6,15 @@ import (
 	"flag"
 	"fmt"
 	"net/http"
-	"slices"
 	"strings"
 	"time"
 
-	"github.com/qdm12/dns/v2/pkg/doh"
-	dnsprovider "github.com/qdm12/dns/v2/pkg/provider"
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 	"github.com/qdm12/gluetun/internal/constants"
 	"github.com/qdm12/gluetun/internal/constants/providers"
 	"github.com/qdm12/gluetun/internal/openvpn/extract"
 	"github.com/qdm12/gluetun/internal/provider"
-	"github.com/qdm12/gluetun/internal/publicip/api"
+	"github.com/qdm12/gluetun/internal/publicip/ipinfo"
 	"github.com/qdm12/gluetun/internal/storage"
 	"github.com/qdm12/gluetun/internal/updater"
 	"github.com/qdm12/gluetun/internal/updater/resolver"
@@ -27,8 +24,6 @@ import (
 var (
 	ErrModeUnspecified     = errors.New("at least one of -enduser or -maintainer must be specified")
 	ErrNoProviderSpecified = errors.New("no provider was specified")
-	ErrUsernameMissing     = errors.New("username is required for this provider")
-	ErrPasswordMissing     = errors.New("password is required for this provider")
 )
 
 type UpdaterLogger interface {
@@ -40,30 +35,21 @@ type UpdaterLogger interface {
 func (c *CLI) Update(ctx context.Context, args []string, logger UpdaterLogger) error {
 	options := settings.Updater{}
 	var endUserMode, maintainerMode, updateAll bool
-	var dnsServer, csvProviders, ipToken, protonUsername, protonEmail, protonPassword string
+	var csvProviders string
 	flagSet := flag.NewFlagSet("update", flag.ExitOnError)
 	flagSet.BoolVar(&endUserMode, "enduser", false, "Write results to /gluetun/servers.json (for end users)")
 	flagSet.BoolVar(&maintainerMode, "maintainer", false,
 		"Write results to ./internal/storage/servers.json to modify the program (for maintainers)")
-	flagSet.StringVar(&dnsServer, "dns", "", "no longer used, your DNS will use DoH with Cloudflare and Google")
+	flagSet.StringVar(&options.DNSAddress, "dns", "8.8.8.8", "DNS resolver address to use")
 	const defaultMinRatio = 0.8
 	flagSet.Float64Var(&options.MinRatio, "minratio", defaultMinRatio,
 		"Minimum ratio of servers to find for the update to succeed")
 	flagSet.BoolVar(&updateAll, "all", false, "Update servers for all VPN providers")
 	flagSet.StringVar(&csvProviders, "providers", "", "CSV string of VPN providers to update server data for")
-	flagSet.StringVar(&ipToken, "ip-token", "", "IP data service token (e.g. ipinfo.io) to use")
-	flagSet.StringVar(&protonUsername, "proton-username", "",
-		"(Retro-compatibility) Username to use to authenticate with Proton. Use -proton-email instead.") // v4 remove this
-	flagSet.StringVar(&protonEmail, "proton-email", "", "Email to use to authenticate with Proton")
-	flagSet.StringVar(&protonPassword, "proton-password", "", "Password to use to authenticate with Proton")
 	if err := flagSet.Parse(args); err != nil {
 		return err
 	}
 
-	if dnsServer != "" {
-		logger.Warn("The -dns flag is no longer used, your DNS will use DoH with Cloudflare and Google")
-	}
-
 	if !endUserMode && !maintainerMode {
 		return fmt.Errorf("%w", ErrModeUnspecified)
 	}
@@ -77,16 +63,6 @@ func (c *CLI) Update(ctx context.Context, args []string, logger UpdaterLogger) e
 		options.Providers = strings.Split(csvProviders, ",")
 	}
 
-	if slices.Contains(options.Providers, providers.Protonvpn) {
-		if protonEmail == "" && protonUsername != "" {
-			protonEmail = protonUsername + "@protonmail.com"
-			logger.Warn("use -proton-email instead of -proton-username in the future. " +
-				"This assumes the email is " + protonEmail + " and may not work.")
-		}
-		options.ProtonEmail = &protonEmail
-		options.ProtonPassword = &protonPassword
-	}
-
 	options.SetDefaults(options.Providers[0])
 
 	err := options.Validate()
@@ -94,45 +70,20 @@ func (c *CLI) Update(ctx context.Context, args []string, logger UpdaterLogger) e
 		return fmt.Errorf("options validation failed: %w", err)
 	}
 
-	serversDataPath := constants.ServersData
-	if maintainerMode {
-		serversDataPath = ""
-	}
-	storage, err := storage.New(logger, serversDataPath)
+	storage, err := storage.New(logger, constants.ServersData)
 	if err != nil {
 		return fmt.Errorf("creating servers storage: %w", err)
 	}
 
-	dohSettings := doh.Settings{
-		UpstreamResolvers: []dnsprovider.Provider{
-			dnsprovider.Cloudflare(),
-			dnsprovider.Google(),
-		},
-	}
-	dnsDialer, err := doh.New(dohSettings)
-	if err != nil {
-		return fmt.Errorf("creating DoH dialer: %w", err)
-	}
-
 	const clientTimeout = 10 * time.Second
 	httpClient := &http.Client{Timeout: clientTimeout}
 	unzipper := unzip.New(httpClient)
-	parallelResolver := resolver.NewParallelResolver(dnsDialer)
-	nameTokenPairs := []api.NameToken{
-		{Name: string(api.IPInfo), Token: ipToken},
-		{Name: string(api.IP2Location)},
-		{Name: string(api.IfConfigCo)},
-	}
-	fetchers, err := api.New(nameTokenPairs, httpClient)
-	if err != nil {
-		return fmt.Errorf("creating public IP fetchers: %w", err)
-	}
-	ipFetcher := api.NewResilient(fetchers, logger)
-
+	parallelResolver := resolver.NewParallelResolver(options.DNSAddress)
+	ipFetcher := ipinfo.New(httpClient)
 	openvpnFileExtractor := extract.New()
 
 	providers := provider.NewProviders(storage, time.Now, logger, httpClient,
-		unzipper, parallelResolver, ipFetcher, openvpnFileExtractor, options)
+		unzipper, parallelResolver, ipFetcher, openvpnFileExtractor)
 
 	updater := updater.New(httpClient, storage, providers, logger)
 	err = updater.UpdateServers(ctx, options.Providers, options.MinRatio)

internal/command/cmder.go

@@ -1,8 +0,0 @@
-package command
-
-// Cmder handles running subprograms synchronously and asynchronously.
-type Cmder struct{}
-
-func New() *Cmder {
-	return &Cmder{}
-}

internal/command/interfaces_local.go

@@ -1,11 +0,0 @@
-package command
-
-import "io"
-
-type execCmd interface {
-	CombinedOutput() ([]byte, error)
-	StdoutPipe() (io.ReadCloser, error)
-	StderrPipe() (io.ReadCloser, error)
-	Start() error
-	Wait() error
-}

internal/command/mocks_generate_test.go

@@ -1,3 +0,0 @@
-package command
-
-//go:generate mockgen -destination=mocks_local_test.go -package=$GOPACKAGE -source=interfaces_local.go

internal/command/mocks_local_test.go

@@ -1,108 +0,0 @@
-// Code generated by MockGen. DO NOT EDIT.
-// Source: interfaces_local.go
-
-// Package command is a generated GoMock package.
-package command
-
-import (
-	io "io"
-	reflect "reflect"
-
-	gomock "github.com/golang/mock/gomock"
-)
-
-// MockexecCmd is a mock of execCmd interface.
-type MockexecCmd struct {
-	ctrl     *gomock.Controller
-	recorder *MockexecCmdMockRecorder
-}
-
-// MockexecCmdMockRecorder is the mock recorder for MockexecCmd.
-type MockexecCmdMockRecorder struct {
-	mock *MockexecCmd
-}
-
-// NewMockexecCmd creates a new mock instance.
-func NewMockexecCmd(ctrl *gomock.Controller) *MockexecCmd {
-	mock := &MockexecCmd{ctrl: ctrl}
-	mock.recorder = &MockexecCmdMockRecorder{mock}
-	return mock
-}
-
-// EXPECT returns an object that allows the caller to indicate expected use.
-func (m *MockexecCmd) EXPECT() *MockexecCmdMockRecorder {
-	return m.recorder
-}
-
-// CombinedOutput mocks base method.
-func (m *MockexecCmd) CombinedOutput() ([]byte, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "CombinedOutput")
-	ret0, _ := ret[0].([]byte)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// CombinedOutput indicates an expected call of CombinedOutput.
-func (mr *MockexecCmdMockRecorder) CombinedOutput() *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CombinedOutput", reflect.TypeOf((*MockexecCmd)(nil).CombinedOutput))
-}
-
-// Start mocks base method.
-func (m *MockexecCmd) Start() error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Start")
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// Start indicates an expected call of Start.
-func (mr *MockexecCmdMockRecorder) Start() *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Start", reflect.TypeOf((*MockexecCmd)(nil).Start))
-}
-
-// StderrPipe mocks base method.
-func (m *MockexecCmd) StderrPipe() (io.ReadCloser, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "StderrPipe")
-	ret0, _ := ret[0].(io.ReadCloser)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// StderrPipe indicates an expected call of StderrPipe.
-func (mr *MockexecCmdMockRecorder) StderrPipe() *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StderrPipe", reflect.TypeOf((*MockexecCmd)(nil).StderrPipe))
-}
-
-// StdoutPipe mocks base method.
-func (m *MockexecCmd) StdoutPipe() (io.ReadCloser, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "StdoutPipe")
-	ret0, _ := ret[0].(io.ReadCloser)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// StdoutPipe indicates an expected call of StdoutPipe.
-func (mr *MockexecCmdMockRecorder) StdoutPipe() *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StdoutPipe", reflect.TypeOf((*MockexecCmd)(nil).StdoutPipe))
-}
-
-// Wait mocks base method.
-func (m *MockexecCmd) Wait() error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Wait")
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// Wait indicates an expected call of Wait.
-func (mr *MockexecCmdMockRecorder) Wait() *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Wait", reflect.TypeOf((*MockexecCmd)(nil).Wait))
-}

internal/command/run.go

@@ -1,30 +0,0 @@
-package command
-
-import (
-	"os/exec"
-	"strings"
-)
-
-// Run runs a command in a blocking manner, returning its output and
-// an error if it failed.
-func (c *Cmder) Run(cmd *exec.Cmd) (output string, err error) {
-	return run(cmd)
-}
-
-func run(cmd execCmd) (output string, err error) {
-	stdout, err := cmd.CombinedOutput()
-	output = string(stdout)
-	output = strings.TrimSuffix(output, "\n")
-	lines := stringToLines(output)
-	for i := range lines {
-		lines[i] = strings.TrimPrefix(lines[i], "'")
-		lines[i] = strings.TrimSuffix(lines[i], "'")
-	}
-	output = strings.Join(lines, "\n")
-	return output, err
-}
-
-func stringToLines(s string) (lines []string) {
-	s = strings.TrimSuffix(s, "\n")
-	return strings.Split(s, "\n")
-}

internal/command/run_test.go

@@ -1,54 +0,0 @@
-package command
-
-import (
-	"errors"
-	"testing"
-
-	gomock "github.com/golang/mock/gomock"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func Test_run(t *testing.T) {
-	t.Parallel()
-
-	errDummy := errors.New("dummy")
-
-	testCases := map[string]struct {
-		stdout []byte
-		cmdErr error
-		output string
-		err    error
-	}{
-		"no output": {},
-		"cmd error": {
-			stdout: []byte("'hello \nworld'\n"),
-			cmdErr: errDummy,
-			output: "hello \nworld",
-			err:    errDummy,
-		},
-	}
-
-	for name, testCase := range testCases {
-		t.Run(name, func(t *testing.T) {
-			t.Parallel()
-
-			ctrl := gomock.NewController(t)
-
-			mockCmd := NewMockexecCmd(ctrl)
-
-			mockCmd.EXPECT().CombinedOutput().Return(testCase.stdout, testCase.cmdErr)
-
-			output, err := run(mockCmd)
-
-			if testCase.err != nil {
-				require.Error(t, err)
-				assert.Equal(t, testCase.err.Error(), err.Error())
-			} else {
-				assert.NoError(t, err)
-			}
-
-			assert.Equal(t, testCase.output, output)
-		})
-	}
-}

internal/command/split.go

@@ -1,150 +0,0 @@
-package command
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"strings"
-	"unicode/utf8"
-)
-
-var (
-	errCommandEmpty            = errors.New("command is empty")
-	errSingleQuoteUnterminated = errors.New("unterminated single-quoted string")
-	errDoubleQuoteUnterminated = errors.New("unterminated double-quoted string")
-	errEscapeUnterminated      = errors.New("unterminated backslash-escape")
-)
-
-// split splits a command string into a slice of arguments.
-// This is especially important for commands such as:
-// /bin/sh -c "echo hello"
-// which should be split into: ["/bin/sh", "-c", "echo hello"]
-// It supports backslash-escapes, single-quotes and double-quotes.
-// It does not support:
-// - the $" quoting style.
-// - expansion (brace, shell or pathname).
-func split(command string) (words []string, err error) {
-	if command == "" {
-		return nil, fmt.Errorf("%w", errCommandEmpty)
-	}
-
-	const bufferSize = 1024
-	buffer := bytes.NewBuffer(make([]byte, bufferSize))
-
-	startIndex := 0
-
-	for startIndex < len(command) {
-		// skip any split characters at the start
-		character, runeSize := utf8.DecodeRuneInString(command[startIndex:])
-		switch {
-		case strings.ContainsRune(" \n\t", character):
-			startIndex += runeSize
-		case character == '\\':
-			// Look ahead to eventually skip an escaped newline
-			if command[startIndex+runeSize:] == "" {
-				return nil, fmt.Errorf("%w: %q", errEscapeUnterminated, command)
-			}
-			character, runeSize := utf8.DecodeRuneInString(command[startIndex+runeSize:])
-			if character == '\n' {
-				startIndex += runeSize + runeSize // backslash and newline
-			}
-		default:
-			var word string
-			buffer.Reset()
-			word, startIndex, err = splitWord(command, startIndex, buffer)
-			if err != nil {
-				return nil, fmt.Errorf("splitting word in %q: %w", command, err)
-			}
-			words = append(words, word)
-		}
-	}
-	return words, nil
-}
-
-// WARNING: buffer must be cleared before calling this function.
-func splitWord(input string, startIndex int, buffer *bytes.Buffer) (
-	word string, newStartIndex int, err error,
-) {
-	cursor := startIndex
-	for cursor < len(input) {
-		character, runeLength := utf8.DecodeRuneInString(input[cursor:])
-		cursor += runeLength
-		if character == '"' ||
-			character == '\'' ||
-			character == '\\' ||
-			character == ' ' ||
-			character == '\n' ||
-			character == '\t' {
-			buffer.WriteString(input[startIndex : cursor-runeLength])
-		}
-
-		switch {
-		case strings.ContainsRune(" \n\t", character): // spacing character
-			return buffer.String(), cursor, nil
-		case character == '"':
-			return handleDoubleQuoted(input, cursor, buffer)
-		case character == '\'':
-			return handleSingleQuoted(input, cursor, buffer)
-		case character == '\\':
-			return handleEscaped(input, cursor, buffer)
-		}
-	}
-
-	buffer.WriteString(input[startIndex:])
-	return buffer.String(), len(input), nil
-}
-
-func handleDoubleQuoted(input string, startIndex int, buffer *bytes.Buffer) (
-	word string, newStartIndex int, err error,
-) {
-	cursor := startIndex
-	for cursor < len(input) {
-		nextCharacter, nextRuneLength := utf8.DecodeRuneInString(input[cursor:])
-		cursor += nextRuneLength
-		switch nextCharacter {
-		case '"': // end of the double quoted string
-			buffer.WriteString(input[startIndex : cursor-nextRuneLength])
-			return splitWord(input, cursor, buffer)
-		case '\\': // escaped character
-			escapedCharacter, escapedRuneLength := utf8.DecodeRuneInString(input[cursor:])
-			cursor += escapedRuneLength
-			if !strings.ContainsRune("$`\"\n\\", escapedCharacter) {
-				break
-			}
-			buffer.WriteString(input[startIndex : cursor-nextRuneLength-escapedRuneLength])
-			if escapedCharacter != '\n' {
-				// skip backslash entirely for the newline character
-				buffer.WriteRune(escapedCharacter)
-			}
-			startIndex = cursor
-		}
-	}
-	return "", 0, fmt.Errorf("%w", errDoubleQuoteUnterminated)
-}
-
-func handleSingleQuoted(input string, startIndex int, buffer *bytes.Buffer) (
-	word string, newStartIndex int, err error,
-) {
-	closingQuoteIndex := strings.IndexRune(input[startIndex:], '\'')
-	if closingQuoteIndex == -1 {
-		return "", 0, fmt.Errorf("%w", errSingleQuoteUnterminated)
-	}
-	buffer.WriteString(input[startIndex : startIndex+closingQuoteIndex])
-	const singleQuoteRuneLength = 1
-	startIndex += closingQuoteIndex + singleQuoteRuneLength
-	return splitWord(input, startIndex, buffer)
-}
-
-func handleEscaped(input string, startIndex int, buffer *bytes.Buffer) (
-	word string, newStartIndex int, err error,
-) {
-	if input[startIndex:] == "" {
-		return "", 0, fmt.Errorf("%w", errEscapeUnterminated)
-	}
-	character, runeLength := utf8.DecodeRuneInString(input[startIndex:])
-	if character != '\n' { // backslash-escaped newline is ignored
-		buffer.WriteString(input[startIndex : startIndex+runeLength])
-	}
-	startIndex += runeLength
-	return splitWord(input, startIndex, buffer)
-}

internal/command/split_test.go

@@ -1,110 +0,0 @@
-package command
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func Test_split(t *testing.T) {
-	t.Parallel()
-
-	testCases := map[string]struct {
-		command    string
-		words      []string
-		errWrapped error
-		errMessage string
-	}{
-		"empty": {
-			command:    "",
-			errWrapped: errCommandEmpty,
-			errMessage: "command is empty",
-		},
-		"concrete_sh_command": {
-			command: `/bin/sh -c "echo 123"`,
-			words:   []string{"/bin/sh", "-c", "echo 123"},
-		},
-		"single_word": {
-			command: "word1",
-			words:   []string{"word1"},
-		},
-		"two_words_single_space": {
-			command: "word1 word2",
-			words:   []string{"word1", "word2"},
-		},
-		"two_words_multiple_space": {
-			command: "word1    word2",
-			words:   []string{"word1", "word2"},
-		},
-		"two_words_no_expansion": {
-			command: "word1*    word2?",
-			words:   []string{"word1*", "word2?"},
-		},
-		"escaped_single quote": {
-			command: "ain\\'t good",
-			words:   []string{"ain't", "good"},
-		},
-		"escaped_single_quote_all_single_quoted": {
-			command: "'ain'\\''t good'",
-			words:   []string{"ain't good"},
-		},
-		"empty_single_quoted": {
-			command: "word1 ''  word2",
-			words:   []string{"word1", "", "word2"},
-		},
-		"escaped_newline": {
-			command: "word1\\\nword2",
-			words:   []string{"word1word2"},
-		},
-		"quoted_newline": {
-			command: "text \"with\na\" quoted newline",
-			words:   []string{"text", "with\na", "quoted", "newline"},
-		},
-		"quoted_escaped_newline": {
-			command: "\"word1\\d\\\\\\\" word2\\\nword3 word4\"",
-			words:   []string{"word1\\d\\\" word2word3 word4"},
-		},
-		"escaped_separated_newline": {
-			command: "word1 \\\n word2",
-			words:   []string{"word1", "word2"},
-		},
-		"double_quotes_no_spacing": {
-			command: "word1\"word2\"word3",
-			words:   []string{"word1word2word3"},
-		},
-		"unterminated_single_quote": {
-			command:    "'abc'\\''def",
-			errWrapped: errSingleQuoteUnterminated,
-			errMessage: `splitting word in "'abc'\\''def": unterminated single-quoted string`,
-		},
-		"unterminated_double_quote": {
-			command:    "\"abc'def",
-			errWrapped: errDoubleQuoteUnterminated,
-			errMessage: `splitting word in "\"abc'def": unterminated double-quoted string`,
-		},
-		"unterminated_escape": {
-			command:    "abc\\",
-			errWrapped: errEscapeUnterminated,
-			errMessage: `splitting word in "abc\\": unterminated backslash-escape`,
-		},
-		"unterminated_escape_only": {
-			command:    "   \\",
-			errWrapped: errEscapeUnterminated,
-			errMessage: `unterminated backslash-escape: "   \\"`,
-		},
-	}
-
-	for name, testCase := range testCases {
-		t.Run(name, func(t *testing.T) {
-			t.Parallel()
-
-			words, err := split(testCase.command)
-
-			assert.Equal(t, testCase.words, words)
-			assert.ErrorIs(t, err, testCase.errWrapped)
-			if testCase.errWrapped != nil {
-				assert.EqualError(t, err, testCase.errMessage)
-			}
-		})
-	}
-}

internal/command/start.go

@@ -1,100 +0,0 @@
-package command
-
-import (
-	"bufio"
-	"errors"
-	"io"
-	"os"
-	"os/exec"
-)
-
-// Start launches a command and streams stdout and stderr to channels.
-// All the channels returned are ready only and won't be closed
-// if the command fails later.
-func (c *Cmder) Start(cmd *exec.Cmd) (
-	stdoutLines, stderrLines <-chan string,
-	waitError <-chan error, startErr error,
-) {
-	return start(cmd)
-}
-
-func start(cmd execCmd) (stdoutLines, stderrLines <-chan string,
-	waitError <-chan error, startErr error,
-) {
-	stop := make(chan struct{})
-	stdoutReady := make(chan struct{})
-	stdoutLinesCh := make(chan string)
-	stdoutDone := make(chan struct{})
-	stderrReady := make(chan struct{})
-	stderrLinesCh := make(chan string)
-	stderrDone := make(chan struct{})
-
-	stdout, err := cmd.StdoutPipe()
-	if err != nil {
-		return nil, nil, nil, err
-	}
-	go streamToChannel(stdoutReady, stop, stdoutDone, stdout, stdoutLinesCh)
-
-	stderr, err := cmd.StderrPipe()
-	if err != nil {
-		_ = stdout.Close()
-		close(stop)
-		<-stdoutDone
-		return nil, nil, nil, err
-	}
-	go streamToChannel(stderrReady, stop, stderrDone, stderr, stderrLinesCh)
-
-	err = cmd.Start()
-	if err != nil {
-		_ = stdout.Close()
-		_ = stderr.Close()
-		close(stop)
-		<-stdoutDone
-		<-stderrDone
-		return nil, nil, nil, err
-	}
-
-	waitErrorCh := make(chan error)
-	go func() {
-		err := cmd.Wait()
-		_ = stdout.Close()
-		_ = stderr.Close()
-		close(stop)
-		<-stdoutDone
-		<-stderrDone
-		waitErrorCh <- err
-	}()
-
-	return stdoutLinesCh, stderrLinesCh, waitErrorCh, nil
-}
-
-func streamToChannel(ready chan<- struct{},
-	stop <-chan struct{}, done chan<- struct{},
-	stream io.Reader, lines chan<- string,
-) {
-	defer close(done)
-	close(ready)
-	scanner := bufio.NewScanner(stream)
-	lineBuffer := make([]byte, bufio.MaxScanTokenSize) // 64KB
-	const maxCapacity = 20 * 1024 * 1024               // 20MB
-	scanner.Buffer(lineBuffer, maxCapacity)
-
-	for scanner.Scan() {
-		// scanner is closed if the context is canceled
-		// or if the command failed starting because the
-		// stream is closed (io.EOF error).
-		lines <- scanner.Text()
-	}
-	err := scanner.Err()
-	if err == nil || errors.Is(err, os.ErrClosed) {
-		return
-	}
-
-	// ignore the error if it is stopped.
-	select {
-	case <-stop:
-		return
-	default:
-		lines <- "stream error: " + err.Error()
-	}
-}

internal/command/start_test.go

@@ -1,118 +0,0 @@
-package command
-
-import (
-	"bytes"
-	"errors"
-	"io"
-	"strings"
-	"testing"
-
-	gomock "github.com/golang/mock/gomock"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func linesToReadCloser(lines []string) io.ReadCloser {
-	s := strings.Join(lines, "\n")
-	return io.NopCloser(bytes.NewBufferString(s))
-}
-
-func Test_start(t *testing.T) {
-	t.Parallel()
-
-	errDummy := errors.New("dummy")
-
-	testCases := map[string]struct {
-		stdout        []string
-		stdoutPipeErr error
-		stderr        []string
-		stderrPipeErr error
-		startErr      error
-		waitErr       error
-		err           error
-	}{
-		"no output": {},
-		"success": {
-			stdout: []string{"hello", "world"},
-			stderr: []string{"some", "error"},
-		},
-		"stdout pipe error": {
-			stdoutPipeErr: errDummy,
-			err:           errDummy,
-		},
-		"stderr pipe error": {
-			stderrPipeErr: errDummy,
-			err:           errDummy,
-		},
-		"start error": {
-			startErr: errDummy,
-			err:      errDummy,
-		},
-		"wait error": {
-			waitErr: errDummy,
-		},
-	}
-
-	for name, testCase := range testCases {
-		t.Run(name, func(t *testing.T) {
-			t.Parallel()
-
-			ctrl := gomock.NewController(t)
-
-			stdout := linesToReadCloser(testCase.stdout)
-			stderr := linesToReadCloser(testCase.stderr)
-
-			mockCmd := NewMockexecCmd(ctrl)
-
-			mockCmd.EXPECT().StdoutPipe().
-				Return(stdout, testCase.stdoutPipeErr)
-			if testCase.stdoutPipeErr == nil {
-				mockCmd.EXPECT().StderrPipe().Return(stderr, testCase.stderrPipeErr)
-				if testCase.stderrPipeErr == nil {
-					mockCmd.EXPECT().Start().Return(testCase.startErr)
-					if testCase.startErr == nil {
-						mockCmd.EXPECT().Wait().Return(testCase.waitErr)
-					}
-				}
-			}
-
-			stdoutLines, stderrLines, waitError, err := start(mockCmd)
-
-			if testCase.err != nil {
-				require.Error(t, err)
-				assert.Equal(t, testCase.err.Error(), err.Error())
-				assert.Nil(t, stdoutLines)
-				assert.Nil(t, stderrLines)
-				assert.Nil(t, waitError)
-				return
-			}
-
-			require.NoError(t, err)
-
-			var stdoutIndex, stderrIndex int
-
-			done := false
-			for !done {
-				select {
-				case line := <-stdoutLines:
-					assert.Equal(t, testCase.stdout[stdoutIndex], line)
-					stdoutIndex++
-				case line := <-stderrLines:
-					assert.Equal(t, testCase.stderr[stderrIndex], line)
-					stderrIndex++
-				case err := <-waitError:
-					if testCase.waitErr != nil {
-						require.Error(t, err)
-						assert.Equal(t, testCase.waitErr.Error(), err.Error())
-					} else {
-						assert.NoError(t, err)
-					}
-					done = true
-				}
-			}
-
-			assert.Equal(t, len(testCase.stdout), stdoutIndex)
-			assert.Equal(t, len(testCase.stderr), stderrIndex)
-		})
-	}
-}

internal/command/startnlog.go

@@ -1,48 +0,0 @@
-package command
-
-import (
-	"context"
-	"fmt"
-	"os/exec"
-)
-
-func (c *Cmder) RunAndLog(ctx context.Context, command string, logger Logger) (err error) {
-	args, err := split(command)
-	if err != nil {
-		return fmt.Errorf("parsing command: %w", err)
-	}
-
-	cmd := exec.CommandContext(ctx, args[0], args[1:]...) // #nosec G204
-	stdout, stderr, waitError, err := c.Start(cmd)
-	if err != nil {
-		return err
-	}
-
-	streamCtx, streamCancel := context.WithCancel(context.Background())
-	streamDone := make(chan struct{})
-	go streamLines(streamCtx, streamDone, logger, stdout, stderr)
-
-	err = <-waitError
-	streamCancel()
-	<-streamDone
-	return err
-}
-
-func streamLines(ctx context.Context, done chan<- struct{},
-	logger Logger, stdout, stderr <-chan string,
-) {
-	defer close(done)
-
-	var line string
-
-	for {
-		select {
-		case <-ctx.Done():
-			return
-		case line = <-stdout:
-			logger.Info(line)
-		case line = <-stderr:
-			logger.Error(line)
-		}
-	}
-}

internal/configuration/settings/amneziawg.go

@@ -1,243 +0,0 @@
-package settings
-
-import (
-	"errors"
-	"fmt"
-	"strconv"
-	"strings"
-
-	"github.com/qdm12/gosettings"
-	"github.com/qdm12/gosettings/reader"
-	"github.com/qdm12/gotree"
-)
-
-type AmneziaWg struct {
-	// Wireguard contains the configuration for Wireguard, given
-	// AmneziaWg is based on Wireguard
-	Wireguard       Wireguard `json:"wireguard"`
-	JunkPacketCount *uint16   `json:"junk_packet_count"`
-	JunkPacketMin   *uint16   `json:"junk_packet_min"`
-	JunkPacketMax   *uint16   `json:"junk_packet_max"`
-	PaddingS1       *uint16   `json:"padding_s1"`
-	PaddingS2       *uint16   `json:"padding_s2"`
-	PaddingS3       *uint16   `json:"padding_s3"`
-	PaddingS4       *uint16   `json:"padding_s4"`
-	HeaderH1        *string   `json:"header_h1"`
-	HeaderH2        *string   `json:"header_h2"`
-	HeaderH3        *string   `json:"header_h3"`
-	HeaderH4        *string   `json:"header_h4"`
-	InitPacketI1    *string   `json:"init_packet_i1"`
-	InitPacketI2    *string   `json:"init_packet_i2"`
-	InitPacketI3    *string   `json:"init_packet_i3"`
-	InitPacketI4    *string   `json:"init_packet_i4"`
-	InitPacketI5    *string   `json:"init_packet_i5"`
-}
-
-func (a *AmneziaWg) read(r *reader.Reader) (err error) {
-	const amneziawg = true
-	err = a.Wireguard.read(r, amneziawg)
-	if err != nil {
-		return err // do not wrap this error
-	}
-
-	uint16Fields := map[string]**uint16{
-		"AMNEZIAWG_JC":   &a.JunkPacketCount,
-		"AMNEZIAWG_JMIN": &a.JunkPacketMin,
-		"AMNEZIAWG_JMAX": &a.JunkPacketMax,
-		"AMNEZIAWG_S1":   &a.PaddingS1,
-		"AMNEZIAWG_S2":   &a.PaddingS2,
-		"AMNEZIAWG_S3":   &a.PaddingS3,
-		"AMNEZIAWG_S4":   &a.PaddingS4,
-	}
-	for key, dst := range uint16Fields {
-		*dst, err = r.Uint16Ptr(key)
-		if err != nil {
-			return err
-		}
-	}
-	stringFields := map[string]**string{
-		"AMNEZIAWG_H1": &a.HeaderH1,
-		"AMNEZIAWG_H2": &a.HeaderH2,
-		"AMNEZIAWG_H3": &a.HeaderH3,
-		"AMNEZIAWG_H4": &a.HeaderH4,
-		"AMNEZIAWG_I1": &a.InitPacketI1,
-		"AMNEZIAWG_I2": &a.InitPacketI2,
-		"AMNEZIAWG_I3": &a.InitPacketI3,
-		"AMNEZIAWG_I4": &a.InitPacketI4,
-		"AMNEZIAWG_I5": &a.InitPacketI5,
-	}
-	opt := reader.ForceLowercase(false)
-	for key, dst := range stringFields {
-		*dst = r.Get(key, opt)
-	}
-	return nil
-}
-
-func (a AmneziaWg) copy() (copied AmneziaWg) {
-	return AmneziaWg{
-		Wireguard:       a.Wireguard.copy(),
-		JunkPacketCount: gosettings.CopyPointer(a.JunkPacketCount),
-		JunkPacketMin:   gosettings.CopyPointer(a.JunkPacketMin),
-		JunkPacketMax:   gosettings.CopyPointer(a.JunkPacketMax),
-		PaddingS1:       gosettings.CopyPointer(a.PaddingS1),
-		PaddingS2:       gosettings.CopyPointer(a.PaddingS2),
-		PaddingS3:       gosettings.CopyPointer(a.PaddingS3),
-		PaddingS4:       gosettings.CopyPointer(a.PaddingS4),
-		HeaderH1:        gosettings.CopyPointer(a.HeaderH1),
-		HeaderH2:        gosettings.CopyPointer(a.HeaderH2),
-		HeaderH3:        gosettings.CopyPointer(a.HeaderH3),
-		HeaderH4:        gosettings.CopyPointer(a.HeaderH4),
-		InitPacketI1:    gosettings.CopyPointer(a.InitPacketI1),
-		InitPacketI2:    gosettings.CopyPointer(a.InitPacketI2),
-		InitPacketI3:    gosettings.CopyPointer(a.InitPacketI3),
-		InitPacketI4:    gosettings.CopyPointer(a.InitPacketI4),
-		InitPacketI5:    gosettings.CopyPointer(a.InitPacketI5),
-	}
-}
-
-func (a *AmneziaWg) overrideWith(other AmneziaWg) {
-	a.Wireguard.overrideWith(other.Wireguard)
-	a.JunkPacketCount = gosettings.OverrideWithPointer(a.JunkPacketCount, other.JunkPacketCount)
-	a.JunkPacketMin = gosettings.OverrideWithPointer(a.JunkPacketMin, other.JunkPacketMin)
-	a.JunkPacketMax = gosettings.OverrideWithPointer(a.JunkPacketMax, other.JunkPacketMax)
-	a.PaddingS1 = gosettings.OverrideWithPointer(a.PaddingS1, other.PaddingS1)
-	a.PaddingS2 = gosettings.OverrideWithPointer(a.PaddingS2, other.PaddingS2)
-	a.PaddingS3 = gosettings.OverrideWithPointer(a.PaddingS3, other.PaddingS3)
-	a.PaddingS4 = gosettings.OverrideWithPointer(a.PaddingS4, other.PaddingS4)
-	a.HeaderH1 = gosettings.OverrideWithPointer(a.HeaderH1, other.HeaderH1)
-	a.HeaderH2 = gosettings.OverrideWithPointer(a.HeaderH2, other.HeaderH2)
-	a.HeaderH3 = gosettings.OverrideWithPointer(a.HeaderH3, other.HeaderH3)
-	a.HeaderH4 = gosettings.OverrideWithPointer(a.HeaderH4, other.HeaderH4)
-	a.InitPacketI1 = gosettings.OverrideWithPointer(a.InitPacketI1, other.InitPacketI1)
-	a.InitPacketI2 = gosettings.OverrideWithPointer(a.InitPacketI2, other.InitPacketI2)
-	a.InitPacketI3 = gosettings.OverrideWithPointer(a.InitPacketI3, other.InitPacketI3)
-	a.InitPacketI4 = gosettings.OverrideWithPointer(a.InitPacketI4, other.InitPacketI4)
-	a.InitPacketI5 = gosettings.OverrideWithPointer(a.InitPacketI5, other.InitPacketI5)
-}
-
-func (a *AmneziaWg) setDefaults(vpnProvider string) {
-	a.Wireguard.setDefaults(vpnProvider)
-	a.Wireguard.Implementation = "userspace" // unused except in logs
-	a.JunkPacketCount = gosettings.DefaultPointer(a.JunkPacketCount, 0)
-	a.JunkPacketMin = gosettings.DefaultPointer(a.JunkPacketMin, 0)
-	a.JunkPacketMax = gosettings.DefaultPointer(a.JunkPacketMax, 0)
-	a.PaddingS1 = gosettings.DefaultPointer(a.PaddingS1, 0)
-	a.PaddingS2 = gosettings.DefaultPointer(a.PaddingS2, 0)
-	a.PaddingS3 = gosettings.DefaultPointer(a.PaddingS3, 0)
-	a.PaddingS4 = gosettings.DefaultPointer(a.PaddingS4, 0)
-	a.HeaderH1 = gosettings.DefaultPointer(a.HeaderH1, "")
-	a.HeaderH2 = gosettings.DefaultPointer(a.HeaderH2, "")
-	a.HeaderH3 = gosettings.DefaultPointer(a.HeaderH3, "")
-	a.HeaderH4 = gosettings.DefaultPointer(a.HeaderH4, "")
-	a.InitPacketI1 = gosettings.DefaultPointer(a.InitPacketI1, "")
-	a.InitPacketI2 = gosettings.DefaultPointer(a.InitPacketI2, "")
-	a.InitPacketI3 = gosettings.DefaultPointer(a.InitPacketI3, "")
-	a.InitPacketI4 = gosettings.DefaultPointer(a.InitPacketI4, "")
-	a.InitPacketI5 = gosettings.DefaultPointer(a.InitPacketI5, "")
-}
-
-func (a AmneziaWg) toLinesNode() (node *gotree.Node) {
-	node = gotree.New("AmneziaWG settings:")
-	node.AppendNode(a.Wireguard.toLinesNode())
-
-	uintFields := []struct {
-		key string
-		val *uint16
-	}{
-		{"JC", a.JunkPacketCount},
-		{"JMIN", a.JunkPacketMin},
-		{"JMAX", a.JunkPacketMax},
-		{"S1", a.PaddingS1},
-		{"S2", a.PaddingS2},
-		{"S3", a.PaddingS3},
-		{"S4", a.PaddingS4},
-	}
-	for _, f := range uintFields {
-		node.Appendf("%s: %d", f.key, *f.val)
-	}
-
-	stringFields := []struct {
-		key string
-		val *string
-	}{
-		{"H1", a.HeaderH1},
-		{"H2", a.HeaderH2},
-		{"H3", a.HeaderH3},
-		{"H4", a.HeaderH4},
-		{"I1", a.InitPacketI1},
-		{"I2", a.InitPacketI2},
-		{"I3", a.InitPacketI3},
-		{"I4", a.InitPacketI4},
-		{"I5", a.InitPacketI5},
-	}
-	for _, f := range stringFields {
-		node.Appendf("%s: %s", f.key, *f.val)
-	}
-
-	return node
-}
-
-var (
-	ErrAmenziawgImplementationNotValid = errors.New("AmneziaWG implementation is not valid")
-	ErrJunkPacketBounds                = errors.New("junk packet minimum must be lower than or equal to maximum")
-	ErrJunkPacketMinMaxNotSet          = errors.New("junk packet min and max must be set when junk packet count is set")
-	ErrJunkPacketCountNotSet           = errors.New("junk packet count must be set when junk packet min or max is set")
-	ErrHeaderRangeMalformed            = errors.New("header range is malformed")
-)
-
-func (a AmneziaWg) validate(vpnProvider string, ipv6Supported bool) error {
-	const amneziaWG = true
-	err := a.Wireguard.validate(vpnProvider, ipv6Supported, amneziaWG)
-	if err != nil {
-		return fmt.Errorf("wireguard settings: %w", err)
-	}
-
-	if *a.JunkPacketCount == 0 {
-		if *a.JunkPacketMin != 0 || *a.JunkPacketMax != 0 {
-			return fmt.Errorf("%w: jc=%d and jmin=%d and jmax=%d",
-				ErrJunkPacketCountNotSet, a.JunkPacketCount, *a.JunkPacketMin, *a.JunkPacketMax)
-		}
-	} else {
-		if *a.JunkPacketMin == 0 || *a.JunkPacketMax == 0 {
-			return fmt.Errorf("%w: jc=%d and jmin=%d and jmax=%d",
-				ErrJunkPacketMinMaxNotSet, a.JunkPacketCount, *a.JunkPacketMin, *a.JunkPacketMax)
-		} else if *a.JunkPacketMin > *a.JunkPacketMax {
-			return fmt.Errorf("%w: jmin=%d and jmax=%d",
-				ErrJunkPacketBounds, *a.JunkPacketMin, *a.JunkPacketMax)
-		}
-	}
-
-	nameToHeaderRange := map[string]string{
-		"h1": *a.HeaderH1,
-		"h2": *a.HeaderH2,
-		"h3": *a.HeaderH3,
-		"h4": *a.HeaderH4,
-	}
-	for name, headerRange := range nameToHeaderRange {
-		if headerRange == "" {
-			continue
-		}
-		fields := strings.Split(headerRange, "-")
-		switch len(fields) {
-		case 1:
-			_, err := strconv.Atoi(fields[0])
-			if err != nil {
-				return fmt.Errorf("%w: %s value %s is not a number",
-					ErrHeaderRangeMalformed, name, headerRange)
-			}
-		case 2: //nolint:mnd
-			for _, field := range fields {
-				_, err := strconv.Atoi(field)
-				if err != nil {
-					return fmt.Errorf("%w: %s value %s is not a valid range",
-						ErrHeaderRangeMalformed, name, headerRange)
-				}
-			}
-		default:
-			return fmt.Errorf("%w: %s value %s must be in the form n or n-m",
-				ErrHeaderRangeMalformed, name, headerRange)
-		}
-	}
-
-	return nil
-}

internal/configuration/settings/boringpoll.go

@@ -1,51 +0,0 @@
-package settings
-
-import (
-	"github.com/qdm12/gosettings"
-	"github.com/qdm12/gosettings/reader"
-	"github.com/qdm12/gotree"
-)
-
-type BoringPoll struct {
-	GluetunCom *bool
-}
-
-func (b BoringPoll) validate() error {
-	return nil
-}
-
-func (b BoringPoll) Copy() BoringPoll {
-	return BoringPoll{
-		GluetunCom: gosettings.CopyPointer(b.GluetunCom),
-	}
-}
-
-func (b *BoringPoll) overrideWith(other BoringPoll) {
-	b.GluetunCom = gosettings.OverrideWithPointer(b.GluetunCom, other.GluetunCom)
-}
-
-func (b *BoringPoll) setDefaults() {
-	b.GluetunCom = gosettings.DefaultPointer(b.GluetunCom, false)
-}
-
-func (b BoringPoll) String() string {
-	return b.toLinesNode().String()
-}
-
-func (b BoringPoll) toLinesNode() *gotree.Node {
-	if !*b.GluetunCom {
-		return nil
-	}
-
-	node := gotree.New("Boring-poll settings:")
-	node.Append("gluetun.com: on")
-	return node
-}
-
-func (b *BoringPoll) read(r *reader.Reader) (err error) {
-	b.GluetunCom, err = r.BoolPtr("BORINGPOLL_GLUETUNCOM")
-	if err != nil {
-		return err
-	}
-	return nil
-}

internal/configuration/settings/deprecated.go

@@ -1,31 +0,0 @@
-package settings
-
-import (
-	"slices"
-
-	"github.com/qdm12/gosettings/reader"
-	"golang.org/x/exp/maps"
-)
-
-func readObsolete(r *reader.Reader) (warnings []string) {
-	keyToMessage := map[string]string{
-		"DOT_VERBOSITY":                "DOT_VERBOSITY is obsolete, use LOG_LEVEL instead.",
-		"DOT_VERBOSITY_DETAILS":        "DOT_VERBOSITY_DETAILS is obsolete because it was specific to Unbound.",
-		"DOT_VALIDATION_LOGLEVEL":      "DOT_VALIDATION_LOGLEVEL is obsolete because DNSSEC validation is not implemented.",
-		"HEALTH_VPN_DURATION_INITIAL":  "HEALTH_VPN_DURATION_INITIAL is obsolete",
-		"HEALTH_VPN_DURATION_ADDITION": "HEALTH_VPN_DURATION_ADDITION is obsolete",
-		"DNS_SERVER":                   "DNS_SERVER is obsolete because the forwarding server is always enabled.",
-		"DOT":                          "DOT is obsolete because the forwarding server is always enabled.",
-		"DNS_KEEP_NAMESERVER": "DNS_KEEP_NAMESERVER is obsolete because the forwarding server is always used and " +
-			"forwards local names to private DNS resolvers found in /etc/resolv.conf",
-	}
-	sortedKeys := maps.Keys(keyToMessage)
-	slices.Sort(sortedKeys)
-	warnings = make([]string, 0, len(keyToMessage))
-	for _, key := range sortedKeys {
-		if r.Get(key) != nil {
-			warnings = append(warnings, keyToMessage[key])
-		}
-	}
-	return warnings
-}

internal/configuration/settings/dns.go

@@ -1,96 +1,37 @@
 package settings
 
 import (
-	"errors"
 	"fmt"
 	"net/netip"
-	"time"
 
-	"github.com/qdm12/dns/v2/pkg/provider"
 	"github.com/qdm12/gluetun/internal/configuration/settings/helpers"
-	"github.com/qdm12/gosettings"
-	"github.com/qdm12/gosettings/reader"
 	"github.com/qdm12/gotree"
 )
 
-const (
-	DNSUpstreamTypeDot   = "dot"
-	DNSUpstreamTypeDoh   = "doh"
-	DNSUpstreamTypePlain = "plain"
-)
-
 // DNS contains settings to configure DNS.
 type DNS struct {
-	// UpstreamType can be [DNSUpstreamTypeDot], [DNSUpstreamTypeDoh]
-	// or [DNSUpstreamTypePlain]. It defaults to [DNSUpstreamTypeDot].
-	UpstreamType string `json:"upstream_type"`
-	// UpdatePeriod is the period to update DNS block lists.
-	// It can be set to 0 to disable the update.
-	// It defaults to 24h and cannot be nil in
-	// the internal state.
-	UpdatePeriod *time.Duration
-	// Providers is a list of DNS providers.
-	// It defaults to ["cloudflare"] and is ignored if the UpstreamType is
-	// [DNSUpstreamTypePlain] and the UpstreamPlainAddresses field is set.
-	Providers []string `json:"providers"`
-	// Caching is true if the server should cache
-	// DNS responses.
-	Caching *bool `json:"caching"`
-	// IPv6 is true if the server should connect over IPv6.
-	IPv6 *bool `json:"ipv6"`
-	// Blacklist contains settings to configure the filter
-	// block lists.
-	Blacklist DNSBlacklist
-	// UpstreamPlainAddresses are the upstream plaintext DNS resolver
-	// addresses to use by the built-in DNS server forwarder.
-	// Note, if the upstream type is [dnsUpstreamTypePlain] and this field is set,
-	// the Providers field is ignored.
-	UpstreamPlainAddresses []netip.AddrPort
+	// ServerAddress is the DNS server to use inside
+	// the Go program and for the system.
+	// It defaults to '127.0.0.1' to be used with the
+	// DoT server. It cannot be the zero value in the internal
+	// state.
+	ServerAddress netip.Addr
+	// KeepNameserver is true if the Docker DNS server
+	// found in /etc/resolv.conf should be kept.
+	// Note settings this to true will go around the
+	// DoT server blocking.
+	// It defaults to false and cannot be nil in the
+	// internal state.
+	KeepNameserver *bool
+	// DOT contains settings to configure the DoT
+	// server.
+	DoT DoT
 }
 
-var (
-	ErrDNSUpstreamTypeNotValid = errors.New("DNS upstream type is not valid")
-	ErrDNSUpdatePeriodTooShort = errors.New("update period is too short")
-	ErrDNSUpstreamPlainNoIPv6  = errors.New("upstream plain addresses do not contain any IPv6 address")
-	ErrDNSUpstreamPlainNoIPv4  = errors.New("upstream plain addresses do not contain any IPv4 address")
-)
-
 func (d DNS) validate() (err error) {
-	if !helpers.IsOneOf(d.UpstreamType, DNSUpstreamTypeDot, DNSUpstreamTypeDoh, DNSUpstreamTypePlain) {
-		return fmt.Errorf("%w: %s", ErrDNSUpstreamTypeNotValid, d.UpstreamType)
-	}
-
-	const minUpdatePeriod = 30 * time.Second
-	if *d.UpdatePeriod != 0 && *d.UpdatePeriod < minUpdatePeriod {
-		return fmt.Errorf("%w: %s must be bigger than %s",
-			ErrDNSUpdatePeriodTooShort, *d.UpdatePeriod, minUpdatePeriod)
-	}
-
-	if d.UpstreamType == DNSUpstreamTypePlain {
-		selectedHasPlainIPv4, selectedHasPlainIPv6 := false, false
-		for _, addrPort := range d.UpstreamPlainAddresses {
-			if !selectedHasPlainIPv4 && addrPort.Addr().Is4() {
-				selectedHasPlainIPv4 = true
-			}
-			if !selectedHasPlainIPv6 && addrPort.Addr().Is6() {
-				selectedHasPlainIPv6 = true
-			}
-			if selectedHasPlainIPv4 && selectedHasPlainIPv6 {
-				break
-			}
-		}
-		switch {
-		case *d.IPv6 && !selectedHasPlainIPv6:
-			return fmt.Errorf("%w: in %d addresses", ErrDNSUpstreamPlainNoIPv6, len(d.UpstreamPlainAddresses))
-		case !*d.IPv6 && !selectedHasPlainIPv4:
-			return fmt.Errorf("%w: in %d addresses", ErrDNSUpstreamPlainNoIPv4, len(d.UpstreamPlainAddresses))
-		}
-	}
-	// Note: all DNS built in providers have both IPv4 and IPv6 addresses for all modes
-
-	err = d.Blacklist.validate()
+	err = d.DoT.validate()
 	if err != nil {
-		return err
+		return fmt.Errorf("validating DoT settings: %w", err)
 	}
 
 	return nil
@@ -98,44 +39,34 @@ func (d DNS) validate() (err error) {
 
 func (d *DNS) Copy() (copied DNS) {
 	return DNS{
-		UpstreamType:           d.UpstreamType,
-		UpdatePeriod:           gosettings.CopyPointer(d.UpdatePeriod),
-		Providers:              gosettings.CopySlice(d.Providers),
-		Caching:                gosettings.CopyPointer(d.Caching),
-		IPv6:                   gosettings.CopyPointer(d.IPv6),
-		Blacklist:              d.Blacklist.copy(),
-		UpstreamPlainAddresses: gosettings.CopySlice(d.UpstreamPlainAddresses),
+		ServerAddress:  d.ServerAddress,
+		KeepNameserver: helpers.CopyPointer(d.KeepNameserver),
+		DoT:            d.DoT.copy(),
 	}
 }
 
+// mergeWith merges the other settings into any
+// unset field of the receiver settings object.
+func (d *DNS) mergeWith(other DNS) {
+	d.ServerAddress = helpers.MergeWithIP(d.ServerAddress, other.ServerAddress)
+	d.KeepNameserver = helpers.MergeWithPointer(d.KeepNameserver, other.KeepNameserver)
+	d.DoT.mergeWith(other.DoT)
+}
+
 // overrideWith overrides fields of the receiver
 // settings object with any field set in the other
 // settings.
 func (d *DNS) overrideWith(other DNS) {
-	d.UpstreamType = gosettings.OverrideWithComparable(d.UpstreamType, other.UpstreamType)
-	d.UpdatePeriod = gosettings.OverrideWithPointer(d.UpdatePeriod, other.UpdatePeriod)
-	d.Providers = gosettings.OverrideWithSlice(d.Providers, other.Providers)
-	d.Caching = gosettings.OverrideWithPointer(d.Caching, other.Caching)
-	d.IPv6 = gosettings.OverrideWithPointer(d.IPv6, other.IPv6)
-	d.Blacklist.overrideWith(other.Blacklist)
-	d.UpstreamPlainAddresses = gosettings.OverrideWithSlice(d.UpstreamPlainAddresses, other.UpstreamPlainAddresses)
+	d.ServerAddress = helpers.OverrideWithIP(d.ServerAddress, other.ServerAddress)
+	d.KeepNameserver = helpers.OverrideWithPointer(d.KeepNameserver, other.KeepNameserver)
+	d.DoT.overrideWith(other.DoT)
 }
 
 func (d *DNS) setDefaults() {
-	d.UpstreamType = gosettings.DefaultComparable(d.UpstreamType, DNSUpstreamTypeDot)
-	const defaultUpdatePeriod = 24 * time.Hour
-	d.UpdatePeriod = gosettings.DefaultPointer(d.UpdatePeriod, defaultUpdatePeriod)
-	d.UpstreamPlainAddresses = gosettings.DefaultSlice(d.UpstreamPlainAddresses, []netip.AddrPort{})
-	d.Providers = gosettings.DefaultSlice(d.Providers, defaultDNSProviders())
-	d.Caching = gosettings.DefaultPointer(d.Caching, true)
-	d.IPv6 = gosettings.DefaultPointer(d.IPv6, false)
-	d.Blacklist.setDefaults()
-}
-
-func defaultDNSProviders() []string {
-	return []string{
-		provider.Cloudflare().Name,
-	}
+	localhost := netip.AddrFrom4([4]byte{127, 0, 0, 1})
+	d.ServerAddress = helpers.DefaultIP(d.ServerAddress, localhost)
+	d.KeepNameserver = helpers.DefaultPointer(d.KeepNameserver, false)
+	d.DoT.setDefaults()
 }
 
 func (d DNS) String() string {
@@ -144,102 +75,8 @@ func (d DNS) String() string {
 
 func (d DNS) toLinesNode() (node *gotree.Node) {
 	node = gotree.New("DNS settings:")
-
-	node.Appendf("Upstream resolver type: %s", d.UpstreamType)
-
-	upstreamResolvers := node.Append("Upstream resolvers:")
-	if len(d.UpstreamPlainAddresses) > 0 {
-		if d.UpstreamType == DNSUpstreamTypePlain {
-			for _, addr := range d.UpstreamPlainAddresses {
-				upstreamResolvers.Append(addr.String())
-			}
-		} else {
-			node.Appendf("Upstream plain addresses: ignored because upstream type is not plain")
-			for _, provider := range d.Providers {
-				upstreamResolvers.Append(provider)
-			}
-		}
-	} else {
-		for _, provider := range d.Providers {
-			upstreamResolvers.Append(provider)
-		}
-	}
-
-	node.Appendf("Caching: %s", gosettings.BoolToYesNo(d.Caching))
-	node.Appendf("IPv6: %s", gosettings.BoolToYesNo(d.IPv6))
-
-	update := "disabled"
-	if *d.UpdatePeriod > 0 {
-		update = "every " + d.UpdatePeriod.String()
-	}
-	node.Appendf("Update period: %s", update)
-
-	node.AppendNode(d.Blacklist.toLinesNode())
-
+	node.Appendf("DNS server address to use: %s", d.ServerAddress)
+	node.Appendf("Keep existing nameserver(s): %s", helpers.BoolPtrToYesNo(d.KeepNameserver))
+	node.AppendNode(d.DoT.toLinesNode())
 	return node
 }
-
-func (d *DNS) read(r *reader.Reader) (err error) {
-	d.UpstreamType = r.String("DNS_UPSTREAM_RESOLVER_TYPE")
-
-	d.UpdatePeriod, err = r.DurationPtr("DNS_UPDATE_PERIOD")
-	if err != nil {
-		return err
-	}
-
-	d.Providers = r.CSV("DNS_UPSTREAM_RESOLVERS", reader.RetroKeys("DOT_PROVIDERS"))
-
-	d.Caching, err = r.BoolPtr("DNS_CACHING", reader.RetroKeys("DOT_CACHING"))
-	if err != nil {
-		return err
-	}
-
-	d.IPv6, err = r.BoolPtr("DNS_UPSTREAM_IPV6", reader.RetroKeys("DOT_IPV6"))
-	if err != nil {
-		return err
-	}
-
-	err = d.Blacklist.read(r)
-	if err != nil {
-		return err
-	}
-
-	err = d.readUpstreamPlainAddresses(r)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (d *DNS) readUpstreamPlainAddresses(r *reader.Reader) (err error) {
-	// If DNS_UPSTREAM_PLAIN_ADDRESSES is set, the user must also set DNS_UPSTREAM_TYPE=plain
-	// for these to be used. This is an added safety measure to reduce misunderstandings, and
-	// reduce odd settings overrides.
-	d.UpstreamPlainAddresses, err = r.CSVNetipAddrPorts("DNS_UPSTREAM_PLAIN_ADDRESSES")
-	if err != nil {
-		return err
-	}
-
-	// Retro-compatibility - remove in v4
-	// If DNS_ADDRESS is set to a non-localhost address, append it to the other
-	// upstream plain addresses, assuming port 53, and force the upstream type to plain
-	// to maintain retro-compatibility behavior.
-	serverAddress, err := r.NetipAddr("DNS_ADDRESS",
-		reader.RetroKeys("DNS_PLAINTEXT_ADDRESS"),
-		reader.IsRetro("DNS_UPSTREAM_PLAIN_ADDRESSES"))
-	if err != nil {
-		return err
-	} else if !serverAddress.IsValid() {
-		return nil
-	}
-	isLocalhost := serverAddress.Compare(netip.AddrFrom4([4]byte{127, 0, 0, 1})) == 0
-	if isLocalhost {
-		return nil
-	}
-	const defaultPlainPort = 53
-	addrPort := netip.AddrPortFrom(serverAddress, defaultPlainPort)
-	d.UpstreamPlainAddresses = append(d.UpstreamPlainAddresses, addrPort)
-	d.UpstreamType = DNSUpstreamTypePlain
-	return nil
-}

internal/configuration/settings/dns_test.go

@@ -1,26 +0,0 @@
-package settings
-
-import (
-	"testing"
-
-	"github.com/qdm12/dns/v2/pkg/provider"
-	"github.com/stretchr/testify/require"
-)
-
-func Test_defaultDNSProviders(t *testing.T) {
-	t.Parallel()
-
-	names := defaultDNSProviders()
-
-	found := false
-	providers := provider.NewProviders()
-	for _, name := range names {
-		provider, err := providers.Get(name)
-		require.NoError(t, err)
-		if len(provider.Plain.IPv4) > 0 {
-			found = true
-			break
-		}
-	}
-	require.True(t, found, "no default DNS provider has a plaintext IPv4 address")
-}

internal/configuration/settings/dnsblacklist.go

@@ -3,13 +3,11 @@ package settings
 import (
 	"errors"
 	"fmt"
-	"net/http"
 	"net/netip"
 	"regexp"
 
-	"github.com/qdm12/dns/v2/pkg/blockbuilder"
-	"github.com/qdm12/gosettings"
-	"github.com/qdm12/gosettings/reader"
+	"github.com/qdm12/dns/pkg/blacklist"
+	"github.com/qdm12/gluetun/internal/configuration/settings/helpers"
 	"github.com/qdm12/gotree"
 )
 
@@ -22,25 +20,19 @@ type DNSBlacklist struct {
 	AddBlockedHosts      []string
 	AddBlockedIPs        []netip.Addr
 	AddBlockedIPPrefixes []netip.Prefix
-	// RebindingProtectionExemptHostnames is a list of hostnames
-	// exempt from DNS rebinding protection. It can contain parent
-	// domains which are of the form "*.example.com". Note the wildcard
-	// can only be used at the start of the hostname.
-	RebindingProtectionExemptHostnames []string
 }
 
 func (b *DNSBlacklist) setDefaults() {
-	b.BlockMalicious = gosettings.DefaultPointer(b.BlockMalicious, true)
-	b.BlockAds = gosettings.DefaultPointer(b.BlockAds, false)
-	b.BlockSurveillance = gosettings.DefaultPointer(b.BlockSurveillance, true)
+	b.BlockMalicious = helpers.DefaultPointer(b.BlockMalicious, true)
+	b.BlockAds = helpers.DefaultPointer(b.BlockAds, false)
+	b.BlockSurveillance = helpers.DefaultPointer(b.BlockSurveillance, true)
 }
 
 var hostRegex = regexp.MustCompile(`^([a-zA-Z0-9]|[a-zA-Z0-9_][a-zA-Z0-9\-_]{0,61}[a-zA-Z0-9_])(\.([a-zA-Z0-9]|[a-zA-Z0-9_][a-zA-Z0-9\-_]{0,61}[a-zA-Z0-9]))*$`) //nolint:lll
 
 var (
-	ErrAllowedHostNotValid                   = errors.New("allowed host is not valid")
-	ErrBlockedHostNotValid                   = errors.New("blocked host is not valid")
-	ErrRebindingProtectionExemptHostNotValid = errors.New("rebinding protection exempt host is not valid")
+	ErrAllowedHostNotValid = errors.New("allowed host is not valid")
+	ErrBlockedHostNotValid = errors.New("blocked host is not valid")
 )
 
 func (b DNSBlacklist) validate() (err error) {
@@ -56,56 +48,51 @@ func (b DNSBlacklist) validate() (err error) {
 		}
 	}
 
-	for _, host := range b.RebindingProtectionExemptHostnames {
-		if len(host) > 2 && host[:2] == "*." {
-			host = host[2:]
-		}
-		if !hostRegex.MatchString(host) {
-			return fmt.Errorf("%w: %s", ErrRebindingProtectionExemptHostNotValid, host)
-		}
-	}
-
 	return nil
 }
 
 func (b DNSBlacklist) copy() (copied DNSBlacklist) {
 	return DNSBlacklist{
-		BlockMalicious:                     gosettings.CopyPointer(b.BlockMalicious),
-		BlockAds:                           gosettings.CopyPointer(b.BlockAds),
-		BlockSurveillance:                  gosettings.CopyPointer(b.BlockSurveillance),
-		AllowedHosts:                       gosettings.CopySlice(b.AllowedHosts),
-		AddBlockedHosts:                    gosettings.CopySlice(b.AddBlockedHosts),
-		AddBlockedIPs:                      gosettings.CopySlice(b.AddBlockedIPs),
-		AddBlockedIPPrefixes:               gosettings.CopySlice(b.AddBlockedIPPrefixes),
-		RebindingProtectionExemptHostnames: gosettings.CopySlice(b.RebindingProtectionExemptHostnames),
+		BlockMalicious:       helpers.CopyPointer(b.BlockMalicious),
+		BlockAds:             helpers.CopyPointer(b.BlockAds),
+		BlockSurveillance:    helpers.CopyPointer(b.BlockSurveillance),
+		AllowedHosts:         helpers.CopySlice(b.AllowedHosts),
+		AddBlockedHosts:      helpers.CopySlice(b.AddBlockedHosts),
+		AddBlockedIPs:        helpers.CopySlice(b.AddBlockedIPs),
+		AddBlockedIPPrefixes: helpers.CopySlice(b.AddBlockedIPPrefixes),
 	}
 }
 
+func (b *DNSBlacklist) mergeWith(other DNSBlacklist) {
+	b.BlockMalicious = helpers.MergeWithPointer(b.BlockMalicious, other.BlockMalicious)
+	b.BlockAds = helpers.MergeWithPointer(b.BlockAds, other.BlockAds)
+	b.BlockSurveillance = helpers.MergeWithPointer(b.BlockSurveillance, other.BlockSurveillance)
+	b.AllowedHosts = helpers.MergeSlices(b.AllowedHosts, other.AllowedHosts)
+	b.AddBlockedHosts = helpers.MergeSlices(b.AddBlockedHosts, other.AddBlockedHosts)
+	b.AddBlockedIPs = helpers.MergeSlices(b.AddBlockedIPs, other.AddBlockedIPs)
+	b.AddBlockedIPPrefixes = helpers.MergeSlices(b.AddBlockedIPPrefixes, other.AddBlockedIPPrefixes)
+}
+
 func (b *DNSBlacklist) overrideWith(other DNSBlacklist) {
-	b.BlockMalicious = gosettings.OverrideWithPointer(b.BlockMalicious, other.BlockMalicious)
-	b.BlockAds = gosettings.OverrideWithPointer(b.BlockAds, other.BlockAds)
-	b.BlockSurveillance = gosettings.OverrideWithPointer(b.BlockSurveillance, other.BlockSurveillance)
-	b.AllowedHosts = gosettings.OverrideWithSlice(b.AllowedHosts, other.AllowedHosts)
-	b.AddBlockedHosts = gosettings.OverrideWithSlice(b.AddBlockedHosts, other.AddBlockedHosts)
-	b.AddBlockedIPs = gosettings.OverrideWithSlice(b.AddBlockedIPs, other.AddBlockedIPs)
-	b.AddBlockedIPPrefixes = gosettings.OverrideWithSlice(b.AddBlockedIPPrefixes, other.AddBlockedIPPrefixes)
-	b.RebindingProtectionExemptHostnames = gosettings.OverrideWithSlice(b.RebindingProtectionExemptHostnames,
-		other.RebindingProtectionExemptHostnames)
+	b.BlockMalicious = helpers.OverrideWithPointer(b.BlockMalicious, other.BlockMalicious)
+	b.BlockAds = helpers.OverrideWithPointer(b.BlockAds, other.BlockAds)
+	b.BlockSurveillance = helpers.OverrideWithPointer(b.BlockSurveillance, other.BlockSurveillance)
+	b.AllowedHosts = helpers.OverrideWithSlice(b.AllowedHosts, other.AllowedHosts)
+	b.AddBlockedHosts = helpers.OverrideWithSlice(b.AddBlockedHosts, other.AddBlockedHosts)
+	b.AddBlockedIPs = helpers.OverrideWithSlice(b.AddBlockedIPs, other.AddBlockedIPs)
+	b.AddBlockedIPPrefixes = helpers.OverrideWithSlice(b.AddBlockedIPPrefixes, other.AddBlockedIPPrefixes)
 }
 
-func (b DNSBlacklist) ToBlockBuilderSettings(client *http.Client) (
-	settings blockbuilder.Settings,
-) {
-	return blockbuilder.Settings{
-		Client:               client,
-		BlockMalicious:       b.BlockMalicious,
-		BlockAds:             b.BlockAds,
-		BlockSurveillance:    b.BlockSurveillance,
+func (b DNSBlacklist) ToBlacklistFormat() (settings blacklist.BuilderSettings, err error) {
+	return blacklist.BuilderSettings{
+		BlockMalicious:       *b.BlockMalicious,
+		BlockAds:             *b.BlockAds,
+		BlockSurveillance:    *b.BlockSurveillance,
 		AllowedHosts:         b.AllowedHosts,
 		AddBlockedHosts:      b.AddBlockedHosts,
-		AddBlockedIPs:        b.AddBlockedIPs,
-		AddBlockedIPPrefixes: b.AddBlockedIPPrefixes,
-	}
+		AddBlockedIPs:        netipAddressesToNetaddrIPs(b.AddBlockedIPs),
+		AddBlockedIPPrefixes: netipPrefixesToNetaddrIPPrefixes(b.AddBlockedIPPrefixes),
+	}, nil
 }
 
 func (b DNSBlacklist) String() string {
@@ -115,130 +102,37 @@ func (b DNSBlacklist) String() string {
 func (b DNSBlacklist) toLinesNode() (node *gotree.Node) {
 	node = gotree.New("DNS filtering settings:")
 
-	node.Appendf("Block malicious: %s", gosettings.BoolToYesNo(b.BlockMalicious))
-	node.Appendf("Block ads: %s", gosettings.BoolToYesNo(b.BlockAds))
-	node.Appendf("Block surveillance: %s", gosettings.BoolToYesNo(b.BlockSurveillance))
+	node.Appendf("Block malicious: %s", helpers.BoolPtrToYesNo(b.BlockMalicious))
+	node.Appendf("Block ads: %s", helpers.BoolPtrToYesNo(b.BlockAds))
+	node.Appendf("Block surveillance: %s", helpers.BoolPtrToYesNo(b.BlockSurveillance))
 
 	if len(b.AllowedHosts) > 0 {
-		allowedHostsNode := node.Append("Allowed hosts:")
+		allowedHostsNode := node.Appendf("Allowed hosts:")
 		for _, host := range b.AllowedHosts {
-			allowedHostsNode.Append(host)
+			allowedHostsNode.Appendf(host)
 		}
 	}
 
 	if len(b.AddBlockedHosts) > 0 {
-		blockedHostsNode := node.Append("Blocked hosts:")
+		blockedHostsNode := node.Appendf("Blocked hosts:")
 		for _, host := range b.AddBlockedHosts {
-			blockedHostsNode.Append(host)
+			blockedHostsNode.Appendf(host)
 		}
 	}
 
 	if len(b.AddBlockedIPs) > 0 {
-		blockedIPsNode := node.Append("Blocked IP addresses:")
+		blockedIPsNode := node.Appendf("Blocked IP addresses:")
 		for _, ip := range b.AddBlockedIPs {
-			blockedIPsNode.Append(ip.String())
+			blockedIPsNode.Appendf(ip.String())
 		}
 	}
 
 	if len(b.AddBlockedIPPrefixes) > 0 {
-		blockedIPPrefixesNode := node.Append("Blocked IP networks:")
+		blockedIPPrefixesNode := node.Appendf("Blocked IP networks:")
 		for _, ipNetwork := range b.AddBlockedIPPrefixes {
-			blockedIPPrefixesNode.Append(ipNetwork.String())
-		}
-	}
-
-	if len(b.RebindingProtectionExemptHostnames) > 0 {
-		exemptHostsNode := node.Append("Rebinding protection exempt hostnames:")
-		for _, host := range b.RebindingProtectionExemptHostnames {
-			exemptHostsNode.Append(host)
+			blockedIPPrefixesNode.Appendf(ipNetwork.String())
 		}
 	}
 
 	return node
 }
-
-func (b *DNSBlacklist) read(r *reader.Reader) (err error) {
-	b.BlockMalicious, err = r.BoolPtr("BLOCK_MALICIOUS")
-	if err != nil {
-		return err
-	}
-
-	b.BlockSurveillance, err = r.BoolPtr("BLOCK_SURVEILLANCE",
-		reader.RetroKeys("BLOCK_NSA"))
-	if err != nil {
-		return err
-	}
-
-	b.BlockAds, err = r.BoolPtr("BLOCK_ADS")
-	if err != nil {
-		return err
-	}
-
-	b.AddBlockedIPs, b.AddBlockedIPPrefixes, err = readDNSBlockedIPs(r)
-	if err != nil {
-		return err
-	}
-
-	b.AllowedHosts = r.CSV("DNS_UNBLOCK_HOSTNAMES", reader.RetroKeys("UNBLOCK"))
-
-	b.RebindingProtectionExemptHostnames = r.CSV("DNS_REBINDING_PROTECTION_EXEMPT_HOSTNAMES")
-
-	return nil
-}
-
-func readDNSBlockedIPs(r *reader.Reader) (ips []netip.Addr,
-	ipPrefixes []netip.Prefix, err error,
-) {
-	ips, err = r.CSVNetipAddresses("DNS_BLOCK_IPS")
-	if err != nil {
-		return nil, nil, err
-	}
-	ipPrefixes, err = r.CSVNetipPrefixes("DNS_BLOCK_IP_PREFIXES")
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO v4 remove this block below
-	privateIPs, privateIPPrefixes, err := readDNSPrivateAddresses(r)
-	if err != nil {
-		return nil, nil, err
-	}
-	ips = append(ips, privateIPs...)
-	ipPrefixes = append(ipPrefixes, privateIPPrefixes...)
-
-	return ips, ipPrefixes, nil
-}
-
-var ErrPrivateAddressNotValid = errors.New("private address is not a valid IP or CIDR range")
-
-func readDNSPrivateAddresses(r *reader.Reader) (ips []netip.Addr,
-	ipPrefixes []netip.Prefix, err error,
-) {
-	privateAddresses := r.CSV("DOT_PRIVATE_ADDRESS", reader.IsRetro("DNS_BLOCK_IP_PREFIXES"))
-	if len(privateAddresses) == 0 {
-		return nil, nil, nil
-	}
-
-	ips = make([]netip.Addr, 0, len(privateAddresses))
-	ipPrefixes = make([]netip.Prefix, 0, len(privateAddresses))
-
-	for _, privateAddress := range privateAddresses {
-		ip, err := netip.ParseAddr(privateAddress)
-		if err == nil {
-			ips = append(ips, ip)
-			continue
-		}
-
-		ipPrefix, err := netip.ParsePrefix(privateAddress)
-		if err == nil {
-			ipPrefixes = append(ipPrefixes, ipPrefix)
-			continue
-		}
-
-		return nil, nil, fmt.Errorf(
-			"environment variable DOT_PRIVATE_ADDRESS: %w: %s",
-			ErrPrivateAddressNotValid, privateAddress)
-	}
-
-	return ips, ipPrefixes, nil
-}

internal/configuration/settings/dot.go

@@ -0,0 +1,113 @@
+package settings
+
+import (
+	"errors"
+	"fmt"
+	"time"
+
+	"github.com/qdm12/gluetun/internal/configuration/settings/helpers"
+	"github.com/qdm12/gotree"
+)
+
+// DoT contains settings to configure the DoT server.
+type DoT struct {
+	// Enabled is true if the DoT server should be running
+	// and used. It defaults to true, and cannot be nil
+	// in the internal state.
+	Enabled *bool
+	// UpdatePeriod is the period to update DNS block
+	// lists and cryptographic files for DNSSEC validation.
+	// It can be set to 0 to disable the update.
+	// It defaults to 24h and cannot be nil in
+	// the internal state.
+	UpdatePeriod *time.Duration
+	// Unbound contains settings to configure Unbound.
+	Unbound Unbound
+	// Blacklist contains settings to configure the filter
+	// block lists.
+	Blacklist DNSBlacklist
+}
+
+var (
+	ErrDoTUpdatePeriodTooShort = errors.New("update period is too short")
+)
+
+func (d DoT) validate() (err error) {
+	const minUpdatePeriod = 30 * time.Second
+	if *d.UpdatePeriod != 0 && *d.UpdatePeriod < minUpdatePeriod {
+		return fmt.Errorf("%w: %s must be bigger than %s",
+			ErrDoTUpdatePeriodTooShort, *d.UpdatePeriod, minUpdatePeriod)
+	}
+
+	err = d.Unbound.validate()
+	if err != nil {
+		return err
+	}
+
+	err = d.Blacklist.validate()
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (d *DoT) copy() (copied DoT) {
+	return DoT{
+		Enabled:      helpers.CopyPointer(d.Enabled),
+		UpdatePeriod: helpers.CopyPointer(d.UpdatePeriod),
+		Unbound:      d.Unbound.copy(),
+		Blacklist:    d.Blacklist.copy(),
+	}
+}
+
+// mergeWith merges the other settings into any
+// unset field of the receiver settings object.
+func (d *DoT) mergeWith(other DoT) {
+	d.Enabled = helpers.MergeWithPointer(d.Enabled, other.Enabled)
+	d.UpdatePeriod = helpers.MergeWithPointer(d.UpdatePeriod, other.UpdatePeriod)
+	d.Unbound.mergeWith(other.Unbound)
+	d.Blacklist.mergeWith(other.Blacklist)
+}
+
+// overrideWith overrides fields of the receiver
+// settings object with any field set in the other
+// settings.
+func (d *DoT) overrideWith(other DoT) {
+	d.Enabled = helpers.OverrideWithPointer(d.Enabled, other.Enabled)
+	d.UpdatePeriod = helpers.OverrideWithPointer(d.UpdatePeriod, other.UpdatePeriod)
+	d.Unbound.overrideWith(other.Unbound)
+	d.Blacklist.overrideWith(other.Blacklist)
+}
+
+func (d *DoT) setDefaults() {
+	d.Enabled = helpers.DefaultPointer(d.Enabled, true)
+	const defaultUpdatePeriod = 24 * time.Hour
+	d.UpdatePeriod = helpers.DefaultPointer(d.UpdatePeriod, defaultUpdatePeriod)
+	d.Unbound.setDefaults()
+	d.Blacklist.setDefaults()
+}
+
+func (d DoT) String() string {
+	return d.toLinesNode().String()
+}
+
+func (d DoT) toLinesNode() (node *gotree.Node) {
+	node = gotree.New("DNS over TLS settings:")
+
+	node.Appendf("Enabled: %s", helpers.BoolPtrToYesNo(d.Enabled))
+	if !*d.Enabled {
+		return node
+	}
+
+	update := "disabled"
+	if *d.UpdatePeriod > 0 {
+		update = "every " + d.UpdatePeriod.String()
+	}
+	node.Appendf("Update period: %s", update)
+
+	node.AppendNode(d.Unbound.toLinesNode())
+	node.AppendNode(d.Blacklist.toLinesNode())
+
+	return node
+}

internal/configuration/settings/errors.go

@@ -3,14 +3,11 @@ package settings
 import "errors"
 
 var (
-	ErrValueUnknown                    = errors.New("value is unknown")
 	ErrCityNotValid                    = errors.New("the city specified is not valid")
 	ErrControlServerPrivilegedPort     = errors.New("cannot use privileged port without running as root")
-	ErrCategoryNotValid                = errors.New("the category specified is not valid")
 	ErrCountryNotValid                 = errors.New("the country specified is not valid")
 	ErrFilepathMissing                 = errors.New("filepath is missing")
-	ErrFirewallZeroPort                = errors.New("cannot have a zero port")
-	ErrFirewallPublicOutboundSubnet    = errors.New("outbound subnet has an unspecified address")
+	ErrFirewallZeroPort                = errors.New("cannot have a zero port to block")
 	ErrHostnameNotValid                = errors.New("the hostname specified is not valid")
 	ErrISPNotValid                     = errors.New("the ISP specified is not valid")
 	ErrMinRatioNotValid                = errors.New("minimum ratio is not valid")
@@ -28,20 +25,15 @@ var (
 	ErrOpenVPNVerbosityIsOutOfBounds   = errors.New("verbosity value is out of bounds")
 	ErrOpenVPNVersionIsNotValid        = errors.New("version is not valid")
 	ErrPortForwardingEnabled           = errors.New("port forwarding cannot be enabled")
-	ErrPortForwardingUserEmpty         = errors.New("port forwarding username is empty")
-	ErrPortForwardingPasswordEmpty     = errors.New("port forwarding password is empty")
+	ErrPublicIPPeriodTooShort          = errors.New("public IP address check period is too short")
 	ErrRegionNotValid                  = errors.New("the region specified is not valid")
 	ErrServerAddressNotValid           = errors.New("server listening address is not valid")
 	ErrSystemPGIDNotValid              = errors.New("process group id is not valid")
 	ErrSystemPUIDNotValid              = errors.New("process user id is not valid")
 	ErrSystemTimezoneNotValid          = errors.New("timezone is not valid")
 	ErrUpdaterPeriodTooSmall           = errors.New("VPN server data updater period is too small")
-	ErrUpdaterProtonPasswordMissing    = errors.New("proton password is missing")
-	ErrUpdaterProtonEmailMissing       = errors.New("proton email is missing")
 	ErrVPNProviderNameNotValid         = errors.New("VPN provider name is not valid")
 	ErrVPNTypeNotValid                 = errors.New("VPN type is not valid")
-	ErrWireguardAllowedIPNotSet        = errors.New("allowed IP is not set")
-	ErrWireguardAllowedIPsNotSet       = errors.New("allowed IPs is not set")
 	ErrWireguardEndpointIPNotSet       = errors.New("endpoint IP is not set")
 	ErrWireguardEndpointPortNotAllowed = errors.New("endpoint port is not allowed")
 	ErrWireguardEndpointPortNotSet     = errors.New("endpoint port is not set")
@@ -53,6 +45,5 @@ var (
 	ErrWireguardPrivateKeyNotSet       = errors.New("private key is not set")
 	ErrWireguardPublicKeyNotSet        = errors.New("public key is not set")
 	ErrWireguardPublicKeyNotValid      = errors.New("public key is not valid")
-	ErrWireguardKeepAliveNegative      = errors.New("persistent keep alive interval is negative")
 	ErrWireguardImplementationNotValid = errors.New("implementation is not valid")
 )

internal/configuration/settings/firewall.go

@@ -4,8 +4,7 @@ import (
 	"fmt"
 	"net/netip"
 
-	"github.com/qdm12/gosettings"
-	"github.com/qdm12/gosettings/reader"
+	"github.com/qdm12/gluetun/internal/configuration/settings/helpers"
 	"github.com/qdm12/gotree"
 )
 
@@ -15,7 +14,7 @@ type Firewall struct {
 	InputPorts      []uint16
 	OutboundSubnets []netip.Prefix
 	Enabled         *bool
-	Iptables        Iptables
+	Debug           *bool
 }
 
 func (f Firewall) validate() (err error) {
@@ -27,17 +26,6 @@ func (f Firewall) validate() (err error) {
 		return fmt.Errorf("input ports: %w", ErrFirewallZeroPort)
 	}
 
-	for _, subnet := range f.OutboundSubnets {
-		if subnet.Addr().IsUnspecified() {
-			return fmt.Errorf("%w: %s", ErrFirewallPublicOutboundSubnet, subnet)
-		}
-	}
-
-	err = f.Iptables.validate()
-	if err != nil {
-		return fmt.Errorf("iptables settings: %w", err)
-	}
-
 	return nil
 }
 
@@ -52,28 +40,40 @@ func hasZeroPort(ports []uint16) (has bool) {
 
 func (f *Firewall) copy() (copied Firewall) {
 	return Firewall{
-		VPNInputPorts:   gosettings.CopySlice(f.VPNInputPorts),
-		InputPorts:      gosettings.CopySlice(f.InputPorts),
-		OutboundSubnets: gosettings.CopySlice(f.OutboundSubnets),
-		Enabled:         gosettings.CopyPointer(f.Enabled),
-		Iptables:        f.Iptables.copy(),
+		VPNInputPorts:   helpers.CopySlice(f.VPNInputPorts),
+		InputPorts:      helpers.CopySlice(f.InputPorts),
+		OutboundSubnets: helpers.CopySlice(f.OutboundSubnets),
+		Enabled:         helpers.CopyPointer(f.Enabled),
+		Debug:           helpers.CopyPointer(f.Debug),
 	}
 }
 
+// mergeWith merges the other settings into any
+// unset field of the receiver settings object.
+// It merges values of slices together, even if they
+// are set in the receiver settings.
+func (f *Firewall) mergeWith(other Firewall) {
+	f.VPNInputPorts = helpers.MergeSlices(f.VPNInputPorts, other.VPNInputPorts)
+	f.InputPorts = helpers.MergeSlices(f.InputPorts, other.InputPorts)
+	f.OutboundSubnets = helpers.MergeSlices(f.OutboundSubnets, other.OutboundSubnets)
+	f.Enabled = helpers.MergeWithPointer(f.Enabled, other.Enabled)
+	f.Debug = helpers.MergeWithPointer(f.Debug, other.Debug)
+}
+
 // overrideWith overrides fields of the receiver
 // settings object with any field set in the other
 // settings.
 func (f *Firewall) overrideWith(other Firewall) {
-	f.VPNInputPorts = gosettings.OverrideWithSlice(f.VPNInputPorts, other.VPNInputPorts)
-	f.InputPorts = gosettings.OverrideWithSlice(f.InputPorts, other.InputPorts)
-	f.OutboundSubnets = gosettings.OverrideWithSlice(f.OutboundSubnets, other.OutboundSubnets)
-	f.Enabled = gosettings.OverrideWithPointer(f.Enabled, other.Enabled)
-	f.Iptables.overrideWith(other.Iptables)
+	f.VPNInputPorts = helpers.OverrideWithSlice(f.VPNInputPorts, other.VPNInputPorts)
+	f.InputPorts = helpers.OverrideWithSlice(f.InputPorts, other.InputPorts)
+	f.OutboundSubnets = helpers.OverrideWithSlice(f.OutboundSubnets, other.OutboundSubnets)
+	f.Enabled = helpers.OverrideWithPointer(f.Enabled, other.Enabled)
+	f.Debug = helpers.OverrideWithPointer(f.Debug, other.Debug)
 }
 
-func (f *Firewall) setDefaults(globalLogLevel string) {
-	f.Enabled = gosettings.DefaultPointer(f.Enabled, true)
-	f.Iptables.setDefaults(globalLogLevel)
+func (f *Firewall) setDefaults() {
+	f.Enabled = helpers.DefaultPointer(f.Enabled, true)
+	f.Debug = helpers.DefaultPointer(f.Debug, false)
 }
 
 func (f Firewall) String() string {
@@ -83,12 +83,14 @@ func (f Firewall) String() string {
 func (f Firewall) toLinesNode() (node *gotree.Node) {
 	node = gotree.New("Firewall settings:")
 
-	node.Appendf("Enabled: %s", gosettings.BoolToYesNo(f.Enabled))
+	node.Appendf("Enabled: %s", helpers.BoolPtrToYesNo(f.Enabled))
 	if !*f.Enabled {
 		return node
 	}
 
-	node.AppendNode(f.Iptables.toLinesNode())
+	if *f.Debug {
+		node.Appendf("Debug mode: on")
+	}
 
 	if len(f.VPNInputPorts) > 0 {
 		vpnInputPortsNode := node.Appendf("VPN input ports:")
@@ -107,39 +109,10 @@ func (f Firewall) toLinesNode() (node *gotree.Node) {
 	if len(f.OutboundSubnets) > 0 {
 		outboundSubnets := node.Appendf("Outbound subnets:")
 		for _, subnet := range f.OutboundSubnets {
+			subnet := subnet
 			outboundSubnets.Appendf("%s", &subnet)
 		}
 	}
 
 	return node
 }
-
-func (f *Firewall) read(r *reader.Reader) (err error) {
-	f.VPNInputPorts, err = r.CSVUint16("FIREWALL_VPN_INPUT_PORTS")
-	if err != nil {
-		return err
-	}
-
-	f.InputPorts, err = r.CSVUint16("FIREWALL_INPUT_PORTS")
-	if err != nil {
-		return err
-	}
-
-	f.OutboundSubnets, err = r.CSVNetipPrefixes(
-		"FIREWALL_OUTBOUND_SUBNETS", reader.RetroKeys("EXTRA_SUBNETS"))
-	if err != nil {
-		return err
-	}
-
-	f.Enabled, err = r.BoolPtr("FIREWALL_ENABLED_DISABLING_IT_SHOOTS_YOU_IN_YOUR_FOOT")
-	if err != nil {
-		return err
-	}
-
-	err = f.Iptables.read(r)
-	if err != nil {
-		return fmt.Errorf("reading iptables settings: %w", err)
-	}
-
-	return nil
-}

internal/configuration/settings/firewall_test.go

@@ -1,79 +0,0 @@
-package settings
-
-import (
-	"net/netip"
-	"testing"
-
-	"github.com/qdm12/log"
-	"github.com/stretchr/testify/assert"
-)
-
-func Test_Firewall_validate(t *testing.T) {
-	t.Parallel()
-
-	testCases := map[string]struct {
-		firewall   Firewall
-		errWrapped error
-		errMessage string
-	}{
-		"empty": {
-			errWrapped: log.ErrLevelNotRecognized,
-			errMessage: "iptables settings: log level: level is not recognized: ",
-		},
-		"zero_vpn_input_port": {
-			firewall: Firewall{
-				VPNInputPorts: []uint16{0},
-			},
-			errWrapped: ErrFirewallZeroPort,
-			errMessage: "VPN input ports: cannot have a zero port",
-		},
-		"zero_input_port": {
-			firewall: Firewall{
-				InputPorts: []uint16{0},
-			},
-			errWrapped: ErrFirewallZeroPort,
-			errMessage: "input ports: cannot have a zero port",
-		},
-		"unspecified_outbound_subnet": {
-			firewall: Firewall{
-				OutboundSubnets: []netip.Prefix{
-					netip.MustParsePrefix("0.0.0.0/0"),
-				},
-			},
-			errWrapped: ErrFirewallPublicOutboundSubnet,
-			errMessage: "outbound subnet has an unspecified address: 0.0.0.0/0",
-		},
-		"public_outbound_subnet": {
-			firewall: Firewall{
-				Iptables: Iptables{LogLevel: log.LevelInfo.String()},
-				OutboundSubnets: []netip.Prefix{
-					netip.MustParsePrefix("1.2.3.4/32"),
-				},
-			},
-		},
-		"valid_settings": {
-			firewall: Firewall{
-				Iptables:      Iptables{LogLevel: log.LevelInfo.String()},
-				VPNInputPorts: []uint16{100, 101},
-				InputPorts:    []uint16{200, 201},
-				OutboundSubnets: []netip.Prefix{
-					netip.MustParsePrefix("192.168.1.0/24"),
-					netip.MustParsePrefix("10.10.1.1/32"),
-				},
-			},
-		},
-	}
-
-	for name, testCase := range testCases {
-		t.Run(name, func(t *testing.T) {
-			t.Parallel()
-
-			err := testCase.firewall.validate()
-
-			assert.ErrorIs(t, err, testCase.errWrapped)
-			if testCase.errWrapped != nil {
-				assert.EqualError(t, err, testCase.errMessage)
-			}
-		})
-	}
-}

internal/configuration/settings/health.go

@@ -1,15 +1,13 @@
 package settings
 
 import (
-	"errors"
 	"fmt"
-	"net/netip"
 	"os"
+	"time"
 
-	"github.com/qdm12/gosettings"
-	"github.com/qdm12/gosettings/reader"
-	"github.com/qdm12/gosettings/validate"
+	"github.com/qdm12/gluetun/internal/configuration/settings/helpers"
 	"github.com/qdm12/gotree"
+	"github.com/qdm12/govalid/address"
 )
 
 // Health contains settings for the healthcheck and health server.
@@ -18,51 +16,36 @@ type Health struct {
 	// for the health check server.
 	// It cannot be the empty string in the internal state.
 	ServerAddress string
-	// TargetAddresses are the addresses (host or host:port)
-	// to TCP TLS dial to periodically for the health check.
-	// Addresses after the first one are used as fallbacks for retries.
-	// It cannot be empty in the internal state.
-	TargetAddresses []string
-	// ICMPTargetIPs are the IP addresses to use for ICMP echo requests
-	// in the health checker. The slice can be set to a single
-	// unspecified address (0.0.0.0) such that the VPN server IP is used,
-	// although this can be less reliable. It defaults to [1.1.1.1,8.8.8.8],
-	// and cannot be left empty in the internal state.
-	ICMPTargetIPs []netip.Addr
-	// SmallCheckType is the type of small health check to perform.
-	// It can be "icmp" or "dns", and defaults to "icmp".
-	// Note it changes automatically to dns if icmp is not supported.
-	SmallCheckType string
-	// RestartVPN indicates whether to restart the VPN connection
-	// when the healthcheck fails.
-	RestartVPN *bool
+	// ReadHeaderTimeout is the HTTP server header read timeout
+	// duration of the HTTP server. It defaults to 100 milliseconds.
+	ReadHeaderTimeout time.Duration
+	// ReadTimeout is the HTTP read timeout duration of the
+	// HTTP server. It defaults to 500 milliseconds.
+	ReadTimeout time.Duration
+	// TargetAddress is the address (host or host:port)
+	// to TCP dial to periodically for the health check.
+	// It cannot be the empty string in the internal state.
+	TargetAddress string
+	// SuccessWait is the duration to wait to re-run the
+	// healthcheck after a successful healthcheck.
+	// It defaults to 5 seconds and cannot be zero in
+	// the internal state.
+	SuccessWait time.Duration
+	// VPN has health settings specific to the VPN loop.
+	VPN HealthyWait
 }
 
-var (
-	ErrICMPTargetIPNotValid       = errors.New("ICMP target IP address is not valid")
-	ErrICMPTargetIPsNotCompatible = errors.New("ICMP target IP addresses are not compatible")
-	ErrSmallCheckTypeNotValid     = errors.New("small check type is not valid")
-)
-
 func (h Health) Validate() (err error) {
-	err = validate.ListeningAddress(h.ServerAddress, os.Getuid())
+	uid := os.Getuid()
+	_, err = address.Validate(h.ServerAddress,
+		address.OptionListening(uid))
 	if err != nil {
 		return fmt.Errorf("server listening address is not valid: %w", err)
 	}
 
-	for _, ip := range h.ICMPTargetIPs {
-		switch {
-		case !ip.IsValid():
-			return fmt.Errorf("%w: %s", ErrICMPTargetIPNotValid, ip)
-		case ip.IsUnspecified() && len(h.ICMPTargetIPs) > 1:
-			return fmt.Errorf("%w: only a single IP address must be set if it is to be unspecified",
-				ErrICMPTargetIPsNotCompatible)
-		}
-	}
-
-	err = validate.IsOneOf(h.SmallCheckType, "icmp", "dns")
+	err = h.VPN.validate()
 	if err != nil {
-		return fmt.Errorf("%w: %s", ErrSmallCheckTypeNotValid, err)
+		return fmt.Errorf("health VPN settings: %w", err)
 	}
 
 	return nil
@@ -70,34 +53,48 @@ func (h Health) Validate() (err error) {
 
 func (h *Health) copy() (copied Health) {
 	return Health{
-		ServerAddress:   h.ServerAddress,
-		TargetAddresses: h.TargetAddresses,
-		ICMPTargetIPs:   gosettings.CopySlice(h.ICMPTargetIPs),
-		SmallCheckType:  h.SmallCheckType,
-		RestartVPN:      gosettings.CopyPointer(h.RestartVPN),
+		ServerAddress:     h.ServerAddress,
+		ReadHeaderTimeout: h.ReadHeaderTimeout,
+		ReadTimeout:       h.ReadTimeout,
+		TargetAddress:     h.TargetAddress,
+		SuccessWait:       h.SuccessWait,
+		VPN:               h.VPN.copy(),
 	}
 }
 
+// MergeWith merges the other settings into any
+// unset field of the receiver settings object.
+func (h *Health) MergeWith(other Health) {
+	h.ServerAddress = helpers.MergeWithString(h.ServerAddress, other.ServerAddress)
+	h.ReadHeaderTimeout = helpers.MergeWithNumber(h.ReadHeaderTimeout, other.ReadHeaderTimeout)
+	h.ReadTimeout = helpers.MergeWithNumber(h.ReadTimeout, other.ReadTimeout)
+	h.TargetAddress = helpers.MergeWithString(h.TargetAddress, other.TargetAddress)
+	h.SuccessWait = helpers.MergeWithNumber(h.SuccessWait, other.SuccessWait)
+	h.VPN.mergeWith(other.VPN)
+}
+
 // OverrideWith overrides fields of the receiver
 // settings object with any field set in the other
 // settings.
 func (h *Health) OverrideWith(other Health) {
-	h.ServerAddress = gosettings.OverrideWithComparable(h.ServerAddress, other.ServerAddress)
-	h.TargetAddresses = gosettings.OverrideWithSlice(h.TargetAddresses, other.TargetAddresses)
-	h.ICMPTargetIPs = gosettings.OverrideWithSlice(h.ICMPTargetIPs, other.ICMPTargetIPs)
-	h.SmallCheckType = gosettings.OverrideWithComparable(h.SmallCheckType, other.SmallCheckType)
-	h.RestartVPN = gosettings.OverrideWithPointer(h.RestartVPN, other.RestartVPN)
+	h.ServerAddress = helpers.OverrideWithString(h.ServerAddress, other.ServerAddress)
+	h.ReadHeaderTimeout = helpers.OverrideWithNumber(h.ReadHeaderTimeout, other.ReadHeaderTimeout)
+	h.ReadTimeout = helpers.OverrideWithNumber(h.ReadTimeout, other.ReadTimeout)
+	h.TargetAddress = helpers.OverrideWithString(h.TargetAddress, other.TargetAddress)
+	h.SuccessWait = helpers.OverrideWithNumber(h.SuccessWait, other.SuccessWait)
+	h.VPN.overrideWith(other.VPN)
 }
 
 func (h *Health) SetDefaults() {
-	h.ServerAddress = gosettings.DefaultComparable(h.ServerAddress, "127.0.0.1:9999")
-	h.TargetAddresses = gosettings.DefaultSlice(h.TargetAddresses, []string{"cloudflare.com:443", "github.com:443"})
-	h.ICMPTargetIPs = gosettings.DefaultSlice(h.ICMPTargetIPs, []netip.Addr{
-		netip.AddrFrom4([4]byte{1, 1, 1, 1}),
-		netip.AddrFrom4([4]byte{8, 8, 8, 8}),
-	})
-	h.SmallCheckType = gosettings.DefaultComparable(h.SmallCheckType, "icmp")
-	h.RestartVPN = gosettings.DefaultPointer(h.RestartVPN, true)
+	h.ServerAddress = helpers.DefaultString(h.ServerAddress, "127.0.0.1:9999")
+	const defaultReadHeaderTimeout = 100 * time.Millisecond
+	h.ReadHeaderTimeout = helpers.DefaultNumber(h.ReadHeaderTimeout, defaultReadHeaderTimeout)
+	const defaultReadTimeout = 500 * time.Millisecond
+	h.ReadTimeout = helpers.DefaultNumber(h.ReadTimeout, defaultReadTimeout)
+	h.TargetAddress = helpers.DefaultString(h.TargetAddress, "cloudflare.com:443")
+	const defaultSuccessWait = 5 * time.Second
+	h.SuccessWait = helpers.DefaultNumber(h.SuccessWait, defaultSuccessWait)
+	h.VPN.setDefaults()
 }
 
 func (h Health) String() string {
@@ -107,40 +104,10 @@ func (h Health) String() string {
 func (h Health) toLinesNode() (node *gotree.Node) {
 	node = gotree.New("Health settings:")
 	node.Appendf("Server listening address: %s", h.ServerAddress)
-	targetAddrs := node.Appendf("Target addresses:")
-	for _, targetAddr := range h.TargetAddresses {
-		targetAddrs.Append(targetAddr)
-	}
-	switch h.SmallCheckType {
-	case "icmp":
-		icmpNode := node.Appendf("Small health check type: ICMP echo request")
-		if len(h.ICMPTargetIPs) == 1 && h.ICMPTargetIPs[0].IsUnspecified() {
-			icmpNode.Appendf("ICMP target IP: VPN server IP address")
-		} else {
-			icmpIPs := icmpNode.Appendf("ICMP target IPs:")
-			for _, ip := range h.ICMPTargetIPs {
-				icmpIPs.Append(ip.String())
-			}
-		}
-	case "dns":
-		node.Appendf("Small health check type: Plain DNS lookup over UDP")
-	}
-	node.Appendf("Restart VPN on healthcheck failure: %s", gosettings.BoolToYesNo(h.RestartVPN))
+	node.Appendf("Target address: %s", h.TargetAddress)
+	node.Appendf("Duration to wait after success: %s", h.SuccessWait)
+	node.Appendf("Read header timeout: %s", h.ReadHeaderTimeout)
+	node.Appendf("Read timeout: %s", h.ReadTimeout)
+	node.AppendNode(h.VPN.toLinesNode("VPN"))
 	return node
 }
-
-func (h *Health) Read(r *reader.Reader) (err error) {
-	h.ServerAddress = r.String("HEALTH_SERVER_ADDRESS")
-	h.TargetAddresses = r.CSV("HEALTH_TARGET_ADDRESSES",
-		reader.RetroKeys("HEALTH_ADDRESS_TO_PING", "HEALTH_TARGET_ADDRESS"))
-	h.ICMPTargetIPs, err = r.CSVNetipAddresses("HEALTH_ICMP_TARGET_IPS", reader.RetroKeys("HEALTH_ICMP_TARGET_IP"))
-	if err != nil {
-		return err
-	}
-	h.SmallCheckType = r.String("HEALTH_SMALL_CHECK_TYPE")
-	h.RestartVPN, err = r.BoolPtr("HEALTH_RESTART_VPN")
-	if err != nil {
-		return err
-	}
-	return nil
-}

internal/configuration/settings/healthywait.go

@@ -0,0 +1,66 @@
+package settings
+
+import (
+	"time"
+
+	"github.com/qdm12/gluetun/internal/configuration/settings/helpers"
+	"github.com/qdm12/gotree"
+)
+
+type HealthyWait struct {
+	// Initial is the initial duration to wait for the program
+	// to be healthy before taking action.
+	// It cannot be nil in the internal state.
+	Initial *time.Duration
+	// Addition is the duration to add to the Initial duration
+	// after Initial has expired to wait longer for the program
+	// to be healthy.
+	// It cannot be nil in the internal state.
+	Addition *time.Duration
+}
+
+func (h HealthyWait) validate() (err error) {
+	return nil
+}
+
+// mergeWith merges the other settings into any
+// unset field of the receiver settings object.
+func (h *HealthyWait) copy() (copied HealthyWait) {
+	return HealthyWait{
+		Initial:  helpers.CopyPointer(h.Initial),
+		Addition: helpers.CopyPointer(h.Addition),
+	}
+}
+
+// mergeWith merges the other settings into any
+// unset field of the receiver settings object.
+func (h *HealthyWait) mergeWith(other HealthyWait) {
+	h.Initial = helpers.MergeWithPointer(h.Initial, other.Initial)
+	h.Addition = helpers.MergeWithPointer(h.Addition, other.Addition)
+}
+
+// overrideWith overrides fields of the receiver
+// settings object with any field set in the other
+// settings.
+func (h *HealthyWait) overrideWith(other HealthyWait) {
+	h.Initial = helpers.OverrideWithPointer(h.Initial, other.Initial)
+	h.Addition = helpers.OverrideWithPointer(h.Addition, other.Addition)
+}
+
+func (h *HealthyWait) setDefaults() {
+	const initialDurationDefault = 6 * time.Second
+	const additionDurationDefault = 5 * time.Second
+	h.Initial = helpers.DefaultPointer(h.Initial, initialDurationDefault)
+	h.Addition = helpers.DefaultPointer(h.Addition, additionDurationDefault)
+}
+
+func (h HealthyWait) String() string {
+	return h.toLinesNode("Health").String()
+}
+
+func (h HealthyWait) toLinesNode(kind string) (node *gotree.Node) {
+	node = gotree.New(kind + " wait durations:")
+	node.Appendf("Initial duration: %s", *h.Initial)
+	node.Appendf("Additional duration: %s", *h.Addition)
+	return node
+}

internal/configuration/settings/helpers.go

@@ -1,5 +0,0 @@
-package settings
-
-func ptrTo[T any](value T) *T {
-	return &value
-}

internal/configuration/settings/helpers/belong.go

@@ -1,6 +1,12 @@
 package helpers
 
-func IsOneOf[T comparable](value T, choices ...T) (ok bool) {
+import (
+	"errors"
+	"fmt"
+	"strings"
+)
+
+func IsOneOf(value string, choices ...string) (ok bool) {
 	for _, choice := range choices {
 		if value == choice {
 			return true
@@ -8,3 +14,39 @@ func IsOneOf[T comparable](value T, choices ...T) (ok bool) {
 	}
 	return false
 }
+
+var (
+	ErrNoChoice      = errors.New("one or more values is set but there is no possible value available")
+	ErrValueNotOneOf = errors.New("value is not one of the possible choices")
+)
+
+func AreAllOneOf(values, choices []string) (err error) {
+	if len(values) > 0 && len(choices) == 0 {
+		return fmt.Errorf("%w", ErrNoChoice)
+	}
+
+	set := make(map[string]struct{}, len(choices))
+	for _, choice := range choices {
+		choice = strings.ToLower(choice)
+		set[choice] = struct{}{}
+	}
+
+	for _, value := range values {
+		_, ok := set[value]
+		if !ok {
+			return fmt.Errorf("%w: value %q, choices available are %s",
+				ErrValueNotOneOf, value, strings.Join(choices, ", "))
+		}
+	}
+
+	return nil
+}
+
+func Uint16IsOneOf(port uint16, choices []uint16) (ok bool) {
+	for _, choice := range choices {
+		if port == choice {
+			return true
+		}
+	}
+	return false
+}

internal/configuration/settings/helpers/copy.go

@@ -0,0 +1,20 @@
+package helpers
+
+import (
+	"net/netip"
+
+	"golang.org/x/exp/slices"
+)
+
+func CopyPointer[T any](original *T) (copied *T) {
+	if original == nil {
+		return nil
+	}
+	copied = new(T)
+	*copied = *original
+	return copied
+}
+
+func CopySlice[T string | uint16 | netip.Addr | netip.Prefix](original []T) (copied []T) {
+	return slices.Clone(original)
+}

internal/configuration/settings/helpers/default.go

@@ -0,0 +1,39 @@
+package helpers
+
+import (
+	"net/netip"
+)
+
+func DefaultPointer[T any](existing *T, defaultValue T) (
+	result *T) {
+	if existing != nil {
+		return existing
+	}
+	result = new(T)
+	*result = defaultValue
+	return result
+}
+
+func DefaultString(existing string, defaultValue string) (
+	result string) {
+	if existing != "" {
+		return existing
+	}
+	return defaultValue
+}
+
+func DefaultNumber[T Number](existing T, defaultValue T) ( //nolint:ireturn
+	result T) {
+	if existing != 0 {
+		return existing
+	}
+	return defaultValue
+}
+
+func DefaultIP(existing netip.Addr, defaultValue netip.Addr) (
+	result netip.Addr) {
+	if existing.IsValid() {
+		return existing
+	}
+	return defaultValue
+}

internal/configuration/settings/helpers/files.go

@@ -0,0 +1,31 @@
+package helpers
+
+import (
+	"errors"
+	"fmt"
+	"os"
+	"path/filepath"
+)
+
+var (
+	ErrFileDoesNotExist = errors.New("file does not exist")
+	ErrFileRead         = errors.New("cannot read file")
+	ErrFileClose        = errors.New("cannot close file")
+)
+
+func FileExists(path string) (err error) {
+	path = filepath.Clean(path)
+
+	f, err := os.Open(path)
+	if errors.Is(err, os.ErrNotExist) {
+		return fmt.Errorf("%w: %s", ErrFileDoesNotExist, path)
+	} else if err != nil {
+		return fmt.Errorf("%w: %s", ErrFileRead, err)
+	}
+
+	if err := f.Close(); err != nil {
+		return fmt.Errorf("%w: %s", ErrFileClose, err)
+	}
+
+	return nil
+}

internal/configuration/settings/helpers/generics.go

@@ -0,0 +1,10 @@
+package helpers
+
+import "time"
+
+type Number interface {
+	uint8 | uint16 | uint32 | uint64 | uint |
+		int8 | int16 | int32 | int64 | int |
+		float32 | float64 |
+		time.Duration
+}

internal/configuration/settings/helpers/merge.go

@@ -0,0 +1,69 @@
+package helpers
+
+import (
+	"net/http"
+	"net/netip"
+)
+
+func MergeWithPointer[T any](existing, other *T) (result *T) {
+	if existing != nil {
+		return existing
+	} else if other == nil {
+		return nil
+	}
+	result = new(T)
+	*result = *other
+	return result
+}
+
+func MergeWithString(existing, other string) (result string) {
+	if existing != "" {
+		return existing
+	}
+	return other
+}
+
+func MergeWithNumber[T Number](existing, other T) (result T) { //nolint:ireturn
+	if existing != 0 {
+		return existing
+	}
+	return other
+}
+
+func MergeWithIP(existing, other netip.Addr) (result netip.Addr) {
+	if existing.IsValid() {
+		return existing
+	}
+	return other
+}
+
+func MergeWithHTTPHandler(existing, other http.Handler) (result http.Handler) {
+	if existing != nil {
+		return existing
+	}
+	return other
+}
+
+func MergeSlices[T comparable](a, b []T) (result []T) {
+	if a == nil && b == nil {
+		return nil
+	}
+
+	seen := make(map[T]struct{}, len(a)+len(b))
+	result = make([]T, 0, len(a)+len(b))
+	for _, s := range a {
+		if _, ok := seen[s]; ok {
+			continue // duplicate
+		}
+		result = append(result, s)
+		seen[s] = struct{}{}
+	}
+	for _, s := range b {
+		if _, ok := seen[s]; ok {
+			continue // duplicate
+		}
+		result = append(result, s)
+		seen[s] = struct{}{}
+	}
+	return result
+}

internal/configuration/settings/helpers/messages.go

@@ -0,0 +1,29 @@
+package helpers
+
+import (
+	"fmt"
+	"strings"
+)
+
+func ChoicesOrString(choices []string) string {
+	return strings.Join(
+		choices[:len(choices)-1], ", ") +
+		" or " + choices[len(choices)-1]
+}
+
+func PortChoicesOrString(ports []uint16) (s string) {
+	switch len(ports) {
+	case 0:
+		return "there is no allowed port"
+	case 1:
+		return "allowed port is " + fmt.Sprint(ports[0])
+	}
+
+	s = "allowed ports are "
+	portStrings := make([]string, len(ports))
+	for i := range ports {
+		portStrings[i] = fmt.Sprint(ports[i])
+	}
+	s += ChoicesOrString(portStrings)
+	return s
+}

internal/configuration/settings/helpers/obfuscate.go

@@ -0,0 +1,25 @@
+package helpers
+
+func ObfuscateWireguardKey(fullKey string) (obfuscatedKey string) {
+	const minKeyLength = 10
+	if len(fullKey) < minKeyLength {
+		return "(too short)"
+	}
+
+	lastIndex := len(fullKey) - 1
+	return fullKey[0:2] + "..." + fullKey[lastIndex-2:]
+}
+
+func ObfuscatePassword(password string) (obfuscatedPassword string) {
+	if password != "" {
+		return "[set]"
+	}
+	return "[not set]"
+}
+
+func ObfuscateData(data string) (obfuscated string) {
+	if data != "" {
+		return "[set]"
+	}
+	return "[not set]"
+}

internal/configuration/settings/helpers/override.go

@@ -0,0 +1,52 @@
+package helpers
+
+import (
+	"net/http"
+	"net/netip"
+)
+
+func OverrideWithPointer[T any](existing, other *T) (result *T) {
+	if other == nil {
+		return existing
+	}
+	result = new(T)
+	*result = *other
+	return result
+}
+
+func OverrideWithString(existing, other string) (result string) {
+	if other == "" {
+		return existing
+	}
+	return other
+}
+
+func OverrideWithNumber[T Number](existing, other T) (result T) { //nolint:ireturn
+	if other == 0 {
+		return existing
+	}
+	return other
+}
+
+func OverrideWithIP(existing, other netip.Addr) (result netip.Addr) {
+	if !other.IsValid() {
+		return existing
+	}
+	return other
+}
+
+func OverrideWithHTTPHandler(existing, other http.Handler) (result http.Handler) {
+	if other != nil {
+		return other
+	}
+	return existing
+}
+
+func OverrideWithSlice[T any](existing, other []T) (result []T) {
+	if other == nil {
+		return existing
+	}
+	result = make([]T, len(other))
+	copy(result, other)
+	return result
+}