Fix DNS_KEEP_NAMESERVER behavior

.devcontainer/.dockerignore

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

.devcontainer/Dockerfile

@@ -1,3 +1 @@
-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

.devcontainer/README.md

@@ -2,47 +2,67 @@
 
 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.
 
 ## 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,70 @@
-{
-    "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": "go mod download",
+    "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
+    ],
+    "settings": {
+        "files.eol": "\n",
+        "remote.extensionKind": {
+            "ms-azuretools.vscode-docker": "workspace"
+        },
+        "go.useLanguageServer": true,
+        "go.autocompleteUnimportedPackages": true,
+        "go.gotoSymbol.includeImports": true,
+        "go.gotoSymbol.includeGoroot": true,
+        "gopls": {
+            "completeUnimported": true,
+            "deepCompletion": true,
+            "usePlaceholders": false
+        },
+        "go.lintTool": "golangci-lint",
+        "go.buildOnSave": "workspace",
+        "go.lintOnSave": "workspace",
+        "go.vetOnSave": "workspace",
+        "editor.formatOnSave": true,
+        "[go]": {
+            "editor.codeActionsOnSave": {
+                "source.organizeImports": 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,25 @@
+version: "3.7"
+
+services:
+  vscode:
+    build: .
+    image: godevcontainer
+    volumes:
+      - ../:/workspace
+      # Docker socket to access Docker server
+      - /var/run/docker.sock:/var/run/docker.sock
+      # SSH directory
+      - ~/.ssh:/home/vscode/.ssh
+      - ~/.ssh:/root/.ssh
+      # Git config
+      - ~/.gitconfig:/home/districter/.gitconfig
+      - ~/.gitconfig:/root/.gitconfig
+    environment:
+      - TZ=
+    cap_add:
+      # For debugging with dlv
+      - SYS_PTRACE
+    security_opt:
+      # For debugging with dlv
+      - seccomp:unconfined
+    entrypoint: zsh -c "while sleep 1000; do :; done"

.dockerignore

@@ -1,10 +1,11 @@
 .devcontainer
 .git
 .github
+.vscode
+cmd
+!cmd/gluetun
 doc
 docker-compose.yml
-Dockerfile
 LICENSE
 README.md
 title.svg
-devrun

.github/CONTRIBUTING.md

@@ -4,15 +4,26 @@ Contributions are [released](https://help.github.com/articles/github-terms-of-se
 
 ## Submitting a pull request
 
-1. [Fork](https://github.com/passteque/gluetun/fork) and clone the repository
+1. [Fork](https://github.com/qdm12/gluetun/fork) and clone the repository
 1. Create a new branch `git checkout -b my-branch-name`
 1. Modify the code
-1. Ensure the docker build succeeds `docker build .` (you might need `export DOCKER_BUILDKIT=1`)
+1. Ensure the docker build succeeds `docker build .`
 1. Commit your modifications
-1. Push to your fork and [submit a pull request](https://github.com/passteque/gluetun/compare)
+1. Push to your fork and [submit a pull request](https://github.com/qdm12/gluetun/compare)
 
 ## Resources
 
-- [Gluetun guide on development](https://github.com/qdm12/gluetun-wiki/blob/main/contributing/development.md)
 - [Using Pull Requests](https://help.github.com/articles/about-pull-requests/)
 - [How to Contribute to Open Source](https://opensource.guide/how-to-contribute/)
+
+## Contributors
+
+Thanks for all the contributions, whether small or not so small!
+
+- [@JeordyR](https://github.com/JeordyR) for testing the Mullvad version and opening a [PR with a few fixes](https://github.com/qdm12/gluetun/pull/84/files) 👍
+- [@rorph](https://github.com/rorph) for a [PR to pick a random region for PIA](https://github.com/qdm12/gluetun/pull/70) and a [PR to make the container work with kubernetes](https://github.com/qdm12/gluetun/pull/69)
+- [@JesterEE](https://github.com/JesterEE) for a [PR to fix silly line endings in block lists back then](https://github.com/qdm12/gluetun/pull/55) 📎
+- [@elmerfdz](https://github.com/elmerfdz) for a [PR to add timezone information to have correct log timestampts](https://github.com/qdm12/gluetun/pull/51) 🕙
+- [@Juggels](https://github.com/Juggels) for a [PR to write the PIA forwarded port to a file](https://github.com/qdm12/gluetun/pull/43)
+- [@gdlx](https://github.com/gdlx) for a [PR to fix and improve PIA port forwarding script](https://github.com/qdm12/gluetun/pull/32)
+- [@janaz](https://github.com/janaz) for keeping an eye on [updating things in the Dockerfile](https://github.com/qdm12/gluetun/pull/8)

.github/ISSUE_TEMPLATE/bug.md

@@ -0,0 +1,37 @@
+---
+name: Bug
+about: Report a bug
+title: 'Bug: FILL THIS TEXT!'
+labels: ":bug: bug"
+assignees: qdm12
+
+---
+
+**Host OS** (approximate answer is fine too): Ubuntu 18
+
+**Is this urgent?**: No
+
+**What VPN provider are you using**:
+
+**What are you using to run your container?**: Docker Compose
+
+**What is the version of the program** (See the line at the top of your logs)
+
+```
+Running version latest built on 2020-03-13T01:30:06Z (commit d0f678c)
+```
+
+**What's the problem** 🤔
+
+That feature doesn't work
+
+**Share your logs...**
+
+...*careful to remove i.e. token information with PIA port forwarding*
+
+```log
+
+PASTE YOUR LOGS
+IN THERE
+
+```

.github/ISSUE_TEMPLATE/bug.yml

@@ -1,117 +0,0 @@
-name: Bug
-description: Report a bug
-title: "Bug: "
-labels: [":bug: bug"]
-body:
-  - type: markdown
-    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.
-      options:
-        - "No"
-        - "Yes"
-  - type: input
-    id: host-os
-    attributes:
-      label: Host OS
-      description: What is your host OS?
-      placeholder: "Debian Buster"
-  - type: dropdown
-    id: cpu-arch
-    attributes:
-      label: CPU arch
-      description: You can find it on Linux with `uname -m`.
-      options:
-        - x86_64
-        - aarch64
-        - armv7l
-        - "386"
-        - s390x
-        - ppc64le
-  - type: dropdown
-    id: vpn-service-provider
-    attributes:
-      label: VPN service provider
-      options:
-        - AirVPN
-        - Custom
-        - Cyberghost
-        - ExpressVPN
-        - FastestVPN
-        - Giganews
-        - HideMyAss
-        - IPVanish
-        - IVPN
-        - Mullvad
-        - NordVPN
-        - OVPN
-        - Privado
-        - Private Internet Access
-        - PrivateVPN
-        - ProtonVPN
-        - PureVPN
-        - SlickVPN
-        - Surfshark
-        - TorGuard
-        - VPNSecure.me
-        - VPNUnlimited
-        - VyprVPN
-        - Windscribe
-    validations:
-      required: true
-  - type: dropdown
-    id: docker
-    attributes:
-      label: What are you using to run the container
-      options:
-        - docker run
-        - docker-compose
-        - Portainer
-        - Kubernetes
-        - Podman
-        - Unraid
-        - Other
-    validations:
-      required: true
-  - type: input
-    id: version
-    attributes:
-      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)`.
-    validations:
-      required: true
-  - type: textarea
-    id: problem
-    attributes:
-      label: "What's the problem 🤔"
-      placeholder: "That feature does not work..."
-    validations:
-      required: true
-  - type: textarea
-    id: logs
-    attributes:
-      label: Share your logs (at least 10 lines)
-      description: No sensitive information is logged out except when running with `LOG_LEVEL=debug`.
-      render: plain text
-    validations:
-      required: true
-  - type: textarea
-    id: config
-    attributes:
-      label: Share your configuration
-      description: Share your configuration such as `docker-compose.yml`. Ensure to remove credentials.
-      render: yml

.github/ISSUE_TEMPLATE/config.yml

@@ -1,11 +0,0 @@
-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/passteque/gluetun/discussions/new/choose
-    about: Please create a Github discussion.
-  - name: Unraid template issue
-    url: https://github.com/passteque/gluetun/discussions/550
-    about: Please read the relevant Github discussion.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest a feature to add to this project
+title: 'Feature request: FILL THIS TEXT!'
+labels: ":bulb: feature request"
+assignees: qdm12
+
+---
+
+**What's the feature?** 🧐
+
+- Support this new feature because that and that
+
+**Optional extra information** 🚀
+
+- I tried `docker run something` and it doesn't work
+- That [url](https://github.com/qdm12/gluetun) is interesting

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,19 +0,0 @@
-name: Feature request
-description: Suggest a feature to add to Gluetun
-title: "Feature request: "
-labels: [":bulb: feature request"]
-body:
-  - type: textarea
-    id: description
-    attributes:
-      label: "What's the feature 🧐"
-      placeholder: "Make the tunnel resistant to earth quakes"
-    validations:
-      required: true
-  - type: textarea
-    id: extra
-    attributes:
-      label: "Extra information and references"
-      placeholder: |
-        - I tried `docker run something` and it doesn't work
-        - That [url](https://github.com/qdm12/gluetun) is interesting

.github/ISSUE_TEMPLATE/help.md

@@ -0,0 +1,53 @@
+---
+name: Help
+about: Ask for help
+title: 'Help: FILL THIS TEXT!'
+labels: ":pray: help wanted"
+assignees:
+
+---
+
+**Host OS** (approximate answer is fine too): Ubuntu 18
+
+**Is this urgent?**: No
+
+**What VPN provider are you using**:
+
+**What is the version of the program** (See the line at the top of your logs)
+
+```
+Running version latest built on 2020-03-13T01:30:06Z (commit d0f678c)
+```
+
+**What's the problem** 🤔
+
+That feature doesn't work
+
+**Share your logs...**
+
+...*careful to remove i.e. token information with PIA port forwarding*
+
+```log
+
+PASTE YOUR LOGS
+IN THERE
+
+```
+
+**What are you using to run your container?**: Docker Compose
+
+Please also share your configuration file:
+
+```yml
+your .yml
+content
+in here
+```
+
+or
+
+```sh
+# your docker
+# run command
+# in here
+```

.github/ISSUE_TEMPLATE/provider.md

@@ -1,40 +0,0 @@
----
-name: Support a VPN provider
-about: Suggest a VPN provider to be supported
-title: 'VPN provider support: NAME OF THE PROVIDER'
-labels: ":bulb: New provider"
-
----
-
-Important notes:
-
-- 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 the list of servers **and attach** an example Openvpn configuration file for both TCP and UDP

.github/dependabot.yml

@@ -1,15 +0,0 @@
-version: 2
-updates:
-  # Maintain dependencies for GitHub Actions
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "daily"
-  - package-ecosystem: docker
-    directory: /
-    schedule:
-      interval: "daily"
-  - package-ecosystem: gomod
-    directory: /
-    schedule:
-      interval: "daily"

.github/labels.yml

@@ -1,158 +1,67 @@
-- name: "Status: 🗯️ Waiting for feedback"
-  color: "f7d692"
-- name: "Status: 🔴 Blocked"
-  color: "f7d692"
-  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"
-  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"
-
-- 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"
+- name: "Bug :bug:"
+  color: "b60205"
+  description: ""
+- name: "Feature request :bulb:"
+  color: "0e8a16"
+  description: ""
+- name: "Help wanted :pray:"
+  color: "4caf50"
+  description: ""
+- name: "Documentation :memo:"
+  color: "c5def5"
+  description: ""
+- name: "Needs more info :thinking:"
+  color: "795548"
+  description: ""
 
 # VPN providers
-- name: "☁️ AirVPN"
+- name: ":cloud: Cyberghost"
   color: "cfe8d4"
-- name: "☁️ Custom"
+  description: ""
+- name: ":cloud: Mullvad"
   color: "cfe8d4"
-- name: "☁️ Cyberghost"
+  description: ""
+- name: ":cloud: NordVPN"
   color: "cfe8d4"
-- name: "☁️ Giganews"
+  description: ""
+- name: ":cloud: PIA"
   color: "cfe8d4"
-- name: "☁️ HideMyAss"
+  description: ""
+- name: ":cloud: Privado"
   color: "cfe8d4"
-- name: "☁️ IPVanish"
+  description: ""
+- name: ":cloud: PureVPN"
   color: "cfe8d4"
-- name: "☁️ IVPN"
+  description: ""
+- name: ":cloud: Surfshark"
   color: "cfe8d4"
-- name: "☁️ ExpressVPN"
+  description: ""
+- name: ":cloud: Vyprvpn"
   color: "cfe8d4"
-- name: "☁️ FastestVPN"
-  color: "cfe8d4"
-- name: "☁️ Mullvad"
-  color: "cfe8d4"
-- name: "☁️ NordVPN"
-  color: "cfe8d4"
-- name: "☁️ OVPN"
-  color: "cfe8d4"
-- name: "☁️ Perfect Privacy"
-  color: "cfe8d4"
-- name: "☁️ PIA"
-  color: "cfe8d4"
-- name: "☁️ Privado"
-  color: "cfe8d4"
-- name: "☁️ PrivateVPN"
-  color: "cfe8d4"
-- name: "☁️ ProtonVPN"
-  color: "cfe8d4"
-- name: "☁️ PureVPN"
-  color: "cfe8d4"
-- name: "☁️ SlickVPN"
-  color: "cfe8d4"
-- name: "☁️ Surfshark"
-  color: "cfe8d4"
-- name: "☁️ Torguard"
-  color: "cfe8d4"
-- name: "☁️ VPNSecure.me"
-  color: "cfe8d4"
-- name: "☁️ VPNUnlimited"
-  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: "Unbound (DNS over TLS)"
   color: "ffc7ea"
-- name: "Category: Documentation ✒️"
-  description: "A problem with the readme or a code comment."
+  description: ""
+- name: "Firewall"
   color: "ffc7ea"
-- name: "Category: Maintenance ⛓️"
-  description: "Anything related to code or other maintenance"
+  description: ""
+- name: "HTTP proxy"
   color: "ffc7ea"
-- name: "Category: Logs 📚"
-  description: "Something to change in logs"
+  description: ""
+- name: "Shadowsocks"
   color: "ffc7ea"
-- name: "Category: Good idea 🎯"
-  description: "This is a good idea, judged by the maintainers"
+  description: ""
+- name: "Healthcheck server"
   color: "ffc7ea"
-- name: "Category: Motivated! 🙌"
-  description: "Your pumpness makes me pumped! The issue or PR shows great motivation!"
-  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: Socks5 proxy 🔁"
-  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/build.yml

@@ -0,0 +1,21 @@
+name: Docker build
+on:
+  pull_request:
+    branches: [master]
+    paths:
+      - .github/workflows/build.yml
+      - cmd/**
+      - internal/**
+      - .dockerignore
+      - .golangci.yml
+      - Dockerfile
+      - go.mod
+      - go.sum
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Build image
+        run: docker build .

.github/workflows/buildx-branch.yml

@@ -0,0 +1,39 @@
+name: Buildx branch
+on:
+  push:
+    branches:
+      - "*"
+      - "*/*"
+      - "!master"
+    paths:
+      - .github/workflows/buildx-branch.yml
+      - cmd/**
+      - internal/**
+      - .dockerignore
+      - .golangci.yml
+      - Dockerfile
+      - go.mod
+      - go.sum
+jobs:
+  buildx:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Buildx setup
+        uses: crazy-max/ghaction-docker-buildx@v3
+      - name: Dockerhub login
+        run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u qmcgaw --password-stdin 2>&1
+      - name: Run Buildx
+        run: |
+          docker buildx build \
+            --progress plain \
+            --platform=linux/amd64 \
+            --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+            --build-arg COMMIT=`git rev-parse --short HEAD` \
+            --build-arg VERSION=${GITHUB_REF##*/} \
+            -t qmcgaw/private-internet-access:${GITHUB_REF##*/} \
+            -t qmcgaw/gluetun:${GITHUB_REF##*/} \
+            --push \
+            .
+      - run: curl -X POST https://hooks.microbadger.com/images/qmcgaw/private-internet-access/tQFy7AxtSUNANPe6aoVChYdsI_I=
+        continue-on-error: true

.github/workflows/buildx-latest.yml

@@ -0,0 +1,36 @@
+name: Buildx latest
+on:
+  push:
+    branches: [master]
+    paths:
+      - .github/workflows/buildx-latest.yml
+      - cmd/**
+      - internal/**
+      - .dockerignore
+      - .golangci.yml
+      - Dockerfile
+      - go.mod
+      - go.sum
+jobs:
+  buildx:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Buildx setup
+        uses: crazy-max/ghaction-docker-buildx@v3
+      - name: Dockerhub login
+        run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u qmcgaw --password-stdin 2>&1
+      - name: Run Buildx
+        run: |
+          docker buildx build \
+            --progress plain \
+            --platform=linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/arm/v6 \
+            --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+            --build-arg COMMIT=`git rev-parse --short HEAD` \
+            --build-arg VERSION=latest \
+            -t qmcgaw/private-internet-access:latest \
+            -t qmcgaw/gluetun:latest \
+            --push \
+            .
+      - run: curl -X POST https://hooks.microbadger.com/images/qmcgaw/private-internet-access/tQFy7AxtSUNANPe6aoVChYdsI_I=
+        continue-on-error: true

.github/workflows/buildx-release.yml

@@ -0,0 +1,36 @@
+name: Buildx release
+on:
+  release:
+    types: [published]
+    paths:
+      - .github/workflows/buildx-release.yml
+      - cmd/**
+      - internal/**
+      - .dockerignore
+      - .golangci.yml
+      - Dockerfile
+      - go.mod
+      - go.sum
+jobs:
+  buildx:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Buildx setup
+        uses: crazy-max/ghaction-docker-buildx@v3
+      - name: Dockerhub login
+        run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u qmcgaw --password-stdin 2>&1
+      - name: Run Buildx
+        run: |
+          docker buildx build \
+            --progress plain \
+            --platform=linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/arm/v6 \
+            --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+            --build-arg COMMIT=`git rev-parse --short HEAD` \
+            --build-arg VERSION=${GITHUB_REF##*/} \
+            -t qmcgaw/private-internet-access:${GITHUB_REF##*/} \
+            -t qmcgaw/gluetun:${GITHUB_REF##*/} \
+            --push \
+            .
+      - run: curl -X POST https://hooks.microbadger.com/images/qmcgaw/private-internet-access/tQFy7AxtSUNANPe6aoVChYdsI_I=
+        continue-on-error: true

.github/workflows/ci-skip.yml

@@ -1,35 +0,0 @@
-name: No trigger file paths
-on:
-  push:
-    branches:
-      - master
-    paths-ignore:
-      - .github/workflows/ci.yml
-      - cmd/**
-      - internal/**
-      - pkg/**
-      - .dockerignore
-      - .golangci.yml
-      - Dockerfile
-      - go.mod
-      - go.sum
-  pull_request:
-    paths-ignore:
-      - .github/workflows/ci.yml
-      - cmd/**
-      - internal/**
-      - pkg/**
-      - .dockerignore
-      - .golangci.yml
-      - Dockerfile
-      - go.mod
-      - go.sum
-
-jobs:
-  verify:
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-    steps:
-      - name: No trigger path triggered for required verify workflow.
-        run: exit 0

.github/workflows/ci.yml

@@ -1,233 +0,0 @@
-name: CI
-on:
-  release:
-    types:
-      - published
-  push:
-    branches:
-      - master
-    paths:
-      - .github/workflows/ci.yml
-      - cmd/**
-      - internal/**
-      - pkg/**
-      - .dockerignore
-      - .golangci.yml
-      - Dockerfile
-      - go.mod
-      - go.sum
-  pull_request:
-    paths:
-      - .github/workflows/ci.yml
-      - cmd/**
-      - internal/**
-      - pkg/**
-      - .dockerignore
-      - .golangci.yml
-      - Dockerfile
-      - go.mod
-      - go.sum
-
-jobs:
-  verify:
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-    env:
-      DOCKER_BUILDKIT: "1"
-    steps:
-      - uses: actions/checkout@v6
-
-      - uses: reviewdog/action-misspell@v1
-        with:
-          locale: "US"
-          level: error
-          exclude: |
-            ./internal/storage/servers.json
-            ./.golangci.yml
-            *.md
-
-      - name: Linting
-        run: docker build --target lint .
-
-      - name: Mocks check
-        run: docker build --target mocks .
-
-      - name: Build test image
-        run: docker build --target test -t test-container .
-
-      - name: Run tests in test container
-        run: |
-          touch coverage.txt
-          docker run --rm --cap-add=NET_ADMIN --device /dev/net/tun \
-          -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-tools:
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-    steps:
-      - uses: actions/checkout@v6
-
-      - uses: actions/setup-go@v6
-        with:
-          go-version-file: ./devrun/go.mod
-      - run: go test ./...
-        working-directory: ./devrun
-
-      - uses: actions/setup-go@v6
-        with:
-          go-version-file: ./ci/go.mod
-      - run: go test ./...
-        working-directory: ./ci
-
-  verify-private:
-    if: |
-      github.repository == 'passteque/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 Wireguard and port forwarding
-          configuration
-        run: echo -e "${{ secrets.PROTONVPN_WIREGUARD_PRIVATE_KEY }}" | ./ci/runner
-          protonvpn-wireguard-port-forwarding
-
-      - name: Run Gluetun container with ProtonVPN OpenVPN and port forwarding
-          configuration
-        run: echo -e "${{ secrets.PROTONVPN_OPENVPN_USER }}\n${{
-          secrets.PROTONVPN_OPENVPN_PASSWORD }}" | ./ci/runner
-          protonvpn-openvpn-port-forwarding
-
-      - name: Run Gluetun container with Private Internet Access OpenVPN and port
-          forwarding configuration
-        run: echo -e "${{ secrets.PRIVATEINTERNETACCESS_OPENVPN_USER }}\n${{
-          secrets.PRIVATEINTERNETACCESS_OPENVPN_PASSWORD }}" | ./ci/runner
-          private-internet-access-openvpn-port-forwarding
-
-      - name: Run Gluetun container with AirVPN Wireguard configuration
-        run: echo -e "${{ secrets.AIRVPN_WIREGUARD_PRIVATE_KEY }}\n${{
-          secrets.AIRVPN_WIREGUARD_PRESHARED_KEY }}\n${{
-          secrets.AIRVPN_WIREGUARD_ADDRESSES }}" | ./ci/runner airvpn-wireguard
-
-      - name: Run Gluetun container with AirVPN OpenVPN configuration
-        run: echo -e "${{ secrets.AIRVPN_OPENVPN_KEY }}\n${{ secrets.AIRVPN_OPENVPN_CERT
-          }}" | ./ci/runner airvpn-openvpn
-
-  codeql:
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      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
-        with:
-          languages: go
-      - uses: github/codeql-action/autobuild@v4
-      - uses: github/codeql-action/analyze@v4
-
-  publish:
-    if: |
-      github.repository == 'passteque/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, verify-private, codeql ]
-    permissions:
-      actions: read
-      contents: read
-      packages: write
-    runs-on: ubuntu-latest
-    environment: secrets
-    steps:
-      - uses: actions/checkout@v6
-
-      # extract metadata (tags, labels) for Docker
-      # https://github.com/docker/metadata-action
-      - name: Extract Docker metadata
-        id: meta
-        uses: docker/metadata-action@v6
-        with:
-          flavor: |
-            latest=${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }}
-          images: |
-            ghcr.io/qdm12/gluetun
-            qmcgaw/gluetun
-            qmcgaw/private-internet-access
-          tags: |
-            type=ref,event=pr
-            type=semver,pattern=v{{major}}.{{minor}}.{{patch}}
-            type=semver,pattern=v{{major}}.{{minor}}
-            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/login-action@v4
-        with:
-          username: qmcgaw
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      - uses: docker/login-action@v4
-        with:
-          registry: ghcr.io
-          username: qdm12
-          password: ${{ secrets.GHCR_PAT }}
-
-      - 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
-
-      - name: Build and push final image
-        uses: docker/build-push-action@v7
-        with:
-          platforms: linux/amd64,linux/386,linux/arm64,linux/arm/v6,linux/arm/v7,linux/ppc64le
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            CREATED=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }}
-            COMMIT=${{ steps.shortcommit.outputs.value }}
-            VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
-          tags: ${{ steps.meta.outputs.tags }}
-          push: true

.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,17 +0,0 @@
-{
-  "ignorePatterns": [
-    {
-      "pattern": "^https://console.substack.com/p/console-72$"
-    },
-    {
-      "pattern": "^https://github.com/passteque/gluetun$"
-    }
-  ],
-  "timeout": "20s",
-  "retryOn429": false,
-  "fallbackRetryDelay": "30s",
-  "aliveStatusCodes": [
-    200,
-    429
-  ]
-}

.github/workflows/dockerhub-description.yml

@@ -0,0 +1,21 @@
+name: Docker Hub description
+on:
+  push:
+    branches: [master]
+    paths:
+      - README.md
+      - .github/workflows/dockerhub-description.yml
+jobs:
+  dockerHubDescription:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Docker Hub Description
+        uses: peter-evans/dockerhub-description@v2.4.1
+        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

@@ -7,11 +7,12 @@ on:
       - .github/workflows/labels.yml
 jobs:
   labeler:
-    permissions:
-      issues: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
-      - uses: crazy-max/ghaction-github-labeler@v6
-        with:
-          yaml-file: .github/labels.yml
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Labeler
+        if: success()
+        uses: crazy-max/ghaction-github-labeler@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.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,48 +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
-    environment: secrets
-    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 == 'passteque/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/misspell.yml

@@ -0,0 +1,16 @@
+name: Misspells
+on:
+  pull_request:
+    branches: [master]
+  push:
+    branches: [master]
+jobs:
+  misspell:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: reviewdog/action-misspell@master
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          locale: "US"
+          level: error

.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 == 'passteque/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 +0,0 @@
-scratch.txt
-.DS_Store

.golangci.yml

@@ -1,102 +1,31 @@
-version: "2"
-
-formatters:
-  enable:
-    - gci
-    - gofumpt
-    - goimports
-  exclusions:
-    generated: lax
-    paths:
-      - third_party$
-      - builtin$
-      - examples$
+linters-settings:
+  maligned:
+    suggest-new: true
+  misspell:
+    locale: US
 
+issues:
+  exclude-rules:
+    - path: _test\.go
+      linters:
+        - dupl
+        - maligned
+    - path: internal/unix/constants\.go
+      linters:
+        - golint
+      text: don't use ALL_CAPS in Go names; use CamelCase
 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
-      - linters:
-          - err113
-        text: "do not define dynamic errors, use wrapped static errors instead"
-
-    paths:
-      - third_party$
-      - builtin$
-      - examples$
+  disable-all: true
   enable:
-    # - cyclop
-    # - errorlint
-    - asasalint
     - asciicheck
-    - bidichk
     - bodyclose
-    - containedctx
-    - copyloopvar
-    - decorder
+    - deadcode
     - dogsled
     - dupl
-    - dupword
-    - durationcheck
-    - err113
-    - errchkjson
-    - errname
+    - errcheck
     - exhaustive
-    - fatcontext
-    - forcetypeassert
-    - gocheckcompilerdirectives
+    - exportloopref
+    - gci
     - gochecknoglobals
     - gochecknoinits
     - gocognit
@@ -105,43 +34,37 @@ linters:
     - gocyclo
     - godot
     - goheader
-    - gomoddirectives
+    - goimports
+    - golint
+    - gomnd
     - goprintffuncname
     - gosec
-    - gosmopolitan
-    - grouper
-    - importas
-    - interfacebloat
-    - intrange
-    - ireturn
+    - gosimple
+    - govet
+    - ineffassign
+    - interfacer
     - lll
-    - maintidx
-    - makezero
-    - mirror
+    - maligned
     - misspell
-    - mnd
-    - musttag
     - nakedret
     - nestif
-    - nilerr
-    - nilnil
     - noctx
     - nolintlint
-    - nosprintfhostport
-    - paralleltest
     - prealloc
-    - predeclared
-    - promlinter
-    - reassign
-    - revive
     - rowserrcheck
+    - scopelint
     - sqlclosecheck
-    - tagalign
-    - thelper
-    - tparallel
+    - staticcheck
+    - structcheck
+    - typecheck
     - unconvert
     - unparam
-    - usestdlibvars
-    - wastedassign
+    - unused
+    - varcheck
     - 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 +1,9 @@
 {
-  // This list should be kept to the strict minimum
-  // to develop this project.
-  "recommendations": [
-    "golang.go",
-    "davidanson.vscode-markdownlint",
-  ],
+    "recommendations": [
+        "shardulm94.trailing-spaces",
+        "ms-azuretools.vscode-docker",
+        "davidanson.vscode-markdownlint",
+        "IBM.output-colorizer",
+        "golang.go"
+    ]
 }

.vscode/settings.json

@@ -1,29 +1,91 @@
 {
-  // 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"
+    // General settings
+    "files.eol": "\n",
+    // Docker
+    "remote.extensionKind": {
+        "ms-azuretools.vscode-docker": "workspace"
+    },
+    // Golang general settings
+    "go.useLanguageServer": true,
+    "go.autocompleteUnimportedPackages": true,
+    "go.gotoSymbol.includeImports": true,
+    "go.gotoSymbol.includeGoroot": true,
+    "gopls": {
+        "completeUnimported": true,
+        "deepCompletion": true,
+        "usePlaceholders": false
+    },
+    "go.lintTool": "golangci-lint",
+    "go.lintFlags": [
+        "--fast",
+        "--enable",
+        "rowserrcheck",
+        "--enable",
+        "bodyclose",
+        "--enable",
+        "dogsled",
+        "--enable",
+        "dupl",
+        "--enable",
+        "gochecknoglobals",
+        "--enable",
+        "gochecknoinits",
+        "--enable",
+        "gocognit",
+        "--enable",
+        "goconst",
+        "--enable",
+        "gocritic",
+        "--enable",
+        "gocyclo",
+        "--enable",
+        "goimports",
+        "--enable",
+        "golint",
+        "--enable",
+        "gosec",
+        "--enable",
+        "interfacer",
+        "--enable",
+        "maligned",
+        "--enable",
+        "misspell",
+        "--enable",
+        "nakedret",
+        "--enable",
+        "prealloc",
+        "--enable",
+        "scopelint",
+        "--enable",
+        "unconvert",
+        "--enable",
+        "unparam",
+        "--enable",
+        "whitespace"
+    ],
+    // Golang on save
+    "go.buildOnSave": "workspace",
+    "go.lintOnSave": "workspace",
+    "go.vetOnSave": "workspace",
+    "editor.formatOnSave": true,
+    "[go]": {
+        "editor.codeActionsOnSave": {
+            "source.organizeImports": true
+        }
+    },
+    // Golang testing
+    "go.toolsEnvVars": {
+        "GOFLAGS": "-tags="
+    },
+    "gopls.env": {
+        "GOFLAGS": "-tags="
+    },
+    "go.testEnvVars": {},
+    "go.testFlags": [
+        "-v",
+        // "-race"
+    ],
+    "go.testTimeout": "600s",
+    "go.coverOnSingleTestFile": true,
+    "go.coverOnSingleTest": true
 }

.vscode/tasks.json

@@ -1,81 +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"
-            ],
-        },
-        {
-            "label": "Devrun",
-            "type": "shell",
-            "command": "go run ./cmd/main.go run ${input:devrunProvider} ${input:devrunVPNProtocol} ${input:devrunExtraFlags}",
-            "options": {
-                "cwd": "${workspaceFolder}/devrun"
-            },
-            "problemMatcher": []
-        }
-    ],
-    "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",
-        },
-        {
-            "id": "devrunProvider",
-            "type": "promptString",
-            "description": "Please enter a single provider",
-        },
-        {
-            "id": "devrunVPNProtocol",
-            "type": "pickString",
-            "description": "VPN protocol to use",
-            "options": [
-                "wireguard",
-                "openvpn"
-            ],
-            "default": "wireguard"
-        },
-        {
-            "id": "devrunExtraFlags",
-            "type": "promptString",
-            "description": "Extra flags (optional)",
-            "default": ""
-        },
-    ]
-}

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,236 +1,109 @@
-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 MOCKGEN_VERSION=v1.6.0
-ARG BUILDPLATFORM=linux/amd64
+ARG ALPINE_VERSION=3.12
+ARG GO_VERSION=1.15
 
-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} 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
+FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS builder
+RUN apk --update add git
 ENV CGO_ENABLED=0
-COPY --from=golangci-lint /bin /go/bin/golangci-lint
-COPY --from=mockgen /bin /go/bin/mockgen
+ARG GOLANGCI_LINT_VERSION=v1.34.1
+RUN wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s ${GOLANGCI_LINT_VERSION}
 WORKDIR /tmp/gobuild
+COPY .golangci.yml .
 COPY go.mod go.sum ./
 RUN go mod download
-COPY cmd/ ./cmd/
-COPY internal/ ./internal/
-
-FROM --platform=${BUILDPLATFORM} base AS test
-# Note on the go race detector:
-# - we set CGO_ENABLED=1 to have it enabled
-# - we installed g++ to support the race detector
-ENV CGO_ENABLED=1
-ENTRYPOINT go test -race -coverpkg=./... -coverprofile=coverage.txt -covermode=atomic ./...
-
-FROM --platform=${BUILDPLATFORM} base AS lint
-COPY .golangci.yml ./
-RUN golangci-lint run
-
-FROM --platform=${BUILDPLATFORM} base AS mocks
-RUN git init && \
-    git config user.email ci@localhost && \
-    git config user.name ci && \
-    git config core.fileMode false && \
-    git add -A && \
-    git commit -m "snapshot" && \
-    grep -lr -E '^// Code generated by MockGen\. DO NOT EDIT\.$' . | xargs -r -d '\n' rm && \
-    go generate -run "mockgen" ./... && \
-    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
-ARG CREATED="an unknown date"
+ARG BUILD_DATE="an unknown date"
 ARG COMMIT=unknown
-RUN GOARCH="$(xcputranslate translate -field arch -targetplatform ${TARGETPLATFORM})" \
-    GOARM="$(xcputranslate translate -field arm -targetplatform ${TARGETPLATFORM})" \
-    go build -trimpath -ldflags="-s -w \
+COPY cmd/gluetun/main.go .
+COPY internal/ ./internal/
+RUN go test ./...
+RUN golangci-lint run --timeout=10m
+RUN go build -trimpath -ldflags="-s -w \
     -X 'main.version=$VERSION' \
-    -X 'main.created=$CREATED' \
+    -X 'main.buildDate=$BUILD_DATE' \
     -X 'main.commit=$COMMIT' \
-    " -o entrypoint cmd/gluetun/main.go
+    " -o entrypoint main.go
 
 FROM alpine:${ALPINE_VERSION}
 ARG VERSION=unknown
-ARG CREATED="an unknown date"
+ARG BUILD_DATE="an unknown date"
 ARG COMMIT=unknown
 LABEL \
     org.opencontainers.image.authors="quentin.mcgaw@gmail.com" \
-    org.opencontainers.image.created=$CREATED \
+    org.opencontainers.image.created=$BUILD_DATE \
     org.opencontainers.image.version=$VERSION \
     org.opencontainers.image.revision=$COMMIT \
-    org.opencontainers.image.url="https://github.com/passteque/gluetun" \
-    org.opencontainers.image.documentation="https://github.com/passteque/gluetun" \
-    org.opencontainers.image.source="https://github.com/passteque/gluetun" \
+    org.opencontainers.image.url="https://github.com/qdm12/gluetun" \
+    org.opencontainers.image.documentation="https://github.com/qdm12/gluetun" \
+    org.opencontainers.image.source="https://github.com/qdm12/gluetun" \
     org.opencontainers.image.title="VPN swiss-knife like client for multiple VPN providers" \
     org.opencontainers.image.description="VPN swiss-knife like client to tunnel to multiple VPN servers using OpenVPN, IPtables, DNS over TLS, Shadowsocks, an HTTP proxy and Alpine Linux"
-ENV VPN_SERVICE_PROVIDER=pia \
-    VPN_TYPE=openvpn \
-    # Common VPN options
-    VPN_INTERFACE=tun0 \
-    # OpenVPN
-    OPENVPN_ENDPOINT_IP= \
-    OPENVPN_ENDPOINT_PORT= \
-    OPENVPN_PROTOCOL=udp \
+ENV VPNSP=pia \
+    VERSION_INFORMATION=on \
+    PROTOCOL=udp \
+    OPENVPN_VERBOSITY=1 \
+    OPENVPN_ROOT=no \
+    OPENVPN_TARGET_IP= \
+    OPENVPN_IPV6=off \
+    TZ= \
+    PUID= \
+    PGID= \
+    PUBLICIP_FILE="/tmp/gluetun/ip" \
+    # PIA, Windscribe, Surfshark, Cyberghost, Vyprvpn, NordVPN, PureVPN only
     OPENVPN_USER= \
     OPENVPN_PASSWORD= \
-    OPENVPN_USER_SECRETFILE=/run/secrets/openvpn_user \
-    OPENVPN_PASSWORD_SECRETFILE=/run/secrets/openvpn_password \
-    OPENVPN_VERSION=2.6 \
-    OPENVPN_VERBOSITY=1 \
-    OPENVPN_FLAGS= \
-    OPENVPN_CIPHERS= \
-    OPENVPN_AUTH= \
-    OPENVPN_PROCESS_USER=root \
-    OPENVPN_MSSFIX= \
-    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= \
-    # 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:
+    USER_SECRETFILE=/run/secrets/openvpn_user \
+    PASSWORD_SECRETFILE=/run/secrets/openvpn_password \
+    REGION= \
+    # PIA only
+    PIA_ENCRYPTION=strong \
+    PORT_FORWARDING=off \
+    PORT_FORWARDING_STATUS_FILE="/tmp/gluetun/forwarded_port" \
+    # Mullvad and PureVPN only
+    COUNTRY= \
+    # Mullvad, PureVPN, Windscribe only
+    CITY= \
+    # Windscribe only
+    SERVER_HOSTNAME= \
+    # Mullvad only
     ISP= \
-    OWNED_ONLY=no \
-    # # Private Internet Access only:
-    PRIVATE_INTERNET_ACCESS_OPENVPN_ENCRYPTION_PRESET= \
-    VPN_PORT_FORWARDING_USERNAME= \
-    VPN_PORT_FORWARDING_PASSWORD= \
-    # # Cyberghost only:
-    OPENVPN_CERT= \
-    OPENVPN_KEY= \
+    OWNED=no \
+    # Mullvad and Windscribe only
+    PORT= \
+    # Cyberghost only
+    CYBERGHOST_GROUP="Premium UDP Europe" \
     OPENVPN_CLIENTCRT_SECRETFILE=/run/secrets/openvpn_clientcrt \
     OPENVPN_CLIENTKEY_SECRETFILE=/run/secrets/openvpn_clientkey \
-    # # VPNSecure only:
-    OPENVPN_ENCRYPTED_KEY= \
-    OPENVPN_ENCRYPTED_KEY_SECRETFILE=/run/secrets/openvpn_encrypted_key \
-    OPENVPN_KEY_PASSPHRASE= \
-    OPENVPN_KEY_PASSPHRASE_SECRETFILE=/run/secrets/openvpn_key_passphrase \
-    # # Nordvpn only:
+    # NordVPN only
     SERVER_NUMBER= \
-    # # PIA only:
-    SERVER_NAMES= \
-    # # VPNUnlimited and ProtonVPN only:
-    STREAM_ONLY= \
-    FREE_ONLY= \
-    # # ProtonVPN only:
-    SECURE_CORE_ONLY= \
-    TOR_ONLY= \
-    # # Surfshark and ovpn only:
-    MULTIHOP_ONLY= \
-    # # VPN Secure only:
-    PREMIUM_ONLY= \
-    # # PIA and ProtonVPN only:
-    PORT_FORWARD_ONLY= \
-    # # Ovpn only:
-    SERVER_DEDICATED=no \
-    # Firewall
-    FIREWALL_ENABLED_DISABLING_IT_SHOOTS_YOU_IN_YOUR_FOOT=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 \
-    # 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_SERVER=on \
-    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 \
+    # Openvpn
+    OPENVPN_CIPHER= \
+    OPENVPN_AUTH= \
+    # 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:0:0/96 \
+    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_PLAINTEXT_ADDRESS=1.1.1.1 \
+    DNS_KEEP_NAMESERVER=off \
+    # Firewall
+    FIREWALL=on \
+    FIREWALL_VPN_INPUT_PORTS= \
+    FIREWALL_INPUT_PORTS= \
+    FIREWALL_OUTBOUND_SUBNETS= \
+    FIREWALL_DEBUG=off \
     # HTTP proxy
     HTTPPROXY= \
     HTTPPROXY_LOG=off \
-    HTTPPROXY_LISTENING_ADDRESS=":8888" \
-    HTTPPROXY_STEALTH=off \
+    HTTPPROXY_PORT=8888 \
     HTTPPROXY_USER= \
     HTTPPROXY_PASSWORD= \
     HTTPPROXY_USER_SECRETFILE=/run/secrets/httpproxy_user \
@@ -238,56 +111,19 @@ ENV VPN_SERVICE_PROVIDER=pia \
     # Shadowsocks
     SHADOWSOCKS=off \
     SHADOWSOCKS_LOG=off \
-    SHADOWSOCKS_LISTENING_ADDRESS=":8388" \
+    SHADOWSOCKS_PORT=8388 \
     SHADOWSOCKS_PASSWORD= \
     SHADOWSOCKS_PASSWORD_SECRETFILE=/run/secrets/shadowsocks_password \
-    SHADOWSOCKS_CIPHER=chacha20-ietf-poly1305 \
-    # Socks5
-    SOCKS5_ENABLED=off \
-    SOCKS5_LISTENING_ADDRESS=":1080" \
-    SOCKS5_USER= \
-    SOCKS5_PASSWORD= \
-    # 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_PREFER_DIRECT_DOWNLOAD=no \
-    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_SERVERS_ENABLED=on \
-    STORAGE_SERVERS_DIRECTORY_PATH=/gluetun/servers/ \
-    # Pprof
-    PPROF_ENABLED=no \
-    PPROF_BLOCK_PROFILE_RATE=0 \
-    PPROF_MUTEX_PROFILE_RATE=0 \
-    PPROF_HTTP_SERVER_ADDRESS=":6060" \
-    # Extras
-    VERSION_INFORMATION=on \
-    TZ= \
-    PUID=1000 \
-    PGID=1000
-ENTRYPOINT ["/gluetun-entrypoint"]
-EXPOSE 8000/tcp 8888/tcp 8388/tcp 8388/udp 1080/tcp
-HEALTHCHECK --interval=5s --timeout=5s --start-period=10s --retries=3 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 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 && \
+    SHADOWSOCKS_METHOD=chacha20-ietf-poly1305 \
+    UPDATER_PERIOD=0
+ENTRYPOINT ["/entrypoint"]
+EXPOSE 8000/tcp 8888/tcp 8388/tcp 8388/udp
+HEALTHCHECK --interval=5s --timeout=5s --start-period=10s --retries=1 CMD /entrypoint healthcheck
+RUN apk add -q --progress --no-cache --update openvpn ca-certificates iptables ip6tables unbound tzdata && \
+    rm -rf /var/cache/apk/* /etc/unbound/* /usr/sbin/unbound-* && \
     deluser openvpn && \
+    deluser unbound && \
     mkdir /gluetun
-COPY --from=build /tmp/gobuild/entrypoint /gluetun-entrypoint
+# TODO remove once SAN is added to PIA servers certificates, see https://github.com/pia-foss/manual-connections/issues/10
+ENV GODEBUG=x509ignoreCN=0
+COPY --from=builder /tmp/gobuild/entrypoint /entrypoint

README.md

@@ -1,138 +1,132 @@
-# Gluetun VPN client
-
-Lightweight swiss-army-knife-like VPN client to multiple VPN service providers
-
-⚠️ This and [gluetun-wiki](https://github.com/qdm12/gluetun-wiki) are the only websites for Gluetun, other websites claiming to be official are scams ⚠️
-
-🗯️ this repository will be migrated to [github.com/passteque/gluetun](https://github.com/passteque/gluetun) on 2026-05-21, which is a Github organization under my sole control, so don't get alarmed if you get redirected in the coming days 😉 Reason being migrating Github sponsors to the Open source collective due to my personal situation, basically annoying paperwork. On the plus side, it will be more transparent and funds donated will only be used for the project. The Docker image names will remain the same.
-
-![Title image](https://raw.githubusercontent.com/passteque/gluetun/master/title.svg)
-
-[![Build status](https://github.com/passteque/gluetun/actions/workflows/ci.yml/badge.svg)](https://github.com/passteque/gluetun/actions/workflows/ci.yml)
-
-[![Docker pulls qmcgaw/gluetun](https://img.shields.io/docker/pulls/qmcgaw/gluetun.svg)](https://hub.docker.com/r/qmcgaw/gluetun)
-[![Docker pulls qmcgaw/private-internet-access](https://img.shields.io/docker/pulls/qmcgaw/private-internet-access.svg)](https://hub.docker.com/r/qmcgaw/gluetun)
-
-[![Docker stars qmcgaw/gluetun](https://img.shields.io/docker/stars/qmcgaw/gluetun.svg)](https://hub.docker.com/r/qmcgaw/gluetun)
-[![Docker stars qmcgaw/private-internet-access](https://img.shields.io/docker/stars/qmcgaw/private-internet-access.svg)](https://hub.docker.com/r/qmcgaw/gluetun)
-
-![Last release](https://img.shields.io/github/release/passteque/gluetun?label=Last%20release)
-![Last Docker tag](https://img.shields.io/docker/v/qmcgaw/gluetun?sort=semver&label=Last%20Docker%20tag)
-[![Last release size](https://img.shields.io/docker/image-size/qmcgaw/gluetun?sort=semver&label=Last%20released%20image)](https://hub.docker.com/r/qmcgaw/gluetun/tags?page=1&ordering=last_updated)
-![GitHub last release date](https://img.shields.io/github/release-date/passteque/gluetun?label=Last%20release%20date)
-![Commits since release](https://img.shields.io/github/commits-since/passteque/gluetun/latest?sort=semver)
-
-[![Latest size](https://img.shields.io/docker/image-size/qmcgaw/gluetun/latest?label=Latest%20image)](https://hub.docker.com/r/qmcgaw/gluetun/tags)
-
-[![GitHub last commit](https://img.shields.io/github/last-commit/passteque/gluetun.svg)](https://github.com/passteque/gluetun/commits/master)
-[![GitHub commit activity](https://img.shields.io/github/commit-activity/y/passteque/gluetun.svg)](https://github.com/passteque/gluetun/graphs/contributors)
-[![GitHub closed PRs](https://img.shields.io/github/issues-pr-closed/passteque/gluetun.svg)](https://github.com/passteque/gluetun/pulls?q=is%3Apr+is%3Aclosed)
-[![GitHub issues](https://img.shields.io/github/issues/passteque/gluetun.svg)](https://github.com/passteque/gluetun/issues)
-[![GitHub closed issues](https://img.shields.io/github/issues-closed/passteque/gluetun.svg)](https://github.com/passteque/gluetun/issues?q=is%3Aissue+is%3Aclosed)
-
-![Code size](https://img.shields.io/github/languages/code-size/passteque/gluetun)
-![GitHub repo size](https://img.shields.io/github/repo-size/passteque/gluetun)
-![Go version](https://img.shields.io/github/go-mod/go-version/passteque/gluetun)
-
-![Visitors count](https://visitor-badge.laobi.icu/badge?page_id=gluetun.readme)
-
-## Quick links
-
-- [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)
-  - [Start a discussion](https://github.com/passteque/gluetun/discussions)
-  - [Fix the Unraid template](https://github.com/passteque/gluetun/discussions/550)
-- Suggestion?
-  - [Create an issue](https://github.com/passteque/gluetun/issues)
-- 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)
-- Video:
-
-  [![Video Gif](https://i.imgur.com/CetWunc.gif)](https://youtu.be/0F6I03LQcI4)
-
-- [Substack Console interview](https://console.substack.com/p/console-72)
-
-## 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**, **Ovpn**, **Perfect Privacy**, **Privado**, **Private Internet Access**, **PrivateVPN**, **ProtonVPN**, **PureVPN**,  **SlickVPN**, **Surfshark**, **TorGuard**, **VPNSecure.me**, **VPNUnlimited**, **Vyprvpn**, **Windscribe** servers
-- Supports OpenVPN for all providers listed
-- Supports Wireguard both kernelspace and userspace
-  - For **AirVPN**, **FastestVPN**, **Ivpn**, **Mullvad**, **NordVPN**, **Ovpn**, **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)
-  - More in progress, see [#134](https://github.com/passteque/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 Socks5 proxy server (tunnels TCP) - partial credits to @angelakis and @adjscent
-- 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)
-- 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)
-- Possibility of split horizon DNS by selecting multiple DNS over TLS providers
-- 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)!
-
-[🐛 Found a bug in the Wiki?!](https://github.com/qdm12/gluetun-wiki/issues/new/choose)
-
-Here's a docker-compose.yml for the laziest:
-
-```yml
----
-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
-    cap_add:
-      - NET_ADMIN
-    devices:
-      - /dev/net/tun:/dev/net/tun
-    ports:
-      - 8888:8888/tcp # HTTP proxy
-      - 8388:8388/tcp # Shadowsocks
-      - 8388:8388/udp # Shadowsocks
-    volumes:
-      - /yourpath:/gluetun
-    environment:
-      # See https://github.com/qdm12/gluetun-wiki/tree/main/setup#setup
-      - VPN_SERVICE_PROVIDER=ivpn
-      - VPN_TYPE=openvpn
-      # OpenVPN:
-      - OPENVPN_USER=
-      - OPENVPN_PASSWORD=
-      # Wireguard:
-      # - WIREGUARD_PRIVATE_KEY=wOEI9rqqbDwnN8/Bpp22sVz48T71vJ4fYmFWujulwUU=
-      # - 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
-      - UPDATER_PERIOD=
-```
-
-🆕 Image also available as `ghcr.io/qdm12/gluetun`
-
-## Fun graphs
-
-[![Star History Chart](https://api.star-history.com/svg?repos=passteque/gluetun&type=date&legend=top-left)](https://www.star-history.com/#passteque/gluetun&type=date&legend=top-left)
-
-## License
-
-[![MIT](https://img.shields.io/github/license/passteque/gluetun)](https://github.com/passteque/gluetun/blob/master/LICENSE)
+# Gluetun VPN client
+
+*Lightweight swiss-knife-like VPN client to tunnel to Private Internet Access,
+Mullvad, Windscribe, Surfshark Cyberghost, VyprVPN, NordVPN, PureVPN and Privado VPN servers, using Go, OpenVPN, iptables, DNS over TLS, ShadowSocks and an HTTP proxy*
+
+**ANNOUNCEMENT**: *New Docker image name `qmcgaw/gluetun`*
+
+<img height="250" src="https://raw.githubusercontent.com/qdm12/gluetun/master/title.svg?sanitize=true">
+
+[![Size](https://img.shields.io/docker/image-size/qmcgaw/gluetun?sort=semver&label=Last%20released%20image)](https://hub.docker.com/r/qmcgaw/gluetun/tags?page=1&ordering=last_updated)
+[![Size](https://img.shields.io/docker/image-size/qmcgaw/gluetun/latest?label=Latest%20image)](https://hub.docker.com/r/qmcgaw/gluetun/tags)
+
+[![Docker Pulls](https://img.shields.io/docker/pulls/qmcgaw/private-internet-access.svg)](https://hub.docker.com/r/qmcgaw/private-internet-access)
+[![Docker Pulls](https://img.shields.io/docker/pulls/qmcgaw/gluetun.svg)](https://hub.docker.com/r/qmcgaw/gluetun)
+
+![Last release](https://img.shields.io/github/release/qdm12/gluetun?label=Last%20release)
+![Last Docker tag](https://img.shields.io/docker/v/qmcgaw/gluetun?sort=semver&label=Last%20Docker%20tag)
+![GitHub Release Date](https://img.shields.io/github/release-date/qdm12/gluetun?label=Last%20release%20date)
+
+![Commits since release](https://img.shields.io/github/commits-since/qdm12/gluetun/latest?sort=semver)
+[![GitHub last commit](https://img.shields.io/github/last-commit/qdm12/gluetun.svg)](https://github.com/qdm12/gluetun/commits)
+
+[![Lines of code](https://img.shields.io/tokei/lines/github/qdm12/gluetun)](https://github.com/qdm12/gluetun)
+
+## Quick links
+
+- Problem or suggestion?
+  - [Start a discussion](https://github.com/qdm12/gluetun/discussions)
+  - [Create an issue](https://github.com/qdm12/gluetun/issues)
+  - [Check the Wiki](https://github.com/qdm12/gluetun/wiki)
+  - [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)
+
+## Features
+
+- Based on Alpine 3.12 for a small Docker image of 52MB
+- Supports **Private Internet Access**, **Mullvad**, **Windscribe**, **Surfshark**, **Cyberghost**, **Vyprvpn**, **NordVPN**, **PureVPN** and **Privado** servers
+- Supports Openvpn only 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 (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/Connect-to-gluetun)
+- [Connect LAN devices to it](https://github.com/qdm12/gluetun/wiki/Connect-to-gluetun)
+- Compatible with amd64, i686 (32 bit), **ARM** 64 bit, ARM 32 bit v6 and v7 🎆
+- VPN server side port forwarding for Private Internet Access and Vyprvpn
+- Possibility of split horizon DNS by selecting multiple DNS over TLS providers
+- Subprograms all drop root privileges once launched
+- Subprograms output streams are all merged together
+- Can work as a Kubernetes sidecar container, thanks @rorph
+
+## Setup
+
+1. On some devices you may need to setup your tunnel kernel module on your host with `insmod /lib/modules/tun.ko` or `modprobe tun`
+    - [Synology users Wiki page](https://github.com/qdm12/gluetun/wiki/Synology-setup)
+1. Launch the container with:
+
+    ```bash
+    docker run -d --name gluetun --cap-add=NET_ADMIN \
+    -e VPNSP="private internet access" -e REGION="CA Montreal" \
+    -e OPENVPN_USER=js89ds7 -e OPENVPN_PASSWORD=8fd9s239G \
+    -v /yourpath:/gluetun \
+    qmcgaw/gluetun
+    ```
+
+    or use [docker-compose.yml](https://github.com/qdm12/gluetun/blob/master/docker-compose.yml) with:
+
+    ```bash
+    echo "your openvpn username" > openvpn_user
+    echo "your openvpn password" > openvpn_password
+    docker-compose up -d
+    ```
+
+    You should probably check the many [environment variables](https://github.com/qdm12/gluetun/wiki/Environment-variables) available to adapt the container to your needs.
+
+## Further setup
+
+The following points are all optional but should give you insights on all the possibilities with this container.
+
+- Use [Docker secrets](https://github.com/qdm12/gluetun/wiki/Docker-secrets) to read your credentials instead of environment variables
+- [Test your setup](https://github.com/qdm12/gluetun/wiki/Test-your-setup)
+- [How to connect other containers and devices to Gluetun](https://github.com/qdm12/gluetun/wiki/Connect-to-gluetun)
+- [VPN server side port forwarding](https://github.com/qdm12/gluetun/wiki/Port-forwarding)
+- [HTTP control server](https://github.com/qdm12/gluetun/wiki/HTTP-Control-server) to automate things, restart Openvpn etc.
+- Update the image with `docker pull qmcgaw/gluetun:latest`. See this [Wiki document](https://github.com/qdm12/gluetun/wiki/Docker-image-tags) for Docker tags available.
+
+## Development
+
+- 💻 [Contribute with code](https://github.com/qdm12/gluetun/wiki/Development) ([existing contributors 👍](https://github.com/qdm12/gluetun/blob/master/.github/CONTRIBUTING.md#Contributors))
+- [List of issues and feature requests](https://github.com/qdm12/gluetun/issues)
+- [Kanban board](https://github.com/qdm12/gluetun/projects/1)
+
+## License
+
+[![MIT](https://img.shields.io/github/license/qdm12/gluetun)](https://github.com/qdm12/gluetun/master/LICENSE)
+
+## Support
+
+- Sponsor me on [Github](https://github.com/sponsors/qdm12) or donate to [paypal.me/qmcgaw](https://www.paypal.me/qmcgaw)
+
+  [![https://github.com/sponsors/qdm12](https://raw.githubusercontent.com/qdm12/gluetun/master/doc/sponsors.jpg)](https://github.com/sponsors/qdm12)
+  [![https://www.paypal.me/qmcgaw](https://raw.githubusercontent.com/qdm12/gluetun/master/doc/paypal.jpg)](https://www.paypal.me/qmcgaw)
+
+- Contribute to the issues and discussions on Github
+- Many thanks to @Frepke, @Ralph521, G. Mendez, M. Otmar Weber, J. Perez, A. Cooper and **others** for supporting me financially 🥇👍
+
+## Metadata
+
+[![GitHub commit activity](https://img.shields.io/github/commit-activity/y/qdm12/gluetun.svg)](https://github.com/qdm12/gluetun/commits)
+[![GitHub closed PRs](https://img.shields.io/github/issues-pr-closed/qdm12/gluetun.svg)](https://github.com/qdm12/gluetun/pulls?q=is%3Apr+is%3Aclosed)
+
+[![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)
+
+![Visitors count](https://visitor-badge.laobi.icu/badge?page_id=gluetun.readme)
+![GitHub stars](https://img.shields.io/github/stars/qdm12/gluetun?style=social)
+![GitHub watchers](https://img.shields.io/github/watchers/qdm12/gluetun?style=social)
+![Contributors](https://img.shields.io/github/contributors/qdm12/gluetun)
+![GitHub forks](https://img.shields.io/github/forks/qdm12/gluetun?style=social)
+
+![Code size](https://img.shields.io/github/languages/code-size/qdm12/gluetun)
+![GitHub repo size](https://img.shields.io/github/repo-size/qdm12/gluetun)
+
+[![dockeri.co](https://dockeri.co/image/qmcgaw/gluetun)](https://hub.docker.com/r/qmcgaw/gluetun)
+
+![Docker Layers for latest](https://img.shields.io/microbadger/layers/qmcgaw/gluetun/latest?label=Docker%20image%20layers)
+![Go version](https://img.shields.io/github/go-mod/go-version/qdm12/gluetun)

ci/cmd/main.go

@@ -1,45 +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-wireguard-port-forwarding":
-		err = internal.ProtonVPNWireguardPortForwardingTest(ctx, logger)
-	case "protonvpn-openvpn-port-forwarding":
-		err = internal.ProtonVPNOpenVPNPortForwardingTest(ctx, logger)
-	case "private-internet-access-openvpn-port-forwarding":
-		err = internal.PrivateInternetAccessOpenVPNPortForwardingTest(ctx, logger)
-	case "airvpn-wireguard":
-		err = internal.AirVPNWireguardTest(ctx, logger)
-	case "airvpn-openvpn":
-		err = internal.AirVPNOpenVPNTest(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/airvpn.go

@@ -1,54 +0,0 @@
-package internal
-
-import (
-	"context"
-	"fmt"
-	"regexp"
-	"time"
-)
-
-func AirVPNWireguardTest(ctx context.Context, logger Logger) error {
-	expectedSecrets := []string{
-		"Wireguard private key",
-		"Wireguard preshared key",
-		"Wireguard addresses",
-	}
-	secrets, err := readSecrets(ctx, expectedSecrets, logger)
-	if err != nil {
-		return fmt.Errorf("reading secrets: %w", err)
-	}
-
-	env := []string{
-		"VPN_SERVICE_PROVIDER=airvpn",
-		"VPN_TYPE=wireguard",
-		"LOG_LEVEL=debug",
-		"SERVER_COUNTRIES=United States",
-		"WIREGUARD_PRIVATE_KEY=" + secrets[0],
-		"WIREGUARD_PRESHARED_KEY=" + secrets[1],
-		"WIREGUARD_ADDRESSES=" + secrets[2],
-	}
-	const timeout = 60 * time.Second
-	return runContainerTest(ctx, env, []*regexp.Regexp{successRegexp}, timeout, logger)
-}
-
-func AirVPNOpenVPNTest(ctx context.Context, logger Logger) error {
-	expectedSecrets := []string{
-		"OpenVPN key",
-		"OpenVPN cert",
-	}
-	secrets, err := readSecrets(ctx, expectedSecrets, logger)
-	if err != nil {
-		return fmt.Errorf("reading secrets: %w", err)
-	}
-
-	env := []string{
-		"VPN_SERVICE_PROVIDER=airvpn",
-		"VPN_TYPE=openvpn",
-		"LOG_LEVEL=debug",
-		"SERVER_COUNTRIES=United States",
-		"OPENVPN_KEY=" + secrets[0],
-		"OPENVPN_CERT=" + secrets[1],
-	}
-	const timeout = 60 * time.Second
-	return runContainerTest(ctx, env, []*regexp.Regexp{successRegexp}, timeout, logger)
-}

ci/internal/mullvad.go

@@ -1,30 +0,0 @@
-package internal
-
-import (
-	"context"
-	"fmt"
-	"regexp"
-	"time"
-)
-
-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],
-	}
-	const timeout = 60 * time.Second
-	return runContainerTest(ctx, env, []*regexp.Regexp{successRegexp}, timeout, logger)
-}

ci/internal/privateinternetaccess.go

@@ -1,31 +0,0 @@
-package internal
-
-import (
-	"context"
-	"fmt"
-	"regexp"
-	"time"
-)
-
-func PrivateInternetAccessOpenVPNPortForwardingTest(ctx context.Context, logger Logger) error {
-	expectedSecrets := []string{
-		"OpenVPN username",
-		"OpenVPN password",
-	}
-	secrets, err := readSecrets(ctx, expectedSecrets, logger)
-	if err != nil {
-		return fmt.Errorf("reading secrets: %w", err)
-	}
-
-	env := []string{
-		"VPN_SERVICE_PROVIDER=private internet access",
-		"VPN_TYPE=openvpn",
-		"LOG_LEVEL=debug",
-		"SERVER_REGIONS=CA Montreal",
-		"OPENVPN_USER=" + secrets[0],
-		"OPENVPN_PASSWORD=" + secrets[1],
-		"VPN_PORT_FORWARDING=on",
-	}
-	const timeout = 80 * time.Second
-	return runContainerTest(ctx, env, []*regexp.Regexp{successRegexp, portForwardingRegexp}, timeout, logger)
-}

ci/internal/protonvpn.go

@@ -1,52 +0,0 @@
-package internal
-
-import (
-	"context"
-	"fmt"
-	"regexp"
-	"time"
-)
-
-func ProtonVPNWireguardPortForwardingTest(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],
-		"VPN_PORT_FORWARDING=on",
-	}
-	const timeout = 80 * time.Second
-	return runContainerTest(ctx, env, []*regexp.Regexp{successRegexp, portForwardingRegexp}, timeout, logger)
-}
-
-func ProtonVPNOpenVPNPortForwardingTest(ctx context.Context, logger Logger) error {
-	expectedSecrets := []string{
-		"OpenVPN username",
-		"OpenVPN password",
-	}
-	secrets, err := readSecrets(ctx, expectedSecrets, logger)
-	if err != nil {
-		return fmt.Errorf("reading secrets: %w", err)
-	}
-
-	env := []string{
-		"VPN_SERVICE_PROVIDER=protonvpn",
-		"VPN_TYPE=openvpn",
-		"LOG_LEVEL=debug",
-		"SERVER_COUNTRIES=United States",
-		"OPENVPN_USER=" + secrets[0],
-		"OPENVPN_PASSWORD=" + secrets[1],
-		"VPN_PORT_FORWARDING=on",
-	}
-	const timeout = 80 * time.Second
-	return runContainerTest(ctx, env, []*regexp.Regexp{successRegexp, portForwardingRegexp}, timeout, 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,144 +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 }
-
-var (
-	successRegexp        = regexp.MustCompile(`^.+Public IP address is .+$`)
-	portForwardingRegexp = regexp.MustCompile(`port forwarded is \d`)
-)
-
-func runContainerTest(ctx context.Context, env []string,
-	regexps []*regexp.Regexp, timeout time.Duration, logger Logger,
-) error {
-	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 waitForLogLines(ctx, client, containerID, beforeStartTime, regexps, 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)
-	}
-}
-
-func waitForLogLines(ctx context.Context, client *client.Client, containerID string,
-	beforeStartTime time.Time, regexps []*regexp.Regexp, 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()
-
-	regexpMatched := 0
-
-	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)
-			regex := regexps[regexpMatched]
-			if regex.MatchString(line) {
-				fmt.Println("✅ Expected line logged:", line)
-				if regexpMatched == len(regexps)-1 {
-					return nil
-				}
-				regexpMatched++
-			}
-			continue
-		}
-		err := scanner.Err()
-		if err != nil && err != io.EOF {
-			logSeenLines(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(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(lines []string) {
-	fmt.Println("Logs seen so far:")
-	for _, line := range lines {
-		fmt.Println("  " + line)
-	}
-}

devrun/.gitignore

@@ -1 +0,0 @@
-credentials

devrun/README.md

@@ -1,152 +0,0 @@
-# devrun
-
-`devrun` is a small development helper for starting a local `qmcgaw/gluetun` Docker container with provider credentials stored in an encrypted file.
-
-It solves two practical problems for local development:
-
-- keeping VPN credentials out of the shell history and out of a plaintext file once setup is complete;
-- quickly starting a Gluetun container for a specific provider and VPN type with a small set of extra Docker runtime options.
-
-The tool has four commands:
-
-- `add-cred`: add or replace credentials for one provider and one VPN type in the encrypted store `credentials`;
-- `delete-cred`: remove credentials for one provider and one VPN type from the encrypted store `credentials`;
-- `dump-cred`: print credentials for one provider and one VPN type from the encrypted store `credentials`;
-- `run`: decrypt credentials on demand, build the required Gluetun environment variables, and run a `qmcgaw/gluetun` container.
-
-## Prerequisites
-
-- Go installed locally
-- Docker installed and a daemon available to the Docker client
-- an interactive terminal, since the tool prompts for passwords without echoing them
-
-The Docker client is created from the standard Docker environment, so settings such as `DOCKER_HOST` are honored.
-
-## Quick start
-
-### Add credentials
-
-Add one credential entry to the encrypted store:
-
-```sh
-go run ./cmd/main.go add-cred protonvpn openvpn
-go run ./cmd/main.go add-cred mullvad wireguard
-```
-
-Behavior:
-
-- if `credentials` does not exist yet, `add-cred` asks for a new credentials password and creates the encrypted store;
-- if `credentials` already exists, `add-cred` asks for the existing password first, decrypts the store, updates it, and writes it back encrypted;
-- sensitive fields are read from stdin without echo.
-
-Prompted values depend on the VPN type:
-
-- `openvpn`: username and password
-- `wireguard`: private key, optional address, optional preshared key
-
-Running `add-cred` again for the same provider and VPN type replaces the existing values for that entry.
-
-### Delete credentials
-
-Remove one credential entry from the encrypted store:
-
-```sh
-go run ./cmd/main.go delete-cred protonvpn openvpn
-```
-
-This asks for the credentials password first, decrypts the store, removes the requested provider and VPN type, and writes the store back encrypted.
-
-### Dump credentials
-
-Print one credential entry from the encrypted store:
-
-```sh
-go run ./cmd/main.go dump-cred protonvpn openvpn
-```
-
-This asks for the credentials password first and then prints the selected provider and VPN type values.
-
-### Container run
-
-Run a container using the image `qmcgaw/gluetun` and the encrypted credentials with the `run` command.
-For example:
-
-```sh
-go run ./cmd/main.go run mullvad wireguard
-go run ./cmd/main.go run protonvpn wireguard -e PORT_FORWARDING=on -p 8000:8000/tcp
-```
-
-You will be prompted for the credentials password, the file `credentials` will be decrypted in memory, and the container will be started.
-
-The following environment variables are always added by the tool:
-
-- `VPN_SERVICE_PROVIDER=<provider>`
-- `VPN_TYPE=<vpn-type>`
-- `LOG_LEVEL=debug`
-
-The tool also adds `NET_ADMIN` to the container capabilities by default.
-
-## Credential model
-
-Internally, the encrypted file stores a binary-encoded map keyed by provider name. Each provider can define `openvpn`, `wireguard`, or both.
-
-Conceptually, the stored data looks like this:
-
-- provider `mullvad`: contains `wireguard`
-- provider `protonvpn`: contains `wireguard`
-- provider `protonvpn`: contains `openvpn`
-
-You do not edit this directly. It is stored as encrypted binary data in `credentials`.
-
-### OpenVPN fields
-
-- `username` is required;
-- `password` is required;
-
-At runtime these map to:
-
-- `OPENVPN_USER`
-- `OPENVPN_PASSWORD`
-
-### WireGuard fields
-
-- `private_key` is required and must be a valid WireGuard private key;
-- `address` is optional and must be a valid network prefix if set;
-- `preshared_key` is optional and must be a valid WireGuard key if set.
-
-At runtime these map to:
-
-- `WIREGUARD_PRIVATE_KEY`
-- `WIREGUARD_ADDRESSES` when `address` is set
-- `WIREGUARD_PRESHARED_KEY` when `preshared_key` is set
-
-## Supported extra Docker flags
-
-The `run` command only accepts a focused subset of Docker-style runtime flags. Unsupported flags return an error.
-
-Supported flags:
-
-- `-e`, `--env KEY=VALUE`
-- `-v`, `--volume SOURCE:TARGET[:mode]`
-- `-p`, `--publish HOSTPORT:CONTAINERPORT[/proto]`
-- `--dns IP`
-- `--device SPEC`
-- `--label KEY=VALUE`
-- `--cap-add CAPABILITY`
-
-## Signals and shutdown
-
-While the container is running:
-
-- the first `Ctrl+C` requests a graceful stop with a 5 second timeout;
-- the second `Ctrl+C` sends a kill signal to the container;
-- a further interrupt exits the tool immediately.
-
-## Notes and limitations
-
-- The container image is fixed to `qmcgaw/gluetun`.
-- The container name is fixed to `gluetun`.
-- Credentials are decrypted in memory only during execution.
-- If the requested provider or VPN type is not present in the encrypted credentials file, the command fails with an explicit error.
-- The encrypted credential store file is named `credentials`.
-- This tool is intended for local development convenience, not as a general replacement for `docker run`.

devrun/cmd/main.go

@@ -1,156 +0,0 @@
-package main
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"os/signal"
-
-	"github.com/qdm12/gluetun/devrun/internal"
-)
-
-func main() {
-	const minArgs = 2
-	if len(os.Args) < minArgs {
-		printUsage()
-		os.Exit(1)
-	}
-
-	switch os.Args[1] {
-	case "add-cred":
-		const addCredMinArgs = 4
-		if len(os.Args) < addCredMinArgs {
-			fmt.Fprintf(os.Stderr,
-				`Usage: %s add-cred <provider> <vpn-type>
-Example: %s add-cred protonvpn wireguard`, os.Args[0], os.Args[0])
-			os.Exit(1)
-		}
-		provider := os.Args[2]
-		vpnType := os.Args[3]
-		err := runWithSignals(func(ctx context.Context, _ <-chan struct{}) error {
-			return internal.AddCredential(ctx, provider, vpnType)
-		})
-		if err != nil {
-			fmt.Fprintln(os.Stderr, "add-cred failed:", err)
-			os.Exit(1)
-		}
-	case "delete-cred":
-		const deleteCredMinArgs = 4
-		if len(os.Args) < deleteCredMinArgs {
-			fmt.Fprintf(os.Stderr,
-				`Usage: %s delete-cred <provider> <vpn-type>
-Example: %s delete-cred protonvpn openvpn`, os.Args[0], os.Args[0])
-			os.Exit(1)
-		}
-		provider := os.Args[2]
-		vpnType := os.Args[3]
-		err := runWithSignals(func(ctx context.Context, _ <-chan struct{}) error {
-			return internal.DeleteCredential(ctx, provider, vpnType)
-		})
-		if err != nil {
-			fmt.Fprintln(os.Stderr, "delete-cred failed:", err)
-			os.Exit(1)
-		}
-	case "dump-cred":
-		const dumpCredMinArgs = 4
-		if len(os.Args) < dumpCredMinArgs {
-			fmt.Fprintf(os.Stderr,
-				`Usage: %s dump-cred <provider> <vpn-type>
-Example: %s dump-cred protonvpn wireguard`, os.Args[0], os.Args[0])
-			os.Exit(1)
-		}
-		provider := os.Args[2]
-		vpnType := os.Args[3]
-		err := runWithSignals(func(ctx context.Context, _ <-chan struct{}) error {
-			return internal.DumpCredential(ctx, provider, vpnType)
-		})
-		if err != nil {
-			fmt.Fprintln(os.Stderr, "dump-cred failed:", err)
-			os.Exit(1)
-		}
-	case "run":
-		const runMinArgs = 4
-		if len(os.Args) < runMinArgs {
-			fmt.Fprintf(os.Stderr,
-				`Usage: %s run <provider> <vpn-type> [extra docker flags...]
-Example: %s run mullvad wireguard -e SERVER_COUNTRIES=USA`, os.Args[0], os.Args[0])
-			os.Exit(1)
-		}
-		provider := os.Args[2]
-		vpnType := os.Args[3]
-		extraArgs := os.Args[4:]
-		err := runWithSignals(func(ctx context.Context, forceKill <-chan struct{}) error {
-			return internal.Run(ctx, provider, vpnType, extraArgs, forceKill)
-		})
-		if err != nil {
-			fmt.Fprintln(os.Stderr, "run failed:", err)
-			os.Exit(1)
-		}
-	default:
-		fmt.Fprintln(os.Stderr, "unknown command:", os.Args[1])
-		printUsage()
-		os.Exit(1)
-	}
-}
-
-func printUsage() {
-	fmt.Fprintf(os.Stderr, `Usage: %s <command> [args...]
-
-Commands:
-	add-cred <provider> <vpn-type>
-				Add or replace credentials in the encrypted credentials store.
-	delete-cred <provider> <vpn-type>
-				Delete credentials from the encrypted credentials store.
-	dump-cred <provider> <vpn-type>
-				Print credentials for a provider and VPN type pair.
-	run <provider> <vpn-type> [flags...]
-				Decrypt credentials and run a Gluetun container.
-				Extra flags (e.g. -e PORT_FORWARDING=on) are passed to docker run.`,
-		os.Args[0])
-}
-
-func runWithSignals(runFn func(ctx context.Context, forceKill <-chan struct{}) error) error {
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	const signalBufferSize = 3
-	sigCh := make(chan os.Signal, signalBufferSize)
-	signal.Notify(sigCh, os.Interrupt)
-	defer signal.Stop(sigCh)
-
-	forceKill := make(chan struct{})
-	stopSignalLoop := make(chan struct{})
-	signalLoopDone := make(chan struct{})
-
-	go func() {
-		defer close(signalLoopDone)
-
-		const secondInterrupt = 2
-		interruptCount := uint(0)
-		forceKillSent := false
-		for {
-			select {
-			case <-stopSignalLoop:
-				return
-			case <-sigCh:
-				interruptCount++
-				switch interruptCount {
-				case 1:
-					cancel()
-				case secondInterrupt:
-					if !forceKillSent {
-						close(forceKill)
-						forceKillSent = true
-					}
-				default:
-					os.Exit(1)
-				}
-			}
-		}
-	}()
-
-	err := runFn(ctx, forceKill)
-	close(stopSignalLoop)
-	<-signalLoopDone
-	return err
-}

devrun/go.mod

@@ -1,40 +0,0 @@
-module github.com/qdm12/gluetun/devrun
-
-go 1.25.0
-
-require (
-	github.com/docker/docker v28.5.2+incompatible
-	github.com/docker/go-connections v0.7.0
-	github.com/opencontainers/image-spec v1.1.1
-	golang.org/x/crypto v0.50.0
-	golang.org/x/term v0.42.0
-	golang.zx2c4.com/wireguard/wgctrl v0.0.0-20241231184526-a9ab2273dd10
-)
-
-require (
-	github.com/Microsoft/go-winio v0.6.2 // indirect
-	github.com/cespare/xxhash/v2 v2.3.0 // 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-units v0.5.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/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.1.0 // indirect
-	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
-	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0 // indirect
-	go.opentelemetry.io/otel v1.43.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0 // indirect
-	go.opentelemetry.io/otel/metric v1.43.0 // indirect
-	go.opentelemetry.io/otel/trace v1.43.0 // indirect
-	golang.org/x/sys v0.43.0 // indirect
-	golang.org/x/time v0.15.0 // indirect
-	gotest.tools/v3 v3.5.2 // indirect
-)

devrun/go.sum

@@ -1,105 +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/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
-github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-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.2+incompatible h1:DBX0Y0zAjZbSrm1uzOkdr1onVghKaftjlSWt4AFexzM=
-github.com/docker/docker v28.5.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
-github.com/docker/go-connections v0.7.0 h1:6SsRfJddP22WMrCkj19x9WKjEDTB+ahsdiGYf0mN39c=
-github.com/docker/go-connections v0.7.0/go.mod h1:no1qkHdjq7kLMGUXYAduOhYPSJxxvgWBh7ogVvptn3Q=
-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/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.28.0 h1:HWRh5R2+9EifMyIHV7ZV+MIZqgz+PMpZ14Jynv3O2Zs=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0/go.mod h1:JfhWUomR1baixubs02l85lZYYOm7LV6om4ceouMv45c=
-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.1.0 h1:vBBl0pUnvi/Je71dsRrhMBtreIqNMYErSAbEeb8jrXQ=
-github.com/morikuni/aec v1.1.0/go.mod h1:xDRgiq/iw5l+zkao76YTKzKttOp2cwPEne25HDkJnBw=
-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/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.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
-go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0 h1:CqXxU8VOmDefoh0+ztfGaymYbhdB/tT3zs79QaZTNGY=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0/go.mod h1:BuhAPThV8PBHBvg8ZzZ/Ok3idOdhWIodywz2xEcRbJo=
-go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I=
-go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 h1:88Y4s2C8oTui1LGM6bTWkw0ICGcOLCAI5l6zsD1j20k=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0/go.mod h1:Vl1/iaggsuRlrHf/hfPJPvVag77kKyvrLeD10kpMl+A=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0 h1:3iZJKlCZufyRzPzlQhUIWVmfltrXuGyfjREgGP3UUjc=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0/go.mod h1:/G+nUPfhq2e+qiXMGxMwumDrP5jtzU+mWN7/sjT2rak=
-go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM=
-go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY=
-go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg=
-go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg=
-go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw=
-go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A=
-go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A=
-go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0=
-go.opentelemetry.io/proto/otlp v1.10.0 h1:IQRWgT5srOCYfiWnpqUYz9CVmbO8bFmKcwYxpuCSL2g=
-go.opentelemetry.io/proto/otlp v1.10.0/go.mod h1:/CV4QoCR/S9yaPj8utp3lvQPoqMtxXdzn7ozvvozVqk=
-golang.org/x/crypto v0.50.0 h1:zO47/JPrL6vsNkINmLoo/PH1gcxpls50DNogFvB5ZGI=
-golang.org/x/crypto v0.50.0/go.mod h1:3muZ7vA7PBCE6xgPX7nkzzjiUq87kRItoJQM1Yo8S+Q=
-golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0=
-golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw=
-golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI=
-golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
-golang.org/x/term v0.42.0 h1:UiKe+zDFmJobeJ5ggPwOshJIVt6/Ft0rcfrXZDLWAWY=
-golang.org/x/term v0.42.0/go.mod h1:Dq/D+snpsbazcBG5+F9Q1n2rXV8Ma+71xEjTRufARgY=
-golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg=
-golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164=
-golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U=
-golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno=
-golang.zx2c4.com/wireguard/wgctrl v0.0.0-20241231184526-a9ab2273dd10 h1:3GDAcqdIg1ozBNLgPy4SLT84nfcBjr6rhGtXYtrkWLU=
-golang.zx2c4.com/wireguard/wgctrl v0.0.0-20241231184526-a9ab2273dd10/go.mod h1:T97yPqesLiNrOYxkwmhMI0ZIlJDm+p0PMR8eRVeR5tQ=
-google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 h1:VPWxll4HlMw1Vs/qXtN7BvhZqsS9cdAittCNvVENElA=
-google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:7QBABkRtR8z+TEnmXTqIqwJLlzrZKVfAUm7tY3yGv0M=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 h1:m8qni9SQFH0tJc1X0vmnpw/0t+AImlSvp30sEupozUg=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
-google.golang.org/grpc v1.80.0 h1:Xr6m2WmWZLETvUNvIUmeD5OAagMw3FiKmMlTdViWsHM=
-google.golang.org/grpc v1.80.0/go.mod h1:ho/dLnxwi3EDJA4Zghp7k2Ec1+c2jqup0bFkw07bwF4=
-google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
-google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
-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=

devrun/internal/credentials.go

@@ -1,251 +0,0 @@
-package internal
-
-import (
-	"bytes"
-	"encoding/gob"
-	"fmt"
-	"maps"
-	"net/netip"
-	"slices"
-	"strings"
-
-	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
-)
-
-const credentialsFilename = "credentials"
-
-const (
-	vpnTypeOpenVPN   = "openvpn"
-	vpnTypeWireGuard = "wireguard"
-)
-
-type providerCredentials struct {
-	OpenVPN   *openvpnCredentials
-	WireGuard *wireguardCredentials
-}
-
-type openvpnCredentials struct {
-	Username string
-	Password string
-	Key      string
-	Cert     string
-}
-
-type wireguardCredentials struct {
-	PrivateKey   string
-	Address      string
-	PresharedKey string
-}
-
-func loadCredentials(data []byte) (map[string]providerCredentials, error) {
-	credentials := make(map[string]providerCredentials)
-	err := gob.NewDecoder(bytes.NewReader(data)).Decode(&credentials)
-	if err != nil {
-		return nil, fmt.Errorf("decoding credentials: %w", err)
-	}
-	return credentials, nil
-}
-
-func marshalCredentials(credentials map[string]providerCredentials) ([]byte, error) {
-	buffer := bytes.NewBuffer(nil)
-	err := gob.NewEncoder(buffer).Encode(credentials)
-	if err != nil {
-		return nil, fmt.Errorf("encoding credentials: %w", err)
-	}
-	return buffer.Bytes(), nil
-}
-
-func validateCredentials(providerNameToCredentials map[string]providerCredentials) error {
-	for provider, credentials := range providerNameToCredentials {
-		if credentials.OpenVPN == nil && credentials.WireGuard == nil {
-			return fmt.Errorf("provider %q has no openvpn or wireguard credentials", provider)
-		}
-		if credentials.OpenVPN != nil {
-			err := validateOpenvpnCredentials(provider, credentials.OpenVPN)
-			if err != nil {
-				return err
-			}
-		}
-		if credentials.WireGuard != nil {
-			err := validateWireguardCredentials(provider, credentials.WireGuard)
-			if err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-func validateOpenvpnCredentials(provider string, creds *openvpnCredentials) error {
-	switch {
-	case creds.Username == "" && creds.Password != "":
-		return fmt.Errorf("provider %q openvpn credentials are missing the username", provider)
-	case creds.Password == "" && creds.Username != "":
-		return fmt.Errorf("provider %q openvpn credentials are missing the password", provider)
-	case creds.Username == "" && creds.Password == "" && creds.Key == "" && creds.Cert == "":
-		return fmt.Errorf("provider %q openvpn credentials are missing the username and password", provider)
-	}
-	return nil
-}
-
-func validateWireguardCredentials(provider string, creds *wireguardCredentials) error {
-	if creds.PrivateKey == "" {
-		return fmt.Errorf("provider %q wireguard credentials are missing the private key", provider)
-	} else if _, err := wgtypes.ParseKey(creds.PrivateKey); err != nil {
-		return fmt.Errorf("provider %q wireguard credentials have an invalid private key: %w", provider, err)
-	}
-
-	if creds.Address != "" {
-		_, err := netip.ParsePrefix(creds.Address)
-		if err != nil {
-			return fmt.Errorf("provider %q wireguard credentials have an invalid address %q: %w", provider, creds.Address, err)
-		}
-	}
-
-	if creds.PresharedKey != "" {
-		if _, err := wgtypes.ParseKey(creds.PresharedKey); err != nil {
-			return fmt.Errorf("provider %q wireguard credentials have an invalid preshared key: %w", provider, err)
-		}
-	}
-	return nil
-}
-
-func lookupCredentials(credentials map[string]providerCredentials, provider, vpnType string) ([]string, error) {
-	providerCreds, exists := credentials[provider]
-	if !exists {
-		existing := slices.Collect(maps.Keys(credentials))
-		return nil, fmt.Errorf("no credentials found for provider %q, available providers are: %s",
-			provider, strings.Join(existing, ", "))
-	}
-
-	switch vpnType {
-	case vpnTypeWireGuard:
-		if providerCreds.WireGuard == nil {
-			return nil, fmt.Errorf("no wireguard credentials found for provider %q", provider)
-		}
-		return buildWireGuardEnv(providerCreds.WireGuard), nil
-	case vpnTypeOpenVPN:
-		if providerCreds.OpenVPN == nil {
-			return nil, fmt.Errorf("no openvpn credentials found for provider %q", provider)
-		}
-		return buildOpenvpnEnv(providerCreds.OpenVPN), nil
-	default:
-		return nil, fmt.Errorf("unknown vpn type %q, must be wireguard or openvpn", vpnType)
-	}
-}
-
-func buildWireGuardEnv(creds *wireguardCredentials) []string {
-	envVars := []string{
-		"WIREGUARD_PRIVATE_KEY=" + creds.PrivateKey,
-	}
-	if creds.Address != "" {
-		envVars = append(envVars, "WIREGUARD_ADDRESSES="+creds.Address)
-	}
-	if creds.PresharedKey != "" {
-		envVars = append(envVars, "WIREGUARD_PRESHARED_KEY="+creds.PresharedKey)
-	}
-	return envVars
-}
-
-func buildOpenvpnEnv(creds *openvpnCredentials) []string {
-	return []string{
-		"OPENVPN_USER=" + creds.Username,
-		"OPENVPN_PASSWORD=" + creds.Password,
-		"OPENVPN_KEY=" + creds.Key,
-		"OPENVPN_CERT=" + creds.Cert,
-	}
-}
-
-func addCredential(credentials map[string]providerCredentials, provider, vpnType string,
-	openvpnCredentials *openvpnCredentials, wireguardCredentials *wireguardCredentials,
-) error {
-	providerCredentials := credentials[provider]
-
-	switch vpnType {
-	case vpnTypeOpenVPN:
-		providerCredentials.OpenVPN = openvpnCredentials
-	case vpnTypeWireGuard:
-		providerCredentials.WireGuard = wireguardCredentials
-	default:
-		return fmt.Errorf("unknown vpn type %q, must be wireguard or openvpn", vpnType)
-	}
-
-	credentials[provider] = providerCredentials
-	return nil
-}
-
-func deleteCredential(credentials map[string]providerCredentials, provider, vpnType string) error {
-	providerCredentials, exists := credentials[provider]
-	if !exists {
-		return fmt.Errorf("provider %q does not exist", provider)
-	}
-
-	switch vpnType {
-	case vpnTypeOpenVPN:
-		if providerCredentials.OpenVPN == nil {
-			return fmt.Errorf("provider %q has no openvpn credentials", provider)
-		}
-		providerCredentials.OpenVPN = nil
-	case vpnTypeWireGuard:
-		if providerCredentials.WireGuard == nil {
-			return fmt.Errorf("provider %q has no wireguard credentials", provider)
-		}
-		providerCredentials.WireGuard = nil
-	default:
-		return fmt.Errorf("unknown vpn type %q, must be wireguard or openvpn", vpnType)
-	}
-
-	if providerCredentials.OpenVPN == nil && providerCredentials.WireGuard == nil {
-		delete(credentials, provider)
-		return nil
-	}
-
-	credentials[provider] = providerCredentials
-	return nil
-}
-
-func formatCredentialForDump(provider, vpnType string,
-	providerCredentials providerCredentials,
-) (output string, err error) {
-	var builder strings.Builder
-
-	builder.WriteString("provider: ")
-	builder.WriteString(provider)
-	builder.WriteString("\n")
-	builder.WriteString("vpn_type: ")
-	builder.WriteString(vpnType)
-	builder.WriteString("\n")
-
-	switch vpnType {
-	case vpnTypeOpenVPN:
-		if providerCredentials.OpenVPN == nil {
-			return "", fmt.Errorf("no openvpn credentials found for provider %q", provider)
-		}
-		builder.WriteString("username: ")
-		builder.WriteString(providerCredentials.OpenVPN.Username)
-		builder.WriteString("\n")
-		builder.WriteString("password: ")
-		builder.WriteString(providerCredentials.OpenVPN.Password)
-		builder.WriteString("\nkey: ")
-		builder.WriteString(providerCredentials.OpenVPN.Key)
-		builder.WriteString("\ncert: ")
-		builder.WriteString(providerCredentials.OpenVPN.Cert)
-		builder.WriteString("\n")
-	case vpnTypeWireGuard:
-		if providerCredentials.WireGuard == nil {
-			return "", fmt.Errorf("no wireguard credentials found for provider %q", provider)
-		}
-		builder.WriteString("private_key: ")
-		builder.WriteString(providerCredentials.WireGuard.PrivateKey)
-		builder.WriteString("\n")
-		builder.WriteString("address: ")
-		builder.WriteString(providerCredentials.WireGuard.Address)
-		builder.WriteString("\n")
-		builder.WriteString("preshared_key: ")
-		builder.WriteString(providerCredentials.WireGuard.PresharedKey)
-	default:
-		return "", fmt.Errorf("unknown vpn type %q, must be wireguard or openvpn", vpnType)
-	}
-
-	return builder.String(), nil
-}

devrun/internal/credentials_test.go

@@ -1,350 +0,0 @@
-package internal
-
-import (
-	"testing"
-
-	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
-)
-
-func Test_addCredential(t *testing.T) {
-	t.Parallel()
-
-	wireguardPrivateKey, err := wgtypes.GeneratePrivateKey()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	testCases := map[string]struct {
-		initialCredentials map[string]providerCredentials
-		provider           string
-		vpnType            string
-		openvpnCredentials *openvpnCredentials
-		wireguardCreds     *wireguardCredentials
-		expectedLength     int
-		expectedOpenVPN    bool
-		expectedWireGuard  bool
-	}{
-		"adds_openvpn_credentials": {
-			initialCredentials: map[string]providerCredentials{},
-			provider:           "protonvpn",
-			vpnType:            "openvpn",
-			openvpnCredentials: &openvpnCredentials{Username: "user", Password: "pass"},
-			expectedLength:     1,
-			expectedOpenVPN:    true,
-		},
-		"adds_wireguard_credentials": {
-			initialCredentials: map[string]providerCredentials{},
-			provider:           "mullvad",
-			vpnType:            "wireguard",
-			wireguardCreds: &wireguardCredentials{
-				PrivateKey: wireguardPrivateKey.String(),
-				Address:    "10.0.0.2/32",
-			},
-			expectedLength:    1,
-			expectedWireGuard: true,
-		},
-		"preserves_other_protocol": {
-			initialCredentials: map[string]providerCredentials{
-				"protonvpn": {
-					WireGuard: &wireguardCredentials{PrivateKey: wireguardPrivateKey.String()},
-				},
-			},
-			provider:           "protonvpn",
-			vpnType:            "openvpn",
-			openvpnCredentials: &openvpnCredentials{Username: "user", Password: "pass"},
-			expectedLength:     1,
-			expectedOpenVPN:    true,
-			expectedWireGuard:  true,
-		},
-	}
-
-	for name, testCase := range testCases {
-		t.Run(name, func(t *testing.T) {
-			t.Parallel()
-
-			credentials := cloneCredentials(testCase.initialCredentials)
-
-			err := addCredential(credentials, testCase.provider, testCase.vpnType,
-				testCase.openvpnCredentials, testCase.wireguardCreds)
-			if err != nil {
-				t.Fatalf("unexpected error: %v", err)
-			}
-
-			providerCredentials := credentials[testCase.provider]
-			if len(credentials) != testCase.expectedLength {
-				t.Fatalf("expected %d providers, got %d", testCase.expectedLength, len(credentials))
-			}
-			if (providerCredentials.OpenVPN != nil) != testCase.expectedOpenVPN {
-				t.Fatalf("expected openvpn presence %t, got %t", testCase.expectedOpenVPN, providerCredentials.OpenVPN != nil)
-			}
-			if (providerCredentials.WireGuard != nil) != testCase.expectedWireGuard {
-				t.Fatalf("expected wireguard presence %t, got %t", testCase.expectedWireGuard, providerCredentials.WireGuard != nil)
-			}
-		})
-	}
-}
-
-func Test_deleteCredential(t *testing.T) {
-	t.Parallel()
-
-	wireguardPrivateKey, err := wgtypes.GeneratePrivateKey()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	testCases := map[string]struct {
-		initialCredentials map[string]providerCredentials
-		provider           string
-		vpnType            string
-		expectedLength     int
-		expectedOpenVPN    bool
-		expectedWireGuard  bool
-	}{
-		"deletes_openvpn_only": {
-			initialCredentials: map[string]providerCredentials{
-				"protonvpn": {
-					OpenVPN:   &openvpnCredentials{Username: "user", Password: "pass"},
-					WireGuard: &wireguardCredentials{PrivateKey: wireguardPrivateKey.String()},
-				},
-			},
-			provider:          "protonvpn",
-			vpnType:           "openvpn",
-			expectedLength:    1,
-			expectedWireGuard: true,
-		},
-		"deletes_last_protocol_and_provider": {
-			initialCredentials: map[string]providerCredentials{
-				"protonvpn": {
-					OpenVPN: &openvpnCredentials{Username: "user", Password: "pass"},
-				},
-			},
-			provider:       "protonvpn",
-			vpnType:        "openvpn",
-			expectedLength: 0,
-		},
-	}
-
-	for name, testCase := range testCases {
-		t.Run(name, func(t *testing.T) {
-			t.Parallel()
-
-			credentials := cloneCredentials(testCase.initialCredentials)
-
-			err := deleteCredential(credentials, testCase.provider, testCase.vpnType)
-			if err != nil {
-				t.Fatalf("unexpected error: %v", err)
-			}
-
-			if len(credentials) != testCase.expectedLength {
-				t.Fatalf("expected %d providers, got %d", testCase.expectedLength, len(credentials))
-			}
-
-			providerCredentials, exists := credentials[testCase.provider]
-			if !exists {
-				return
-			}
-
-			if (providerCredentials.OpenVPN != nil) != testCase.expectedOpenVPN {
-				t.Fatalf("expected openvpn presence %t, got %t", testCase.expectedOpenVPN, providerCredentials.OpenVPN != nil)
-			}
-			if (providerCredentials.WireGuard != nil) != testCase.expectedWireGuard {
-				t.Fatalf("expected wireguard presence %t, got %t", testCase.expectedWireGuard, providerCredentials.WireGuard != nil)
-			}
-		})
-	}
-}
-
-func Test_validateCredentials(t *testing.T) {
-	t.Parallel()
-
-	wireguardPrivateKey, err := wgtypes.GeneratePrivateKey()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	testCases := map[string]struct {
-		credentials map[string]providerCredentials
-		wantError   bool
-	}{
-		"both_protocols_valid": {
-			credentials: map[string]providerCredentials{
-				"protonvpn": {
-					OpenVPN:   &openvpnCredentials{Username: "user", Password: "pass"},
-					WireGuard: &wireguardCredentials{PrivateKey: wireguardPrivateKey.String()},
-				},
-			},
-		},
-		"invalid_wireguard_when_both_present": {
-			credentials: map[string]providerCredentials{
-				"protonvpn": {
-					OpenVPN:   &openvpnCredentials{Username: "user", Password: "pass"},
-					WireGuard: &wireguardCredentials{PrivateKey: "invalid"},
-				},
-			},
-			wantError: true,
-		},
-	}
-
-	for name, testCase := range testCases {
-		t.Run(name, func(t *testing.T) {
-			t.Parallel()
-
-			err := validateCredentials(testCase.credentials)
-			if testCase.wantError && err == nil {
-				t.Fatal("expected an error but got nil")
-			}
-			if !testCase.wantError && err != nil {
-				t.Fatalf("expected no error, got %v", err)
-			}
-		})
-	}
-}
-
-func Test_marshalLoadCredentials(t *testing.T) {
-	t.Parallel()
-
-	wireguardPrivateKey, err := wgtypes.GeneratePrivateKey()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	credentials := map[string]providerCredentials{
-		"mullvad": {
-			WireGuard: &wireguardCredentials{
-				PrivateKey: wireguardPrivateKey.String(),
-				Address:    "10.0.0.2/32",
-			},
-		},
-		"protonvpn": {
-			OpenVPN: &openvpnCredentials{
-				Username: "user",
-				Password: "pass",
-			},
-		},
-	}
-
-	encoded, err := marshalCredentials(credentials)
-	if err != nil {
-		t.Fatalf("unexpected marshal error: %v", err)
-	}
-
-	decoded, err := loadCredentials(encoded)
-	if err != nil {
-		t.Fatalf("unexpected load error: %v", err)
-	}
-
-	if len(decoded) != len(credentials) {
-		t.Fatalf("expected %d providers, got %d", len(credentials), len(decoded))
-	}
-
-	if decoded["mullvad"].WireGuard == nil {
-		t.Fatal("expected mullvad wireguard credentials to be present")
-	}
-	if decoded["protonvpn"].OpenVPN == nil {
-		t.Fatal("expected protonvpn openvpn credentials to be present")
-	}
-	if decoded["protonvpn"].OpenVPN.Password != "pass" {
-		t.Fatalf("expected protonvpn password %q, got %q", "pass", decoded["protonvpn"].OpenVPN.Password)
-	}
-}
-
-func Test_formatCredentialForDump(t *testing.T) {
-	t.Parallel()
-
-	testCases := map[string]struct {
-		provider            string
-		vpnType             string
-		providerCredentials providerCredentials
-		expectedOutput      string
-		wantError           bool
-	}{
-		"openvpn": {
-			provider: "protonvpn",
-			vpnType:  vpnTypeOpenVPN,
-			providerCredentials: providerCredentials{
-				OpenVPN: &openvpnCredentials{
-					Username: "user",
-					Password: "pass",
-					Key:      "key",
-					Cert:     "cert",
-				},
-			},
-			expectedOutput: "provider: protonvpn\n" +
-				"vpn_type: openvpn\n" +
-				"username: user\n" +
-				"password: pass\n" +
-				"key: key\n" +
-				"cert: cert\n",
-		},
-		"wireguard": {
-			provider: "mullvad",
-			vpnType:  vpnTypeWireGuard,
-			providerCredentials: providerCredentials{
-				WireGuard: &wireguardCredentials{
-					PrivateKey:   "private",
-					Address:      "10.0.0.2/32",
-					PresharedKey: "preshared",
-				},
-			},
-			expectedOutput: "provider: mullvad\n" +
-				"vpn_type: wireguard\n" +
-				"private_key: private\n" +
-				"address: 10.0.0.2/32\n" +
-				"preshared_key: preshared",
-		},
-		"missing_protocol": {
-			provider:  "protonvpn",
-			vpnType:   vpnTypeOpenVPN,
-			wantError: true,
-		},
-		"unknown_protocol": {
-			provider:  "protonvpn",
-			vpnType:   "other",
-			wantError: true,
-		},
-	}
-
-	for name, testCase := range testCases {
-		t.Run(name, func(t *testing.T) {
-			t.Parallel()
-
-			output, err := formatCredentialForDump(
-				testCase.provider,
-				testCase.vpnType,
-				testCase.providerCredentials,
-			)
-
-			if testCase.wantError {
-				if err == nil {
-					t.Fatal("expected an error but got nil")
-				}
-				return
-			}
-
-			if err != nil {
-				t.Fatalf("expected no error, got %v", err)
-			}
-
-			if output != testCase.expectedOutput {
-				t.Fatalf("expected output %q, got %q", testCase.expectedOutput, output)
-			}
-		})
-	}
-}
-
-func cloneCredentials(credentials map[string]providerCredentials) map[string]providerCredentials {
-	clone := make(map[string]providerCredentials, len(credentials))
-	for provider, providerCredentials := range credentials {
-		copied := providerCredentials
-		if providerCredentials.OpenVPN != nil {
-			openvpnCredentials := *providerCredentials.OpenVPN
-			copied.OpenVPN = &openvpnCredentials
-		}
-		if providerCredentials.WireGuard != nil {
-			wireguardCredentials := *providerCredentials.WireGuard
-			copied.WireGuard = &wireguardCredentials
-		}
-		clone[provider] = copied
-	}
-	return clone
-}

devrun/internal/encrypt.go

@@ -1,533 +0,0 @@
-package internal
-
-import (
-	"bufio"
-	"context"
-	"crypto/aes"
-	"crypto/cipher"
-	"crypto/rand"
-	"fmt"
-	"io"
-	"maps"
-	"os"
-	"slices"
-	"strings"
-	"sync"
-	"syscall"
-
-	"golang.org/x/crypto/scrypt"
-	"golang.org/x/term"
-)
-
-// Encryption format: [16-byte salt][12-byte nonce][AES-256-GCM ciphertext+tag]
-// Key derivation: scrypt(password, salt, N=32768, r=8, p=1, keyLen=32)
-
-const (
-	saltSize  = 16
-	nonceSize = 12
-	keySize   = 32
-	scryptN   = 32768
-	scryptR   = 8
-	scryptP   = 1
-)
-
-// AddCredential prompts for credential values and stores them in the encrypted credentials file.
-func AddCredential(ctx context.Context, provider, vpnType string) error {
-	credentials, password, err := loadCredentialsForMutation(ctx)
-	if err != nil {
-		return err
-	}
-
-	err = promptAndAddCredential(ctx, credentials, provider, vpnType)
-	if err != nil {
-		return err
-	}
-
-	err = validateCredentials(credentials)
-	if err != nil {
-		return fmt.Errorf("validating credentials: %w", err)
-	}
-
-	err = writeEncryptedCredentials(credentials, password)
-	if err != nil {
-		return err
-	}
-
-	fmt.Printf(
-		"Credentials for provider %q and vpn type %q saved to %s\n",
-		provider, vpnType, credentialsFilename,
-	)
-	return nil
-}
-
-// DeleteCredential removes credentials for a provider and VPN type
-// from the encrypted credentials file.
-func DeleteCredential(ctx context.Context, provider, vpnType string) error {
-	credentials, password, err := loadExistingCredentialsForMutation(ctx)
-	if err != nil {
-		return err
-	}
-
-	err = deleteCredential(credentials, provider, vpnType)
-	if err != nil {
-		return err
-	}
-
-	err = writeEncryptedCredentials(credentials, password)
-	if err != nil {
-		return err
-	}
-
-	fmt.Printf(
-		"Credentials for provider %q and vpn type %q removed from %s\n",
-		provider, vpnType, credentialsFilename,
-	)
-	return nil
-}
-
-// DumpCredential decrypts the credential store and prints one provider/vpn-type entry.
-func DumpCredential(ctx context.Context, provider, vpnType string) error {
-	credentials, err := decryptCredentials(ctx)
-	if err != nil {
-		return err
-	}
-
-	providerCredentials, exists := credentials[provider]
-	if !exists {
-		existingProviders := slices.Collect(maps.Keys(credentials))
-		return fmt.Errorf("provider %q does not exist, available providers are: %s",
-			provider, strings.Join(existingProviders, ", "))
-	}
-
-	output, err := formatCredentialForDump(provider, vpnType, providerCredentials)
-	if err != nil {
-		return err
-	}
-
-	fmt.Println(output)
-	return nil
-}
-
-// decryptCredentials reads the encrypted credentials file,
-// prompts for a password, and returns the decrypted credentials.
-func decryptCredentials(ctx context.Context) (map[string]providerCredentials, error) {
-	password, err := readSecret(ctx, "Enter credentials password: ", false)
-	if err != nil {
-		return nil, fmt.Errorf("reading password: %w", err)
-	}
-
-	plaintext, err := decryptCredentialsFile(password)
-	if err != nil {
-		return nil, err
-	}
-
-	credentials, err := loadCredentials(plaintext)
-	if err != nil {
-		return nil, fmt.Errorf("loading credentials: %w", err)
-	}
-
-	return credentials, nil
-}
-
-func loadCredentialsForMutation(ctx context.Context) (
-	credentials map[string]providerCredentials,
-	password []byte,
-	err error,
-) {
-	_, err = os.Stat(credentialsFilename)
-	if os.IsNotExist(err) {
-		password, err = readPasswordConfirmed(ctx,
-			"Enter new credentials password: ",
-			"Confirm new credentials password: ",
-		)
-		if err != nil {
-			return nil, nil, fmt.Errorf("reading password: %w", err)
-		}
-		return make(map[string]providerCredentials), password, nil
-	}
-	if err != nil {
-		return nil, nil, fmt.Errorf("stating %s: %w", credentialsFilename, err)
-	}
-
-	password, err = readSecret(ctx, "Enter credentials password: ", false)
-	if err != nil {
-		return nil, nil, fmt.Errorf("reading password: %w", err)
-	}
-
-	plaintext, err := decryptCredentialsFile(password)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	credentials, err = loadCredentials(plaintext)
-	if err != nil {
-		return nil, nil, fmt.Errorf("loading credentials: %w", err)
-	}
-
-	return credentials, password, nil
-}
-
-func loadExistingCredentialsForMutation(ctx context.Context) (
-	credentials map[string]providerCredentials,
-	password []byte,
-	err error,
-) {
-	_, err = os.Stat(credentialsFilename)
-	if os.IsNotExist(err) {
-		return nil, nil, fmt.Errorf("%s does not exist", credentialsFilename)
-	}
-	if err != nil {
-		return nil, nil, fmt.Errorf("stating %s: %w", credentialsFilename, err)
-	}
-
-	password, err = readSecret(ctx, "Enter credentials password: ", false)
-	if err != nil {
-		return nil, nil, fmt.Errorf("reading password: %w", err)
-	}
-
-	plaintext, err := decryptCredentialsFile(password)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	credentials, err = loadCredentials(plaintext)
-	if err != nil {
-		return nil, nil, fmt.Errorf("loading credentials: %w", err)
-	}
-
-	return credentials, password, nil
-}
-
-func promptAndAddCredential(
-	ctx context.Context,
-	credentials map[string]providerCredentials,
-	provider, vpnType string,
-) error {
-	switch vpnType {
-	case vpnTypeOpenVPN:
-		username, err := readLine(ctx, "OpenVPN username: ", true)
-		if err != nil {
-			return fmt.Errorf("reading username: %w", err)
-		}
-
-		password, err := readSecret(ctx, "OpenVPN password: ", username == "")
-		if err != nil {
-			return fmt.Errorf("reading password: %w", err)
-		}
-
-		key, err := readSecret(ctx, "OpenVPN key: ", true)
-		if err != nil {
-			return fmt.Errorf("reading key: %w", err)
-		}
-
-		cert, err := readSecret(ctx, "OpenVPN cert: ", true)
-		if err != nil {
-			return fmt.Errorf("reading cert: %w", err)
-		}
-
-		openvpnCredentials := &openvpnCredentials{
-			Username: username,
-			Password: string(password),
-			Key:      string(key),
-			Cert:     string(cert),
-		}
-		err = validateOpenvpnCredentials(provider, openvpnCredentials)
-		if err != nil {
-			return err
-		}
-
-		return addCredential(credentials, provider, vpnType, openvpnCredentials, nil)
-
-	case vpnTypeWireGuard:
-		privateKey, err := readSecret(ctx, "WireGuard private key: ", false)
-		if err != nil {
-			return fmt.Errorf("reading private key: %w", err)
-		}
-
-		address, err := readLine(ctx, "WireGuard address (optional): ", true)
-		if err != nil {
-			return fmt.Errorf("reading address: %w", err)
-		}
-
-		presharedKey, err := readSecret(
-			ctx,
-			"WireGuard preshared key (optional): ",
-			true,
-		)
-		if err != nil {
-			return fmt.Errorf("reading preshared key: %w", err)
-		}
-
-		wireguardCredentials := &wireguardCredentials{
-			PrivateKey:   string(privateKey),
-			Address:      address,
-			PresharedKey: string(presharedKey),
-		}
-		err = validateWireguardCredentials(provider, wireguardCredentials)
-		if err != nil {
-			return err
-		}
-
-		return addCredential(credentials, provider, vpnType, nil, wireguardCredentials)
-
-	default:
-		return fmt.Errorf("unknown vpn type %q, must be wireguard or openvpn", vpnType)
-	}
-}
-
-func writeEncryptedCredentials(
-	credentials map[string]providerCredentials,
-	password []byte,
-) error {
-	plaintext, err := marshalCredentials(credentials)
-	if err != nil {
-		return fmt.Errorf("encoding credentials: %w", err)
-	}
-
-	encrypted, err := encryptData(plaintext, password)
-	if err != nil {
-		return fmt.Errorf("encrypting credentials: %w", err)
-	}
-
-	const filePerms = 0o600
-	err = os.WriteFile(credentialsFilename, encrypted, filePerms)
-	if err != nil {
-		return fmt.Errorf("writing %s: %w", credentialsFilename, err)
-	}
-
-	return nil
-}
-
-func decryptCredentialsFile(password []byte) ([]byte, error) {
-	encryptedData, err := os.ReadFile(credentialsFilename)
-	if err != nil {
-		return nil, fmt.Errorf("reading %s: %w", credentialsFilename, err)
-	}
-
-	plaintext, err := decryptData(encryptedData, password)
-	if err != nil {
-		return nil, fmt.Errorf("decrypting credentials: %w", err)
-	}
-
-	return plaintext, nil
-}
-
-func readSecret(ctx context.Context, prompt string, allowEmpty bool) ([]byte, error) {
-	fmt.Print(prompt)
-
-	passwordFD, err := syscall.Dup(syscall.Stdin)
-	if err != nil {
-		fmt.Println()
-		return nil, fmt.Errorf("duplicating stdin file descriptor: %w", err)
-	}
-
-	var closeFDOnce sync.Once
-	closePasswordFD := func() {
-		closeFDOnce.Do(func() {
-			_ = syscall.Close(passwordFD)
-		})
-	}
-
-	passwordResult := make(chan struct {
-		password []byte
-		err      error
-	})
-
-	go func() {
-		password, err := term.ReadPassword(passwordFD)
-		closePasswordFD()
-		result := struct {
-			password []byte
-			err      error
-		}{
-			password: password,
-			err:      err,
-		}
-
-		select {
-		case <-ctx.Done():
-			return
-		case passwordResult <- result:
-		}
-	}()
-
-	select {
-	case <-ctx.Done():
-		closePasswordFD()
-		fmt.Println()
-		return nil, ctx.Err()
-	case result := <-passwordResult:
-		closePasswordFD()
-		fmt.Println()
-		if result.err != nil {
-			return nil, fmt.Errorf("reading hidden input from terminal: %w", result.err)
-		}
-		if len(result.password) == 0 && !allowEmpty {
-			return nil, fmt.Errorf("value cannot be empty")
-		}
-		return result.password, nil
-	}
-}
-
-func readLine(ctx context.Context, prompt string, allowEmpty bool) (string, error) {
-	fmt.Print(prompt)
-
-	inputFD, err := syscall.Dup(syscall.Stdin)
-	if err != nil {
-		fmt.Println()
-		return "", fmt.Errorf("duplicating stdin file descriptor: %w", err)
-	}
-
-	var closeFDOnce sync.Once
-	closeInputFD := func() {
-		closeFDOnce.Do(func() {
-			_ = syscall.Close(inputFD)
-		})
-	}
-
-	inputResult := make(chan struct {
-		value string
-		err   error
-	})
-
-	go func() {
-		inputFile := os.NewFile(uintptr(inputFD), "stdin")
-		reader := bufio.NewReader(inputFile)
-		value, err := reader.ReadString('\n')
-		closeInputFD()
-		value = strings.TrimRight(value, "\r\n")
-		if err == io.EOF {
-			err = nil
-		}
-
-		result := struct {
-			value string
-			err   error
-		}{
-			value: value,
-			err:   err,
-		}
-
-		select {
-		case <-ctx.Done():
-			return
-		case inputResult <- result:
-		}
-	}()
-
-	select {
-	case <-ctx.Done():
-		closeInputFD()
-		fmt.Println()
-		return "", ctx.Err()
-	case result := <-inputResult:
-		closeInputFD()
-		if result.err != nil {
-			return "", fmt.Errorf("reading line from terminal: %w", result.err)
-		}
-		if result.value == "" && !allowEmpty {
-			return "", fmt.Errorf("value cannot be empty")
-		}
-		return result.value, nil
-	}
-}
-
-func readPasswordConfirmed(
-	ctx context.Context,
-	prompt, confirmationPrompt string,
-) ([]byte, error) {
-	password, err := readSecret(ctx, prompt, false)
-	if err != nil {
-		return nil, err
-	}
-
-	confirmation, err := readSecret(ctx, confirmationPrompt, false)
-	if err != nil {
-		return nil, err
-	}
-
-	if string(password) != string(confirmation) {
-		return nil, fmt.Errorf("passwords do not match")
-	}
-
-	return password, nil
-}
-
-func deriveKey(password, salt []byte) ([]byte, error) {
-	key, err := scrypt.Key(password, salt, scryptN, scryptR, scryptP, keySize)
-	if err != nil {
-		return nil, fmt.Errorf("deriving key with scrypt: %w", err)
-	}
-	return key, nil
-}
-
-func encryptData(plaintext, password []byte) ([]byte, error) {
-	salt := make([]byte, saltSize)
-	_, err := io.ReadFull(rand.Reader, salt)
-	if err != nil {
-		return nil, fmt.Errorf("generating salt: %w", err)
-	}
-
-	key, err := deriveKey(password, salt)
-	if err != nil {
-		return nil, err
-	}
-
-	block, err := aes.NewCipher(key)
-	if err != nil {
-		return nil, fmt.Errorf("creating AES cipher: %w", err)
-	}
-
-	gcm, err := cipher.NewGCM(block)
-	if err != nil {
-		return nil, fmt.Errorf("creating GCM: %w", err)
-	}
-
-	nonce := make([]byte, nonceSize)
-	_, err = io.ReadFull(rand.Reader, nonce)
-	if err != nil {
-		return nil, fmt.Errorf("generating nonce: %w", err)
-	}
-
-	ciphertext := gcm.Seal(nil, nonce, plaintext, nil)
-
-	result := make([]byte, 0, saltSize+nonceSize+len(ciphertext))
-	result = append(result, salt...)
-	result = append(result, nonce...)
-	result = append(result, ciphertext...)
-
-	return result, nil
-}
-
-func decryptData(data, password []byte) ([]byte, error) {
-	const minSize = saltSize + nonceSize + 16 // 16 is the GCM tag size
-	if len(data) < minSize {
-		return nil, fmt.Errorf("encrypted data too short: %d bytes", len(data))
-	}
-
-	salt := data[:saltSize]
-	nonce := data[saltSize : saltSize+nonceSize]
-	ciphertext := data[saltSize+nonceSize:]
-
-	key, err := deriveKey(password, salt)
-	if err != nil {
-		return nil, err
-	}
-
-	block, err := aes.NewCipher(key)
-	if err != nil {
-		return nil, fmt.Errorf("creating AES cipher: %w", err)
-	}
-
-	gcm, err := cipher.NewGCM(block)
-	if err != nil {
-		return nil, fmt.Errorf("creating GCM: %w", err)
-	}
-
-	plaintext, err := gcm.Open(nil, nonce, ciphertext, nil)
-	if err != nil {
-		return nil, fmt.Errorf("decrypting data (wrong password?): %w", err)
-	}
-
-	return plaintext, nil
-}

devrun/internal/runner.go

@@ -1,351 +0,0 @@
-package internal
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"os"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/mount"
-	"github.com/docker/docker/api/types/network"
-	"github.com/docker/docker/client"
-	"github.com/docker/docker/pkg/stdcopy"
-	"github.com/docker/go-connections/nat"
-	v1 "github.com/opencontainers/image-spec/specs-go/v1"
-	"golang.org/x/term"
-)
-
-type containerOptions struct {
-	env     []string
-	binds   []string
-	ports   nat.PortMap
-	dns     []string
-	devices []container.DeviceMapping
-	labels  map[string]string
-	capAdd  []string
-}
-
-// Run decrypts credentials, builds the container environment, and runs a Gluetun container.
-// extraArgs is the list of additional flags (e.g. ["-e", "PORT_FORWARDING=on", "-v", "/host:/container"]).
-func Run(ctx context.Context, provider, vpnType string, extraArgs []string,
-	forceKill <-chan struct{},
-) error {
-	credentials, err := decryptCredentials(ctx)
-	if err != nil {
-		return fmt.Errorf("loading credentials: %w", err)
-	}
-
-	credentialEnvVars, err := lookupCredentials(credentials, provider, vpnType)
-	if err != nil {
-		return err
-	}
-
-	extraOpts, err := parseExtraArgs(extraArgs)
-	if err != nil {
-		return fmt.Errorf("parsing extra flags: %w", err)
-	}
-	opts := extraOpts
-	opts.env = append(opts.env,
-		"VPN_SERVICE_PROVIDER="+provider,
-		"VPN_TYPE="+vpnType,
-		"LOG_LEVEL=debug",
-	)
-	opts.env = append(opts.env, credentialEnvVars...)
-	opts.capAdd = append(opts.capAdd, "NET_ADMIN")
-
-	return runContainer(ctx, opts, forceKill)
-}
-
-// parseExtraArgs parses extra arguments and maps them to container options.
-// Supported flags:
-//
-//	-e, --env KEY=VALUE       - environment variable
-//	-v, --volume SPEC         - volume mount (e.g., "/host:/container" or "name:/container")
-//	-p, --publish PORT:PORT   - port mapping
-//	--dns IP                  - DNS server
-//	--device SPEC             - device access (e.g., "/dev/net/tun")
-//	--label KEY=VALUE         - container label
-//	--cap-add CAPABILITY      - add Linux capability (e.g., "SYS_PTRACE")
-func parseExtraArgs(args []string) (opts containerOptions, err error) { //nolint:gocognit,gocyclo
-	opts = containerOptions{
-		ports:  make(nat.PortMap),
-		labels: make(map[string]string),
-	}
-
-	for i := 0; i < len(args); i++ {
-		arg := args[i]
-		switch {
-		case arg == "-e" || arg == "--env":
-			if i+1 >= len(args) {
-				return opts, fmt.Errorf("flag %q requires an argument", arg)
-			}
-			i++
-			opts.env = append(opts.env, args[i])
-		case strings.HasPrefix(arg, "-e="):
-			opts.env = append(opts.env, strings.TrimPrefix(arg, "-e="))
-		case strings.HasPrefix(arg, "--env="):
-			opts.env = append(opts.env, strings.TrimPrefix(arg, "--env="))
-
-		case arg == "-v" || arg == "--volume":
-			if i+1 >= len(args) {
-				return opts, fmt.Errorf("flag %q requires an argument", arg)
-			}
-			i++
-			opts.binds = append(opts.binds, args[i])
-		case strings.HasPrefix(arg, "-v="):
-			opts.binds = append(opts.binds, strings.TrimPrefix(arg, "-v="))
-		case strings.HasPrefix(arg, "--volume="):
-			opts.binds = append(opts.binds, strings.TrimPrefix(arg, "--volume="))
-
-		case arg == "-p" || arg == "--publish":
-			if i+1 >= len(args) {
-				return opts, fmt.Errorf("flag %q requires an argument", arg)
-			}
-			i++
-			if err := parsePortMapping(opts.ports, args[i]); err != nil {
-				return opts, fmt.Errorf("parsing port mapping: %w", err)
-			}
-		case strings.HasPrefix(arg, "-p="):
-			if err := parsePortMapping(opts.ports, strings.TrimPrefix(arg, "-p=")); err != nil {
-				return opts, fmt.Errorf("parsing port mapping: %w", err)
-			}
-		case strings.HasPrefix(arg, "--publish="):
-			if err := parsePortMapping(opts.ports, strings.TrimPrefix(arg, "--publish=")); err != nil {
-				return opts, fmt.Errorf("parsing port mapping: %w", err)
-			}
-
-		case arg == "--dns":
-			if i+1 >= len(args) {
-				return opts, fmt.Errorf("flag %q requires an argument", arg)
-			}
-			i++
-			opts.dns = append(opts.dns, args[i])
-		case strings.HasPrefix(arg, "--dns="):
-			opts.dns = append(opts.dns, strings.TrimPrefix(arg, "--dns="))
-
-		case arg == "--device":
-			if i+1 >= len(args) {
-				return opts, fmt.Errorf("flag %q requires an argument", arg)
-			}
-			i++
-			parseDeviceMapping(&opts.devices, args[i])
-		case strings.HasPrefix(arg, "--device="):
-			parseDeviceMapping(&opts.devices, strings.TrimPrefix(arg, "--device="))
-
-		case arg == "--label":
-			if i+1 >= len(args) {
-				return opts, fmt.Errorf("flag %q requires an argument", arg)
-			}
-			i++
-			parseLabel(opts.labels, args[i])
-		case strings.HasPrefix(arg, "--label="):
-			parseLabel(opts.labels, strings.TrimPrefix(arg, "--label="))
-
-		case arg == "--cap-add":
-			if i+1 >= len(args) {
-				return opts, fmt.Errorf("flag %q requires an argument", arg)
-			}
-			i++
-			opts.capAdd = append(opts.capAdd, args[i])
-		case strings.HasPrefix(arg, "--cap-add="):
-			opts.capAdd = append(opts.capAdd, strings.TrimPrefix(arg, "--cap-add="))
-
-		default:
-			return opts, fmt.Errorf("unsupported flag %q", arg)
-		}
-	}
-	return opts, nil
-}
-
-func parsePortMapping(portMap nat.PortMap, spec string) error {
-	port, bindings, err := nat.ParsePortSpecs([]string{spec})
-	if err != nil {
-		return err
-	}
-	for p, binding := range bindings {
-		portMap[p] = binding
-	}
-	for p := range port {
-		if _, exists := portMap[p]; !exists {
-			portMap[p] = []nat.PortBinding{}
-		}
-	}
-	return nil
-}
-
-func parseDeviceMapping(devices *[]container.DeviceMapping, spec string) {
-	parts := strings.SplitN(spec, ":", 3) //nolint:mnd
-	pathOnHost := parts[0]
-	pathInContainer := pathOnHost
-	permissions := "rwm"
-
-	if len(parts) >= 2 { //nolint:mnd
-		pathInContainer = parts[1]
-	}
-	if len(parts) >= 3 { //nolint:mnd
-		permissions = parts[2]
-	}
-
-	*devices = append(*devices, container.DeviceMapping{
-		PathOnHost:        pathOnHost,
-		PathInContainer:   pathInContainer,
-		CgroupPermissions: permissions,
-	})
-}
-
-func parseLabel(labels map[string]string, kv string) {
-	parts := strings.SplitN(kv, "=", 2) //nolint:mnd
-	key := parts[0]
-	value := ""
-	if len(parts) > 1 {
-		value = parts[1]
-	}
-	labels[key] = value
-}
-
-func runContainer(ctx context.Context, opts containerOptions, forceKill <-chan struct{}) error {
-	dockerClient, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
-	if err != nil {
-		return fmt.Errorf("creating docker client: %w", err)
-	}
-	defer dockerClient.Close()
-
-	hasTTY := term.IsTerminal(int(os.Stdout.Fd()))
-
-	containerConfig := &container.Config{
-		Image:  "qmcgaw/gluetun",
-		Env:    opts.env,
-		Labels: opts.labels,
-		Tty:    hasTTY,
-	}
-
-	mounts := make([]mount.Mount, 0, len(opts.binds))
-	for _, bind := range opts.binds {
-		m, err := parseBindMount(bind)
-		if err != nil {
-			return fmt.Errorf("parsing bind mount %q: %w", bind, err)
-		}
-		mounts = append(mounts, m)
-	}
-
-	hostConfig := &container.HostConfig{
-		AutoRemove:   true,
-		CapAdd:       opts.capAdd,
-		Binds:        opts.binds,
-		Mounts:       mounts,
-		PortBindings: opts.ports,
-		DNS:          opts.dns,
-	}
-	hostConfig.Devices = opts.devices
-
-	networkConfig := &network.NetworkingConfig{}
-
-	platform := (*v1.Platform)(nil)
-
-	const containerName = "gluetun"
-	response, err := dockerClient.ContainerCreate(ctx, containerConfig, hostConfig, networkConfig, platform, containerName)
-	if err != nil {
-		return fmt.Errorf("creating container: %w", err)
-	}
-	for _, warning := range response.Warnings {
-		fmt.Fprintln(os.Stderr, "container creation warning:", warning)
-	}
-	containerID := response.ID
-
-	err = dockerClient.ContainerStart(ctx, containerID, container.StartOptions{})
-	if err != nil {
-		return fmt.Errorf("starting container: %w", err)
-	}
-
-	fmt.Printf("Container started (id: %.12s)\n", containerID)
-
-	streamLogsErr := make(chan error, 1)
-	go func() {
-		streamLogsErr <- streamLogs(context.Background(), dockerClient, containerID, hasTTY)
-	}()
-
-	contextDone := ctx.Done()
-	forceKillSignal := forceKill
-	for {
-		select {
-		case err := <-streamLogsErr:
-			if err != nil {
-				return err
-			}
-			return nil
-		case <-contextDone:
-			fmt.Fprintln(os.Stderr, "\nReceived interrupt, stopping container (5s timeout)...")
-			err = stopContainer(dockerClient, containerID)
-			if err != nil {
-				fmt.Fprintln(os.Stderr, "stopping container:", err)
-			}
-			contextDone = nil
-		case <-forceKillSignal:
-			fmt.Fprintln(os.Stderr, "\nReceived second interrupt, killing container...")
-			err = killContainer(dockerClient, containerID)
-			if err != nil {
-				fmt.Fprintln(os.Stderr, "killing container:", err)
-			}
-			forceKillSignal = nil
-		}
-	}
-}
-
-func parseBindMount(bind string) (mount.Mount, error) {
-	parts := strings.SplitN(bind, ":", 3) //nolint:mnd
-	if len(parts) < 2 {                   //nolint:mnd
-		return mount.Mount{}, fmt.Errorf("invalid bind mount format: %q (expected source:target[:mode])", bind)
-	}
-
-	source := parts[0]
-	target := parts[1]
-	readOnly := len(parts) > 2 && strings.Contains(parts[2], "ro") //nolint:mnd
-
-	return mount.Mount{
-		Type:     mount.TypeBind,
-		Source:   source,
-		Target:   target,
-		ReadOnly: readOnly,
-	}, nil
-}
-
-func stopContainer(dockerClient *client.Client, containerID string) error {
-	const stopTimeout = 5 * time.Second
-	stopCtx, stopCancel := context.WithTimeout(context.Background(), stopTimeout)
-	defer stopCancel()
-	timeoutSeconds := int(stopTimeout.Seconds())
-	return dockerClient.ContainerStop(stopCtx, containerID, container.StopOptions{Timeout: &timeoutSeconds})
-}
-
-func killContainer(dockerClient *client.Client, containerID string) error {
-	return dockerClient.ContainerKill(context.Background(), containerID, "KILL")
-}
-
-func streamLogs(ctx context.Context, dockerClient *client.Client, containerID string, hasTTY bool) error {
-	logOptions := container.LogsOptions{
-		ShowStdout: true,
-		ShowStderr: true,
-		Follow:     true,
-		Timestamps: false,
-	}
-
-	reader, err := dockerClient.ContainerLogs(ctx, containerID, logOptions)
-	if err != nil {
-		return fmt.Errorf("getting container logs: %w", err)
-	}
-	defer reader.Close()
-
-	if hasTTY {
-		_, err = io.Copy(os.Stdout, reader)
-	} else {
-		_, err = stdcopy.StdCopy(os.Stdout, os.Stderr, reader)
-	}
-	if err != nil && err != io.EOF {
-		return fmt.Errorf("streaming container logs: %w", err)
-	}
-
-	return nil
-}

docker-compose.yml

@@ -0,0 +1,31 @@
+version: "3.7"
+services:
+  gluetun:
+    image: qmcgaw/gluetun
+    container_name: gluetun
+    cap_add:
+      - NET_ADMIN
+    network_mode: bridge
+    ports:
+      - 8888:8888/tcp # HTTP proxy
+      - 8388:8388/tcp # Shadowsocks
+      - 8388:8388/udp # Shadowsocks
+      - 8000:8000/tcp # Built-in HTTP control server
+    # command:
+    volumes:
+      - /yourpath:/gluetun
+    secrets:
+      - openvpn_user
+      - openvpn_password
+    environment:
+      # More variables are available, see the readme table
+      - VPNSP=private internet access
+      # Timezone for accurate logs times
+      - TZ=
+    restart: always
+
+secrets:
+  openvpn_user:
+    file: ./openvpn_user
+  openvpn_password:
+    file: ./openvpn_password

go.mod

@@ -1,69 +1,14 @@
 module github.com/qdm12/gluetun
 
-go 1.25.0
+go 1.15
 
 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/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/gluetun-servers v0.1.1-0.20260522005421-14277e92ce82
-	github.com/qdm12/goservices v0.1.1-0.20251104135713-6bee97bd4978
-	github.com/qdm12/gosettings v0.4.4
-	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/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/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
-)
-
-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/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/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/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
-	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
+	github.com/fatih/color v1.10.0
+	github.com/golang/mock v1.4.4
+	github.com/kyokomi/emoji v2.2.4+incompatible
+	github.com/qdm12/golibs v0.0.0-20210102015428-6e1d159e61a3
+	github.com/qdm12/ss-server v0.1.0
+	github.com/stretchr/testify v1.6.1
+	github.com/vishvananda/netlink v1.1.0
+	golang.org/x/sys v0.0.0-20201223074533-0d417f636930
 )

go.sum

@@ -1,205 +1,149 @@
-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/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/PuerkitoBio/purell v1.1.0 h1:rmGxhojJlM0tuKtfdvliR84CFHljx9ag64t2xmVkjK4=
+github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
+github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
+github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf h1:eg0MeVzsP1G42dRafH3vf+al2vQIJU0YHX+1Tw87oco=
+github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 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/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/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.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/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/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
+github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s=
+github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
+github.com/fatih/color v1.10.0 h1:s36xzo75JdqLaaWoiEHk767eHiwo0598uUxyfiPkDsg=
+github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
+github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb h1:D4uzjWwKYQ5XnAvUbuvHW93esHg7F8N/OYeBBcJoTr0=
+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 h1:8JV+dzJJiK46XqGLqqLav8ZfEiJECp8jlOFhpiCdZ+0=
+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 h1:azEQ8Fnx0jmtFF2fxsnmd6I0x6rsweUF63qqSO1NmKk=
+github.com/go-openapi/errors v0.17.2/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
+github.com/go-openapi/jsonpointer v0.17.0 h1:nH6xp8XdXHx8dqveo0ZuJBluCO2qGrPbDNZ0dwoRHP0=
+github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
+github.com/go-openapi/jsonreference v0.17.0 h1:yJW3HCkTHg7NOA+gZ83IPHzUSnUzGXhGmsdiCcMexbA=
+github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
+github.com/go-openapi/loads v0.17.0 h1:H22nMs3GDQk4SwAaFQ+jLNw+0xoFeCueawhZlv8MBYs=
+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 h1:/ZK67ikFhQAMFFH/aPu2MaGH7QjP4wHBvHYOVIzDAw0=
+github.com/go-openapi/runtime v0.17.2/go.mod h1:QO936ZXeisByFmZEO1IS1Dqhtf4QV1sYYFtIq6Ld86Q=
+github.com/go-openapi/spec v0.17.0 h1:XNvrt8FlSVP8T1WuhbAFF6QDhJc0zsoWzX4wXARhhpE=
+github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
+github.com/go-openapi/strfmt v0.17.0 h1:1isAxYf//QDTnVzbLAMrUK++0k1EjeLJU/gTOR0o3Mc=
+github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
+github.com/go-openapi/swag v0.17.0 h1:iqrgMg7Q7SvtbWLlltPrkMs0UBJI6oTSs79JFRUi880=
+github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
+github.com/go-openapi/validate v0.17.0 h1:pqoViQz3YLOGIhAmD0N4Lt6pa/3Gnj3ymKqQwq8iS6U=
+github.com/go-openapi/validate v0.17.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4=
+github.com/golang/mock v1.4.3 h1:GV+pQPG/EUUbkh47niozDcADz6go/dUwhVzdUQHIVRw=
+github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc=
+github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
+github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
+github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gotify/go-api-client/v2 v2.0.4 h1:0w8skCr8aLBDKaQDg31LKKHUGF7rt7zdRpR+6cqIAlE=
+github.com/gotify/go-api-client/v2 v2.0.4/go.mod h1:VKiah/UK20bXsr0JObE1eBVLW44zbBouzjuri9iwjFU=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+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/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 h1:np0woGKwx9LiHAQmwZx79Oc0rHpNw3o+3evou4BEPv4=
+github.com/kyokomi/emoji v2.2.4+incompatible/go.mod h1:mZ6aGCD7yk8j6QY6KICwnZ2pxoszVseX1DNoGtU2tBA=
+github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329 h1:2gxZ0XQIU/5z3Z3bUBu+FXuk2pFbkN6tcwi/pjyaDic=
+github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA=
+github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
+github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
+github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.11 h1:FxPOTFNqGkuDUGi3H/qkUbQO4ZiBa2brKq5r0l8TGeM=
+github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
+github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
+github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
+github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/mr-tron/base58 v1.1.3 h1:v+sk57XuaCKGXpWtVBX8YJzO7hMGx4Aajh4TQbdEFdc=
+github.com/mr-tron/base58 v1.1.3/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
+github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
+github.com/phayes/permbits v0.0.0-20190612203442-39d7c581d2ee h1:P6U24L02WMfj9ymZTxl7CxS73JC99x3ukk+DBkgQGQs=
+github.com/phayes/permbits v0.0.0-20190612203442-39d7c581d2ee/go.mod h1:3uODdxMgOaPYeWU7RzZLxVtJHZ/x1f/iHkBZuKJDzuY=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
+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/gluetun-servers v0.1.1-0.20260522005421-14277e92ce82 h1:tE44IEW7o9yPQaO8HBeoO9RxtTTxqhboIypegrQlVt8=
-github.com/qdm12/gluetun-servers v0.1.1-0.20260522005421-14277e92ce82/go.mod h1:acttuyHyoFDu6GTbf3kAV+QXeiX8oJeh0MBic67/9z8=
-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/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/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/golibs v0.0.0-20210102015428-6e1d159e61a3 h1:tnkjZkYZuAFNga7Wd/j3z3gPJLkv0OXow4q/YTkRdmE=
+github.com/qdm12/golibs v0.0.0-20210102015428-6e1d159e61a3/go.mod h1:pikkTN7g7zRuuAnERwqW1yAFq6pYmxrxpjiwGvb0Ysc=
+github.com/qdm12/ss-server v0.1.0 h1:WV9MkHCDEWRwe4WpnYFeR/zcZAxYoTbfntLDnw9AQ50=
+github.com/qdm12/ss-server v0.1.0/go.mod h1:ABVUkxubboL3vqBkOwDV9glX1/x7SnYrckBe5d+M/zw=
 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/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-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.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/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.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=
+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.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/vishvananda/netlink v1.1.0 h1:1iyaYNBLmP6L0220aDnYQpo1QEV4t4hJ+xEEhhJH8j0=
+github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
+github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df h1:OviZH7qLw/7ZovXvuNyL3XQl8UFofeikI1NW1Gypu7k=
+github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
+go.uber.org/atomic v1.5.0 h1:OI5t8sDa1Or+q8AeE+yKeB/SDYioSHAgcVljj9JIETY=
+go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
+go.uber.org/multierr v1.3.0 h1:sFPn2GLc3poCkfrpIXGhBD2X0CMIo4Q/zSULXrj/+uc=
+go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
+go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4=
+go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
+go.uber.org/zap v1.13.0 h1:nR6NoDBgAf67s68NhaXbsojM+2gxp3S1hWkHDl27pVU=
+go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-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/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/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200117160349-530e935923ad/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de h1:ikNHVSjEfnvz6sxdSPCaPt572qowuyMDMJLLm3Db3ig=
+golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs=
+golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
+golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/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-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/sync v0.0.0-20190423024810-112230192c58/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.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-20190222072716-a9d3bda3a223/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-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/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-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/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/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+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-20201223074533-0d417f636930 h1:vRgIt+nup/B/BwIS0g2oC0haq0iqbV3ZA+u6+0TlNCo=
+golang.org/x/sys v0.0.0-20201223074533-0d417f636930/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/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/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-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/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5 h1:hKsoRgsbwY1NafxrwTs+k64bikrLBkAgPir1TNCj3Zs=
+golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 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-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=
 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/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+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 h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 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=
+honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM=
+honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
+rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
+rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

internal/alpine/alpine.go

@@ -1,21 +1,22 @@
 package alpine
 
 import (
-	"os/user"
+	"github.com/qdm12/golibs/os"
+	"github.com/qdm12/golibs/os/user"
 )
 
-type Alpine struct {
-	alpineReleasePath string
-	passwdPath        string
-	lookupID          func(uid string) (*user.User, error)
-	lookup            func(username string) (*user.User, error)
+type Configurator interface {
+	CreateUser(username string, uid int) (createdUsername string, err error)
 }
 
-func New() *Alpine {
-	return &Alpine{
-		alpineReleasePath: "/etc/alpine-release",
-		passwdPath:        "/etc/passwd",
-		lookupID:          user.LookupId,
-		lookup:            user.Lookup,
+type configurator struct {
+	openFile os.OpenFileFunc
+	osUser   user.OSUser
+}
+
+func NewConfigurator(openFile os.OpenFileFunc, osUser user.OSUser) Configurator {
+	return &configurator{
+		openFile: openFile,
+		osUser:   osUser,
 	}
 }

internal/alpine/users.go

@@ -2,43 +2,34 @@ package alpine
 
 import (
 	"fmt"
-	"io/fs"
 	"os"
 	"os/user"
-	"strconv"
 )
 
 // CreateUser creates a user in Alpine with the given UID.
-func (a *Alpine) CreateUser(username string, uid int) (createdUsername string, err error) {
-	UIDStr := strconv.Itoa(uid)
-	u, err := a.lookupID(UIDStr)
+func (c *configurator) CreateUser(username string, uid int) (createdUsername string, err error) {
+	UIDStr := fmt.Sprintf("%d", uid)
+	u, err := c.osUser.LookupID(UIDStr)
 	_, unknownUID := err.(user.UnknownUserIdError)
 	if err != nil && !unknownUID {
-		return "", err
-	}
-
-	if u != nil {
+		return "", fmt.Errorf("cannot create user: %w", err)
+	} else if u != nil {
 		if u.Username == username {
 			return "", nil
 		}
 		return u.Username, nil
 	}
-
-	u, err = a.lookup(username)
+	u, err = c.osUser.Lookup(username)
 	_, unknownUsername := err.(user.UnknownUserError)
 	if err != nil && !unknownUsername {
-		return "", err
-	}
-
-	if u != nil {
-		return "", fmt.Errorf("user already exists: with name %s for ID %s instead of %d",
+		return "", fmt.Errorf("cannot create user: %w", err)
+	} else if u != nil {
+		return "", fmt.Errorf("cannot create user: user with name %s already exists for ID %s instead of %d",
 			username, u.Uid, uid)
 	}
-
-	const permission = fs.FileMode(0o644)
-	file, err := os.OpenFile(a.passwdPath, os.O_APPEND|os.O_WRONLY, permission)
+	file, err := c.openFile("/etc/passwd", os.O_APPEND|os.O_WRONLY, 0644)
 	if err != nil {
-		return "", err
+		return "", fmt.Errorf("cannot create user: %w", err)
 	}
 	s := fmt.Sprintf("%s:x:%d:::/dev/null:/sbin/nologin\n", username, uid)
 	_, err = file.WriteString(s)
@@ -46,6 +37,5 @@ func (a *Alpine) CreateUser(username string, uid int) (createdUsername string, e
 		_ = file.Close()
 		return "", err
 	}
-
 	return username, file.Close()
 }

internal/alpine/version.go

@@ -1,27 +0,0 @@
-package alpine
-
-import (
-	"context"
-	"io"
-	"os"
-	"strings"
-)
-
-func (a *Alpine) Version(context.Context) (version string, err error) {
-	file, err := os.OpenFile(a.alpineReleasePath, os.O_RDONLY, 0)
-	if err != nil {
-		return "", err
-	}
-
-	b, err := io.ReadAll(file)
-	if err != nil {
-		return "", err
-	}
-
-	if err := file.Close(); err != nil {
-		return "", err
-	}
-
-	version = strings.ReplaceAll(string(b), "\n", "")
-	return version, nil
-}

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,87 +0,0 @@
-package amneziawg
-
-import (
-	"errors"
-	"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: errors.New("private key is missing"),
-		},
-		"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,127 +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"
-)
-
-// 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("TUN device name is mismatching: expected %q and got %q", 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 = errors.New("device waited for")
-		}
-
-		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 {
-		logger.Infof("gluetun.com is DOWN most likely thanks to you! so not doing anything anymore")
-	}
-	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/ci.go

@@ -1,7 +0,0 @@
-package cli
-
-import "context"
-
-func (c *CLI) CI(context.Context) error {
-	return nil
-}

internal/cli/cli.go

@@ -1,7 +1,20 @@
 package cli
 
-type CLI struct{}
+import (
+	"context"
 
-func New() *CLI {
-	return &CLI{}
+	"github.com/qdm12/golibs/os"
+)
+
+type CLI interface {
+	ClientKey(args []string, openFile os.OpenFileFunc) error
+	HealthCheck(ctx context.Context) error
+	OpenvpnConfig(os os.OS) error
+	Update(args []string, os os.OS) error
+}
+
+type cli struct{}
+
+func New() CLI {
+	return &cli{}
 }

internal/cli/clientkey.go

@@ -3,23 +3,24 @@ package cli
 import (
 	"flag"
 	"fmt"
-	"io"
-	"os"
+	"io/ioutil"
 	"strings"
+
+	"github.com/qdm12/gluetun/internal/constants"
+	"github.com/qdm12/golibs/os"
 )
 
-func (c *CLI) ClientKey(args []string) error {
+func (c *cli) ClientKey(args []string, openFile os.OpenFileFunc) 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", string(constants.ClientKey), "file path to the client.key file")
 	if err := flagSet.Parse(args); err != nil {
 		return err
 	}
-	file, err := os.OpenFile(*filepath, os.O_RDONLY, 0)
+	file, err := openFile(*filepath, os.O_RDONLY, 0)
 	if err != nil {
 		return err
 	}
-	data, err := io.ReadAll(file)
+	data, err := ioutil.ReadAll(file)
 	if err != nil {
 		_ = file.Close()
 		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

@@ -1,104 +0,0 @@
-package cli
-
-import (
-	"errors"
-	"flag"
-	"fmt"
-	"io/fs"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/qdm12/gluetun/internal/constants/providers"
-	"golang.org/x/text/cases"
-	"golang.org/x/text/language"
-)
-
-func addProviderFlag(flagSet *flag.FlagSet, providerToFormat map[string]*bool,
-	provider string, titleCaser cases.Caser,
-) {
-	boolPtr, ok := providerToFormat[provider]
-	if !ok {
-		panic(fmt.Sprintf("unknown provider in format map: %s", provider))
-	}
-	flagSet.BoolVar(boolPtr, provider, false, "Format "+titleCaser.String(provider)+" servers")
-}
-
-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 {
-		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.StringVar(&output, "output", "/dev/stdout", "Output file to write the formatted data to")
-	titleCaser := cases.Title(language.English)
-	for _, provider := range allProviderFlags {
-		addProviderFlag(flagSet, providersToFormat, provider, titleCaser)
-	}
-	if err := flagSet.Parse(args); err != nil {
-		return err
-	}
-
-	// Note the format is validated by storage.Format
-
-	// Verify only one provider is set to be formatted.
-	var providers []string
-	for provider, formatPtr := range providersToFormat {
-		if *formatPtr {
-			providers = append(providers, provider)
-		}
-	}
-	switch len(providers) {
-	case 0:
-		return errors.New("VPN provider to format was not specified")
-	case 1:
-	default:
-		return fmt.Errorf("more than one VPN provider to format were specified: %d specified: %s", len(providers),
-			strings.Join(providers, ", "))
-	}
-
-	var providerToFormat string
-	for _, providerToFormat = range allProviders {
-		if strings.ReplaceAll(providerToFormat, " ", "-") == providers[0] {
-			break
-		}
-	}
-
-	storage, err := setupStorage(newNoopLogger())
-	if err != nil {
-		return fmt.Errorf("setting up storage: %w", err)
-	}
-
-	formatted, err := storage.Format(providerToFormat, format)
-	if err != nil {
-		return fmt.Errorf("formatting servers: %w", err)
-	}
-
-	output = filepath.Clean(output)
-	const permission = fs.FileMode(0o644)
-	file, err := os.OpenFile(output, os.O_TRUNC|os.O_WRONLY|os.O_CREATE, permission)
-	if err != nil {
-		return fmt.Errorf("opening output file: %w", err)
-	}
-
-	_, err = fmt.Fprint(file, formatted)
-	if err != nil {
-		_ = file.Close()
-		return fmt.Errorf("writing to output file: %w", err)
-	}
-
-	err = file.Close()
-	if err != nil {
-		return fmt.Errorf("closing output file: %w", err)
-	}
-
-	return nil
-}

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

@@ -2,41 +2,19 @@ package cli
 
 import (
 	"context"
-	"net"
 	"net/http"
 	"time"
 
-	"github.com/qdm12/gluetun/internal/configuration/settings"
+	"github.com/qdm12/gluetun/internal/constants"
 	"github.com/qdm12/gluetun/internal/healthcheck"
-	"github.com/qdm12/gosettings/reader"
 )
 
-func (c *CLI) HealthCheck(ctx context.Context, reader *reader.Reader, _ Warner) (err error) {
-	// Extract the health server port from the configuration.
-	var config settings.Health
-	err = config.Read(reader)
-	if err != nil {
-		return err
-	}
-
-	config.SetDefaults()
-
-	err = config.Validate()
-	if err != nil {
-		return err
-	}
-
-	_, port, err := net.SplitHostPort(config.ServerAddress)
-	if err != nil {
-		return err
-	}
-
+func (c *cli) HealthCheck(ctx context.Context) error {
 	const timeout = 10 * time.Second
 	httpClient := &http.Client{Timeout: timeout}
-	client := healthcheck.NewClient(httpClient)
+	healthchecker := healthcheck.NewChecker(httpClient)
 	ctx, cancel := context.WithTimeout(ctx, timeout)
 	defer cancel()
-
-	url := "http://127.0.0.1:" + port
-	return client.Check(ctx, url)
+	const url = "http://" + constants.HealthcheckAddress
+	return healthchecker.Check(ctx, url)
 }

internal/cli/helpers.go

@@ -1,39 +0,0 @@
-package cli
-
-import (
-	"fmt"
-
-	"github.com/qdm12/gluetun/internal/configuration/settings"
-	"github.com/qdm12/gluetun/internal/configuration/sources/files"
-	"github.com/qdm12/gluetun/internal/configuration/sources/secrets"
-	"github.com/qdm12/gluetun/internal/storage"
-	"github.com/qdm12/gosettings/reader"
-	"github.com/qdm12/gosettings/reader/sources/env"
-)
-
-type storageSetupLogger interface {
-	storage.Logger
-	files.Warner
-}
-
-func setupStorage(logger storageSetupLogger) (s *storage.Storage, err error) {
-	settingsReader := reader.New(reader.Settings{
-		Sources: []reader.Source{
-			secrets.New(logger),
-			files.New(logger),
-			env.New(env.Settings{}),
-		},
-	})
-	var settings settings.Storage
-	err = settings.Read(settingsReader)
-	if err != nil {
-		return nil, fmt.Errorf("reading storage settings: %w", err)
-	}
-	settings.SetDefaults()
-	storage, err := storage.New(logger, *settings.ServersEnabled, settings.ServersPath,
-		settings.LegacyServersFilepath)
-	if err != nil {
-		return nil, fmt.Errorf("creating storage: %w", err)
-	}
-	return storage, nil
-}

internal/cli/interfaces.go

@@ -1,9 +0,0 @@
-package cli
-
-import "github.com/qdm12/gluetun/internal/configuration/settings"
-
-type Source interface {
-	Read() (settings settings.Settings, err error)
-	ReadHealth() (health settings.Health, err error)
-	String() string
-}

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,12 +0,0 @@
-package cli
-
-type noopLogger struct{}
-
-func newNoopLogger() *noopLogger {
-	return new(noopLogger)
-}
-
-func (l *noopLogger) Info(string)          {}
-func (l *noopLogger) Infof(string, ...any) {}
-func (l *noopLogger) Warn(string)          {}
-func (l *noopLogger) Warnf(string, ...any) {}

internal/cli/openvpnconfig.go

@@ -1,95 +1,48 @@
 package cli
 
 import (
-	"context"
 	"fmt"
-	"net/http"
-	"net/netip"
 	"strings"
 	"time"
 
-	"github.com/qdm12/gluetun/internal/configuration/settings"
-	"github.com/qdm12/gluetun/internal/models"
-	"github.com/qdm12/gluetun/internal/netlink"
-	"github.com/qdm12/gluetun/internal/openvpn/extract"
+	"github.com/qdm12/gluetun/internal/constants"
+	"github.com/qdm12/gluetun/internal/params"
 	"github.com/qdm12/gluetun/internal/provider"
-	"github.com/qdm12/gluetun/internal/updater/resolver"
-	"github.com/qdm12/gosettings/reader"
+	"github.com/qdm12/gluetun/internal/settings"
+	"github.com/qdm12/gluetun/internal/storage"
+	"github.com/qdm12/golibs/logging"
+	"github.com/qdm12/golibs/os"
 )
 
-type OpenvpnConfigLogger interface {
-	Info(s string)
-	Warn(s string)
-}
-
-type Unzipper interface {
-	FetchAndExtract(ctx context.Context, url string) (
-		contents map[string][]byte, err error)
-}
-
-type ParallelResolver interface {
-	Resolve(ctx context.Context, settings resolver.ParallelSettings) (
-		hostToIPs map[string][]netip.Addr, warnings []string, err error)
-}
-
-type IPFetcher interface {
-	String() string
-	CanFetchAnyIP() bool
-	FetchInfo(ctx context.Context, ip netip.Addr) (data models.PublicIP, err error)
-}
-
-type IPv6Checker interface {
-	FindIPv6SupportLevel(ctx context.Context,
-		checkAddresses []netip.AddrPort, firewall netlink.Firewall,
-	) (level netlink.IPv6SupportLevel, err error)
-}
-
-func (c *CLI) OpenvpnConfig(logger OpenvpnConfigLogger, reader *reader.Reader,
-	ipv6Checker IPv6Checker,
-) error {
-	storage, err := setupStorage(newNoopLogger())
-	if err != nil {
-		return fmt.Errorf("setting up storage: %w", err)
-	}
-
-	var allSettings settings.Settings
-	err = allSettings.Read(reader, logger)
+func (c *cli) OpenvpnConfig(os os.OS) error {
+	logger, err := logging.NewLogger(logging.ConsoleEncoding, logging.InfoLevel)
 	if err != nil {
 		return err
 	}
-	allSettings.SetDefaults()
-
-	ipv6SupportLevel, err := ipv6Checker.FindIPv6SupportLevel(context.Background(),
-		allSettings.IPv6.CheckAddresses, &noopFirewall{})
-	if err != nil {
-		return fmt.Errorf("checking for IPv6 support: %w", err)
-	}
-
-	err = allSettings.Validate(storage, ipv6SupportLevel.IsSupported(), logger)
-	if err != nil {
-		return fmt.Errorf("validating settings: %w", err)
-	}
-
-	// Unused by this CLI command
-	unzipper := (Unzipper)(nil)
-	client := (*http.Client)(nil)
-	warner := (Warner)(nil)
-	parallelResolver := (ParallelResolver)(nil)
-	ipFetcher := (IPFetcher)(nil)
-	openvpnFileExtractor := extract.New()
-
-	providers := provider.NewProviders(storage, time.Now, warner, client,
-		unzipper, parallelResolver, ipFetcher, openvpnFileExtractor, allSettings.Updater)
-	providerConf := providers.Get(allSettings.VPN.Provider.Name)
-	connection, err := providerConf.GetConnection(
-		allSettings.VPN.Provider.ServerSelection, ipv6SupportLevel == netlink.IPv6Internet)
+	paramsReader := params.NewReader(logger, os)
+	allSettings, err := settings.GetAllSettings(paramsReader)
 	if err != nil {
 		return err
 	}
-
-	lines := providerConf.OpenVPNConfig(connection,
-		allSettings.VPN.OpenVPN, ipv6SupportLevel.IsSupported())
-
+	allServers, err := storage.New(logger, os, constants.ServersData).
+		SyncServers(constants.GetAllServers())
+	if err != nil {
+		return err
+	}
+	providerConf := provider.New(allSettings.OpenVPN.Provider.Name, allServers, time.Now)
+	connection, err := providerConf.GetOpenVPNConnection(allSettings.OpenVPN.Provider.ServerSelection)
+	if err != nil {
+		return err
+	}
+	lines := providerConf.BuildConf(
+		connection,
+		allSettings.OpenVPN.Verbosity,
+		"nonroortuser",
+		allSettings.OpenVPN.Root,
+		allSettings.OpenVPN.Cipher,
+		allSettings.OpenVPN.Auth,
+		allSettings.OpenVPN.Provider.ExtraConfigOptions,
+	)
 	fmt.Println(strings.Join(lines, "\n"))
 	return nil
 }

internal/cli/update.go

@@ -2,133 +2,62 @@ package cli
 
 import (
 	"context"
-	"errors"
 	"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/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/constants"
+	"github.com/qdm12/gluetun/internal/settings"
+	"github.com/qdm12/gluetun/internal/storage"
 	"github.com/qdm12/gluetun/internal/updater"
-	"github.com/qdm12/gluetun/internal/updater/resolver"
-	"github.com/qdm12/gluetun/internal/updater/unzip"
+	"github.com/qdm12/golibs/logging"
+	"github.com/qdm12/golibs/os"
 )
 
-type UpdaterLogger interface {
-	Info(s string)
-	Infof(format string, args ...any)
-	Warn(s string)
-	Warnf(format string, args ...any)
-	Error(s string)
-}
-
-func (c *CLI) Update(ctx context.Context, args []string, logger UpdaterLogger) error {
-	options := settings.Updater{}
-	// TODO v4: remove flags below already present in standard settings
-	var endUserMode, maintainerMode bool
-	var updateAll bool
-	var dnsServer, csvProviders, ipToken, protonUsername, protonEmail, protonPassword string
+func (c *cli) Update(args []string, os os.OS) error {
+	options := settings.Updater{CLI: true}
+	var flushToFile bool
 	flagSet := flag.NewFlagSet("update", flag.ExitOnError)
-	flagSet.StringVar(&dnsServer, "dns", "", "no longer used, your DNS will use DoH with Cloudflare and Google")
-	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")
-	flagSet.BoolVar(&endUserMode, "enduser", false, "deprecated")
-	flagSet.BoolVar(&maintainerMode, "maintainer", false, "deprecated")
+	flagSet.BoolVar(&flushToFile, "file", false, "Write results to /gluetun/servers.json (for end users)")
+	flagSet.BoolVar(&options.Stdout, "stdout", false, "Write results to console to modify the program (for maintainers)")
+	flagSet.StringVar(&options.DNSAddress, "dns", "1.1.1.1", "DNS resolver address to use")
+	flagSet.BoolVar(&options.Cyberghost, "cyberghost", false, "Update Cyberghost servers")
+	flagSet.BoolVar(&options.Mullvad, "mullvad", false, "Update Mullvad servers")
+	flagSet.BoolVar(&options.Nordvpn, "nordvpn", false, "Update Nordvpn servers")
+	flagSet.BoolVar(&options.PIA, "pia", false, "Update Private Internet Access post-summer 2020 servers")
+	flagSet.BoolVar(&options.Privado, "privado", false, "Update Privado servers")
+	flagSet.BoolVar(&options.Purevpn, "purevpn", false, "Update Purevpn servers")
+	flagSet.BoolVar(&options.Surfshark, "surfshark", false, "Update Surfshark servers")
+	flagSet.BoolVar(&options.Vyprvpn, "vyprvpn", false, "Update Vyprvpn servers")
+	flagSet.BoolVar(&options.Windscribe, "windscribe", false, "Update Windscribe servers")
 	if err := flagSet.Parse(args); err != nil {
 		return err
 	}
-
-	switch {
-	case dnsServer != "":
-		logger.Warn("The -dns flag is no longer used, your DNS will use DoH with Cloudflare and Google")
-	case endUserMode:
-		logger.Warn("The -enduser flag is now unused")
-	case maintainerMode:
-		logger.Warn("The -maintainer flag is now unused")
-	}
-
-	if updateAll {
-		options.Providers = providers.All()
-	} else {
-		if csvProviders == "" {
-			return errors.New("no provider was specified")
-		}
-		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()
+	logger, err := logging.NewLogger(logging.ConsoleEncoding, logging.InfoLevel)
 	if err != nil {
-		return fmt.Errorf("options validation failed: %w", err)
+		return err
 	}
-
-	storage, err := setupStorage(logger)
-	if err != nil {
-		return fmt.Errorf("creating servers storage: %w", err)
+	if !flushToFile && !options.Stdout {
+		return fmt.Errorf("at least one of -file or -stdout must be specified")
 	}
-
-	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)
-	}
-
+	ctx := context.Background()
 	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)
+	storage := storage.New(logger, os, constants.ServersData)
+	currentServers, err := storage.SyncServers(constants.GetAllServers())
 	if err != nil {
-		return fmt.Errorf("creating public IP fetchers: %w", err)
+		return fmt.Errorf("cannot update servers: %w", err)
 	}
-	ipFetcher := api.NewResilient(fetchers, logger)
-
-	openvpnFileExtractor := extract.New()
-
-	providers := provider.NewProviders(storage, time.Now, logger, httpClient,
-		unzipper, parallelResolver, ipFetcher, openvpnFileExtractor, options)
-
-	updater := updater.New(httpClient, storage, providers, logger, *options.PreferDirectDownload)
-	err = updater.UpdateServers(ctx, options.Providers, options.MinRatio)
+	updater := updater.New(options, httpClient, currentServers, logger)
+	allServers, err := updater.UpdateServers(ctx)
 	if err != nil {
-		return fmt.Errorf("updating server information: %w", err)
+		return err
+	}
+	if flushToFile {
+		if err := storage.FlushToFile(allServers); err != nil {
+			return fmt.Errorf("cannot update servers: %w", err)
+		}
 	}
 
 	return nil

internal/cli/warner.go

@@ -1,5 +0,0 @@
-package cli
-
-type Warner interface {
-	Warn(s string)
-}

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.go

@@ -1,6 +0,0 @@
-package command
-
-type Logger interface {
-	Info(s string)
-	Error(s string)
-}