fix(httpproxy): redirect from http to https

Credits to @Thamos88 and @15ky3

.devcontainer/Dockerfile

@@ -1,2 +1,2 @@
 FROM qmcgaw/godevcontainer
-RUN apk add wireguard-tools htop
+RUN apk add wireguard-tools htop openssl

.devcontainer/docker-compose.yml

@@ -12,14 +12,12 @@ services:
       # Docker configuration
       - ~/.docker:/root/.docker
       # SSH directory for Linux, OSX and WSL
-      - ~/.ssh:/root/.ssh
-      # For Windows without WSL, a copy will be made
-      # from /tmp/.ssh to ~/.ssh to fix permissions
-      #- ~/.ssh:/tmp/.ssh:ro
+      # On Linux and OSX, a symlink /mnt/ssh <-> ~/.ssh is
+      # created in the container. On Windows, files are copied
+      # from /mnt/ssh to ~/.ssh to fix permissions.
+      - ~/.ssh:/mnt/ssh
       # Shell history persistence
       - ~/.zsh_history:/root/.zsh_history
-      # Git config
-      - ~/.gitconfig:/root/.gitconfig
     environment:
       - TZ=
     cap_add:

.github/ISSUE_TEMPLATE/bug.yml

@@ -40,6 +40,7 @@ body:
     attributes:
       label: VPN service provider
       options:
+        - AirVPN
         - Custom
         - Cyberghost
         - ExpressVPN
@@ -54,8 +55,10 @@ body:
         - PrivateVPN
         - ProtonVPN
         - PureVPN
+        - SlickVPN
         - Surfshark
         - TorGuard
+        - VPNSecure.me
         - VPNUnlimited
         - VyprVPN
         - WeVPN
@@ -96,7 +99,7 @@ body:
     attributes:
       label: Share your logs
       description: No sensitive information is logged out except when running with `LOG_LEVEL=debug`.
-      render: log
+      render: plain text
     validations:
       required: true
   - type: textarea

.github/labels.yml

@@ -1,18 +1,13 @@
-- 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"
+# Temporary status
+- name: "🗯️ Waiting for feedback"
+  color: "aadefa"
   description: ""
+- name: "🔴 Blocked"
+  color: "ff3f14"
+  description: "Blocked by another issue or pull request"
+- name: "🔒 After next release"
+  color: "e8f274"
+  description: "Will be done after the next release"
 
 # Priority
 - name: "🚨 Urgent"
@@ -22,7 +17,18 @@
   color: "4285f4"
   description: ""
 
+# Complexity
+- name: "☣️ Hard to do"
+  color: "7d0008"
+  description: ""
+- name: "🟩 Easy to do"
+  color: "34cf43"
+  description: ""
+
 # VPN providers
+- name: ":cloud: AirVPN"
+  color: "cfe8d4"
+  description: ""
 - name: ":cloud: Cyberghost"
   color: "cfe8d4"
   description: ""
@@ -64,12 +70,17 @@
 - name: ":cloud: PureVPN"
   color: "cfe8d4"
   description: ""
+- name: ":cloud: SlickVPN"
+  color: "cfe8d4"
+  description: ""
 - name: ":cloud: Surfshark"
   color: "cfe8d4"
   description: ""
 - name: ":cloud: Torguard"
   color: "cfe8d4"
   description: ""
+- name: ":cloud: VPNSecure.me"
+  color: "cfe8d4"
 - name: ":cloud: VPNUnlimited"
   color: "cfe8d4"
   description: ""

.github/workflows/ci-skip.yml

@@ -0,0 +1,37 @@
+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:
+    branches:
+      - master
+    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

@@ -32,13 +32,10 @@ on:
 
 jobs:
   verify:
-    # Only run if it's a push event or if it's a PR from this repository, and it is not dependabot.
-    if: |
-      github.actor != 'dependabot[bot]' &&
-      (github.event_name == 'push' ||
-      github.event_name == 'release' ||
-      (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository))
     runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
     env:
       DOCKER_BUILDKIT: "1"
     steps:
@@ -48,12 +45,14 @@ jobs:
         with:
           locale: "US"
           level: error
+          exclude: |
+            ./internal/storage/servers.json
 
       - name: Linting
         run: docker build --target lint .
 
-      - name: Go mod tidy check
-        run: docker build --target tidy .
+      - name: Mocks check
+        run: docker build --target mocks .
 
       - name: Build test image
         run: docker build --target test -t test-container .
@@ -65,28 +64,36 @@ jobs:
           -v "$(pwd)/coverage.txt:/tmp/gobuild/coverage.txt" \
           test-container
 
-      - name: Code security analysis
-        uses: snyk/actions/golang@master
-        env:
-          SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
-
       - name: Build final image
         run: docker build -t final-image .
 
-      # - name: Image security analysis
-      #   uses: snyk/actions/docker@master
-      #   env:
-      #     SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
-      #   with:
-      #     image: final-image
+  codeql:
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+    steps:
+      - uses: actions/checkout@v3
+      - uses: github/codeql-action/init@v2
+        with:
+          languages: go
+      - uses: github/codeql-action/autobuild@v2
+      - uses: github/codeql-action/analyze@v2
 
   publish:
-    # Only run if it's a push event or if it's a PR from this repository
     if: |
-      github.event_name == 'push' ||
-      github.event_name == 'release' ||
-      (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository)
-    needs: [verify]
+      github.repository == 'qdm12/gluetun' &&
+      (
+        github.event_name == 'push' ||
+        github.event_name == 'release' ||
+        (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]')
+      )
+    needs: [verify, codeql]
+    permissions:
+      actions: read
+      contents: read
+      packages: write
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -95,35 +102,41 @@ jobs:
       # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v4
         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=branch,enable=${{ github.ref != format('refs/heads/{0}', github.event.repository.default_branch) }}
             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@v1
-      - uses: docker/setup-buildx-action@v1
+      - uses: docker/setup-qemu-action@v2
+      - uses: docker/setup-buildx-action@v2
 
-      - uses: docker/login-action@v1
+      - uses: docker/login-action@v2
         with:
           username: qmcgaw
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
+      - uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: qdm12
+          password: ${{ github.token }}
+
       - name: Short commit
         id: shortcommit
         run: echo "::set-output name=value::$(git rev-parse --short HEAD)"
 
       - name: Build and push final image
-        uses: docker/build-push-action@v2.10.0
+        uses: docker/build-push-action@v4.0.0
         with:
           platforms: linux/amd64,linux/386,linux/arm64,linux/arm/v6,linux/arm/v7,linux/ppc64le
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/codeql.yml

@@ -1,25 +0,0 @@
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ master ]
-  schedule:
-    - cron: '44 9 * * 0'
-
-jobs:
-  analyze:
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-    steps:
-    - uses: actions/checkout@v3
-    - uses: github/codeql-action/init@v2
-      with:
-        languages: go
-    - uses: github/codeql-action/autobuild@v2
-    - uses: github/codeql-action/analyze@v2

.github/workflows/dependabot.yml

@@ -1,37 +0,0 @@
-name: Dependabot
-on:
-  pull_request:
-    branches:
-      - master
-    paths:
-      - .github/workflows/dependabot.yml
-      - cmd/**
-      - internal/**
-      - pkg/**
-      - .dockerignore
-      - .golangci.yml
-      - Dockerfile
-      - go.mod
-      - go.sum
-
-jobs:
-  verify:
-    if: ${{ github.actor == 'dependabot[bot]' }}
-    runs-on: ubuntu-latest
-    env:
-      DOCKER_BUILDKIT: "1"
-    steps:
-      - uses: actions/checkout@v3
-
-      - 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 \
-          -v "$(pwd)/coverage.txt:/tmp/gobuild/coverage.txt" \
-          test-container
-
-      - name: Build final image
-        run: docker build -t final-image .

.github/workflows/dockerhub-description.yml

@@ -1,18 +1,22 @@
 name: Docker Hub description
 on:
   push:
-    branches: [master]
+    branches:
+      - master
     paths:
       - README.md
       - .github/workflows/dockerhub-description.yml
 jobs:
-  dockerHubDescription:
+  docker-hub-description:
+    if: github.repository == 'qdm12/gluetun'
     runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Docker Hub Description
-        uses: peter-evans/dockerhub-description@v3
+      - uses: actions/checkout@v3
+
+      - uses: peter-evans/dockerhub-description@v3
         with:
           username: qmcgaw
           password: ${{ secrets.DOCKERHUB_PASSWORD }}

.github/workflows/fork.yml

@@ -1,40 +0,0 @@
-name: Fork
-on:
-  pull_request:
-    branches:
-      - master
-    paths:
-      - .github/workflows/fork.yml
-      - cmd/**
-      - internal/**
-      - pkg/**
-      - .dockerignore
-      - .golangci.yml
-      - Dockerfile
-      - go.mod
-      - go.sum
-
-jobs:
-  verify:
-    if: github.event.pull_request.head.repo.full_name != github.repository && github.actor != 'dependabot[bot]'
-    runs-on: ubuntu-latest
-    env:
-      DOCKER_BUILDKIT: "1"
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Linting
-        run: docker build --target lint .
-
-      - 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 \
-          -v "$(pwd)/coverage.txt:/tmp/gobuild/coverage.txt" \
-          test-container
-
-      - name: Build final image
-        run: docker build -t final-image .

.github/workflows/labels.yml

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

.golangci.yml

@@ -7,46 +7,38 @@ issues:
     - path: _test\.go
       linters:
         - dupl
-        - maligned
         - goerr113
         - containedctx
-    - path: internal/server/
+    - path: "internal\\/server\\/.+\\.go"
       linters:
         - dupl
-    - path: internal/configuration/
+    - path: "internal\\/configuration\\/settings\\/.+\\.go"
       linters:
         - dupl
-    - path: internal/constants/
-      linters:
-        - dupl
-    - text: "exported: exported var Err*"
-      linters:
-        - revive
-    - text: "mnd: Magic number: 0644*"
+    - text: "^mnd: Magic number: 0[0-9]{3}, in <argument> detected$"
+      source: "^.+= os\\.OpenFile\\(.+, .+, 0[0-9]{3}\\)"
       linters:
         - gomnd
-    - text: "mnd: Magic number: 0400*"
+    - text: "^mnd: Magic number: 0[0-9]{3}, in <argument> detected$"
+      source: "^.+= os\\.MkdirAll\\(.+, 0[0-9]{3}\\)"
       linters:
         - gomnd
-    - text: "variable 'mssFix' is only used in the if-statement*"
-      path: "openvpnconf.go"
-      linters:
-        - ifshort
-    - text: "variable 'auth' is only used in the if-statement*"
-      path: "openvpnconf.go"
-      linters:
-        - ifshort
     - linters:
         - lll
-      source: "^//go:generate "
+      source: "^//go:generate .+$"
+    - text: "returns interface \\(github\\.com\\/vishvananda\\/netlink\\.Link\\)"
+      linters:
+        - ireturn
+    - path: "internal\\/openvpn\\/pkcs8\\/descbc\\.go"
+      text: "newCipherDESCBCBlock returns interface \\(github\\.com\\/youmark\\/pkcs8\\.Cipher\\)"
+      linters:
+        - ireturn
 
 linters:
   enable:
     # - cyclop
     # - errorlint
-    # - ireturn
-    # - varnamelen
-    # - wrapcheck
+    - asasalint
     - asciicheck
     - bidichk
     - bodyclose
@@ -57,6 +49,7 @@ linters:
     - durationcheck
     - errchkjson
     - errname
+    - execinquery
     - exhaustive
     - exportloopref
     - forcetypeassert
@@ -76,8 +69,9 @@ linters:
     - goprintffuncname
     - gosec
     - grouper
-    - ifshort
     - importas
+    - interfacebloat
+    - ireturn
     - lll
     - maintidx
     - makezero
@@ -88,10 +82,11 @@ linters:
     - nilnil
     - noctx
     - nolintlint
+    - nosprintfhostport
     - prealloc
     - predeclared
-    - predeclared
     - promlinter
+    - reassign
     - revive
     - rowserrcheck
     - sqlclosecheck
@@ -100,6 +95,7 @@ linters:
     - tparallel
     - unconvert
     - unparam
+    - usestdlibvars
     - wastedassign
     - whitespace
 

.vscode/launch.json

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

Dockerfile

@@ -1,18 +1,22 @@
-ARG ALPINE_VERSION=3.15
-ARG GO_ALPINE_VERSION=3.15
-ARG GO_VERSION=1.17
+ARG ALPINE_VERSION=3.17
+ARG GO_ALPINE_VERSION=3.17
+ARG GO_VERSION=1.20
 ARG XCPUTRANSLATE_VERSION=v0.6.0
-ARG GOLANGCI_LINT_VERSION=v1.44.2
+ARG GOLANGCI_LINT_VERSION=v1.52.2
+ARG MOCKGEN_VERSION=v1.6.0
 ARG BUILDPLATFORM=linux/amd64
 
 FROM --platform=${BUILDPLATFORM} qmcgaw/xcputranslate:${XCPUTRANSLATE_VERSION} AS xcputranslate
 FROM --platform=${BUILDPLATFORM} qmcgaw/binpot:golangci-lint-${GOLANGCI_LINT_VERSION} AS golangci-lint
+FROM --platform=${BUILDPLATFORM} qmcgaw/binpot:mockgen-${MOCKGEN_VERSION} AS mockgen
 
 FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION}-alpine${GO_ALPINE_VERSION} AS base
 COPY --from=xcputranslate /xcputranslate /usr/local/bin/xcputranslate
-RUN apk --update add git g++
+# Note: findutils needed to have xargs support `-d` flag for mocks stage.
+RUN apk --update add git g++ findutils
 ENV CGO_ENABLED=0
 COPY --from=golangci-lint /bin /go/bin/golangci-lint
+COPY --from=mockgen /bin /go/bin/mockgen
 WORKDIR /tmp/gobuild
 COPY go.mod go.sum ./
 RUN go mod download
@@ -30,14 +34,17 @@ FROM --platform=${BUILDPLATFORM} base AS lint
 COPY .golangci.yml ./
 RUN golangci-lint run --timeout=10m
 
-FROM --platform=${BUILDPLATFORM} base AS tidy
+FROM --platform=${BUILDPLATFORM} base AS mocks
 RUN git init && \
     git config user.email ci@localhost && \
     git config user.name ci && \
-    git add -A && git commit -m ci && \
-    sed -i '/\/\/ indirect/d' go.mod && \
-    go mod tidy && \
-    git diff --exit-code -- go.mod
+    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 build
 ARG TARGETPLATFORM
@@ -84,13 +91,13 @@ ENV VPN_SERVICE_PROVIDER=pia \
     OPENVPN_CIPHERS= \
     OPENVPN_AUTH= \
     OPENVPN_PROCESS_USER= \
-    OPENVPN_IPV6=off \
     OPENVPN_CUSTOM_CONFIG= \
     # Wireguard
     WIREGUARD_PRIVATE_KEY= \
     WIREGUARD_PRESHARED_KEY= \
     WIREGUARD_PUBLIC_KEY= \
     WIREGUARD_ADDRESSES= \
+    WIREGUARD_IMPLEMENTATION=auto \
     # VPN server filtering
     SERVER_REGIONS= \
     SERVER_COUNTRIES= \
@@ -101,19 +108,28 @@ ENV VPN_SERVICE_PROVIDER=pia \
     OWNED_ONLY=no \
     # # Private Internet Access only:
     PRIVATE_INTERNET_ACCESS_OPENVPN_ENCRYPTION_PRESET= \
-    PRIVATE_INTERNET_ACCESS_VPN_PORT_FORWARDING=off \
-    PRIVATE_INTERNET_ACCESS_VPN_PORT_FORWARDING_STATUS_FILE="/tmp/gluetun/forwarded_port" \
+    VPN_PORT_FORWARDING=off \
+    VPN_PORT_FORWARDING_STATUS_FILE="/tmp/gluetun/forwarded_port" \
     # # Cyberghost only:
+    OPENVPN_CERT= \
+    OPENVPN_KEY= \
     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:
     SERVER_NUMBER= \
-    # # PIA and ProtonVPN only:
+    # # PIA only:
     SERVER_NAMES= \
     # # ProtonVPN only:
     FREE_ONLY= \
     # # Surfshark only:
     MULTIHOP_ONLY= \
+    # # VPN Secure only:
+    PREMIUM_ONLY= \
     # Firewall
     FIREWALL=on \
     FIREWALL_VPN_INPUT_PORTS= \
@@ -125,6 +141,7 @@ ENV VPN_SERVICE_PROVIDER=pia \
     # Health
     HEALTH_SERVER_ADDRESS=127.0.0.1:9999 \
     HEALTH_TARGET_ADDRESS=cloudflare.com:443 \
+    HEALTH_SUCCESS_WAIT_DURATION=5s \
     HEALTH_VPN_DURATION_INITIAL=6s \
     HEALTH_VPN_DURATION_ADDITION=5s \
     # DNS over TLS
@@ -162,6 +179,7 @@ ENV VPN_SERVICE_PROVIDER=pia \
     HTTP_CONTROL_SERVER_ADDRESS=":8000" \
     # Server data updater
     UPDATER_PERIOD=0 \
+    UPDATER_MIN_RATIO=0.8 \
     UPDATER_VPN_SERVICE_PROVIDERS= \
     # Public IP
     PUBLICIP_FILE="/tmp/gluetun/ip" \
@@ -180,8 +198,9 @@ ENTRYPOINT ["/gluetun-entrypoint"]
 EXPOSE 8000/tcp 8888/tcp 8388/tcp 8388/udp
 HEALTHCHECK --interval=5s --timeout=5s --start-period=10s --retries=1 CMD /gluetun-entrypoint healthcheck
 ARG TARGETPLATFORM
-RUN apk add --no-cache --update -l apk-tools && \
+RUN apk add --no-cache --update -l wget && \
     apk add --no-cache --update -X "https://dl-cdn.alpinelinux.org/alpine/v3.12/main" openvpn==2.4.12-r0 && \
+    apk add --no-cache --update -X "https://dl-cdn.alpinelinux.org/alpine/v3.16/main" openssl\~1.1 && \
     mv /usr/sbin/openvpn /usr/sbin/openvpn2.4 && \
     apk del openvpn && \
     apk add --no-cache --update openvpn ca-certificates iptables ip6tables unbound tzdata && \

README.md

@@ -1,128 +1,130 @@
-# Gluetun VPN client
-
-*Lightweight swiss-knife-like VPN client to tunnel to Cyberghost, ExpressVPN, FastestVPN,
-HideMyAss, IPVanish, IVPN, Mullvad, NordVPN, Perfect Privacy, Privado, Private Internet Access, PrivateVPN,
-ProtonVPN, PureVPN, Surfshark, TorGuard, VPNUnlimited, VyprVPN, WeVPN and Windscribe VPN servers
-using Go, OpenVPN or Wireguard, iptables, DNS over TLS, ShadowSocks and an HTTP proxy*
-
-
-![Title image](https://raw.githubusercontent.com/qdm12/gluetun/master/title.svg)
-
-[![Build status](https://github.com/qdm12/gluetun/actions/workflows/ci.yml/badge.svg)](https://github.com/qdm12/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/qdm12/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/qdm12/gluetun?label=Last%20release%20date)
-![Commits since release](https://img.shields.io/github/commits-since/qdm12/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/qdm12/gluetun.svg)](https://github.com/qdm12/gluetun/commits/master)
-[![GitHub commit activity](https://img.shields.io/github/commit-activity/y/qdm12/gluetun.svg)](https://github.com/qdm12/gluetun/graphs/contributors)
-[![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)
-
-[![Lines of code](https://img.shields.io/tokei/lines/github/qdm12/gluetun)](https://github.com/qdm12/gluetun)
-![Code size](https://img.shields.io/github/languages/code-size/qdm12/gluetun)
-![GitHub repo size](https://img.shields.io/github/repo-size/qdm12/gluetun)
-![Go version](https://img.shields.io/github/go-mod/go-version/qdm12/gluetun)
-
-![Visitors count](https://visitor-badge.laobi.icu/badge?page_id=gluetun.readme)
-
-## Quick links
-
-- [Setup](#Setup)
-- [Features](#Features)
-- Problem?
-  - [Check the Wiki](https://github.com/qdm12/gluetun/wiki)
-  - [Start a discussion](https://github.com/qdm12/gluetun/discussions)
-  - [Fix the Unraid template](https://github.com/qdm12/gluetun/discussions/550)
-- Suggestion?
-  - [Create an issue](https://github.com/qdm12/gluetun/issues)
-  - [Join the Slack channel](https://join.slack.com/t/qdm12/shared_invite/enQtOTE0NjcxNTM1ODc5LTYyZmVlOTM3MGI4ZWU0YmJkMjUxNmQ4ODQ2OTAwYzMxMTlhY2Q1MWQyOWUyNjc2ODliNjFjMDUxNWNmNzk5MDk)
-- Happy?
-  - Sponsor me on [github.com/sponsors/qdm12](https://github.com/sponsors/qdm12)
-  - Donate to [paypal.me/qmcgaw](https://www.paypal.me/qmcgaw)
-  - Drop me [an email](mailto:quentin.mcgaw@gmail.com)
-- 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.15 for a small Docker image of 29MB
-- Supports: **Cyberghost**, **ExpressVPN**, **FastestVPN**, **HideMyAss**, **IPVanish**, **IVPN**, **Mullvad**, **NordVPN**, **Perfect Privacy**, **Privado**, **Private Internet Access**, **PrivateVPN**, **ProtonVPN**, **PureVPN**,  **Surfshark**, **TorGuard**, **VPNUnlimited**, **Vyprvpn**, **WeVPN**, **Windscribe** servers
-- Supports OpenVPN for all providers listed
-- Supports Wireguard both kernelspace and userspace
-  - For **Mullvad**, **Ivpn** and **Windscribe**
-  - For **Torguard**, **VPN Unlimited** and **WeVPN** using [the custom provider](https://github.com/qdm12/gluetun/wiki/Custom-provider)
-  - For custom Wireguard configurations using [the custom provider](https://github.com/qdm12/gluetun/wiki/Custom-provider)
-  - More in progress, see [#134](https://github.com/qdm12/gluetun/issues/134)
-- 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-a-container-to-gluetun)
-- [Connect LAN devices to it](https://github.com/qdm12/gluetun/wiki/Connect-a-LAN-device-to-gluetun)
-- Compatible with amd64, i686 (32 bit), **ARM** 64 bit, ARM 32 bit v6 and v7, and even ppc64le 🎆
-- [Custom VPN server side port forwarding for Private Internet Access](https://github.com/qdm12/gluetun/wiki/Private-internet-access#vpn-server-port-forwarding)
-- Possibility of split horizon DNS by selecting multiple DNS over TLS providers
-- Unbound subprogram drops root privileges once launched
-- Can work as a Kubernetes sidecar container, thanks @rorph
-
-## Setup
-
-🎉 There are now instructions specific to each VPN provider with examples to help you get started as quickly as possible!
-
-Go to the [Wiki](https://github.com/qdm12/gluetun/wiki)!
-
-[🐛 Found a bug in the Wiki?!](https://github.com/qdm12/gluetun/issues/new?assignees=&labels=%F0%9F%93%84+Wiki+issue&template=wiki+issue.yml&title=Wiki+issue%3A+)
-
-Here's a docker-compose.yml for the laziest:
-
-```yml
-version: "3"
-services:
-  gluetun:
-    image: qmcgaw/gluetun
-    # container_name: gluetun
-    # line above must be uncommented to allow external containers to connect. See https://github.com/qdm12/gluetun/wiki/Connect-a-container-to-gluetun#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
-      - 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=
-```
-
-## License
-
-[![MIT](https://img.shields.io/github/license/qdm12/gluetun)](https://github.com/qdm12/gluetun/master/LICENSE)
+# Gluetun VPN client
+
+Lightweight swiss-knife-like VPN client to multiple VPN service providers
+
+![Title image](https://raw.githubusercontent.com/qdm12/gluetun/master/title.svg)
+
+[![Build status](https://github.com/qdm12/gluetun/actions/workflows/ci.yml/badge.svg)](https://github.com/qdm12/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/qdm12/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/qdm12/gluetun?label=Last%20release%20date)
+![Commits since release](https://img.shields.io/github/commits-since/qdm12/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/qdm12/gluetun.svg)](https://github.com/qdm12/gluetun/commits/master)
+[![GitHub commit activity](https://img.shields.io/github/commit-activity/y/qdm12/gluetun.svg)](https://github.com/qdm12/gluetun/graphs/contributors)
+[![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)
+
+[![Lines of code](https://img.shields.io/tokei/lines/github/qdm12/gluetun)](https://github.com/qdm12/gluetun)
+![Code size](https://img.shields.io/github/languages/code-size/qdm12/gluetun)
+![GitHub repo size](https://img.shields.io/github/repo-size/qdm12/gluetun)
+![Go version](https://img.shields.io/github/go-mod/go-version/qdm12/gluetun)
+
+![Visitors count](https://visitor-badge.laobi.icu/badge?page_id=gluetun.readme)
+
+## Quick links
+
+- [Setup](#Setup)
+- [Features](#Features)
+- Problem?
+  - [Check the Wiki](https://github.com/qdm12/gluetun/wiki)
+  - [Start a discussion](https://github.com/qdm12/gluetun/discussions)
+  - [Fix the Unraid template](https://github.com/qdm12/gluetun/discussions/550)
+- Suggestion?
+  - [Create an issue](https://github.com/qdm12/gluetun/issues)
+  - [Join the Slack channel](https://join.slack.com/t/qdm12/shared_invite/enQtOTE0NjcxNTM1ODc5LTYyZmVlOTM3MGI4ZWU0YmJkMjUxNmQ4ODQ2OTAwYzMxMTlhY2Q1MWQyOWUyNjc2ODliNjFjMDUxNWNmNzk5MDk)
+- Happy?
+  - Sponsor me on [github.com/sponsors/qdm12](https://github.com/sponsors/qdm12)
+  - Donate to [paypal.me/qmcgaw](https://www.paypal.me/qmcgaw)
+  - Drop me [an email](mailto:quentin.mcgaw@gmail.com)
+- **Want to add a VPN provider?** check [Development](https://github.com/qdm12/gluetun/wiki/Development) and [Add a provider](https://github.com/qdm12/gluetun/wiki/Add-a-provider)
+- Video:
+
+  [![Video Gif](https://i.imgur.com/CetWunc.gif)](https://youtu.be/0F6I03LQcI4)
+
+- [Substack Console interview](https://console.substack.com/p/console-72)
+
+## Features
+
+- Based on Alpine 3.17 for a small Docker image of 42MB
+- Supports: **AirVPN**, **Cyberghost**, **ExpressVPN**, **FastestVPN**, **HideMyAss**, **IPVanish**, **IVPN**, **Mullvad**, **NordVPN**, **Perfect Privacy**, **Privado**, **Private Internet Access**, **PrivateVPN**, **ProtonVPN**, **PureVPN**,  **SlickVPN**, **Surfshark**, **TorGuard**, **VPNSecure.me**, **VPNUnlimited**, **Vyprvpn**, **WeVPN**, **Windscribe** servers
+- Supports OpenVPN for all providers listed
+- Supports Wireguard both kernelspace and userspace
+  - For **Mullvad**, **Ivpn**, **Surfshark** and **Windscribe**
+  - For **ProtonVPN**, **PureVPN**, **Torguard**, **VPN Unlimited** and **WeVPN** using [the custom provider](https://github.com/qdm12/gluetun/wiki/Custom-provider)
+  - For custom Wireguard configurations using [the custom provider](https://github.com/qdm12/gluetun/wiki/Custom-provider)
+  - More in progress, see [#134](https://github.com/qdm12/gluetun/issues/134)
+- 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-a-container-to-gluetun)
+- [Connect LAN devices to it](https://github.com/qdm12/gluetun/wiki/Connect-a-LAN-device-to-gluetun)
+- Compatible with amd64, i686 (32 bit), **ARM** 64 bit, ARM 32 bit v6 and v7, and even ppc64le 🎆
+- [Custom VPN server side port forwarding for Private Internet Access](https://github.com/qdm12/gluetun/wiki/Private-internet-access#vpn-server-port-forwarding)
+- Possibility of split horizon DNS by selecting multiple DNS over TLS providers
+- Unbound subprogram drops root privileges once launched
+- Can work as a Kubernetes sidecar container, thanks @rorph
+
+## Setup
+
+🎉 There are now instructions specific to each VPN provider with examples to help you get started as quickly as possible!
+
+Go to the [Wiki](https://github.com/qdm12/gluetun/wiki)!
+
+[🐛 Found a bug in the Wiki?!](https://github.com/qdm12/gluetun/issues/new?assignees=&labels=%F0%9F%93%84+Wiki+issue&template=wiki+issue.yml&title=Wiki+issue%3A+)
+
+Here's a docker-compose.yml for the laziest:
+
+```yml
+version: "3"
+services:
+  gluetun:
+    image: qmcgaw/gluetun
+    # container_name: gluetun
+    # line above must be uncommented to allow external containers to connect. See https://github.com/qdm12/gluetun/wiki/Connect-a-container-to-gluetun#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
+      - 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/Updating-Servers#periodic-update
+      - UPDATER_PERIOD=
+      - UPDATER_VPN_SERVICE_PROVIDERS=
+```
+
+🆕 Image also available as `ghcr.io/qdm12/gluetun`
+
+## License
+
+[![MIT](https://img.shields.io/github/license/qdm12/gluetun)](https://github.com/qdm12/gluetun/master/LICENSE)

cmd/gluetun/main.go

@@ -16,10 +16,10 @@ import (
 	"github.com/qdm12/dns/pkg/unbound"
 	"github.com/qdm12/gluetun/internal/alpine"
 	"github.com/qdm12/gluetun/internal/cli"
-	"github.com/qdm12/gluetun/internal/configuration/sources"
+	"github.com/qdm12/gluetun/internal/configuration/settings"
 	"github.com/qdm12/gluetun/internal/configuration/sources/env"
 	"github.com/qdm12/gluetun/internal/configuration/sources/files"
-	"github.com/qdm12/gluetun/internal/configuration/sources/mux"
+	mux "github.com/qdm12/gluetun/internal/configuration/sources/merge"
 	"github.com/qdm12/gluetun/internal/configuration/sources/secrets"
 	"github.com/qdm12/gluetun/internal/constants"
 	"github.com/qdm12/gluetun/internal/dns"
@@ -29,15 +29,20 @@ import (
 	"github.com/qdm12/gluetun/internal/models"
 	"github.com/qdm12/gluetun/internal/netlink"
 	"github.com/qdm12/gluetun/internal/openvpn"
+	"github.com/qdm12/gluetun/internal/openvpn/extract"
 	"github.com/qdm12/gluetun/internal/portforward"
 	"github.com/qdm12/gluetun/internal/pprof"
+	"github.com/qdm12/gluetun/internal/provider"
 	"github.com/qdm12/gluetun/internal/publicip"
+	"github.com/qdm12/gluetun/internal/publicip/ipinfo"
 	"github.com/qdm12/gluetun/internal/routing"
 	"github.com/qdm12/gluetun/internal/server"
 	"github.com/qdm12/gluetun/internal/shadowsocks"
 	"github.com/qdm12/gluetun/internal/storage"
 	"github.com/qdm12/gluetun/internal/tun"
-	"github.com/qdm12/gluetun/internal/updater"
+	updater "github.com/qdm12/gluetun/internal/updater/loop"
+	"github.com/qdm12/gluetun/internal/updater/resolver"
+	"github.com/qdm12/gluetun/internal/updater/unzip"
 	"github.com/qdm12/gluetun/internal/vpn"
 	"github.com/qdm12/golibs/command"
 	"github.com/qdm12/goshutdown"
@@ -72,7 +77,8 @@ func main() {
 
 	args := os.Args
 	tun := tun.New()
-	netLinker := netlink.New()
+	netLinkDebugLogger := logger.New(log.SetComponent("netlink"))
+	netLinker := netlink.New(netLinkDebugLogger)
 	cli := cli.New()
 	cmder := command.NewCmder()
 
@@ -86,12 +92,13 @@ func main() {
 		errorCh <- _main(ctx, buildInfo, args, logger, muxReader, tun, netLinker, cmder, cli)
 	}()
 
+	var err error
 	select {
 	case signal := <-signalCh:
 		fmt.Println("")
 		logger.Warn("Caught OS signal " + signal.String() + ", shutting down")
 		cancel()
-	case err := <-errorCh:
+	case err = <-errorCh:
 		close(errorCh)
 		if err == nil { // expected exit such as healthcheck
 			os.Exit(0)
@@ -103,18 +110,27 @@ func main() {
 	const shutdownGracePeriod = 5 * time.Second
 	timer := time.NewTimer(shutdownGracePeriod)
 	select {
-	case <-errorCh:
+	case shutdownErr := <-errorCh:
 		if !timer.Stop() {
 			<-timer.C
 		}
+		if shutdownErr != nil {
+			logger.Warnf("Shutdown not completed gracefully: %s", shutdownErr)
+			os.Exit(1)
+		}
+
 		logger.Info("Shutdown successful")
+		if err != nil {
+			os.Exit(1)
+		}
+		os.Exit(0)
 	case <-timer.C:
 		logger.Warn("Shutdown timed out")
+		os.Exit(1)
 	case signal := <-signalCh:
 		logger.Warn("Caught OS signal " + signal.String() + ", forcing shut down")
+		os.Exit(1)
 	}
-
-	os.Exit(1)
 }
 
 var (
@@ -123,9 +139,9 @@ var (
 
 //nolint:gocognit,gocyclo,maintidx
 func _main(ctx context.Context, buildInfo models.BuildInformation,
-	args []string, logger log.LoggerInterface, source sources.Source,
-	tun tun.Interface, netLinker netlink.NetLinker, cmder command.RunStarter,
-	cli cli.CLIer) error {
+	args []string, logger log.LoggerInterface, source Source,
+	tun Tun, netLinker netLinker, cmder command.RunStarter,
+	cli clier) error {
 	if len(args) > 1 { // cli operation
 		switch args[1] {
 		case "healthcheck":
@@ -133,7 +149,7 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
 		case "clientkey":
 			return cli.ClientKey(args[2:])
 		case "openvpnconfig":
-			return cli.OpenvpnConfig(logger, source)
+			return cli.OpenvpnConfig(logger, source, netLinker)
 		case "update":
 			return cli.Update(ctx, args[2:], logger)
 		case "format-servers":
@@ -174,6 +190,7 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
 	// - firewall Debug and Enabled are booleans parsed from source
 
 	logger.Patch(log.SetLevel(*allSettings.Log.Level))
+	netLinker.PatchLoggerLevel(*allSettings.Log.Level)
 
 	routingLogger := logger.New(log.SetComponent("routing"))
 	if *allSettings.Firewall.Debug { // To remove in v4
@@ -215,9 +232,12 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
 		return err
 	}
 
-	allServers := storage.GetServers()
+	ipv6Supported, err := netLinker.IsIPv6Supported()
+	if err != nil {
+		return fmt.Errorf("checking for IPv6 support: %w", err)
+	}
 
-	err = allSettings.Validate(allServers)
+	err = allSettings.Validate(storage, ipv6Supported)
 	if err != nil {
 		return err
 	}
@@ -225,7 +245,7 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
 	allSettings.Pprof.HTTPServer.Logger = logger.New(log.SetComponent("pprof"))
 	pprofServer, err := pprof.New(allSettings.Pprof)
 	if err != nil {
-		return fmt.Errorf("cannot create Pprof server: %w", err)
+		return fmt.Errorf("creating Pprof server: %w", err)
 	}
 
 	puid, pgid := int(*allSettings.System.PUID), int(*allSettings.System.PGID)
@@ -257,6 +277,10 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
 
 	logger.Info(allSettings.String())
 
+	for _, warning := range allSettings.Warnings() {
+		logger.Warn(warning)
+	}
+
 	if err := os.MkdirAll("/tmp/gluetun", 0644); err != nil {
 		return err
 	}
@@ -267,7 +291,7 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
 	const defaultUsername = "nonrootuser"
 	nonRootUsername, err := alpineConf.CreateUser(defaultUsername, puid)
 	if err != nil {
-		return fmt.Errorf("cannot create user: %w", err)
+		return fmt.Errorf("creating user: %w", err)
 	}
 	if nonRootUsername != defaultUsername {
 		logger.Info("using existing username " + nonRootUsername + " corresponding to user id " + fmt.Sprint(puid))
@@ -285,7 +309,7 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
 		if strings.Contains(err.Error(), "operation not permitted") {
 			logger.Warn("💡 Tip: Are you passing NET_ADMIN capability to gluetun?")
 		}
-		return fmt.Errorf("cannot setup routing: %w", err)
+		return fmt.Errorf("setting up routing: %w", err)
 	}
 	defer func() {
 		routingLogger.Info("routing cleanup...")
@@ -301,6 +325,11 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
 		return err
 	}
 
+	err = routingConf.AddLocalRules(localNetworks)
+	if err != nil {
+		return fmt.Errorf("adding local rules: %w", err)
+	}
+
 	const tunDevice = "/dev/net/tun"
 	if err := tun.Check(tunDevice); err != nil {
 		logger.Info(err.Error() + "; creating it...")
@@ -336,15 +365,18 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
 	tickersGroupHandler := goshutdown.NewGroupHandler("tickers", defaultGroupOptions...)
 	otherGroupHandler := goshutdown.NewGroupHandler("other", defaultGroupOptions...)
 
-	pprofReady := make(chan struct{})
-	pprofHandler, pprofCtx, pprofDone := goshutdown.NewGoRoutineHandler("pprof server")
-	go pprofServer.Run(pprofCtx, pprofReady, pprofDone)
-	otherGroupHandler.Add(pprofHandler)
-	<-pprofReady
+	if *allSettings.Pprof.Enabled {
+		// TODO run in run loop so this can be patched at runtime
+		pprofReady := make(chan struct{})
+		pprofHandler, pprofCtx, pprofDone := goshutdown.NewGoRoutineHandler("pprof server")
+		go pprofServer.Run(pprofCtx, pprofReady, pprofDone)
+		otherGroupHandler.Add(pprofHandler)
+		<-pprofReady
+	}
 
 	portForwardLogger := logger.New(log.SetComponent("port forwarding"))
 	portForwardLooper := portforward.NewLoop(allSettings.VPN.Provider.PortForwarding,
-		httpClient, firewallConf, portForwardLogger)
+		httpClient, firewallConf, portForwardLogger, puid, pgid)
 	portForwardHandler, portForwardCtx, portForwardDone := goshutdown.NewGoRoutineHandler(
 		"port forwarding", goroutine.OptionTimeout(time.Second))
 	go portForwardLooper.Run(portForwardCtx, portForwardDone)
@@ -363,7 +395,8 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
 	go unboundLooper.RunRestartTicker(dnsTickerCtx, dnsTickerDone)
 	controlGroupHandler.Add(dnsTickerHandler)
 
-	publicIPLooper := publicip.NewLoop(httpClient,
+	ipFetcher := ipinfo.New(httpClient)
+	publicIPLooper := publicip.NewLoop(ipFetcher,
 		logger.New(log.SetComponent("ip getter")),
 		allSettings.PublicIP, puid, pgid)
 	pubIPHandler, pubIPCtx, pubIPDone := goshutdown.NewGoRoutineHandler(
@@ -376,18 +409,25 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
 	go publicIPLooper.RunRestartTicker(pubIPTickerCtx, pubIPTickerDone)
 	tickersGroupHandler.Add(pubIPTickerHandler)
 
+	updaterLogger := logger.New(log.SetComponent("updater"))
+
+	unzipper := unzip.New(httpClient)
+	parallelResolver := resolver.NewParallelResolver(allSettings.Updater.DNSAddress)
+	openvpnFileExtractor := extract.New()
+	providers := provider.NewProviders(storage, time.Now, updaterLogger,
+		httpClient, unzipper, parallelResolver, ipFetcher, openvpnFileExtractor)
+
 	vpnLogger := logger.New(log.SetComponent("vpn"))
-	vpnLooper := vpn.NewLoop(allSettings.VPN, allSettings.Firewall.VPNInputPorts,
-		allServers, ovpnConf, netLinker, firewallConf, routingConf, portForwardLooper,
+	vpnLooper := vpn.NewLoop(allSettings.VPN, ipv6Supported, allSettings.Firewall.VPNInputPorts,
+		providers, storage, ovpnConf, netLinker, firewallConf, routingConf, portForwardLooper,
 		cmder, publicIPLooper, unboundLooper, vpnLogger, httpClient,
 		buildInfo, *allSettings.Version.Enabled)
 	vpnHandler, vpnCtx, vpnDone := goshutdown.NewGoRoutineHandler(
 		"vpn", goroutine.OptionTimeout(time.Second))
 	go vpnLooper.Run(vpnCtx, vpnDone)
 
-	updaterLooper := updater.NewLooper(allSettings.Updater,
-		allServers, storage, vpnLooper.SetServers, httpClient,
-		logger.New(log.SetComponent("updater")))
+	updaterLooper := updater.NewLoop(allSettings.Updater,
+		providers, storage, httpClient, updaterLogger)
 	updaterHandler, updaterCtx, updaterDone := goshutdown.NewGoRoutineHandler(
 		"updater", goroutine.OptionTimeout(defaultShutdownTimeout))
 	// wait for updaterLooper.Restart() or its ticket launched with RunRestartTicker
@@ -407,7 +447,7 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
 	go httpProxyLooper.Run(httpProxyCtx, httpProxyDone)
 	otherGroupHandler.Add(httpProxyHandler)
 
-	shadowsocksLooper := shadowsocks.NewLooper(allSettings.Shadowsocks,
+	shadowsocksLooper := shadowsocks.NewLoop(allSettings.Shadowsocks,
 		logger.New(log.SetComponent("shadowsocks")))
 	shadowsocksHandler, shadowsocksCtx, shadowsocksDone := goshutdown.NewGoRoutineHandler(
 		"shadowsocks proxy", goroutine.OptionTimeout(defaultShutdownTimeout))
@@ -420,9 +460,10 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
 		"http server", goroutine.OptionTimeout(defaultShutdownTimeout))
 	httpServer, err := server.New(httpServerCtx, controlServerAddress, controlServerLogging,
 		logger.New(log.SetComponent("http server")),
-		buildInfo, vpnLooper, portForwardLooper, unboundLooper, updaterLooper, publicIPLooper)
+		buildInfo, vpnLooper, portForwardLooper, unboundLooper, updaterLooper, publicIPLooper,
+		storage, ipv6Supported)
 	if err != nil {
-		return fmt.Errorf("cannot setup control server: %w", err)
+		return fmt.Errorf("setting up control server: %w", err)
 	}
 	httpServerReady := make(chan struct{})
 	go httpServer.Run(httpServerCtx, httpServerReady, httpServerDone)
@@ -469,10 +510,69 @@ func printVersions(ctx context.Context, logger infoer,
 	for _, element := range elements {
 		version, err := element.getVersion(ctx)
 		if err != nil {
-			return err
+			return fmt.Errorf("getting %s version: %w", element.name, err)
 		}
 		logger.Info(element.name + " version: " + version)
 	}
 
 	return nil
 }
+
+type netLinker interface {
+	Addresser
+	Router
+	Ruler
+	Linker
+	IsWireguardSupported() (ok bool, err error)
+	IsIPv6Supported() (ok bool, err error)
+	PatchLoggerLevel(level log.Level)
+}
+
+type Addresser interface {
+	AddrList(link netlink.Link, family int) (
+		addresses []netlink.Addr, err error)
+	AddrAdd(link netlink.Link, addr *netlink.Addr) error
+}
+
+type Router interface {
+	RouteList(link netlink.Link, family int) (
+		routes []netlink.Route, err error)
+	RouteAdd(route *netlink.Route) error
+	RouteDel(route *netlink.Route) error
+	RouteReplace(route *netlink.Route) error
+}
+
+type Ruler interface {
+	RuleList(family int) (rules []netlink.Rule, err error)
+	RuleAdd(rule *netlink.Rule) error
+	RuleDel(rule *netlink.Rule) error
+}
+
+type Linker interface {
+	LinkList() (links []netlink.Link, err error)
+	LinkByName(name string) (link netlink.Link, err error)
+	LinkByIndex(index int) (link netlink.Link, err error)
+	LinkAdd(link netlink.Link) (err error)
+	LinkDel(link netlink.Link) (err error)
+	LinkSetUp(link netlink.Link) (err error)
+	LinkSetDown(link netlink.Link) (err error)
+}
+
+type clier interface {
+	ClientKey(args []string) error
+	FormatServers(args []string) error
+	OpenvpnConfig(logger cli.OpenvpnConfigLogger, source cli.Source, ipv6Checker cli.IPv6Checker) error
+	HealthCheck(ctx context.Context, source cli.Source, warner cli.Warner) error
+	Update(ctx context.Context, args []string, logger cli.UpdaterLogger) error
+}
+
+type Tun interface {
+	Check(tunDevice string) error
+	Create(tunDevice string) error
+}
+
+type Source interface {
+	Read() (settings settings.Settings, err error)
+	ReadHealth() (health settings.Health, err error)
+	String() string
+}

go.mod

@@ -1,10 +1,10 @@
 module github.com/qdm12/gluetun
 
-go 1.17
+go 1.20
 
 require (
-	github.com/breml/rootcerts v0.2.3
-	github.com/fatih/color v1.13.0
+	github.com/breml/rootcerts v0.2.10
+	github.com/fatih/color v1.15.0
 	github.com/golang/mock v1.6.0
 	github.com/qdm12/dns v1.11.0
 	github.com/qdm12/golibs v0.0.0-20210822203818-5c568b0777b6
@@ -15,30 +15,36 @@ require (
 	github.com/qdm12/log v0.1.0
 	github.com/qdm12/ss-server v0.4.0
 	github.com/qdm12/updated v0.0.0-20210603204757-205acfe6937e
-	github.com/stretchr/testify v1.7.1
-	github.com/vishvananda/netlink v1.1.1-0.20211129163951-9ada19101fc5
-	golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c
-	golang.zx2c4.com/wireguard v0.0.0-20210805125648-3957e9b9dd19
-	golang.zx2c4.com/wireguard/wgctrl v0.0.0-20210803171230-4253848d036c
-	inet.af/netaddr v0.0.0-20210718074554-06ca8145d722
+	github.com/stretchr/testify v1.8.2
+	github.com/vishvananda/netlink v1.2.1-beta.2
+	github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a
+	golang.org/x/exp v0.0.0-20230519143937-03e91628a987
+	golang.org/x/net v0.10.0
+	golang.org/x/sys v0.8.0
+	golang.org/x/text v0.9.0
+	golang.zx2c4.com/wireguard v0.0.0-20230325221338-052af4a8072b
+	golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230215201556-9c5414ab4bde
+	inet.af/netaddr v0.0.0-20220811202034-502d2d690317
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/google/go-cmp v0.5.5 // indirect
-	github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect
-	github.com/mattn/go-colorable v0.1.9 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/mdlayher/genetlink v1.0.0 // indirect
-	github.com/mdlayher/netlink v1.4.0 // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/josharian/native v1.0.0 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.17 // indirect
+	github.com/mdlayher/genetlink v1.2.0 // indirect
+	github.com/mdlayher/netlink v1.6.2 // indirect
+	github.com/mdlayher/socket v0.2.3 // indirect
 	github.com/miekg/dns v1.1.40 // indirect
 	github.com/mr-tron/base58 v1.2.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 // indirect
 	github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // indirect
-	go4.org/intern v0.0.0-20210108033219-3eb7198706b2 // indirect
-	go4.org/unsafe/assume-no-moving-gc v0.0.0-20201222180813-1025295fd063 // indirect
-	golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 // indirect
-	golang.org/x/net v0.0.0-20210504132125-bbd867fde50d // indirect
-	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
+	go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect
+	go4.org/unsafe/assume-no-moving-gc v0.0.0-20230221090011-e4bae7ad2296 // indirect
+	golang.org/x/crypto v0.6.0 // indirect
+	golang.org/x/sync v0.1.0 // indirect
+	golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -4,8 +4,8 @@ github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/g
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
-github.com/breml/rootcerts v0.2.3 h1:1vkYjKOiHVSyuz9Ue4AOrViEvUm8gk8phTg0vbcuU0A=
-github.com/breml/rootcerts v0.2.3/go.mod h1:24FDtzYMpqIeYC7QzaE8VPRQaFZU5TIUDlyk8qwjD88=
+github.com/breml/rootcerts v0.2.10 h1:UGVZ193UTSUASpGtg6pbDwzOd7XQP+at0Ssg1/2E4h8=
+github.com/breml/rootcerts v0.2.10/go.mod h1:24FDtzYMpqIeYC7QzaE8VPRQaFZU5TIUDlyk8qwjD88=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -14,8 +14,8 @@ github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDD
 github.com/dvyukov/go-fuzz v0.0.0-20210103155950-6a8e9d1f2415/go.mod h1:11Gm+ccJnvAhCNLlf5+cS9KjtbaD5I5zaZpFMsTHWTw=
 github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
 github.com/fatih/color v1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
-github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
-github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
+github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
+github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
 github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
@@ -36,28 +36,18 @@ github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3K
 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/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gotify/go-api-client/v2 v2.0.4/go.mod h1:VKiah/UK20bXsr0JObE1eBVLW44zbBouzjuri9iwjFU=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
-github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 h1:uhL5Gw7BINiiPAo24A2sxkcDI0Jt/sqp1v5xQCniEFA=
-github.com/josharian/native v0.0.0-20200817173448-b6b71def0850/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
-github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw=
-github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod h1:WGuG/smIU4J/54PblvSbh+xvCZmpJnFgr3ds6Z55XMQ=
-github.com/jsimonetti/rtnetlink v0.0.0-20201009170750-9c6f07d100c1/go.mod h1:hqoO/u39cqLeBLebZ8fWdE96O7FxrAsRYhnVOdgHxok=
-github.com/jsimonetti/rtnetlink v0.0.0-20201216134343-bde56ed16391/go.mod h1:cR77jAZG3Y3bsb8hF6fHJbFoyFukLFOkQ98S0pQz3xw=
-github.com/jsimonetti/rtnetlink v0.0.0-20201220180245-69540ac93943/go.mod h1:z4c53zj6Eex712ROyh8WI0ihysb5j2ROyV42iNogmAs=
-github.com/jsimonetti/rtnetlink v0.0.0-20210122163228-8d122574c736/go.mod h1:ZXpIyOK59ZnN7J0BV99cZUPmsqDRZ3eq5X+st7u/oSA=
-github.com/jsimonetti/rtnetlink v0.0.0-20210212075122-66c871082f2b h1:c3NTyLNozICy8B4mlMXemD3z/gXgQzVXZS/HqT+i3do=
-github.com/jsimonetti/rtnetlink v0.0.0-20210212075122-66c871082f2b/go.mod h1:8w9Rh8m+aHZIG69YPGGem1i5VzoyRC8nw2kA8B+ik5U=
+github.com/josharian/native v1.0.0 h1:Ts/E8zCSEsG17dUqv7joXJFybuMLjQfWE04tsBODTxk=
+github.com/josharian/native v1.0.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
 github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -68,29 +58,23 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kyokomi/emoji v2.2.4+incompatible/go.mod h1:mZ6aGCD7yk8j6QY6KICwnZ2pxoszVseX1DNoGtU2tBA=
 github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.9 h1:sqDoxXbdeALODt0DAeJCVp38ps9ZogZEAXjus69YV3U=
-github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43 h1:WgyLFv10Ov49JAQI/ZLUkCZ7VJS3r74hwFIGXJsgZlY=
-github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43/go.mod h1:+t7E0lkKfbBsebllff1xdTmyJt8lH37niI6kwFk9OTo=
-github.com/mdlayher/genetlink v1.0.0 h1:OoHN1OdyEIkScEmRgxLEe2M9U8ClMytqA5niynLtfj0=
-github.com/mdlayher/genetlink v1.0.0/go.mod h1:0rJ0h4itni50A86M2kHcgS85ttZazNt7a8H2a2cw0Gc=
-github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA=
-github.com/mdlayher/netlink v1.0.0/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqcnu43w/+M=
-github.com/mdlayher/netlink v1.1.0/go.mod h1:H4WCitaheIsdF9yOYu8CFmCgQthAPIWZmcKp9uZHgmY=
-github.com/mdlayher/netlink v1.1.1/go.mod h1:WTYpFb/WTvlRJAyKhZL5/uy69TDDpHHu2VZmb2XgV7o=
-github.com/mdlayher/netlink v1.2.0/go.mod h1:kwVW1io0AZy9A1E2YYgaD4Cj+C+GPkU6klXCMzIJ9p8=
-github.com/mdlayher/netlink v1.2.1/go.mod h1:bacnNlfhqHqqLo4WsYeXSqfyXkInQ9JneWI68v1KwSU=
-github.com/mdlayher/netlink v1.2.2-0.20210123213345-5cc92139ae3e/go.mod h1:bacnNlfhqHqqLo4WsYeXSqfyXkInQ9JneWI68v1KwSU=
-github.com/mdlayher/netlink v1.3.0/go.mod h1:xK/BssKuwcRXHrtN04UBkwQ6dY9VviGGuriDdoPSWys=
-github.com/mdlayher/netlink v1.4.0 h1:n3ARR+Fm0dDv37dj5wSWZXDKcy+U0zwcXS3zKMnSiT0=
-github.com/mdlayher/netlink v1.4.0/go.mod h1:dRJi5IABcZpBD2A3D0Mv/AiX8I9uDEu5oGkAVrekmf8=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
+github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mdlayher/genetlink v1.2.0 h1:4yrIkRV5Wfk1WfpWTcoOlGmsWgQj3OtQN9ZsbrE+XtU=
+github.com/mdlayher/genetlink v1.2.0/go.mod h1:ra5LDov2KrUCZJiAtEvXXZBxGMInICMXIwshlJ+qRxQ=
+github.com/mdlayher/netlink v1.6.0/go.mod h1:0o3PlBmGst1xve7wQ7j/hwpNaFaH4qCRyWCdcZk8/vA=
+github.com/mdlayher/netlink v1.6.2 h1:D2zGSkvYsJ6NreeED3JiVTu1lj2sIYATqSaZlhPzUgQ=
+github.com/mdlayher/netlink v1.6.2/go.mod h1:O1HXX2sIWSMJ3Qn1BYZk1yZM+7iMki/uYGGiwGyq/iU=
+github.com/mdlayher/socket v0.1.1/go.mod h1:mYV5YIZAfHh4dzDVzI8x8tWLWCliuX8Mon5Awbj+qDs=
+github.com/mdlayher/socket v0.2.3 h1:XZA2X2TjdOwNoNPVPclRCURoX/hokBY8nkTmRZFEheM=
+github.com/mdlayher/socket v0.2.3/go.mod h1:bz12/FozYNH/VbvC3q7TRIK/Y6dH1kCKsXaUeXi/FmY=
 github.com/miekg/dns v1.1.40 h1:pyyPFfGMnciYUk/mXpKkVmeMQjfXqt3FAJ2hy7tPiLA=
 github.com/miekg/dns v1.1.40/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
 github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721 h1:RlZweED6sbSArvlE924+mUcZuXKLBHA35U7LN621Bws=
-github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721/go.mod h1:Ickgr2WtCLZ2MDGd4Gr0geeCH5HybhRJbonOgQpvSxc=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o=
@@ -127,101 +111,104 @@ github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAm
 github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/vishvananda/netlink v1.1.1-0.20211129163951-9ada19101fc5 h1:b/k/BVWzWRS5v6AB0gf2ckFSbFsHN5jR0HoNso1pN+w=
-github.com/vishvananda/netlink v1.1.1-0.20211129163951-9ada19101fc5/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/vishvananda/netlink v1.2.1-beta.2 h1:Llsql0lnQEbHj0I1OuKyp8otXp0r3q0mPkuhwHfStVs=
+github.com/vishvananda/netlink v1.2.1-beta.2/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho=
 github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae h1:4hwBBUfQCFe3Cym0ZtKyq7L16eZUtYKs+BaHDN6mAns=
 github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
 github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4=
 github.com/yl2chen/cidranger v1.0.2/go.mod h1:9U1yz7WPYDwf0vpNWFaeRh0bjwz5RVgRy/9UEQfHl0g=
+github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a h1:fZHgsYlfvtyqToslyjUt3VOPF4J7aK/3MPcK7xp3PDk=
+github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a/go.mod h1:ul22v+Nro/R083muKhosV54bj5niojjWZvU8xrevuH4=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-go4.org/intern v0.0.0-20210108033219-3eb7198706b2 h1:VFTf+jjIgsldaz/Mr00VaCSswHJrI2hIjQygE/W4IMg=
 go4.org/intern v0.0.0-20210108033219-3eb7198706b2/go.mod h1:vLqJ+12kCw61iCWsPto0EOHhBS+o4rO5VIucbc9g2Cc=
+go4.org/intern v0.0.0-20211027215823-ae77deb06f29 h1:UXLjNohABv4S58tHmeuIZDO6e3mHpW2Dx33gaNt03LE=
+go4.org/intern v0.0.0-20211027215823-ae77deb06f29/go.mod h1:cS2ma+47FKrLPdXFpr7CuxiTW3eyJbWew4qx0qtQWDA=
 go4.org/unsafe/assume-no-moving-gc v0.0.0-20201222175341-b30ae309168e/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
-go4.org/unsafe/assume-no-moving-gc v0.0.0-20201222180813-1025295fd063 h1:1tk03FUNpulq2cuWpXZWj649rwJpk0d20rxWiopKRmc=
 go4.org/unsafe/assume-no-moving-gc v0.0.0-20201222180813-1025295fd063/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
+go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
+go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
+go4.org/unsafe/assume-no-moving-gc v0.0.0-20230221090011-e4bae7ad2296 h1:QJ/xcIANMLApehfgPCHnfK1hZiaMmbaTVmPv7DAoTbo=
+go4.org/unsafe/assume-no-moving-gc v0.0.0-20230221090011-e4bae7ad2296/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
 golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
-golang.org/x/crypto v0.0.0-20210503195802-e9a32991a82e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
 golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
-golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 h1:/UOmuWzQfxxo9UtlXMwuQU8CMgg1eZXqTRwkSQJWKOI=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
+golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
+golang.org/x/exp v0.0.0-20230519143937-03e91628a987 h1:3xJIFvzUFbu4ls0BTBYcgbCGhA63eAOEMxIHugyXJqA=
+golang.org/x/exp v0.0.0-20230519143937-03e91628a987/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/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-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201216054612-986b41b23924/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 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-20210504132125-bbd867fde50d h1:nTDGCTeAu2LhcsHTRzjyIUbZHCJ4QePArsm27Hka0UM=
-golang.org/x/net v0.0.0-20210504132125-bbd867fde50d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220923203811-8be639271d50/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191008105621-543471e840be/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-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201118182958-a01c418693c7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201218084310-7d0127a74742/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210110051926-789bb1bd4061/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210123111255-9b0068b26619/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210216163648-f7da38b97c65/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210309040221-94ec62e08169/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210503173754-0981d6026fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 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-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -231,13 +218,13 @@ golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.zx2c4.com/wireguard v0.0.0-20210427022245-097af6e1351b/go.mod h1:a057zjmoc00UN7gVkaJt2sXVK523kMJcogDTEvPIasg=
-golang.zx2c4.com/wireguard v0.0.0-20210805125648-3957e9b9dd19 h1:ab2jcw2W91Rz07eHAb8Lic7sFQKO0NhBftjv6m/gL/0=
-golang.zx2c4.com/wireguard v0.0.0-20210805125648-3957e9b9dd19/go.mod h1:laHzsbfMhGSobUmruXWAyMKKHSqvIcrqZJMyHD+/3O8=
-golang.zx2c4.com/wireguard/wgctrl v0.0.0-20210803171230-4253848d036c h1:ADNrRDI5NR23/TUCnEmlLZLt4u9DnZ2nwRkPrAcFvto=
-golang.zx2c4.com/wireguard/wgctrl v0.0.0-20210803171230-4253848d036c/go.mod h1:+1XihzyZUBJcSc5WO9SwNA7v26puQwOEDwanaxfNXPQ=
+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-20230325221338-052af4a8072b h1:J1CaxgLerRR5lgx3wnr6L04cJFbWoceSK9JWBdglINo=
+golang.zx2c4.com/wireguard v0.0.0-20230325221338-052af4a8072b/go.mod h1:tqur9LnfstdR9ep2LaJT4lFUl0EjlHtge+gAjmsHUG4=
+golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230215201556-9c5414ab4bde h1:ybF7AMzIUikL9x4LgwEmzhXtzRpKNqngme1VGDWz+Nk=
+golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230215201556-9c5414ab4bde/go.mod h1:mQqgjkW8GQQcJQsbBvK890TKqUK1DfKWkuBGbOkuMHQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -247,8 +234,10 @@ gopkg.in/src-d/go-git.v4 v4.13.1/go.mod h1:nx5NYcxdKxq5fpltdHnPa2Exj4Sx0EclMWZQb
 gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c 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-20221203005347-703fd9b7fbc0 h1:Wobr37noukisGxpKo5jAsLREcpj61RxrWYzD8uwveOY=
 inet.af/netaddr v0.0.0-20210511181906-37180328850c/go.mod h1:z0nx+Dh+7N7CC8V5ayHtHGpZpxLQZZxkIaaz6HN65Ls=
-inet.af/netaddr v0.0.0-20210718074554-06ca8145d722 h1:Qws2rZnQudC58cIagVucPQDLmMi3kAXgxscsgD0v6DU=
-inet.af/netaddr v0.0.0-20210718074554-06ca8145d722/go.mod h1:z0nx+Dh+7N7CC8V5ayHtHGpZpxLQZZxkIaaz6HN65Ls=
+inet.af/netaddr v0.0.0-20220811202034-502d2d690317 h1:U2fwK6P2EqmopP/hFLTOAjWTki0qgd4GMJn5X8wOleU=
+inet.af/netaddr v0.0.0-20220811202034-502d2d690317/go.mod h1:OIezDfdzOgFhuw4HuWapWq2e9l0H9tK4F1j+ETRtF3k=

internal/alpine/alpine.go

@@ -1,17 +1,9 @@
-// Package alpine defines a configurator to interact with the Alpine operating system.
 package alpine
 
 import (
 	"os/user"
 )
 
-var _ Alpiner = (*Alpine)(nil)
-
-type Alpiner interface {
-	UserCreater
-	VersionGetter
-}
-
 type Alpine struct {
 	alpineReleasePath string
 	passwdPath        string

internal/alpine/users.go

@@ -12,10 +12,6 @@ var (
 	ErrUserAlreadyExists = errors.New("user already exists")
 )
 
-type UserCreater interface {
-	CreateUser(username string, uid int) (createdUsername string, err error)
-}
-
 // 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)

internal/alpine/version.go

@@ -7,11 +7,7 @@ import (
 	"strings"
 )
 
-type VersionGetter interface {
-	Version(ctx context.Context) (version string, err error)
-}
-
-func (a *Alpine) Version(ctx context.Context) (version string, err error) {
+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

internal/cli/ci.go

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

internal/cli/cli.go

@@ -1,16 +1,5 @@
-// Package cli defines an interface CLI to run command line operations.
 package cli
 
-var _ CLIer = (*CLI)(nil)
-
-type CLIer interface {
-	ClientKeyFormatter
-	HealthChecker
-	OpenvpnConfigMaker
-	Updater
-	ServersFormatter
-}
-
 type CLI struct {
 	repoServersPath string
 }

internal/cli/clientkey.go

@@ -10,10 +10,6 @@ import (
 	"github.com/qdm12/gluetun/internal/configuration/sources/files"
 )
 
-type ClientKeyFormatter interface {
-	ClientKey(args []string) error
-}
-
 func (c *CLI) ClientKey(args []string) error {
 	flagSet := flag.NewFlagSet("clientkey", flag.ExitOnError)
 	filepath := flagSet.String("path", files.OpenVPNClientKeyPath, "file path to the client.key file")

internal/cli/formatservers.go

@@ -6,49 +6,44 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"strings"
 
 	"github.com/qdm12/gluetun/internal/constants"
 	"github.com/qdm12/gluetun/internal/constants/providers"
 	"github.com/qdm12/gluetun/internal/storage"
+	"golang.org/x/text/cases"
+	"golang.org/x/text/language"
 )
 
-type ServersFormatter interface {
-	FormatServers(args []string) error
-}
-
 var (
-	ErrFormatNotRecognized = errors.New("format is not recognized")
-	ErrProviderUnspecified = errors.New("VPN provider to format was not specified")
+	ErrFormatNotRecognized       = errors.New("format is not recognized")
+	ErrProviderUnspecified       = errors.New("VPN provider to format was not specified")
+	ErrMultipleProvidersToFormat = errors.New("more than one VPN provider to format were specified")
 )
 
+func addProviderFlag(flagSet *flag.FlagSet, providerToFormat map[string]*bool,
+	provider string, titleCaser cases.Caser) {
+	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
-	var cyberghost, expressvpn, fastestvpn, hideMyAss, ipvanish, ivpn, mullvad,
-		nordvpn, perfectPrivacy, pia, privado, privatevpn, protonvpn, purevpn, surfshark,
-		torguard, vpnUnlimited, vyprvpn, wevpn, windscribe bool
+	allProviders := providers.All()
+	providersToFormat := make(map[string]*bool, len(allProviders))
+	for _, provider := range allProviders {
+		providersToFormat[provider] = new(bool)
+	}
 	flagSet := flag.NewFlagSet("markdown", flag.ExitOnError)
 	flagSet.StringVar(&format, "format", "markdown", "Format to use which can be: 'markdown'")
 	flagSet.StringVar(&output, "output", "/dev/stdout", "Output file to write the formatted data to")
-	flagSet.BoolVar(&cyberghost, providers.Cyberghost, false, "Format Cyberghost servers")
-	flagSet.BoolVar(&expressvpn, providers.Expressvpn, false, "Format ExpressVPN servers")
-	flagSet.BoolVar(&fastestvpn, providers.Fastestvpn, false, "Format FastestVPN servers")
-	flagSet.BoolVar(&hideMyAss, providers.HideMyAss, false, "Format HideMyAss servers")
-	flagSet.BoolVar(&ipvanish, providers.Ipvanish, false, "Format IpVanish servers")
-	flagSet.BoolVar(&ivpn, providers.Ivpn, false, "Format IVPN servers")
-	flagSet.BoolVar(&mullvad, providers.Mullvad, false, "Format Mullvad servers")
-	flagSet.BoolVar(&nordvpn, providers.Nordvpn, false, "Format Nordvpn servers")
-	flagSet.BoolVar(&perfectPrivacy, providers.Perfectprivacy, false, "Format Perfect Privacy servers")
-	flagSet.BoolVar(&pia, providers.PrivateInternetAccess, false, "Format Private Internet Access servers")
-	flagSet.BoolVar(&privado, providers.Privado, false, "Format Privado servers")
-	flagSet.BoolVar(&privatevpn, providers.Privatevpn, false, "Format Private VPN servers")
-	flagSet.BoolVar(&protonvpn, providers.Protonvpn, false, "Format Protonvpn servers")
-	flagSet.BoolVar(&purevpn, providers.Purevpn, false, "Format Purevpn servers")
-	flagSet.BoolVar(&surfshark, providers.Surfshark, false, "Format Surfshark servers")
-	flagSet.BoolVar(&torguard, providers.Torguard, false, "Format Torguard servers")
-	flagSet.BoolVar(&vpnUnlimited, providers.VPNUnlimited, false, "Format VPN Unlimited servers")
-	flagSet.BoolVar(&vyprvpn, providers.Vyprvpn, false, "Format Vyprvpn servers")
-	flagSet.BoolVar(&wevpn, providers.Wevpn, false, "Format WeVPN servers")
-	flagSet.BoolVar(&windscribe, providers.Windscribe, false, "Format Windscribe servers")
+	titleCaser := cases.Title(language.English)
+	for _, provider := range allProviders {
+		addProviderFlag(flagSet, providersToFormat, provider, titleCaser)
+	}
 	if err := flagSet.Parse(args); err != nil {
 		return err
 	}
@@ -57,74 +52,47 @@ func (c *CLI) FormatServers(args []string) error {
 		return fmt.Errorf("%w: %s", ErrFormatNotRecognized, 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 fmt.Errorf("%w", ErrProviderUnspecified)
+	case 1:
+	default:
+		return fmt.Errorf("%w: %d specified: %s",
+			ErrMultipleProvidersToFormat, len(providers),
+			strings.Join(providers, ", "))
+	}
+	providerToFormat := providers[0]
+
 	logger := newNoopLogger()
 	storage, err := storage.New(logger, constants.ServersData)
 	if err != nil {
-		return fmt.Errorf("cannot create servers storage: %w", err)
+		return fmt.Errorf("creating servers storage: %w", err)
 	}
-	currentServers := storage.GetServers()
 
-	var formatted string
-	switch {
-	case cyberghost:
-		formatted = currentServers.Cyberghost.ToMarkdown(providers.Cyberghost)
-	case expressvpn:
-		formatted = currentServers.Expressvpn.ToMarkdown(providers.Expressvpn)
-	case fastestvpn:
-		formatted = currentServers.Fastestvpn.ToMarkdown(providers.Fastestvpn)
-	case hideMyAss:
-		formatted = currentServers.HideMyAss.ToMarkdown(providers.HideMyAss)
-	case ipvanish:
-		formatted = currentServers.Ipvanish.ToMarkdown(providers.Ipvanish)
-	case ivpn:
-		formatted = currentServers.Ivpn.ToMarkdown(providers.Ivpn)
-	case mullvad:
-		formatted = currentServers.Mullvad.ToMarkdown(providers.Mullvad)
-	case nordvpn:
-		formatted = currentServers.Nordvpn.ToMarkdown(providers.Nordvpn)
-	case perfectPrivacy:
-		formatted = currentServers.Perfectprivacy.ToMarkdown(providers.Perfectprivacy)
-	case pia:
-		formatted = currentServers.Pia.ToMarkdown(providers.PrivateInternetAccess)
-	case privado:
-		formatted = currentServers.Privado.ToMarkdown(providers.Privado)
-	case privatevpn:
-		formatted = currentServers.Privatevpn.ToMarkdown(providers.Privatevpn)
-	case protonvpn:
-		formatted = currentServers.Protonvpn.ToMarkdown(providers.Protonvpn)
-	case purevpn:
-		formatted = currentServers.Purevpn.ToMarkdown(providers.Purevpn)
-	case surfshark:
-		formatted = currentServers.Surfshark.ToMarkdown(providers.Surfshark)
-	case torguard:
-		formatted = currentServers.Torguard.ToMarkdown(providers.Torguard)
-	case vpnUnlimited:
-		formatted = currentServers.VPNUnlimited.ToMarkdown(providers.VPNUnlimited)
-	case vyprvpn:
-		formatted = currentServers.Vyprvpn.ToMarkdown(providers.Vyprvpn)
-	case wevpn:
-		formatted = currentServers.Wevpn.ToMarkdown(providers.Wevpn)
-	case windscribe:
-		formatted = currentServers.Windscribe.ToMarkdown(providers.Windscribe)
-	default:
-		return ErrProviderUnspecified
-	}
+	formatted := storage.FormatToMarkdown(providerToFormat)
 
 	output = filepath.Clean(output)
 	file, err := os.OpenFile(output, os.O_TRUNC|os.O_WRONLY|os.O_CREATE, 0644)
 	if err != nil {
-		return fmt.Errorf("cannot open output file: %w", err)
+		return fmt.Errorf("opening output file: %w", err)
 	}
 
 	_, err = fmt.Fprint(file, formatted)
 	if err != nil {
 		_ = file.Close()
-		return fmt.Errorf("cannot write to output file: %w", err)
+		return fmt.Errorf("writing to output file: %w", err)
 	}
 
 	err = file.Close()
 	if err != nil {
-		return fmt.Errorf("cannot close output file: %w", err)
+		return fmt.Errorf("closing output file: %w", err)
 	}
 
 	return nil

internal/cli/healthcheck.go

@@ -6,21 +6,18 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/qdm12/gluetun/internal/configuration/sources"
 	"github.com/qdm12/gluetun/internal/healthcheck"
 )
 
-type HealthChecker interface {
-	HealthCheck(ctx context.Context, source sources.Source, warner Warner) error
-}
-
-func (c *CLI) HealthCheck(ctx context.Context, source sources.Source, warner Warner) error {
+func (c *CLI) HealthCheck(ctx context.Context, source Source, _ Warner) error {
 	// Extract the health server port from the configuration.
 	config, err := source.ReadHealth()
 	if err != nil {
 		return err
 	}
 
+	config.SetDefaults()
+
 	err = config.Validate()
 	if err != nil {
 		return err

internal/cli/interfaces.go

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

internal/cli/nooplogger.go

@@ -8,9 +8,9 @@ func newNoopLogger() *noopLogger {
 	return new(noopLogger)
 }
 
-func (l *noopLogger) Debug(s string)                 {}
-func (l *noopLogger) Info(s string)                  {}
-func (l *noopLogger) Warn(s string)                  {}
-func (l *noopLogger) Error(s string)                 {}
-func (l *noopLogger) PatchLevel(level logging.Level) {}
-func (l *noopLogger) PatchPrefix(prefix string)      {}
+func (l *noopLogger) Debug(string)             {}
+func (l *noopLogger) Info(string)              {}
+func (l *noopLogger) Warn(string)              {}
+func (l *noopLogger) Error(string)             {}
+func (l *noopLogger) PatchLevel(logging.Level) {}
+func (l *noopLogger) PatchPrefix(string)       {}

internal/cli/openvpnconfig.go

@@ -1,50 +1,84 @@
 package cli
 
 import (
+	"context"
 	"fmt"
+	"net/http"
+	"net/netip"
 	"strings"
 	"time"
 
-	"github.com/qdm12/gluetun/internal/configuration/sources"
 	"github.com/qdm12/gluetun/internal/constants"
+	"github.com/qdm12/gluetun/internal/openvpn/extract"
 	"github.com/qdm12/gluetun/internal/provider"
+	"github.com/qdm12/gluetun/internal/publicip/ipinfo"
 	"github.com/qdm12/gluetun/internal/storage"
+	"github.com/qdm12/gluetun/internal/updater/resolver"
 )
 
-type OpenvpnConfigMaker interface {
-	OpenvpnConfig(logger OpenvpnConfigLogger, source sources.Source) error
-}
-
 type OpenvpnConfigLogger interface {
 	Info(s string)
 	Warn(s string)
 }
 
-func (c *CLI) OpenvpnConfig(logger OpenvpnConfigLogger, source sources.Source) error {
+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 {
+	FetchMultiInfo(ctx context.Context, ips []netip.Addr) (data []ipinfo.Response, err error)
+}
+
+type IPv6Checker interface {
+	IsIPv6Supported() (supported bool, err error)
+}
+
+func (c *CLI) OpenvpnConfig(logger OpenvpnConfigLogger, source Source,
+	ipv6Checker IPv6Checker) error {
 	storage, err := storage.New(logger, constants.ServersData)
 	if err != nil {
 		return err
 	}
-	allServers := storage.GetServers()
 
 	allSettings, err := source.Read()
 	if err != nil {
 		return err
 	}
 
-	if err = allSettings.Validate(allServers); err != nil {
+	ipv6Supported, err := ipv6Checker.IsIPv6Supported()
+	if err != nil {
+		return fmt.Errorf("checking for IPv6 support: %w", err)
+	}
+
+	if err = allSettings.Validate(storage, ipv6Supported); 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)
+	providerConf := providers.Get(*allSettings.VPN.Provider.Name)
+	connection, err := providerConf.GetConnection(
+		allSettings.VPN.Provider.ServerSelection, ipv6Supported)
+	if err != nil {
 		return err
 	}
 
-	providerConf := provider.New(*allSettings.VPN.Provider.Name, allServers, time.Now)
-	connection, err := providerConf.GetConnection(allSettings.VPN.Provider.ServerSelection)
-	if err != nil {
-		return err
-	}
-	lines, err := providerConf.BuildConf(connection, allSettings.VPN.OpenVPN)
-	if err != nil {
-		return err
-	}
+	lines := providerConf.OpenVPNConfig(connection,
+		allSettings.VPN.OpenVPN, ipv6Supported)
 
 	fmt.Println(strings.Join(lines, "\n"))
 	return nil

internal/cli/update.go

@@ -2,51 +2,48 @@ package cli
 
 import (
 	"context"
-	"encoding/json"
 	"errors"
 	"flag"
 	"fmt"
-	"net"
 	"net/http"
-	"os"
 	"strings"
 	"time"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 	"github.com/qdm12/gluetun/internal/constants"
 	"github.com/qdm12/gluetun/internal/constants/providers"
-	"github.com/qdm12/gluetun/internal/models"
+	"github.com/qdm12/gluetun/internal/openvpn/extract"
+	"github.com/qdm12/gluetun/internal/provider"
+	"github.com/qdm12/gluetun/internal/publicip/ipinfo"
 	"github.com/qdm12/gluetun/internal/storage"
 	"github.com/qdm12/gluetun/internal/updater"
+	"github.com/qdm12/gluetun/internal/updater/resolver"
+	"github.com/qdm12/gluetun/internal/updater/unzip"
 )
 
 var (
 	ErrModeUnspecified     = errors.New("at least one of -enduser or -maintainer must be specified")
-	ErrDNSAddress          = errors.New("DNS address is not valid")
 	ErrNoProviderSpecified = errors.New("no provider was specified")
 )
 
-type Updater interface {
-	Update(ctx context.Context, args []string, logger UpdaterLogger) error
-}
-
 type UpdaterLogger interface {
 	Info(s string)
 	Warn(s string)
 	Error(s string)
 }
 
-func boolPtr(b bool) *bool { return &b }
-
 func (c *CLI) Update(ctx context.Context, args []string, logger UpdaterLogger) error {
-	options := settings.Updater{CLI: boolPtr(true)}
+	options := settings.Updater{}
 	var endUserMode, maintainerMode, updateAll bool
-	var dnsAddress, csvProviders string
+	var csvProviders string
 	flagSet := flag.NewFlagSet("update", flag.ExitOnError)
 	flagSet.BoolVar(&endUserMode, "enduser", false, "Write results to /gluetun/servers.json (for end users)")
 	flagSet.BoolVar(&maintainerMode, "maintainer", false,
 		"Write results to ./internal/storage/servers.json to modify the program (for maintainers)")
-	flagSet.StringVar(&dnsAddress, "dns", "8.8.8.8", "DNS resolver address to use")
+	flagSet.StringVar(&options.DNSAddress, "dns", "8.8.8.8", "DNS resolver address to use")
+	const defaultMinRatio = 0.8
+	flagSet.Float64Var(&options.MinRatio, "minratio", defaultMinRatio,
+		"Minimum ratio of servers to find for the update to succeed")
 	flagSet.BoolVar(&updateAll, "all", false, "Update servers for all VPN providers")
 	flagSet.StringVar(&csvProviders, "providers", "", "CSV string of VPN providers to update server data for")
 	if err := flagSet.Parse(args); err != nil {
@@ -54,24 +51,14 @@ func (c *CLI) Update(ctx context.Context, args []string, logger UpdaterLogger) e
 	}
 
 	if !endUserMode && !maintainerMode {
-		return ErrModeUnspecified
-	}
-
-	options.DNSAddress = net.ParseIP(dnsAddress)
-	if options.DNSAddress == nil {
-		return fmt.Errorf("%w: %s", ErrDNSAddress, dnsAddress)
+		return fmt.Errorf("%w", ErrModeUnspecified)
 	}
 
 	if updateAll {
-		for _, provider := range providers.All() {
-			if provider == providers.Custom {
-				continue
-			}
-			options.Providers = append(options.Providers, provider)
-		}
+		options.Providers = providers.All()
 	} else {
 		if csvProviders == "" {
-			return ErrNoProviderSpecified
+			return fmt.Errorf("%w", ErrNoProviderSpecified)
 		}
 		options.Providers = strings.Split(csvProviders, ",")
 	}
@@ -83,48 +70,33 @@ func (c *CLI) Update(ctx context.Context, args []string, logger UpdaterLogger) e
 		return fmt.Errorf("options validation failed: %w", err)
 	}
 
-	const clientTimeout = 10 * time.Second
-	httpClient := &http.Client{Timeout: clientTimeout}
-
 	storage, err := storage.New(logger, constants.ServersData)
 	if err != nil {
-		return fmt.Errorf("cannot create servers storage: %w", err)
+		return fmt.Errorf("creating servers storage: %w", err)
 	}
-	currentServers := storage.GetServers()
 
-	updater := updater.New(options, httpClient, currentServers, logger)
-	allServers, err := updater.UpdateServers(ctx)
+	const clientTimeout = 10 * time.Second
+	httpClient := &http.Client{Timeout: clientTimeout}
+	unzipper := unzip.New(httpClient)
+	parallelResolver := resolver.NewParallelResolver(options.DNSAddress)
+	ipFetcher := ipinfo.New(httpClient)
+	openvpnFileExtractor := extract.New()
+
+	providers := provider.NewProviders(storage, time.Now, logger, httpClient,
+		unzipper, parallelResolver, ipFetcher, openvpnFileExtractor)
+
+	updater := updater.New(httpClient, storage, providers, logger)
+	err = updater.UpdateServers(ctx, options.Providers, options.MinRatio)
 	if err != nil {
-		return fmt.Errorf("cannot update server information: %w", err)
-	}
-
-	if endUserMode {
-		if err := storage.FlushToFile(allServers); err != nil {
-			return fmt.Errorf("cannot write updated information to file: %w", err)
-		}
+		return fmt.Errorf("updating server information: %w", err)
 	}
 
 	if maintainerMode {
-		if err := writeToEmbeddedJSON(c.repoServersPath, allServers); err != nil {
-			return fmt.Errorf("cannot write updated information to file: %w", err)
+		err := storage.FlushToFile(c.repoServersPath)
+		if err != nil {
+			return fmt.Errorf("writing servers data to embedded JSON file: %w", err)
 		}
 	}
 
 	return nil
 }
-
-func writeToEmbeddedJSON(repoServersPath string,
-	allServers models.AllServers) error {
-	const perms = 0600
-	f, err := os.OpenFile(repoServersPath,
-		os.O_TRUNC|os.O_WRONLY|os.O_CREATE, perms)
-	if err != nil {
-		return err
-	}
-
-	defer f.Close()
-
-	encoder := json.NewEncoder(f)
-	encoder.SetIndent("", "  ")
-	return encoder.Encode(allServers)
-}

internal/configuration/settings/dns.go

@@ -2,7 +2,7 @@ package settings
 
 import (
 	"fmt"
-	"net"
+	"net/netip"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings/helpers"
 	"github.com/qdm12/gotree"
@@ -13,9 +13,9 @@ type DNS struct {
 	// ServerAddress is the DNS server to use inside
 	// the Go program and for the system.
 	// It defaults to '127.0.0.1' to be used with the
-	// DoT server. It cannot be nil in the internal
+	// DoT server. It cannot be the zero value in the internal
 	// state.
-	ServerAddress net.IP
+	ServerAddress netip.Addr
 	// KeepNameserver is true if the Docker DNS server
 	// found in /etc/resolv.conf should be kept.
 	// Note settings this to true will go around the
@@ -31,7 +31,7 @@ type DNS struct {
 func (d DNS) validate() (err error) {
 	err = d.DoT.validate()
 	if err != nil {
-		return fmt.Errorf("failed validating DoT settings: %w", err)
+		return fmt.Errorf("validating DoT settings: %w", err)
 	}
 
 	return nil
@@ -39,8 +39,8 @@ func (d DNS) validate() (err error) {
 
 func (d *DNS) Copy() (copied DNS) {
 	return DNS{
-		ServerAddress:  helpers.CopyIP(d.ServerAddress),
-		KeepNameserver: helpers.CopyBoolPtr(d.KeepNameserver),
+		ServerAddress:  d.ServerAddress,
+		KeepNameserver: helpers.CopyPointer(d.KeepNameserver),
 		DoT:            d.DoT.copy(),
 	}
 }
@@ -49,7 +49,7 @@ func (d *DNS) Copy() (copied DNS) {
 // unset field of the receiver settings object.
 func (d *DNS) mergeWith(other DNS) {
 	d.ServerAddress = helpers.MergeWithIP(d.ServerAddress, other.ServerAddress)
-	d.KeepNameserver = helpers.MergeWithBool(d.KeepNameserver, other.KeepNameserver)
+	d.KeepNameserver = helpers.MergeWithPointer(d.KeepNameserver, other.KeepNameserver)
 	d.DoT.mergeWith(other.DoT)
 }
 
@@ -58,14 +58,14 @@ func (d *DNS) mergeWith(other DNS) {
 // settings.
 func (d *DNS) overrideWith(other DNS) {
 	d.ServerAddress = helpers.OverrideWithIP(d.ServerAddress, other.ServerAddress)
-	d.KeepNameserver = helpers.OverrideWithBool(d.KeepNameserver, other.KeepNameserver)
+	d.KeepNameserver = helpers.OverrideWithPointer(d.KeepNameserver, other.KeepNameserver)
 	d.DoT.overrideWith(other.DoT)
 }
 
 func (d *DNS) setDefaults() {
-	localhost := net.IPv4(127, 0, 0, 1) //nolint:gomnd
+	localhost := netip.AddrFrom4([4]byte{127, 0, 0, 1})
 	d.ServerAddress = helpers.DefaultIP(d.ServerAddress, localhost)
-	d.KeepNameserver = helpers.DefaultBool(d.KeepNameserver, false)
+	d.KeepNameserver = helpers.DefaultPointer(d.KeepNameserver, false)
 	d.DoT.setDefaults()
 }
 

internal/configuration/settings/dnsblacklist.go

@@ -3,12 +3,12 @@ package settings
 import (
 	"errors"
 	"fmt"
+	"net/netip"
 	"regexp"
 
 	"github.com/qdm12/dns/pkg/blacklist"
 	"github.com/qdm12/gluetun/internal/configuration/settings/helpers"
 	"github.com/qdm12/gotree"
-	"inet.af/netaddr"
 )
 
 // DNSBlacklist is settings for the DNS blacklist building.
@@ -18,14 +18,14 @@ type DNSBlacklist struct {
 	BlockSurveillance    *bool
 	AllowedHosts         []string
 	AddBlockedHosts      []string
-	AddBlockedIPs        []netaddr.IP
-	AddBlockedIPPrefixes []netaddr.IPPrefix
+	AddBlockedIPs        []netip.Addr
+	AddBlockedIPPrefixes []netip.Prefix
 }
 
 func (b *DNSBlacklist) setDefaults() {
-	b.BlockMalicious = helpers.DefaultBool(b.BlockMalicious, true)
-	b.BlockAds = helpers.DefaultBool(b.BlockAds, false)
-	b.BlockSurveillance = helpers.DefaultBool(b.BlockSurveillance, true)
+	b.BlockMalicious = helpers.DefaultPointer(b.BlockMalicious, true)
+	b.BlockAds = helpers.DefaultPointer(b.BlockAds, false)
+	b.BlockSurveillance = helpers.DefaultPointer(b.BlockSurveillance, true)
 }
 
 var hostRegex = regexp.MustCompile(`^([a-zA-Z0-9]|[a-zA-Z0-9_][a-zA-Z0-9\-_]{0,61}[a-zA-Z0-9_])(\.([a-zA-Z0-9]|[a-zA-Z0-9_][a-zA-Z0-9\-_]{0,61}[a-zA-Z0-9]))*$`) //nolint:lll
@@ -53,34 +53,34 @@ func (b DNSBlacklist) validate() (err error) {
 
 func (b DNSBlacklist) copy() (copied DNSBlacklist) {
 	return DNSBlacklist{
-		BlockMalicious:       helpers.CopyBoolPtr(b.BlockMalicious),
-		BlockAds:             helpers.CopyBoolPtr(b.BlockAds),
-		BlockSurveillance:    helpers.CopyBoolPtr(b.BlockSurveillance),
-		AllowedHosts:         helpers.CopyStringSlice(b.AllowedHosts),
-		AddBlockedHosts:      helpers.CopyStringSlice(b.AddBlockedHosts),
-		AddBlockedIPs:        helpers.CopyNetaddrIPsSlice(b.AddBlockedIPs),
-		AddBlockedIPPrefixes: helpers.CopyIPPrefixSlice(b.AddBlockedIPPrefixes),
+		BlockMalicious:       helpers.CopyPointer(b.BlockMalicious),
+		BlockAds:             helpers.CopyPointer(b.BlockAds),
+		BlockSurveillance:    helpers.CopyPointer(b.BlockSurveillance),
+		AllowedHosts:         helpers.CopySlice(b.AllowedHosts),
+		AddBlockedHosts:      helpers.CopySlice(b.AddBlockedHosts),
+		AddBlockedIPs:        helpers.CopySlice(b.AddBlockedIPs),
+		AddBlockedIPPrefixes: helpers.CopySlice(b.AddBlockedIPPrefixes),
 	}
 }
 
 func (b *DNSBlacklist) mergeWith(other DNSBlacklist) {
-	b.BlockMalicious = helpers.MergeWithBool(b.BlockMalicious, other.BlockMalicious)
-	b.BlockAds = helpers.MergeWithBool(b.BlockAds, other.BlockAds)
-	b.BlockSurveillance = helpers.MergeWithBool(b.BlockSurveillance, other.BlockSurveillance)
-	b.AllowedHosts = helpers.MergeStringSlices(b.AllowedHosts, other.AllowedHosts)
-	b.AddBlockedHosts = helpers.MergeStringSlices(b.AddBlockedHosts, other.AddBlockedHosts)
-	b.AddBlockedIPs = helpers.MergeNetaddrIPsSlices(b.AddBlockedIPs, other.AddBlockedIPs)
-	b.AddBlockedIPPrefixes = helpers.MergeIPPrefixesSlices(b.AddBlockedIPPrefixes, other.AddBlockedIPPrefixes)
+	b.BlockMalicious = helpers.MergeWithPointer(b.BlockMalicious, other.BlockMalicious)
+	b.BlockAds = helpers.MergeWithPointer(b.BlockAds, other.BlockAds)
+	b.BlockSurveillance = helpers.MergeWithPointer(b.BlockSurveillance, other.BlockSurveillance)
+	b.AllowedHosts = helpers.MergeSlices(b.AllowedHosts, other.AllowedHosts)
+	b.AddBlockedHosts = helpers.MergeSlices(b.AddBlockedHosts, other.AddBlockedHosts)
+	b.AddBlockedIPs = helpers.MergeSlices(b.AddBlockedIPs, other.AddBlockedIPs)
+	b.AddBlockedIPPrefixes = helpers.MergeSlices(b.AddBlockedIPPrefixes, other.AddBlockedIPPrefixes)
 }
 
 func (b *DNSBlacklist) overrideWith(other DNSBlacklist) {
-	b.BlockMalicious = helpers.OverrideWithBool(b.BlockMalicious, other.BlockMalicious)
-	b.BlockAds = helpers.OverrideWithBool(b.BlockAds, other.BlockAds)
-	b.BlockSurveillance = helpers.OverrideWithBool(b.BlockSurveillance, other.BlockSurveillance)
-	b.AllowedHosts = helpers.OverrideWithStringSlice(b.AllowedHosts, other.AllowedHosts)
-	b.AddBlockedHosts = helpers.OverrideWithStringSlice(b.AddBlockedHosts, other.AddBlockedHosts)
-	b.AddBlockedIPs = helpers.OverrideWithNetaddrIPsSlice(b.AddBlockedIPs, other.AddBlockedIPs)
-	b.AddBlockedIPPrefixes = helpers.OverrideWithIPPrefixesSlice(b.AddBlockedIPPrefixes, other.AddBlockedIPPrefixes)
+	b.BlockMalicious = helpers.OverrideWithPointer(b.BlockMalicious, other.BlockMalicious)
+	b.BlockAds = helpers.OverrideWithPointer(b.BlockAds, other.BlockAds)
+	b.BlockSurveillance = helpers.OverrideWithPointer(b.BlockSurveillance, other.BlockSurveillance)
+	b.AllowedHosts = helpers.OverrideWithSlice(b.AllowedHosts, other.AllowedHosts)
+	b.AddBlockedHosts = helpers.OverrideWithSlice(b.AddBlockedHosts, other.AddBlockedHosts)
+	b.AddBlockedIPs = helpers.OverrideWithSlice(b.AddBlockedIPs, other.AddBlockedIPs)
+	b.AddBlockedIPPrefixes = helpers.OverrideWithSlice(b.AddBlockedIPPrefixes, other.AddBlockedIPPrefixes)
 }
 
 func (b DNSBlacklist) ToBlacklistFormat() (settings blacklist.BuilderSettings, err error) {
@@ -90,8 +90,8 @@ func (b DNSBlacklist) ToBlacklistFormat() (settings blacklist.BuilderSettings, e
 		BlockSurveillance:    *b.BlockSurveillance,
 		AllowedHosts:         b.AllowedHosts,
 		AddBlockedHosts:      b.AddBlockedHosts,
-		AddBlockedIPs:        b.AddBlockedIPs,
-		AddBlockedIPPrefixes: b.AddBlockedIPPrefixes,
+		AddBlockedIPs:        netipAddressesToNetaddrIPs(b.AddBlockedIPs),
+		AddBlockedIPPrefixes: netipPrefixesToNetaddrIPPrefixes(b.AddBlockedIPPrefixes),
 	}, nil
 }
 

internal/configuration/settings/dot.go

@@ -54,8 +54,8 @@ func (d DoT) validate() (err error) {
 
 func (d *DoT) copy() (copied DoT) {
 	return DoT{
-		Enabled:      helpers.CopyBoolPtr(d.Enabled),
-		UpdatePeriod: helpers.CopyDurationPtr(d.UpdatePeriod),
+		Enabled:      helpers.CopyPointer(d.Enabled),
+		UpdatePeriod: helpers.CopyPointer(d.UpdatePeriod),
 		Unbound:      d.Unbound.copy(),
 		Blacklist:    d.Blacklist.copy(),
 	}
@@ -64,8 +64,8 @@ func (d *DoT) copy() (copied DoT) {
 // mergeWith merges the other settings into any
 // unset field of the receiver settings object.
 func (d *DoT) mergeWith(other DoT) {
-	d.Enabled = helpers.MergeWithBool(d.Enabled, other.Enabled)
-	d.UpdatePeriod = helpers.MergeWithDuration(d.UpdatePeriod, other.UpdatePeriod)
+	d.Enabled = helpers.MergeWithPointer(d.Enabled, other.Enabled)
+	d.UpdatePeriod = helpers.MergeWithPointer(d.UpdatePeriod, other.UpdatePeriod)
 	d.Unbound.mergeWith(other.Unbound)
 	d.Blacklist.mergeWith(other.Blacklist)
 }
@@ -74,16 +74,16 @@ func (d *DoT) mergeWith(other DoT) {
 // settings object with any field set in the other
 // settings.
 func (d *DoT) overrideWith(other DoT) {
-	d.Enabled = helpers.OverrideWithBool(d.Enabled, other.Enabled)
-	d.UpdatePeriod = helpers.OverrideWithDuration(d.UpdatePeriod, other.UpdatePeriod)
+	d.Enabled = helpers.OverrideWithPointer(d.Enabled, other.Enabled)
+	d.UpdatePeriod = helpers.OverrideWithPointer(d.UpdatePeriod, other.UpdatePeriod)
 	d.Unbound.overrideWith(other.Unbound)
 	d.Blacklist.overrideWith(other.Blacklist)
 }
 
 func (d *DoT) setDefaults() {
-	d.Enabled = helpers.DefaultBool(d.Enabled, true)
+	d.Enabled = helpers.DefaultPointer(d.Enabled, true)
 	const defaultUpdatePeriod = 24 * time.Hour
-	d.UpdatePeriod = helpers.DefaultDuration(d.UpdatePeriod, defaultUpdatePeriod)
+	d.UpdatePeriod = helpers.DefaultPointer(d.UpdatePeriod, defaultUpdatePeriod)
 	d.Unbound.setDefaults()
 	d.Blacklist.setDefaults()
 }

internal/configuration/settings/errors.go

@@ -10,12 +10,14 @@ var (
 	ErrFirewallZeroPort                = errors.New("cannot have a zero port to block")
 	ErrHostnameNotValid                = errors.New("the hostname specified is not valid")
 	ErrISPNotValid                     = errors.New("the ISP specified is not valid")
+	ErrMinRatioNotValid                = errors.New("minimum ratio is not valid")
 	ErrMissingValue                    = errors.New("missing value")
 	ErrNameNotValid                    = errors.New("the server name specified is not valid")
 	ErrOpenVPNClientKeyMissing         = errors.New("client key is missing")
 	ErrOpenVPNCustomPortNotAllowed     = errors.New("custom endpoint port is not allowed")
 	ErrOpenVPNEncryptionPresetNotValid = errors.New("PIA encryption preset is not valid")
 	ErrOpenVPNInterfaceNotValid        = errors.New("interface name is not valid")
+	ErrOpenVPNKeyPassphraseIsEmpty     = errors.New("key passphrase is empty")
 	ErrOpenVPNMSSFixIsTooHigh          = errors.New("mssfix option value is too high")
 	ErrOpenVPNPasswordIsEmpty          = errors.New("password is empty")
 	ErrOpenVPNTCPNotSupported          = errors.New("TCP protocol is not supported")
@@ -35,10 +37,13 @@ var (
 	ErrWireguardEndpointIPNotSet       = errors.New("endpoint IP is not set")
 	ErrWireguardEndpointPortNotAllowed = errors.New("endpoint port is not allowed")
 	ErrWireguardEndpointPortNotSet     = errors.New("endpoint port is not set")
+	ErrWireguardEndpointPortSet        = errors.New("endpoint port is set")
 	ErrWireguardInterfaceAddressNotSet = errors.New("interface address is not set")
+	ErrWireguardInterfaceAddressIPv6   = errors.New("interface address is IPv6 but IPv6 is not supported")
 	ErrWireguardInterfaceNotValid      = errors.New("interface name is not valid")
 	ErrWireguardPreSharedKeyNotSet     = errors.New("pre-shared key is not set")
 	ErrWireguardPrivateKeyNotSet       = errors.New("private key is not set")
 	ErrWireguardPublicKeyNotSet        = errors.New("public key is not set")
 	ErrWireguardPublicKeyNotValid      = errors.New("public key is not valid")
+	ErrWireguardImplementationNotValid = errors.New("implementation is not valid")
 )

internal/configuration/settings/firewall.go

@@ -2,7 +2,7 @@ package settings
 
 import (
 	"fmt"
-	"net"
+	"net/netip"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings/helpers"
 	"github.com/qdm12/gotree"
@@ -12,7 +12,7 @@ import (
 type Firewall struct {
 	VPNInputPorts   []uint16
 	InputPorts      []uint16
-	OutboundSubnets []net.IPNet
+	OutboundSubnets []netip.Prefix
 	Enabled         *bool
 	Debug           *bool
 }
@@ -40,11 +40,11 @@ func hasZeroPort(ports []uint16) (has bool) {
 
 func (f *Firewall) copy() (copied Firewall) {
 	return Firewall{
-		VPNInputPorts:   helpers.CopyUint16Slice(f.VPNInputPorts),
-		InputPorts:      helpers.CopyUint16Slice(f.InputPorts),
-		OutboundSubnets: helpers.CopyIPNetSlice(f.OutboundSubnets),
-		Enabled:         helpers.CopyBoolPtr(f.Enabled),
-		Debug:           helpers.CopyBoolPtr(f.Debug),
+		VPNInputPorts:   helpers.CopySlice(f.VPNInputPorts),
+		InputPorts:      helpers.CopySlice(f.InputPorts),
+		OutboundSubnets: helpers.CopySlice(f.OutboundSubnets),
+		Enabled:         helpers.CopyPointer(f.Enabled),
+		Debug:           helpers.CopyPointer(f.Debug),
 	}
 }
 
@@ -53,27 +53,27 @@ func (f *Firewall) copy() (copied Firewall) {
 // It merges values of slices together, even if they
 // are set in the receiver settings.
 func (f *Firewall) mergeWith(other Firewall) {
-	f.VPNInputPorts = helpers.MergeUint16Slices(f.VPNInputPorts, other.VPNInputPorts)
-	f.InputPorts = helpers.MergeUint16Slices(f.InputPorts, other.InputPorts)
-	f.OutboundSubnets = helpers.MergeIPNetsSlices(f.OutboundSubnets, other.OutboundSubnets)
-	f.Enabled = helpers.MergeWithBool(f.Enabled, other.Enabled)
-	f.Debug = helpers.MergeWithBool(f.Debug, other.Debug)
+	f.VPNInputPorts = helpers.MergeSlices(f.VPNInputPorts, other.VPNInputPorts)
+	f.InputPorts = helpers.MergeSlices(f.InputPorts, other.InputPorts)
+	f.OutboundSubnets = helpers.MergeSlices(f.OutboundSubnets, other.OutboundSubnets)
+	f.Enabled = helpers.MergeWithPointer(f.Enabled, other.Enabled)
+	f.Debug = helpers.MergeWithPointer(f.Debug, other.Debug)
 }
 
 // overrideWith overrides fields of the receiver
 // settings object with any field set in the other
 // settings.
 func (f *Firewall) overrideWith(other Firewall) {
-	f.VPNInputPorts = helpers.OverrideWithUint16Slice(f.VPNInputPorts, other.VPNInputPorts)
-	f.InputPorts = helpers.OverrideWithUint16Slice(f.InputPorts, other.InputPorts)
-	f.OutboundSubnets = helpers.OverrideWithIPNetsSlice(f.OutboundSubnets, other.OutboundSubnets)
-	f.Enabled = helpers.OverrideWithBool(f.Enabled, other.Enabled)
-	f.Debug = helpers.OverrideWithBool(f.Debug, other.Debug)
+	f.VPNInputPorts = helpers.OverrideWithSlice(f.VPNInputPorts, other.VPNInputPorts)
+	f.InputPorts = helpers.OverrideWithSlice(f.InputPorts, other.InputPorts)
+	f.OutboundSubnets = helpers.OverrideWithSlice(f.OutboundSubnets, other.OutboundSubnets)
+	f.Enabled = helpers.OverrideWithPointer(f.Enabled, other.Enabled)
+	f.Debug = helpers.OverrideWithPointer(f.Debug, other.Debug)
 }
 
 func (f *Firewall) setDefaults() {
-	f.Enabled = helpers.DefaultBool(f.Enabled, true)
-	f.Debug = helpers.DefaultBool(f.Debug, false)
+	f.Enabled = helpers.DefaultPointer(f.Enabled, true)
+	f.Debug = helpers.DefaultPointer(f.Debug, false)
 }
 
 func (f Firewall) String() string {
@@ -109,7 +109,8 @@ func (f Firewall) toLinesNode() (node *gotree.Node) {
 	if len(f.OutboundSubnets) > 0 {
 		outboundSubnets := node.Appendf("Outbound subnets:")
 		for _, subnet := range f.OutboundSubnets {
-			outboundSubnets.Appendf("%s", subnet)
+			subnet := subnet
+			outboundSubnets.Appendf("%s", &subnet)
 		}
 	}
 

internal/configuration/settings/health.go

@@ -3,6 +3,7 @@ package settings
 import (
 	"fmt"
 	"os"
+	"time"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings/helpers"
 	"github.com/qdm12/gotree"
@@ -15,11 +16,23 @@ type Health struct {
 	// for the health check server.
 	// It cannot be the empty string in the internal state.
 	ServerAddress string
+	// ReadHeaderTimeout is the HTTP server header read timeout
+	// duration of the HTTP server. It defaults to 100 milliseconds.
+	ReadHeaderTimeout time.Duration
+	// ReadTimeout is the HTTP read timeout duration of the
+	// HTTP server. It defaults to 500 milliseconds.
+	ReadTimeout time.Duration
 	// TargetAddress is the address (host or host:port)
 	// to TCP dial to periodically for the health check.
 	// It cannot be the empty string in the internal state.
 	TargetAddress string
-	VPN           HealthyWait
+	// SuccessWait is the duration to wait to re-run the
+	// healthcheck after a successful healthcheck.
+	// It defaults to 5 seconds and cannot be zero in
+	// the internal state.
+	SuccessWait time.Duration
+	// VPN has health settings specific to the VPN loop.
+	VPN HealthyWait
 }
 
 func (h Health) Validate() (err error) {
@@ -40,9 +53,12 @@ func (h Health) Validate() (err error) {
 
 func (h *Health) copy() (copied Health) {
 	return Health{
-		ServerAddress: h.ServerAddress,
-		TargetAddress: h.TargetAddress,
-		VPN:           h.VPN.copy(),
+		ServerAddress:     h.ServerAddress,
+		ReadHeaderTimeout: h.ReadHeaderTimeout,
+		ReadTimeout:       h.ReadTimeout,
+		TargetAddress:     h.TargetAddress,
+		SuccessWait:       h.SuccessWait,
+		VPN:               h.VPN.copy(),
 	}
 }
 
@@ -50,7 +66,10 @@ func (h *Health) copy() (copied Health) {
 // unset field of the receiver settings object.
 func (h *Health) MergeWith(other Health) {
 	h.ServerAddress = helpers.MergeWithString(h.ServerAddress, other.ServerAddress)
+	h.ReadHeaderTimeout = helpers.MergeWithNumber(h.ReadHeaderTimeout, other.ReadHeaderTimeout)
+	h.ReadTimeout = helpers.MergeWithNumber(h.ReadTimeout, other.ReadTimeout)
 	h.TargetAddress = helpers.MergeWithString(h.TargetAddress, other.TargetAddress)
+	h.SuccessWait = helpers.MergeWithNumber(h.SuccessWait, other.SuccessWait)
 	h.VPN.mergeWith(other.VPN)
 }
 
@@ -59,13 +78,22 @@ func (h *Health) MergeWith(other Health) {
 // settings.
 func (h *Health) OverrideWith(other Health) {
 	h.ServerAddress = helpers.OverrideWithString(h.ServerAddress, other.ServerAddress)
+	h.ReadHeaderTimeout = helpers.OverrideWithNumber(h.ReadHeaderTimeout, other.ReadHeaderTimeout)
+	h.ReadTimeout = helpers.OverrideWithNumber(h.ReadTimeout, other.ReadTimeout)
 	h.TargetAddress = helpers.OverrideWithString(h.TargetAddress, other.TargetAddress)
+	h.SuccessWait = helpers.OverrideWithNumber(h.SuccessWait, other.SuccessWait)
 	h.VPN.overrideWith(other.VPN)
 }
 
 func (h *Health) SetDefaults() {
 	h.ServerAddress = helpers.DefaultString(h.ServerAddress, "127.0.0.1:9999")
+	const defaultReadHeaderTimeout = 100 * time.Millisecond
+	h.ReadHeaderTimeout = helpers.DefaultNumber(h.ReadHeaderTimeout, defaultReadHeaderTimeout)
+	const defaultReadTimeout = 500 * time.Millisecond
+	h.ReadTimeout = helpers.DefaultNumber(h.ReadTimeout, defaultReadTimeout)
 	h.TargetAddress = helpers.DefaultString(h.TargetAddress, "cloudflare.com:443")
+	const defaultSuccessWait = 5 * time.Second
+	h.SuccessWait = helpers.DefaultNumber(h.SuccessWait, defaultSuccessWait)
 	h.VPN.setDefaults()
 }
 
@@ -77,6 +105,9 @@ func (h Health) toLinesNode() (node *gotree.Node) {
 	node = gotree.New("Health settings:")
 	node.Appendf("Server listening address: %s", h.ServerAddress)
 	node.Appendf("Target address: %s", h.TargetAddress)
+	node.Appendf("Duration to wait after success: %s", h.SuccessWait)
+	node.Appendf("Read header timeout: %s", h.ReadHeaderTimeout)
+	node.Appendf("Read timeout: %s", h.ReadTimeout)
 	node.AppendNode(h.VPN.toLinesNode("VPN"))
 	return node
 }

internal/configuration/settings/healthywait.go

@@ -27,31 +27,31 @@ func (h HealthyWait) validate() (err error) {
 // unset field of the receiver settings object.
 func (h *HealthyWait) copy() (copied HealthyWait) {
 	return HealthyWait{
-		Initial:  helpers.CopyDurationPtr(h.Initial),
-		Addition: helpers.CopyDurationPtr(h.Addition),
+		Initial:  helpers.CopyPointer(h.Initial),
+		Addition: helpers.CopyPointer(h.Addition),
 	}
 }
 
 // mergeWith merges the other settings into any
 // unset field of the receiver settings object.
 func (h *HealthyWait) mergeWith(other HealthyWait) {
-	h.Initial = helpers.MergeWithDuration(h.Initial, other.Initial)
-	h.Addition = helpers.MergeWithDuration(h.Addition, other.Addition)
+	h.Initial = helpers.MergeWithPointer(h.Initial, other.Initial)
+	h.Addition = helpers.MergeWithPointer(h.Addition, other.Addition)
 }
 
 // overrideWith overrides fields of the receiver
 // settings object with any field set in the other
 // settings.
 func (h *HealthyWait) overrideWith(other HealthyWait) {
-	h.Initial = helpers.OverrideWithDuration(h.Initial, other.Initial)
-	h.Addition = helpers.OverrideWithDuration(h.Addition, other.Addition)
+	h.Initial = helpers.OverrideWithPointer(h.Initial, other.Initial)
+	h.Addition = helpers.OverrideWithPointer(h.Addition, other.Addition)
 }
 
 func (h *HealthyWait) setDefaults() {
 	const initialDurationDefault = 6 * time.Second
 	const additionDurationDefault = 5 * time.Second
-	h.Initial = helpers.DefaultDuration(h.Initial, initialDurationDefault)
-	h.Addition = helpers.DefaultDuration(h.Addition, additionDurationDefault)
+	h.Initial = helpers.DefaultPointer(h.Initial, initialDurationDefault)
+	h.Addition = helpers.DefaultPointer(h.Addition, additionDurationDefault)
 }
 
 func (h HealthyWait) String() string {

internal/configuration/settings/helpers/belong.go

@@ -22,7 +22,7 @@ var (
 
 func AreAllOneOf(values, choices []string) (err error) {
 	if len(values) > 0 && len(choices) == 0 {
-		return ErrNoChoice
+		return fmt.Errorf("%w", ErrNoChoice)
 	}
 
 	set := make(map[string]struct{}, len(choices))

internal/configuration/settings/helpers/copy.go

@@ -1,199 +1,20 @@
 package helpers
 
 import (
-	"net"
-	"time"
+	"net/netip"
 
-	"github.com/qdm12/log"
-	"inet.af/netaddr"
+	"golang.org/x/exp/slices"
 )
 
-func CopyStringPtr(original *string) (copied *string) {
+func CopyPointer[T any](original *T) (copied *T) {
 	if original == nil {
 		return nil
 	}
-	copied = new(string)
+	copied = new(T)
 	*copied = *original
 	return copied
 }
 
-func CopyBoolPtr(original *bool) (copied *bool) {
-	if original == nil {
-		return nil
-	}
-	copied = new(bool)
-	*copied = *original
-	return copied
-}
-
-func CopyUint8Ptr(original *uint8) (copied *uint8) {
-	if original == nil {
-		return nil
-	}
-	copied = new(uint8)
-	*copied = *original
-	return copied
-}
-
-func CopyUint16Ptr(original *uint16) (copied *uint16) {
-	if original == nil {
-		return nil
-	}
-	copied = new(uint16)
-	*copied = *original
-	return copied
-}
-
-func CopyUint32Ptr(original *uint32) (copied *uint32) {
-	if original == nil {
-		return nil
-	}
-	copied = new(uint32)
-	*copied = *original
-	return copied
-}
-
-func CopyIntPtr(original *int) (copied *int) {
-	if original == nil {
-		return nil
-	}
-	copied = new(int)
-	*copied = *original
-	return copied
-}
-
-func CopyDurationPtr(original *time.Duration) (copied *time.Duration) {
-	if original == nil {
-		return nil
-	}
-	copied = new(time.Duration)
-	*copied = *original
-	return copied
-}
-
-func CopyLogLevelPtr(original *log.Level) (copied *log.Level) {
-	if original == nil {
-		return nil
-	}
-	copied = new(log.Level)
-	*copied = *original
-	return copied
-}
-
-func CopyIP(original net.IP) (copied net.IP) {
-	if original == nil {
-		return nil
-	}
-	copied = make(net.IP, len(original))
-	copy(copied, original)
-	return copied
-}
-
-func CopyIPNet(original net.IPNet) (copied net.IPNet) {
-	if original.IP != nil {
-		copied.IP = make(net.IP, len(original.IP))
-		copy(copied.IP, original.IP)
-	}
-
-	if original.Mask != nil {
-		copied.Mask = make(net.IPMask, len(original.Mask))
-		copy(copied.Mask, original.Mask)
-	}
-
-	return copied
-}
-
-func CopyIPNetPtr(original *net.IPNet) (copied *net.IPNet) {
-	if original == nil {
-		return nil
-	}
-
-	copied = new(net.IPNet)
-	*copied = CopyIPNet(*original)
-	return copied
-}
-
-func CopyNetaddrIP(original netaddr.IP) (copied netaddr.IP) {
-	b, err := original.MarshalBinary()
-	if err != nil {
-		panic(err)
-	}
-
-	err = copied.UnmarshalBinary(b)
-	if err != nil {
-		panic(err)
-	}
-
-	return copied
-}
-
-func CopyIPPrefix(original netaddr.IPPrefix) (copied netaddr.IPPrefix) {
-	b, err := original.MarshalText()
-	if err != nil {
-		panic(err)
-	}
-
-	err = copied.UnmarshalText(b)
-	if err != nil {
-		panic(err)
-	}
-
-	return copied
-}
-
-func CopyStringSlice(original []string) (copied []string) {
-	if original == nil {
-		return nil
-	}
-
-	copied = make([]string, len(original))
-	copy(copied, original)
-	return copied
-}
-
-func CopyUint16Slice(original []uint16) (copied []uint16) {
-	if original == nil {
-		return nil
-	}
-
-	copied = make([]uint16, len(original))
-	copy(copied, original)
-	return copied
-}
-
-func CopyIPNetSlice(original []net.IPNet) (copied []net.IPNet) {
-	if original == nil {
-		return nil
-	}
-
-	copied = make([]net.IPNet, len(original))
-	for i := range original {
-		copied[i] = CopyIPNet(original[i])
-	}
-	return copied
-}
-
-func CopyIPPrefixSlice(original []netaddr.IPPrefix) (copied []netaddr.IPPrefix) {
-	if original == nil {
-		return nil
-	}
-
-	copied = make([]netaddr.IPPrefix, len(original))
-	for i := range original {
-		copied[i] = CopyIPPrefix(original[i])
-	}
-	return copied
-}
-
-func CopyNetaddrIPsSlice(original []netaddr.IP) (copied []netaddr.IP) {
-	if original == nil {
-		return nil
-	}
-
-	copied = make([]netaddr.IP, len(original))
-	for i := range original {
-		copied[i] = CopyNetaddrIP(original[i])
-	}
-
-	return copied
+func CopySlice[T string | uint16 | netip.Addr | netip.Prefix](original []T) (copied []T) {
+	return slices.Clone(original)
 }

internal/configuration/settings/helpers/default.go

@@ -1,57 +1,15 @@
 package helpers
 
 import (
-	"net"
-	"time"
-
-	"github.com/qdm12/log"
+	"net/netip"
 )
 
-func DefaultInt(existing *int, defaultValue int) (
-	result *int) {
+func DefaultPointer[T any](existing *T, defaultValue T) (
+	result *T) {
 	if existing != nil {
 		return existing
 	}
-	result = new(int)
-	*result = defaultValue
-	return result
-}
-
-func DefaultUint8(existing *uint8, defaultValue uint8) (
-	result *uint8) {
-	if existing != nil {
-		return existing
-	}
-	result = new(uint8)
-	*result = defaultValue
-	return result
-}
-
-func DefaultUint16(existing *uint16, defaultValue uint16) (
-	result *uint16) {
-	if existing != nil {
-		return existing
-	}
-	result = new(uint16)
-	*result = defaultValue
-	return result
-}
-func DefaultUint32(existing *uint32, defaultValue uint32) (
-	result *uint32) {
-	if existing != nil {
-		return existing
-	}
-	result = new(uint32)
-	*result = defaultValue
-	return result
-}
-
-func DefaultBool(existing *bool, defaultValue bool) (
-	result *bool) {
-	if existing != nil {
-		return existing
-	}
-	result = new(bool)
+	result = new(T)
 	*result = defaultValue
 	return result
 }
@@ -64,38 +22,17 @@ func DefaultString(existing string, defaultValue string) (
 	return defaultValue
 }
 
-func DefaultStringPtr(existing *string, defaultValue string) (result *string) {
-	if existing != nil {
-		return existing
-	}
-	result = new(string)
-	*result = defaultValue
-	return result
-}
-
-func DefaultDuration(existing *time.Duration,
-	defaultValue time.Duration) (result *time.Duration) {
-	if existing != nil {
-		return existing
-	}
-	result = new(time.Duration)
-	*result = defaultValue
-	return result
-}
-
-func DefaultLogLevel(existing *log.Level,
-	defaultValue log.Level) (result *log.Level) {
-	if existing != nil {
-		return existing
-	}
-	result = new(log.Level)
-	*result = defaultValue
-	return result
-}
-
-func DefaultIP(existing net.IP, defaultValue net.IP) (
-	result net.IP) {
-	if existing != nil {
+func DefaultNumber[T Number](existing T, defaultValue T) ( //nolint:ireturn
+	result T) {
+	if existing != 0 {
+		return existing
+	}
+	return defaultValue
+}
+
+func DefaultIP(existing netip.Addr, defaultValue netip.Addr) (
+	result netip.Addr) {
+	if existing.IsValid() {
 		return existing
 	}
 	return defaultValue

internal/configuration/settings/helpers/generics.go

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

internal/configuration/settings/helpers/merge.go

@@ -1,21 +1,17 @@
 package helpers
 
 import (
-	"net"
 	"net/http"
-	"time"
-
-	"github.com/qdm12/log"
-	"inet.af/netaddr"
+	"net/netip"
 )
 
-func MergeWithBool(existing, other *bool) (result *bool) {
+func MergeWithPointer[T any](existing, other *T) (result *T) {
 	if existing != nil {
 		return existing
 	} else if other == nil {
 		return nil
 	}
-	result = new(bool)
+	result = new(T)
 	*result = *other
 	return result
 }
@@ -27,97 +23,20 @@ func MergeWithString(existing, other string) (result string) {
 	return other
 }
 
-func MergeWithInt(existing, other int) (result int) {
+func MergeWithNumber[T Number](existing, other T) (result T) { //nolint:ireturn
 	if existing != 0 {
 		return existing
 	}
 	return other
 }
 
-func MergeWithStringPtr(existing, other *string) (result *string) {
-	if existing != nil {
-		return existing
-	} else if other == nil {
-		return nil
-	}
-	result = new(string)
-	*result = *other
-	return result
-}
-
-func MergeWithIntPtr(existing, other *int) (result *int) {
-	if existing != nil {
-		return existing
-	} else if other == nil {
-		return nil
-	}
-	result = new(int)
-	*result = *other
-	return result
-}
-
-func MergeWithUint8(existing, other *uint8) (result *uint8) {
-	if existing != nil {
-		return existing
-	} else if other == nil {
-		return nil
-	}
-	result = new(uint8)
-	*result = *other
-	return result
-}
-
-func MergeWithUint16(existing, other *uint16) (result *uint16) {
-	if existing != nil {
-		return existing
-	} else if other == nil {
-		return nil
-	}
-	result = new(uint16)
-	*result = *other
-	return result
-}
-
-func MergeWithUint32(existing, other *uint32) (result *uint32) {
-	if existing != nil {
-		return existing
-	} else if other == nil {
-		return nil
-	}
-	result = new(uint32)
-	*result = *other
-	return result
-}
-
-func MergeWithIP(existing, other net.IP) (result net.IP) {
-	if existing != nil {
-		return existing
-	} else if other == nil {
-		return nil
-	}
-	result = make(net.IP, len(other))
-	copy(result, other)
-	return result
-}
-
-func MergeWithDuration(existing, other *time.Duration) (result *time.Duration) {
-	if existing != nil {
+func MergeWithIP(existing, other netip.Addr) (result netip.Addr) {
+	if existing.IsValid() {
 		return existing
 	}
 	return other
 }
 
-func MergeWithLogLevel(existing, other *log.Level) (result *log.Level) {
-	if existing != nil {
-		return existing
-	} else if other == nil {
-		return nil
-	}
-	result = new(log.Level)
-	*result = *other
-	return result
-}
-
 func MergeWithHTTPHandler(existing, other http.Handler) (result http.Handler) {
 	if existing != nil {
 		return existing
@@ -125,13 +44,13 @@ func MergeWithHTTPHandler(existing, other http.Handler) (result http.Handler) {
 	return other
 }
 
-func MergeStringSlices(a, b []string) (result []string) {
+func MergeSlices[T comparable](a, b []T) (result []T) {
 	if a == nil && b == nil {
 		return nil
 	}
 
-	seen := make(map[string]struct{}, len(a)+len(b))
-	result = make([]string, 0, len(a)+len(b))
+	seen := make(map[T]struct{}, len(a)+len(b))
+	result = make([]T, 0, len(a)+len(b))
 	for _, s := range a {
 		if _, ok := seen[s]; ok {
 			continue // duplicate
@@ -148,105 +67,3 @@ func MergeStringSlices(a, b []string) (result []string) {
 	}
 	return result
 }
-
-func MergeUint16Slices(a, b []uint16) (result []uint16) {
-	if a == nil && b == nil {
-		return nil
-	}
-
-	seen := make(map[uint16]struct{}, len(a)+len(b))
-	result = make([]uint16, 0, len(a)+len(b))
-	for _, n := range a {
-		if _, ok := seen[n]; ok {
-			continue // duplicate
-		}
-		result = append(result, n)
-		seen[n] = struct{}{}
-	}
-	for _, n := range b {
-		if _, ok := seen[n]; ok {
-			continue // duplicate
-		}
-		result = append(result, n)
-		seen[n] = struct{}{}
-	}
-	return result
-}
-
-func MergeIPNetsSlices(a, b []net.IPNet) (result []net.IPNet) {
-	if a == nil && b == nil {
-		return nil
-	}
-
-	seen := make(map[string]struct{}, len(a)+len(b))
-	result = make([]net.IPNet, 0, len(a)+len(b))
-	for _, ipNet := range a {
-		key := ipNet.String()
-		if _, ok := seen[key]; ok {
-			continue // duplicate
-		}
-		result = append(result, ipNet)
-		seen[key] = struct{}{}
-	}
-	for _, ipNet := range b {
-		key := ipNet.String()
-		if _, ok := seen[key]; ok {
-			continue // duplicate
-		}
-		result = append(result, ipNet)
-		seen[key] = struct{}{}
-	}
-	return result
-}
-
-func MergeNetaddrIPsSlices(a, b []netaddr.IP) (result []netaddr.IP) {
-	if a == nil && b == nil {
-		return nil
-	}
-
-	seen := make(map[string]struct{}, len(a)+len(b))
-	result = make([]netaddr.IP, 0, len(a)+len(b))
-	for _, ip := range a {
-		key := ip.String()
-		if _, ok := seen[key]; ok {
-			continue // duplicate
-		}
-		result = append(result, ip)
-		seen[key] = struct{}{}
-	}
-	for _, ip := range b {
-		key := ip.String()
-		if _, ok := seen[key]; ok {
-			continue // duplicate
-		}
-		result = append(result, ip)
-		seen[key] = struct{}{}
-	}
-	return result
-}
-
-func MergeIPPrefixesSlices(a, b []netaddr.IPPrefix) (result []netaddr.IPPrefix) {
-	if a == nil && b == nil {
-		return nil
-	}
-
-	seen := make(map[string]struct{}, len(a)+len(b))
-	result = make([]netaddr.IPPrefix, 0, len(a)+len(b))
-	for _, ipPrefix := range a {
-		key := ipPrefix.String()
-		if _, ok := seen[key]; ok {
-			continue // duplicate
-		}
-		result = append(result, ipPrefix)
-		seen[key] = struct{}{}
-	}
-	for _, ipPrefix := range b {
-		key := ipPrefix.String()
-		if _, ok := seen[key]; ok {
-			continue // duplicate
-		}
-		result = append(result, ipPrefix)
-		seen[key] = struct{}{}
-	}
-	return result
-}

internal/configuration/settings/helpers/override.go

@@ -1,19 +1,15 @@
 package helpers
 
 import (
-	"net"
 	"net/http"
-	"time"
-
-	"github.com/qdm12/log"
-	"inet.af/netaddr"
+	"net/netip"
 )
 
-func OverrideWithBool(existing, other *bool) (result *bool) {
+func OverrideWithPointer[T any](existing, other *T) (result *T) {
 	if other == nil {
 		return existing
 	}
-	result = new(bool)
+	result = new(T)
 	*result = *other
 	return result
 }
@@ -25,83 +21,18 @@ func OverrideWithString(existing, other string) (result string) {
 	return other
 }
 
-func OverrideWithInt(existing, other int) (result int) {
+func OverrideWithNumber[T Number](existing, other T) (result T) { //nolint:ireturn
 	if other == 0 {
 		return existing
 	}
 	return other
 }
 
-func OverrideWithStringPtr(existing, other *string) (result *string) {
-	if other == nil {
+func OverrideWithIP(existing, other netip.Addr) (result netip.Addr) {
+	if !other.IsValid() {
 		return existing
 	}
-	result = new(string)
-	*result = *other
-	return result
-}
-
-func OverrideWithIntPtr(existing, other *int) (result *int) {
-	if other == nil {
-		return existing
-	}
-	result = new(int)
-	*result = *other
-	return result
-}
-
-func OverrideWithUint8(existing, other *uint8) (result *uint8) {
-	if other == nil {
-		return existing
-	}
-	result = new(uint8)
-	*result = *other
-	return result
-}
-
-func OverrideWithUint16(existing, other *uint16) (result *uint16) {
-	if other == nil {
-		return existing
-	}
-	result = new(uint16)
-	*result = *other
-	return result
-}
-
-func OverrideWithUint32(existing, other *uint32) (result *uint32) {
-	if other == nil {
-		return existing
-	}
-	result = new(uint32)
-	*result = *other
-	return result
-}
-
-func OverrideWithIP(existing, other net.IP) (result net.IP) {
-	if other == nil {
-		return existing
-	}
-	result = make(net.IP, len(other))
-	copy(result, other)
-	return result
-}
-
-func OverrideWithDuration(existing, other *time.Duration) (result *time.Duration) {
-	if other == nil {
-		return existing
-	}
-	result = new(time.Duration)
-	*result = *other
-	return result
-}
-
-func OverrideWithLogLevel(existing, other *log.Level) (result *log.Level) {
-	if other == nil {
-		return existing
-	}
-	result = new(log.Level)
-	*result = *other
-	return result
+	return other
 }
 
 func OverrideWithHTTPHandler(existing, other http.Handler) (result http.Handler) {
@@ -111,47 +42,11 @@ func OverrideWithHTTPHandler(existing, other http.Handler) (result http.Handler)
 	return existing
 }
 
-func OverrideWithStringSlice(existing, other []string) (result []string) {
+func OverrideWithSlice[T any](existing, other []T) (result []T) {
 	if other == nil {
 		return existing
 	}
-	result = make([]string, len(other))
-	copy(result, other)
-	return result
-}
-
-func OverrideWithUint16Slice(existing, other []uint16) (result []uint16) {
-	if other == nil {
-		return existing
-	}
-	result = make([]uint16, len(other))
-	copy(result, other)
-	return result
-}
-
-func OverrideWithIPNetsSlice(existing, other []net.IPNet) (result []net.IPNet) {
-	if other == nil {
-		return existing
-	}
-	result = make([]net.IPNet, len(other))
-	copy(result, other)
-	return result
-}
-
-func OverrideWithNetaddrIPsSlice(existing, other []netaddr.IP) (result []netaddr.IP) {
-	if other == nil {
-		return existing
-	}
-	result = make([]netaddr.IP, len(other))
-	copy(result, other)
-	return result
-}
-
-func OverrideWithIPPrefixesSlice(existing, other []netaddr.IPPrefix) (result []netaddr.IPPrefix) {
-	if other == nil {
-		return existing
-	}
-	result = make([]netaddr.IPPrefix, len(other))
+	result = make([]T, len(other))
 	copy(result, other)
 	return result
 }

internal/configuration/settings/helpers/pointers.go

@@ -1,11 +0,0 @@
-package helpers
-
-import "time"
-
-// StringPtr returns a pointer to the string value
-// passed as argument.
-func StringPtr(s string) *string { return &s }
-
-// DurationPtr returns a pointer to the duration value
-// passed as argument.
-func DurationPtr(d time.Duration) *time.Duration { return &d }

internal/configuration/settings/httpproxy.go

@@ -3,6 +3,7 @@ package settings
 import (
 	"fmt"
 	"os"
+	"time"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings/helpers"
 	"github.com/qdm12/gotree"
@@ -33,6 +34,12 @@ type HTTPProxy struct {
 	// each request/response. It cannot be nil in the
 	// internal state.
 	Log *bool
+	// ReadHeaderTimeout is the HTTP header read timeout duration
+	// of the HTTP server. It defaults to 1 second if left unset.
+	ReadHeaderTimeout time.Duration
+	// ReadTimeout is the HTTP read timeout duration
+	// of the HTTP server. It defaults to 3 seconds if left unset.
+	ReadTimeout time.Duration
 }
 
 func (h HTTPProxy) validate() (err error) {
@@ -49,45 +56,55 @@ func (h HTTPProxy) validate() (err error) {
 
 func (h *HTTPProxy) copy() (copied HTTPProxy) {
 	return HTTPProxy{
-		User:             helpers.CopyStringPtr(h.User),
-		Password:         helpers.CopyStringPtr(h.Password),
-		ListeningAddress: h.ListeningAddress,
-		Enabled:          helpers.CopyBoolPtr(h.Enabled),
-		Stealth:          helpers.CopyBoolPtr(h.Stealth),
-		Log:              helpers.CopyBoolPtr(h.Log),
+		User:              helpers.CopyPointer(h.User),
+		Password:          helpers.CopyPointer(h.Password),
+		ListeningAddress:  h.ListeningAddress,
+		Enabled:           helpers.CopyPointer(h.Enabled),
+		Stealth:           helpers.CopyPointer(h.Stealth),
+		Log:               helpers.CopyPointer(h.Log),
+		ReadHeaderTimeout: h.ReadHeaderTimeout,
+		ReadTimeout:       h.ReadTimeout,
 	}
 }
 
 // mergeWith merges the other settings into any
 // unset field of the receiver settings object.
 func (h *HTTPProxy) mergeWith(other HTTPProxy) {
-	h.User = helpers.MergeWithStringPtr(h.User, other.User)
-	h.Password = helpers.MergeWithStringPtr(h.Password, other.Password)
+	h.User = helpers.MergeWithPointer(h.User, other.User)
+	h.Password = helpers.MergeWithPointer(h.Password, other.Password)
 	h.ListeningAddress = helpers.MergeWithString(h.ListeningAddress, other.ListeningAddress)
-	h.Enabled = helpers.MergeWithBool(h.Enabled, other.Enabled)
-	h.Stealth = helpers.MergeWithBool(h.Stealth, other.Stealth)
-	h.Log = helpers.MergeWithBool(h.Log, other.Log)
+	h.Enabled = helpers.MergeWithPointer(h.Enabled, other.Enabled)
+	h.Stealth = helpers.MergeWithPointer(h.Stealth, other.Stealth)
+	h.Log = helpers.MergeWithPointer(h.Log, other.Log)
+	h.ReadHeaderTimeout = helpers.MergeWithNumber(h.ReadHeaderTimeout, other.ReadHeaderTimeout)
+	h.ReadTimeout = helpers.MergeWithNumber(h.ReadTimeout, other.ReadTimeout)
 }
 
 // overrideWith overrides fields of the receiver
 // settings object with any field set in the other
 // settings.
 func (h *HTTPProxy) overrideWith(other HTTPProxy) {
-	h.User = helpers.OverrideWithStringPtr(h.User, other.User)
-	h.Password = helpers.OverrideWithStringPtr(h.Password, other.Password)
+	h.User = helpers.OverrideWithPointer(h.User, other.User)
+	h.Password = helpers.OverrideWithPointer(h.Password, other.Password)
 	h.ListeningAddress = helpers.OverrideWithString(h.ListeningAddress, other.ListeningAddress)
-	h.Enabled = helpers.OverrideWithBool(h.Enabled, other.Enabled)
-	h.Stealth = helpers.OverrideWithBool(h.Stealth, other.Stealth)
-	h.Log = helpers.OverrideWithBool(h.Log, other.Log)
+	h.Enabled = helpers.OverrideWithPointer(h.Enabled, other.Enabled)
+	h.Stealth = helpers.OverrideWithPointer(h.Stealth, other.Stealth)
+	h.Log = helpers.OverrideWithPointer(h.Log, other.Log)
+	h.ReadHeaderTimeout = helpers.OverrideWithNumber(h.ReadHeaderTimeout, other.ReadHeaderTimeout)
+	h.ReadTimeout = helpers.OverrideWithNumber(h.ReadTimeout, other.ReadTimeout)
 }
 
 func (h *HTTPProxy) setDefaults() {
-	h.User = helpers.DefaultStringPtr(h.User, "")
-	h.Password = helpers.DefaultStringPtr(h.Password, "")
+	h.User = helpers.DefaultPointer(h.User, "")
+	h.Password = helpers.DefaultPointer(h.Password, "")
 	h.ListeningAddress = helpers.DefaultString(h.ListeningAddress, ":8888")
-	h.Enabled = helpers.DefaultBool(h.Enabled, false)
-	h.Stealth = helpers.DefaultBool(h.Stealth, false)
-	h.Log = helpers.DefaultBool(h.Log, false)
+	h.Enabled = helpers.DefaultPointer(h.Enabled, false)
+	h.Stealth = helpers.DefaultPointer(h.Stealth, false)
+	h.Log = helpers.DefaultPointer(h.Log, false)
+	const defaultReadHeaderTimeout = time.Second
+	h.ReadHeaderTimeout = helpers.DefaultNumber(h.ReadHeaderTimeout, defaultReadHeaderTimeout)
+	const defaultReadTimeout = 3 * time.Second
+	h.ReadTimeout = helpers.DefaultNumber(h.ReadTimeout, defaultReadTimeout)
 }
 
 func (h HTTPProxy) String() string {
@@ -106,6 +123,8 @@ func (h HTTPProxy) toLinesNode() (node *gotree.Node) {
 	node.Appendf("Password: %s", helpers.ObfuscatePassword(*h.Password))
 	node.Appendf("Stealth mode: %s", helpers.BoolPtrToYesNo(h.Stealth))
 	node.Appendf("Log: %s", helpers.BoolPtrToYesNo(h.Log))
+	node.Appendf("Read header timeout: %s", h.ReadHeaderTimeout)
+	node.Appendf("Read timeout: %s", h.ReadTimeout)
 
 	return node
 }

internal/configuration/settings/log.go

@@ -19,25 +19,25 @@ func (l Log) validate() (err error) {
 
 func (l *Log) copy() (copied Log) {
 	return Log{
-		Level: helpers.CopyLogLevelPtr(l.Level),
+		Level: helpers.CopyPointer(l.Level),
 	}
 }
 
 // mergeWith merges the other settings into any
 // unset field of the receiver settings object.
 func (l *Log) mergeWith(other Log) {
-	l.Level = helpers.MergeWithLogLevel(l.Level, other.Level)
+	l.Level = helpers.MergeWithPointer(l.Level, other.Level)
 }
 
 // overrideWith overrides fields of the receiver
 // settings object with any field set in the other
 // settings.
 func (l *Log) overrideWith(other Log) {
-	l.Level = helpers.OverrideWithLogLevel(l.Level, other.Level)
+	l.Level = helpers.OverrideWithPointer(l.Level, other.Level)
 }
 
 func (l *Log) setDefaults() {
-	l.Level = helpers.DefaultLogLevel(l.Level, log.LevelInfo)
+	l.Level = helpers.DefaultPointer(l.Level, log.LevelInfo)
 }
 
 func (l Log) String() string {

internal/configuration/settings/netaddr.go

@@ -0,0 +1,36 @@
+package settings
+
+import (
+	"net/netip"
+
+	"inet.af/netaddr"
+)
+
+func netipAddressToNetaddrIP(address netip.Addr) (ip netaddr.IP) {
+	if address.Is4() {
+		return netaddr.IPFrom4(address.As4())
+	}
+	return netaddr.IPFrom16(address.As16())
+}
+
+func netipAddressesToNetaddrIPs(addresses []netip.Addr) (ips []netaddr.IP) {
+	ips = make([]netaddr.IP, len(addresses))
+	for i := range addresses {
+		ips[i] = netipAddressToNetaddrIP(addresses[i])
+	}
+	return ips
+}
+
+func netipPrefixToNetaddrIPPrefix(prefix netip.Prefix) (ipPrefix netaddr.IPPrefix) {
+	netaddrIP := netipAddressToNetaddrIP(prefix.Addr())
+	bits := prefix.Bits()
+	return netaddr.IPPrefixFrom(netaddrIP, uint8(bits))
+}
+
+func netipPrefixesToNetaddrIPPrefixes(prefixes []netip.Prefix) (ipPrefixes []netaddr.IPPrefix) {
+	ipPrefixes = make([]netaddr.IPPrefix, len(prefixes))
+	for i := range ipPrefixes {
+		ipPrefixes[i] = netipPrefixToNetaddrIPPrefix(prefixes[i])
+	}
+	return ipPrefixes
+}

internal/configuration/settings/openvpn.go

@@ -1,14 +1,16 @@
 package settings
 
 import (
+	"encoding/base64"
 	"fmt"
 	"regexp"
 	"strings"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings/helpers"
-	"github.com/qdm12/gluetun/internal/constants"
+	"github.com/qdm12/gluetun/internal/constants/openvpn"
 	"github.com/qdm12/gluetun/internal/constants/providers"
-	"github.com/qdm12/gluetun/internal/openvpn/parse"
+	"github.com/qdm12/gluetun/internal/openvpn/extract"
+	"github.com/qdm12/gluetun/internal/provider/privateinternetaccess/presets"
 	"github.com/qdm12/gotree"
 )
 
@@ -18,13 +20,15 @@ type OpenVPN struct {
 	// It can only be "2.4" or "2.5".
 	Version string
 	// User is the OpenVPN authentication username.
-	// It cannot be an empty string in the internal state
-	// if OpenVPN is used.
-	User string
+	// It cannot be nil in the internal state if OpenVPN is used.
+	// It is usually required but in some cases can be the empty string
+	// to indicate no user+password authentication is needed.
+	User *string
 	// Password is the OpenVPN authentication password.
-	// It cannot be an empty string in the internal state
-	// if OpenVPN is used.
-	Password string
+	// It cannot be nil in the internal state if OpenVPN is used.
+	// It is usually required but in some cases can be the empty string
+	// to indicate no user+password authentication is needed.
+	Password *string
 	// ConfFile is a custom OpenVPN configuration file path.
 	// It can be set to the empty string for it to be ignored.
 	// It cannot be nil in the internal state.
@@ -38,24 +42,29 @@ type OpenVPN struct {
 	// It cannot be nil in the internal state.
 	// It is ignored if it is set to the empty string.
 	Auth *string
-	// ClientCrt is the OpenVPN client certificate.
-	// This is notably used by Cyberghost.
+	// Cert is the base64 encoded DER of an OpenVPN certificate for the <cert> block.
+	// This is notably used by Cyberghost and VPN secure.
 	// It can be set to the empty string to be ignored.
 	// It cannot be nil in the internal state.
-	ClientCrt *string
-	// ClientKey is the OpenVPN client key.
+	Cert *string
+	// Key is the base64 encoded DER of an OpenVPN key.
 	// This is used by Cyberghost and VPN Unlimited.
 	// It can be set to the empty string to be ignored.
 	// It cannot be nil in the internal state.
-	ClientKey *string
+	Key *string
+	// EncryptedKey is the base64 encoded DER of an encrypted key for OpenVPN.
+	// It is used by VPN secure.
+	// It defaults to the empty string meaning it is not
+	// to be used. KeyPassphrase must be set if this one is set.
+	EncryptedKey *string
+	// KeyPassphrase is the key passphrase to be used by OpenVPN
+	// to decrypt the EncryptedPrivateKey. It defaults to the
+	// empty string and must be set if EncryptedPrivateKey is set.
+	KeyPassphrase *string
 	// PIAEncPreset is the encryption preset for
 	// Private Internet Access. It can be set to an
 	// empty string for other providers.
 	PIAEncPreset *string
-	// IPv6 is set to true if IPv6 routing should be
-	// set to be tunnel in OpenVPN, and false otherwise.
-	// It cannot be nil in the internal state.
-	IPv6 *bool // TODO automate like with Wireguard
 	// MSSFix is the value (1 to 10000) to set for the
 	// mssfix option for OpenVPN. It is ignored if set to 0.
 	// It cannot be nil in the internal state.
@@ -79,23 +88,26 @@ var ivpnAccountID = regexp.MustCompile(`^(i|ivpn)\-[a-zA-Z0-9]{4}\-[a-zA-Z0-9]{4
 
 func (o OpenVPN) validate(vpnProvider string) (err error) {
 	// Validate version
-	validVersions := []string{constants.Openvpn24, constants.Openvpn25}
+	validVersions := []string{openvpn.Openvpn24, openvpn.Openvpn25}
 	if !helpers.IsOneOf(o.Version, validVersions...) {
 		return fmt.Errorf("%w: %q can only be one of %s",
 			ErrOpenVPNVersionIsNotValid, o.Version, strings.Join(validVersions, ", "))
 	}
 
 	isCustom := vpnProvider == providers.Custom
+	isUserRequired := !isCustom &&
+		vpnProvider != providers.Airvpn &&
+		vpnProvider != providers.VPNSecure
 
-	if !isCustom && o.User == "" {
-		return ErrOpenVPNUserIsEmpty
+	if isUserRequired && *o.User == "" {
+		return fmt.Errorf("%w", ErrOpenVPNUserIsEmpty)
 	}
 
-	passwordRequired := !isCustom &&
-		(vpnProvider != providers.Ivpn || !ivpnAccountID.MatchString(o.User))
+	passwordRequired := isUserRequired &&
+		(vpnProvider != providers.Ivpn || !ivpnAccountID.MatchString(*o.User))
 
-	if passwordRequired && o.Password == "" {
-		return ErrOpenVPNPasswordIsEmpty
+	if passwordRequired && *o.Password == "" {
+		return fmt.Errorf("%w", ErrOpenVPNPasswordIsEmpty)
 	}
 
 	err = validateOpenVPNConfigFilepath(isCustom, *o.ConfFile)
@@ -103,16 +115,25 @@ func (o OpenVPN) validate(vpnProvider string) (err error) {
 		return fmt.Errorf("custom configuration file: %w", err)
 	}
 
-	err = validateOpenVPNClientCertificate(vpnProvider, *o.ClientCrt)
+	err = validateOpenVPNClientCertificate(vpnProvider, *o.Cert)
 	if err != nil {
 		return fmt.Errorf("client certificate: %w", err)
 	}
 
-	err = validateOpenVPNClientKey(vpnProvider, *o.ClientKey)
+	err = validateOpenVPNClientKey(vpnProvider, *o.Key)
 	if err != nil {
 		return fmt.Errorf("client key: %w", err)
 	}
 
+	err = validateOpenVPNEncryptedKey(vpnProvider, *o.EncryptedKey)
+	if err != nil {
+		return fmt.Errorf("encrypted key: %w", err)
+	}
+
+	if *o.EncryptedKey != "" && *o.KeyPassphrase == "" {
+		return fmt.Errorf("%w", ErrOpenVPNKeyPassphraseIsEmpty)
+	}
+
 	const maxMSSFix = 10000
 	if *o.MSSFix > maxMSSFix {
 		return fmt.Errorf("%w: %d is over the maximum value of %d",
@@ -139,7 +160,7 @@ func validateOpenVPNConfigFilepath(isCustom bool,
 	}
 
 	if confFile == "" {
-		return ErrFilepathMissing
+		return fmt.Errorf("%w", ErrFilepathMissing)
 	}
 
 	err = helpers.FileExists(confFile)
@@ -147,6 +168,12 @@ func validateOpenVPNConfigFilepath(isCustom bool,
 		return err
 	}
 
+	extractor := extract.New()
+	_, _, err = extractor.Data(confFile)
+	if err != nil {
+		return fmt.Errorf("extracting information from custom configuration file: %w", err)
+	}
+
 	return nil
 }
 
@@ -154,10 +181,12 @@ func validateOpenVPNClientCertificate(vpnProvider,
 	clientCert string) (err error) {
 	switch vpnProvider {
 	case
+		providers.Airvpn,
 		providers.Cyberghost,
+		providers.VPNSecure,
 		providers.VPNUnlimited:
 		if clientCert == "" {
-			return ErrMissingValue
+			return fmt.Errorf("%w", ErrMissingValue)
 		}
 	}
 
@@ -165,7 +194,7 @@ func validateOpenVPNClientCertificate(vpnProvider,
 		return nil
 	}
 
-	_, err = parse.ExtractCert([]byte(clientCert))
+	_, err = base64.StdEncoding.DecodeString(clientCert)
 	if err != nil {
 		return err
 	}
@@ -175,11 +204,12 @@ func validateOpenVPNClientCertificate(vpnProvider,
 func validateOpenVPNClientKey(vpnProvider, clientKey string) (err error) {
 	switch vpnProvider {
 	case
+		providers.Airvpn,
 		providers.Cyberghost,
 		providers.VPNUnlimited,
 		providers.Wevpn:
 		if clientKey == "" {
-			return ErrMissingValue
+			return fmt.Errorf("%w", ErrMissingValue)
 		}
 	}
 
@@ -187,7 +217,24 @@ func validateOpenVPNClientKey(vpnProvider, clientKey string) (err error) {
 		return nil
 	}
 
-	_, err = parse.ExtractPrivateKey([]byte(clientKey))
+	_, err = base64.StdEncoding.DecodeString(clientKey)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func validateOpenVPNEncryptedKey(vpnProvider,
+	encryptedPrivateKey string) (err error) {
+	if vpnProvider == providers.VPNSecure && encryptedPrivateKey == "" {
+		return fmt.Errorf("%w", ErrMissingValue)
+	}
+
+	if encryptedPrivateKey == "" {
+		return nil
+	}
+
+	_, err = base64.StdEncoding.DecodeString(encryptedPrivateKey)
 	if err != nil {
 		return err
 	}
@@ -196,21 +243,22 @@ func validateOpenVPNClientKey(vpnProvider, clientKey string) (err error) {
 
 func (o *OpenVPN) copy() (copied OpenVPN) {
 	return OpenVPN{
-		Version:      o.Version,
-		User:         o.User,
-		Password:     o.Password,
-		ConfFile:     helpers.CopyStringPtr(o.ConfFile),
-		Ciphers:      helpers.CopyStringSlice(o.Ciphers),
-		Auth:         helpers.CopyStringPtr(o.Auth),
-		ClientCrt:    helpers.CopyStringPtr(o.ClientCrt),
-		ClientKey:    helpers.CopyStringPtr(o.ClientKey),
-		PIAEncPreset: helpers.CopyStringPtr(o.PIAEncPreset),
-		IPv6:         helpers.CopyBoolPtr(o.IPv6),
-		MSSFix:       helpers.CopyUint16Ptr(o.MSSFix),
-		Interface:    o.Interface,
-		ProcessUser:  o.ProcessUser,
-		Verbosity:    helpers.CopyIntPtr(o.Verbosity),
-		Flags:        helpers.CopyStringSlice(o.Flags),
+		Version:       o.Version,
+		User:          helpers.CopyPointer(o.User),
+		Password:      helpers.CopyPointer(o.Password),
+		ConfFile:      helpers.CopyPointer(o.ConfFile),
+		Ciphers:       helpers.CopySlice(o.Ciphers),
+		Auth:          helpers.CopyPointer(o.Auth),
+		Cert:          helpers.CopyPointer(o.Cert),
+		Key:           helpers.CopyPointer(o.Key),
+		EncryptedKey:  helpers.CopyPointer(o.EncryptedKey),
+		KeyPassphrase: helpers.CopyPointer(o.KeyPassphrase),
+		PIAEncPreset:  helpers.CopyPointer(o.PIAEncPreset),
+		MSSFix:        helpers.CopyPointer(o.MSSFix),
+		Interface:     o.Interface,
+		ProcessUser:   o.ProcessUser,
+		Verbosity:     helpers.CopyPointer(o.Verbosity),
+		Flags:         helpers.CopySlice(o.Flags),
 	}
 }
 
@@ -218,20 +266,21 @@ func (o *OpenVPN) copy() (copied OpenVPN) {
 // unset field of the receiver settings object.
 func (o *OpenVPN) mergeWith(other OpenVPN) {
 	o.Version = helpers.MergeWithString(o.Version, other.Version)
-	o.User = helpers.MergeWithString(o.User, other.User)
-	o.Password = helpers.MergeWithString(o.Password, other.Password)
-	o.ConfFile = helpers.MergeWithStringPtr(o.ConfFile, other.ConfFile)
-	o.Ciphers = helpers.MergeStringSlices(o.Ciphers, other.Ciphers)
-	o.Auth = helpers.MergeWithStringPtr(o.Auth, other.Auth)
-	o.ClientCrt = helpers.MergeWithStringPtr(o.ClientCrt, other.ClientCrt)
-	o.ClientKey = helpers.MergeWithStringPtr(o.ClientKey, other.ClientKey)
-	o.PIAEncPreset = helpers.MergeWithStringPtr(o.PIAEncPreset, other.PIAEncPreset)
-	o.IPv6 = helpers.MergeWithBool(o.IPv6, other.IPv6)
-	o.MSSFix = helpers.MergeWithUint16(o.MSSFix, other.MSSFix)
+	o.User = helpers.MergeWithPointer(o.User, other.User)
+	o.Password = helpers.MergeWithPointer(o.Password, other.Password)
+	o.ConfFile = helpers.MergeWithPointer(o.ConfFile, other.ConfFile)
+	o.Ciphers = helpers.MergeSlices(o.Ciphers, other.Ciphers)
+	o.Auth = helpers.MergeWithPointer(o.Auth, other.Auth)
+	o.Cert = helpers.MergeWithPointer(o.Cert, other.Cert)
+	o.Key = helpers.MergeWithPointer(o.Key, other.Key)
+	o.EncryptedKey = helpers.MergeWithPointer(o.EncryptedKey, other.EncryptedKey)
+	o.KeyPassphrase = helpers.MergeWithPointer(o.KeyPassphrase, other.KeyPassphrase)
+	o.PIAEncPreset = helpers.MergeWithPointer(o.PIAEncPreset, other.PIAEncPreset)
+	o.MSSFix = helpers.MergeWithPointer(o.MSSFix, other.MSSFix)
 	o.Interface = helpers.MergeWithString(o.Interface, other.Interface)
 	o.ProcessUser = helpers.MergeWithString(o.ProcessUser, other.ProcessUser)
-	o.Verbosity = helpers.MergeWithIntPtr(o.Verbosity, other.Verbosity)
-	o.Flags = helpers.MergeStringSlices(o.Flags, other.Flags)
+	o.Verbosity = helpers.MergeWithPointer(o.Verbosity, other.Verbosity)
+	o.Flags = helpers.MergeSlices(o.Flags, other.Flags)
 }
 
 // overrideWith overrides fields of the receiver
@@ -239,44 +288,48 @@ func (o *OpenVPN) mergeWith(other OpenVPN) {
 // settings.
 func (o *OpenVPN) overrideWith(other OpenVPN) {
 	o.Version = helpers.OverrideWithString(o.Version, other.Version)
-	o.User = helpers.OverrideWithString(o.User, other.User)
-	o.Password = helpers.OverrideWithString(o.Password, other.Password)
-	o.ConfFile = helpers.OverrideWithStringPtr(o.ConfFile, other.ConfFile)
-	o.Ciphers = helpers.OverrideWithStringSlice(o.Ciphers, other.Ciphers)
-	o.Auth = helpers.OverrideWithStringPtr(o.Auth, other.Auth)
-	o.ClientCrt = helpers.OverrideWithStringPtr(o.ClientCrt, other.ClientCrt)
-	o.ClientKey = helpers.OverrideWithStringPtr(o.ClientKey, other.ClientKey)
-	o.PIAEncPreset = helpers.OverrideWithStringPtr(o.PIAEncPreset, other.PIAEncPreset)
-	o.IPv6 = helpers.OverrideWithBool(o.IPv6, other.IPv6)
-	o.MSSFix = helpers.OverrideWithUint16(o.MSSFix, other.MSSFix)
+	o.User = helpers.OverrideWithPointer(o.User, other.User)
+	o.Password = helpers.OverrideWithPointer(o.Password, other.Password)
+	o.ConfFile = helpers.OverrideWithPointer(o.ConfFile, other.ConfFile)
+	o.Ciphers = helpers.OverrideWithSlice(o.Ciphers, other.Ciphers)
+	o.Auth = helpers.OverrideWithPointer(o.Auth, other.Auth)
+	o.Cert = helpers.OverrideWithPointer(o.Cert, other.Cert)
+	o.Key = helpers.OverrideWithPointer(o.Key, other.Key)
+	o.EncryptedKey = helpers.OverrideWithPointer(o.EncryptedKey, other.EncryptedKey)
+	o.KeyPassphrase = helpers.OverrideWithPointer(o.KeyPassphrase, other.KeyPassphrase)
+	o.PIAEncPreset = helpers.OverrideWithPointer(o.PIAEncPreset, other.PIAEncPreset)
+	o.MSSFix = helpers.OverrideWithPointer(o.MSSFix, other.MSSFix)
 	o.Interface = helpers.OverrideWithString(o.Interface, other.Interface)
 	o.ProcessUser = helpers.OverrideWithString(o.ProcessUser, other.ProcessUser)
-	o.Verbosity = helpers.OverrideWithIntPtr(o.Verbosity, other.Verbosity)
-	o.Flags = helpers.OverrideWithStringSlice(o.Flags, other.Flags)
+	o.Verbosity = helpers.OverrideWithPointer(o.Verbosity, other.Verbosity)
+	o.Flags = helpers.OverrideWithSlice(o.Flags, other.Flags)
 }
 
 func (o *OpenVPN) setDefaults(vpnProvider string) {
-	o.Version = helpers.DefaultString(o.Version, constants.Openvpn25)
+	o.Version = helpers.DefaultString(o.Version, openvpn.Openvpn25)
+	o.User = helpers.DefaultPointer(o.User, "")
 	if vpnProvider == providers.Mullvad {
-		o.Password = "m"
+		o.Password = helpers.DefaultPointer(o.Password, "m")
+	} else {
+		o.Password = helpers.DefaultPointer(o.Password, "")
 	}
 
-	o.ConfFile = helpers.DefaultStringPtr(o.ConfFile, "")
-	o.Auth = helpers.DefaultStringPtr(o.Auth, "")
-	o.ClientCrt = helpers.DefaultStringPtr(o.ClientCrt, "")
-	o.ClientKey = helpers.DefaultStringPtr(o.ClientKey, "")
+	o.ConfFile = helpers.DefaultPointer(o.ConfFile, "")
+	o.Auth = helpers.DefaultPointer(o.Auth, "")
+	o.Cert = helpers.DefaultPointer(o.Cert, "")
+	o.Key = helpers.DefaultPointer(o.Key, "")
+	o.EncryptedKey = helpers.DefaultPointer(o.EncryptedKey, "")
+	o.KeyPassphrase = helpers.DefaultPointer(o.KeyPassphrase, "")
 
 	var defaultEncPreset string
 	if vpnProvider == providers.PrivateInternetAccess {
-		defaultEncPreset = constants.PIAEncryptionPresetStrong
+		defaultEncPreset = presets.Strong
 	}
-	o.PIAEncPreset = helpers.DefaultStringPtr(o.PIAEncPreset, defaultEncPreset)
-
-	o.IPv6 = helpers.DefaultBool(o.IPv6, false)
-	o.MSSFix = helpers.DefaultUint16(o.MSSFix, 0)
+	o.PIAEncPreset = helpers.DefaultPointer(o.PIAEncPreset, defaultEncPreset)
+	o.MSSFix = helpers.DefaultPointer(o.MSSFix, 0)
 	o.Interface = helpers.DefaultString(o.Interface, "tun0")
 	o.ProcessUser = helpers.DefaultString(o.ProcessUser, "root")
-	o.Verbosity = helpers.DefaultInt(o.Verbosity, 1)
+	o.Verbosity = helpers.DefaultPointer(o.Verbosity, 1)
 }
 
 func (o OpenVPN) String() string {
@@ -286,8 +339,8 @@ func (o OpenVPN) String() string {
 func (o OpenVPN) toLinesNode() (node *gotree.Node) {
 	node = gotree.New("OpenVPN settings:")
 	node.Appendf("OpenVPN version: %s", o.Version)
-	node.Appendf("User: %s", helpers.ObfuscatePassword(o.User))
-	node.Appendf("Password: %s", helpers.ObfuscatePassword(o.Password))
+	node.Appendf("User: %s", helpers.ObfuscatePassword(*o.User))
+	node.Appendf("Password: %s", helpers.ObfuscatePassword(*o.Password))
 
 	if *o.ConfFile != "" {
 		node.Appendf("Custom configuration file: %s", *o.ConfFile)
@@ -301,20 +354,23 @@ func (o OpenVPN) toLinesNode() (node *gotree.Node) {
 		node.Appendf("Auth: %s", *o.Auth)
 	}
 
-	if *o.ClientCrt != "" {
-		node.Appendf("Client crt: %s", helpers.ObfuscateData(*o.ClientCrt))
+	if *o.Cert != "" {
+		node.Appendf("Client crt: %s", helpers.ObfuscateData(*o.Cert))
 	}
 
-	if *o.ClientKey != "" {
-		node.Appendf("Client key: %s", helpers.ObfuscateData(*o.ClientKey))
+	if *o.Key != "" {
+		node.Appendf("Client key: %s", helpers.ObfuscateData(*o.Key))
+	}
+
+	if *o.EncryptedKey != "" {
+		node.Appendf("Encrypted key: %s (key passhrapse %s)",
+			helpers.ObfuscateData(*o.EncryptedKey), helpers.ObfuscatePassword(*o.KeyPassphrase))
 	}
 
 	if *o.PIAEncPreset != "" {
 		node.Appendf("Private Internet Access encryption preset: %s", *o.PIAEncPreset)
 	}
 
-	node.Appendf("Tunnel IPv6: %s", helpers.BoolPtrToYesNo(o.IPv6))
-
 	if *o.MSSFix > 0 {
 		node.Appendf("MSS Fix: %d", *o.MSSFix)
 	}

internal/configuration/settings/openvpnselection.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings/helpers"
-	"github.com/qdm12/gluetun/internal/constants"
 	"github.com/qdm12/gluetun/internal/constants/providers"
+	"github.com/qdm12/gluetun/internal/provider/privateinternetaccess/presets"
 	"github.com/qdm12/gotree"
 )
 
@@ -55,19 +55,24 @@ func (o OpenVPNSelection) validate(vpnProvider string) (err error) {
 		switch vpnProvider {
 		// no restriction on port
 		case providers.Cyberghost, providers.HideMyAss,
-			providers.PrivateInternetAccess, providers.Privatevpn,
-			providers.Protonvpn, providers.Torguard:
+			providers.Privatevpn, providers.Torguard:
 		// no custom port allowed
 		case providers.Expressvpn, providers.Fastestvpn,
 			providers.Ipvanish, providers.Nordvpn,
 			providers.Privado, providers.Purevpn,
-			providers.Surfshark, providers.VPNUnlimited,
-			providers.Vyprvpn:
+			providers.Surfshark, providers.VPNSecure,
+			providers.VPNUnlimited, providers.Vyprvpn:
 			return fmt.Errorf("%w: for VPN service provider %s",
 				ErrOpenVPNCustomPortNotAllowed, vpnProvider)
 		default:
 			var allowedTCP, allowedUDP []uint16
 			switch vpnProvider {
+			case providers.Airvpn:
+				allowedTCP = []uint16{
+					53, 80, 443, // IP in 1, 3
+					1194, 2018, 41185, // IP in 1, 2, 3, 4
+				}
+				allowedUDP = []uint16{53, 80, 443, 1194, 2018, 41185}
 			case providers.Ivpn:
 				allowedTCP = []uint16{80, 443, 1143}
 				allowedUDP = []uint16{53, 1194, 2049, 2050}
@@ -83,6 +88,9 @@ func (o OpenVPNSelection) validate(vpnProvider string) (err error) {
 			case providers.Protonvpn:
 				allowedTCP = []uint16{443, 5995, 8443}
 				allowedUDP = []uint16{80, 443, 1194, 4569, 5060}
+			case providers.SlickVPN:
+				allowedTCP = []uint16{443, 8080, 8888}
+				allowedUDP = []uint16{443, 8080, 8888}
 			case providers.Wevpn:
 				allowedTCP = []uint16{53, 1195, 1199, 2018}
 				allowedUDP = []uint16{80, 1194, 1198}
@@ -106,9 +114,9 @@ func (o OpenVPNSelection) validate(vpnProvider string) (err error) {
 	// Validate EncPreset
 	if vpnProvider == providers.PrivateInternetAccess {
 		validEncryptionPresets := []string{
-			constants.PIAEncryptionPresetNone,
-			constants.PIAEncryptionPresetNormal,
-			constants.PIAEncryptionPresetStrong,
+			presets.None,
+			presets.Normal,
+			presets.Strong,
 		}
 		if !helpers.IsOneOf(*o.PIAEncPreset, validEncryptionPresets...) {
 			return fmt.Errorf("%w: %s; valid presets are %s",
@@ -122,37 +130,37 @@ func (o OpenVPNSelection) validate(vpnProvider string) (err error) {
 
 func (o *OpenVPNSelection) copy() (copied OpenVPNSelection) {
 	return OpenVPNSelection{
-		ConfFile:     helpers.CopyStringPtr(o.ConfFile),
-		TCP:          helpers.CopyBoolPtr(o.TCP),
-		CustomPort:   helpers.CopyUint16Ptr(o.CustomPort),
-		PIAEncPreset: helpers.CopyStringPtr(o.PIAEncPreset),
+		ConfFile:     helpers.CopyPointer(o.ConfFile),
+		TCP:          helpers.CopyPointer(o.TCP),
+		CustomPort:   helpers.CopyPointer(o.CustomPort),
+		PIAEncPreset: helpers.CopyPointer(o.PIAEncPreset),
 	}
 }
 
 func (o *OpenVPNSelection) mergeWith(other OpenVPNSelection) {
-	o.ConfFile = helpers.MergeWithStringPtr(o.ConfFile, other.ConfFile)
-	o.TCP = helpers.MergeWithBool(o.TCP, other.TCP)
-	o.CustomPort = helpers.MergeWithUint16(o.CustomPort, other.CustomPort)
-	o.PIAEncPreset = helpers.MergeWithStringPtr(o.PIAEncPreset, other.PIAEncPreset)
+	o.ConfFile = helpers.MergeWithPointer(o.ConfFile, other.ConfFile)
+	o.TCP = helpers.MergeWithPointer(o.TCP, other.TCP)
+	o.CustomPort = helpers.MergeWithPointer(o.CustomPort, other.CustomPort)
+	o.PIAEncPreset = helpers.MergeWithPointer(o.PIAEncPreset, other.PIAEncPreset)
 }
 
 func (o *OpenVPNSelection) overrideWith(other OpenVPNSelection) {
-	o.ConfFile = helpers.OverrideWithStringPtr(o.ConfFile, other.ConfFile)
-	o.TCP = helpers.OverrideWithBool(o.TCP, other.TCP)
-	o.CustomPort = helpers.OverrideWithUint16(o.CustomPort, other.CustomPort)
-	o.PIAEncPreset = helpers.OverrideWithStringPtr(o.PIAEncPreset, other.PIAEncPreset)
+	o.ConfFile = helpers.OverrideWithPointer(o.ConfFile, other.ConfFile)
+	o.TCP = helpers.OverrideWithPointer(o.TCP, other.TCP)
+	o.CustomPort = helpers.OverrideWithPointer(o.CustomPort, other.CustomPort)
+	o.PIAEncPreset = helpers.OverrideWithPointer(o.PIAEncPreset, other.PIAEncPreset)
 }
 
 func (o *OpenVPNSelection) setDefaults(vpnProvider string) {
-	o.ConfFile = helpers.DefaultStringPtr(o.ConfFile, "")
-	o.TCP = helpers.DefaultBool(o.TCP, false)
-	o.CustomPort = helpers.DefaultUint16(o.CustomPort, 0)
+	o.ConfFile = helpers.DefaultPointer(o.ConfFile, "")
+	o.TCP = helpers.DefaultPointer(o.TCP, false)
+	o.CustomPort = helpers.DefaultPointer(o.CustomPort, 0)
 
 	var defaultEncPreset string
 	if vpnProvider == providers.PrivateInternetAccess {
-		defaultEncPreset = constants.PIAEncryptionPresetStrong
+		defaultEncPreset = presets.Strong
 	}
-	o.PIAEncPreset = helpers.DefaultStringPtr(o.PIAEncPreset, defaultEncPreset)
+	o.PIAEncPreset = helpers.DefaultPointer(o.PIAEncPreset, defaultEncPreset)
 }
 
 func (o OpenVPNSelection) String() string {

internal/configuration/settings/portforward.go

@@ -47,24 +47,24 @@ func (p PortForwarding) validate(vpnProvider string) (err error) {
 
 func (p *PortForwarding) copy() (copied PortForwarding) {
 	return PortForwarding{
-		Enabled:  helpers.CopyBoolPtr(p.Enabled),
-		Filepath: helpers.CopyStringPtr(p.Filepath),
+		Enabled:  helpers.CopyPointer(p.Enabled),
+		Filepath: helpers.CopyPointer(p.Filepath),
 	}
 }
 
 func (p *PortForwarding) mergeWith(other PortForwarding) {
-	p.Enabled = helpers.MergeWithBool(p.Enabled, other.Enabled)
-	p.Filepath = helpers.MergeWithStringPtr(p.Filepath, other.Filepath)
+	p.Enabled = helpers.MergeWithPointer(p.Enabled, other.Enabled)
+	p.Filepath = helpers.MergeWithPointer(p.Filepath, other.Filepath)
 }
 
 func (p *PortForwarding) overrideWith(other PortForwarding) {
-	p.Enabled = helpers.OverrideWithBool(p.Enabled, other.Enabled)
-	p.Filepath = helpers.OverrideWithStringPtr(p.Filepath, other.Filepath)
+	p.Enabled = helpers.OverrideWithPointer(p.Enabled, other.Enabled)
+	p.Filepath = helpers.OverrideWithPointer(p.Filepath, other.Filepath)
 }
 
 func (p *PortForwarding) setDefaults() {
-	p.Enabled = helpers.DefaultBool(p.Enabled, false)
-	p.Filepath = helpers.DefaultStringPtr(p.Filepath, "/tmp/gluetun/forwarded_port")
+	p.Enabled = helpers.DefaultPointer(p.Enabled, false)
+	p.Filepath = helpers.DefaultPointer(p.Filepath, "/tmp/gluetun/forwarded_port")
 }
 
 func (p PortForwarding) String() string {

internal/configuration/settings/provider.go

@@ -6,7 +6,6 @@ import (
 	"github.com/qdm12/gluetun/internal/configuration/settings/helpers"
 	"github.com/qdm12/gluetun/internal/constants/providers"
 	"github.com/qdm12/gluetun/internal/constants/vpn"
-	"github.com/qdm12/gluetun/internal/models"
 	"github.com/qdm12/gotree"
 )
 
@@ -23,26 +22,28 @@ type Provider struct {
 }
 
 // TODO v4 remove pointer for receiver (because of Surfshark).
-func (p *Provider) validate(vpnType string, allServers models.AllServers) (err error) {
+func (p *Provider) validate(vpnType string, storage Storage) (err error) {
 	// Validate Name
 	var validNames []string
 	if vpnType == vpn.OpenVPN {
-		validNames = providers.All()
+		validNames = providers.AllWithCustom()
 		validNames = append(validNames, "pia") // Retro-compatibility
 	} else { // Wireguard
 		validNames = []string{
+			providers.Airvpn,
 			providers.Custom,
 			providers.Ivpn,
 			providers.Mullvad,
+			providers.Surfshark,
 			providers.Windscribe,
 		}
 	}
 	if !helpers.IsOneOf(*p.Name, validNames...) {
-		return fmt.Errorf("%w: %q can only be one of %s",
+		return fmt.Errorf("%w for Wireguard: %q can only be one of %s",
 			ErrVPNProviderNameNotValid, *p.Name, helpers.ChoicesOrString(validNames))
 	}
 
-	err = p.ServerSelection.validate(*p.Name, allServers)
+	err = p.ServerSelection.validate(*p.Name, storage)
 	if err != nil {
 		return fmt.Errorf("server selection: %w", err)
 	}
@@ -57,26 +58,26 @@ func (p *Provider) validate(vpnType string, allServers models.AllServers) (err e
 
 func (p *Provider) copy() (copied Provider) {
 	return Provider{
-		Name:            helpers.CopyStringPtr(p.Name),
+		Name:            helpers.CopyPointer(p.Name),
 		ServerSelection: p.ServerSelection.copy(),
 		PortForwarding:  p.PortForwarding.copy(),
 	}
 }
 
 func (p *Provider) mergeWith(other Provider) {
-	p.Name = helpers.MergeWithStringPtr(p.Name, other.Name)
+	p.Name = helpers.MergeWithPointer(p.Name, other.Name)
 	p.ServerSelection.mergeWith(other.ServerSelection)
 	p.PortForwarding.mergeWith(other.PortForwarding)
 }
 
 func (p *Provider) overrideWith(other Provider) {
-	p.Name = helpers.OverrideWithStringPtr(p.Name, other.Name)
+	p.Name = helpers.OverrideWithPointer(p.Name, other.Name)
 	p.ServerSelection.overrideWith(other.ServerSelection)
 	p.PortForwarding.overrideWith(other.PortForwarding)
 }
 
 func (p *Provider) setDefaults() {
-	p.Name = helpers.DefaultStringPtr(p.Name, providers.PrivateInternetAccess)
+	p.Name = helpers.DefaultPointer(p.Name, providers.PrivateInternetAccess)
 	p.ServerSelection.setDefaults(*p.Name)
 	p.PortForwarding.setDefaults()
 }

internal/configuration/settings/publicip.go

@@ -42,25 +42,25 @@ func (p PublicIP) validate() (err error) {
 
 func (p *PublicIP) copy() (copied PublicIP) {
 	return PublicIP{
-		Period:     helpers.CopyDurationPtr(p.Period),
-		IPFilepath: helpers.CopyStringPtr(p.IPFilepath),
+		Period:     helpers.CopyPointer(p.Period),
+		IPFilepath: helpers.CopyPointer(p.IPFilepath),
 	}
 }
 
 func (p *PublicIP) mergeWith(other PublicIP) {
-	p.Period = helpers.MergeWithDuration(p.Period, other.Period)
-	p.IPFilepath = helpers.MergeWithStringPtr(p.IPFilepath, other.IPFilepath)
+	p.Period = helpers.MergeWithPointer(p.Period, other.Period)
+	p.IPFilepath = helpers.MergeWithPointer(p.IPFilepath, other.IPFilepath)
 }
 
 func (p *PublicIP) overrideWith(other PublicIP) {
-	p.Period = helpers.OverrideWithDuration(p.Period, other.Period)
-	p.IPFilepath = helpers.OverrideWithStringPtr(p.IPFilepath, other.IPFilepath)
+	p.Period = helpers.OverrideWithPointer(p.Period, other.Period)
+	p.IPFilepath = helpers.OverrideWithPointer(p.IPFilepath, other.IPFilepath)
 }
 
 func (p *PublicIP) setDefaults() {
 	const defaultPeriod = 12 * time.Hour
-	p.Period = helpers.DefaultDuration(p.Period, defaultPeriod)
-	p.IPFilepath = helpers.DefaultStringPtr(p.IPFilepath, "/tmp/gluetun/ip")
+	p.Period = helpers.DefaultPointer(p.Period, defaultPeriod)
+	p.IPFilepath = helpers.DefaultPointer(p.IPFilepath, "/tmp/gluetun/ip")
 }
 
 func (p PublicIP) String() string {

internal/configuration/settings/server.go

@@ -43,29 +43,29 @@ func (c ControlServer) validate() (err error) {
 
 func (c *ControlServer) copy() (copied ControlServer) {
 	return ControlServer{
-		Address: helpers.CopyStringPtr(c.Address),
-		Log:     helpers.CopyBoolPtr(c.Log),
+		Address: helpers.CopyPointer(c.Address),
+		Log:     helpers.CopyPointer(c.Log),
 	}
 }
 
 // mergeWith merges the other settings into any
 // unset field of the receiver settings object.
 func (c *ControlServer) mergeWith(other ControlServer) {
-	c.Address = helpers.MergeWithStringPtr(c.Address, other.Address)
-	c.Log = helpers.MergeWithBool(c.Log, other.Log)
+	c.Address = helpers.MergeWithPointer(c.Address, other.Address)
+	c.Log = helpers.MergeWithPointer(c.Log, other.Log)
 }
 
 // overrideWith overrides fields of the receiver
 // settings object with any field set in the other
 // settings.
 func (c *ControlServer) overrideWith(other ControlServer) {
-	c.Address = helpers.OverrideWithStringPtr(c.Address, other.Address)
-	c.Log = helpers.OverrideWithBool(c.Log, other.Log)
+	c.Address = helpers.OverrideWithPointer(c.Address, other.Address)
+	c.Log = helpers.OverrideWithPointer(c.Log, other.Log)
 }
 
 func (c *ControlServer) setDefaults() {
-	c.Address = helpers.DefaultStringPtr(c.Address, ":8000")
-	c.Log = helpers.DefaultBool(c.Log, true)
+	c.Address = helpers.DefaultPointer(c.Address, ":8000")
+	c.Log = helpers.DefaultPointer(c.Log, true)
 }
 
 func (c ControlServer) String() string {

internal/configuration/settings/serverselection.go

@@ -3,7 +3,7 @@ package settings
 import (
 	"errors"
 	"fmt"
-	"net"
+	"net/netip"
 	"strings"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings/helpers"
@@ -21,10 +21,10 @@ type ServerSelection struct { //nolint:maligned
 	VPN string
 	// TargetIP is the server endpoint IP address to use.
 	// It will override any IP address from the picked
-	// built-in server. It cannot be nil in the internal
-	// state, and can be set to an empty net.IP{} to indicate
+	// built-in server. It cannot be the empty value in the internal
+	// state, and can be set to the unspecified address to indicate
 	// there is not target IP address to use.
-	TargetIP net.IP
+	TargetIP netip.Addr
 	// Counties is the list of countries to filter VPN servers with.
 	Countries []string
 	// Regions is the list of regions to filter VPN servers with.
@@ -45,6 +45,10 @@ type ServerSelection struct { //nolint:maligned
 	// FreeOnly is true if VPN servers that are not free should
 	// be filtered. This is used with ProtonVPN and VPN Unlimited.
 	FreeOnly *bool
+	// PremiumOnly is true if VPN servers that are not premium should
+	// be filtered. This is used with VPN Secure.
+	// TODO extend to providers using FreeOnly.
+	PremiumOnly *bool
 	// StreamOnly is true if VPN servers not for streaming should
 	// be filtered. This is used with VPNUnlimited.
 	StreamOnly *bool
@@ -63,26 +67,26 @@ type ServerSelection struct { //nolint:maligned
 var (
 	ErrOwnedOnlyNotSupported    = errors.New("owned only filter is not supported")
 	ErrFreeOnlyNotSupported     = errors.New("free only filter is not supported")
+	ErrPremiumOnlyNotSupported  = errors.New("premium only filter is not supported")
 	ErrStreamOnlyNotSupported   = errors.New("stream only filter is not supported")
 	ErrMultiHopOnlyNotSupported = errors.New("multi hop only filter is not supported")
+	ErrFreePremiumBothSet       = errors.New("free only and premium only filters are both set")
 )
 
 func (ss *ServerSelection) validate(vpnServiceProvider string,
-	allServers models.AllServers) (err error) {
+	storage Storage) (err error) {
 	switch ss.VPN {
 	case vpn.OpenVPN, vpn.Wireguard:
 	default:
 		return fmt.Errorf("%w: %s", ErrVPNTypeNotValid, ss.VPN)
 	}
 
-	countryChoices, regionChoices, cityChoices,
-		ispChoices, nameChoices, hostnameChoices, err := getLocationFilterChoices(vpnServiceProvider, ss, allServers)
+	filterChoices, err := getLocationFilterChoices(vpnServiceProvider, ss, storage)
 	if err != nil {
 		return err // already wrapped error
 	}
 
-	err = validateServerFilters(*ss, countryChoices, regionChoices, cityChoices,
-		ispChoices, nameChoices, hostnameChoices)
+	err = validateServerFilters(*ss, filterChoices)
 	if err != nil {
 		if errors.Is(err, helpers.ErrNoChoice) {
 			return fmt.Errorf("for VPN service provider %s: %w", vpnServiceProvider, err)
@@ -105,6 +109,18 @@ func (ss *ServerSelection) validate(vpnServiceProvider string,
 			ErrFreeOnlyNotSupported, vpnServiceProvider)
 	}
 
+	if *ss.PremiumOnly &&
+		!helpers.IsOneOf(vpnServiceProvider,
+			providers.VPNSecure,
+		) {
+		return fmt.Errorf("%w: for VPN service provider %s",
+			ErrPremiumOnlyNotSupported, vpnServiceProvider)
+	}
+
+	if *ss.FreeOnly && *ss.PremiumOnly {
+		return fmt.Errorf("%w", ErrFreePremiumBothSet)
+	}
+
 	if *ss.StreamOnly &&
 		!helpers.IsOneOf(vpnServiceProvider,
 			providers.Protonvpn,
@@ -135,155 +151,48 @@ func (ss *ServerSelection) validate(vpnServiceProvider string,
 	return nil
 }
 
-func getLocationFilterChoices(vpnServiceProvider string, ss *ServerSelection,
-	allServers models.AllServers) (
-	countryChoices, regionChoices, cityChoices,
-	ispChoices, nameChoices, hostnameChoices []string,
+func getLocationFilterChoices(vpnServiceProvider string,
+	ss *ServerSelection, storage Storage) (filterChoices models.FilterChoices,
 	err error) {
-	switch vpnServiceProvider {
-	case providers.Custom:
-	case providers.Cyberghost:
-		servers := allServers.GetCyberghost()
-		countryChoices = validation.ExtractCountries(servers)
-		hostnameChoices = validation.ExtractHostnames(servers)
-	case providers.Expressvpn:
-		servers := allServers.GetExpressvpn()
-		countryChoices = validation.ExtractCountries(servers)
-		cityChoices = validation.ExtractCities(servers)
-		hostnameChoices = validation.ExtractHostnames(servers)
-	case providers.Fastestvpn:
-		servers := allServers.GetFastestvpn()
-		countryChoices = validation.ExtractCountries(servers)
-		hostnameChoices = validation.ExtractHostnames(servers)
-	case providers.HideMyAss:
-		servers := allServers.GetHideMyAss()
-		countryChoices = validation.ExtractCountries(servers)
-		regionChoices = validation.ExtractRegions(servers)
-		cityChoices = validation.ExtractCities(servers)
-		hostnameChoices = validation.ExtractHostnames(servers)
-	case providers.Ipvanish:
-		servers := allServers.GetIpvanish()
-		countryChoices = validation.ExtractCountries(servers)
-		cityChoices = validation.ExtractCities(servers)
-		hostnameChoices = validation.ExtractHostnames(servers)
-	case providers.Ivpn:
-		servers := allServers.GetIvpn()
-		countryChoices = validation.ExtractCountries(servers)
-		cityChoices = validation.ExtractCities(servers)
-		ispChoices = validation.ExtractISPs(servers)
-		hostnameChoices = validation.ExtractHostnames(servers)
-	case providers.Mullvad:
-		servers := allServers.GetMullvad()
-		countryChoices = validation.ExtractCountries(servers)
-		cityChoices = validation.ExtractCities(servers)
-		ispChoices = validation.ExtractISPs(servers)
-		hostnameChoices = validation.ExtractHostnames(servers)
-	case providers.Nordvpn:
-		servers := allServers.GetNordvpn()
-		regionChoices = validation.ExtractRegions(servers)
-		hostnameChoices = validation.ExtractHostnames(servers)
-	case providers.Perfectprivacy:
-		servers := allServers.GetPerfectprivacy()
-		cityChoices = validation.ExtractCities(servers)
-	case providers.Privado:
-		servers := allServers.GetPrivado()
-		countryChoices = validation.ExtractCountries(servers)
-		regionChoices = validation.ExtractRegions(servers)
-		cityChoices = validation.ExtractCities(servers)
-		hostnameChoices = validation.ExtractHostnames(servers)
-	case providers.PrivateInternetAccess:
-		servers := allServers.GetPia()
-		regionChoices = validation.ExtractRegions(servers)
-		hostnameChoices = validation.ExtractHostnames(servers)
-		nameChoices = validation.ExtractServerNames(servers)
-	case providers.Privatevpn:
-		servers := allServers.GetPrivatevpn()
-		countryChoices = validation.ExtractCountries(servers)
-		cityChoices = validation.ExtractCities(servers)
-		hostnameChoices = validation.ExtractHostnames(servers)
-	case providers.Protonvpn:
-		servers := allServers.GetProtonvpn()
-		countryChoices = validation.ExtractCountries(servers)
-		regionChoices = validation.ExtractRegions(servers)
-		cityChoices = validation.ExtractCities(servers)
-		nameChoices = validation.ExtractServerNames(servers)
-		hostnameChoices = validation.ExtractHostnames(servers)
-	case providers.Purevpn:
-		servers := allServers.GetPurevpn()
-		countryChoices = validation.ExtractCountries(servers)
-		regionChoices = validation.ExtractRegions(servers)
-		cityChoices = validation.ExtractCities(servers)
-		hostnameChoices = validation.ExtractHostnames(servers)
-	case providers.Surfshark:
-		servers := allServers.GetSurfshark()
-		countryChoices = validation.ExtractCountries(servers)
-		cityChoices = validation.ExtractCities(servers)
-		hostnameChoices = validation.ExtractHostnames(servers)
-		regionChoices = validation.ExtractRegions(servers)
+	filterChoices = storage.GetFilterChoices(vpnServiceProvider)
+
+	if vpnServiceProvider == providers.Surfshark {
+		// // Retro compatibility
 		// TODO v4 remove
-		regionChoices = append(regionChoices, validation.SurfsharkRetroLocChoices()...)
-		if err := helpers.AreAllOneOf(ss.Regions, regionChoices); err != nil {
-			return nil, nil, nil, nil, nil, nil, fmt.Errorf("%w: %s", ErrRegionNotValid, err)
+		filterChoices.Regions = append(filterChoices.Regions, validation.SurfsharkRetroLocChoices()...)
+		if err := helpers.AreAllOneOf(ss.Regions, filterChoices.Regions); err != nil {
+			return models.FilterChoices{}, fmt.Errorf("%w: %s", ErrRegionNotValid, err)
 		}
-		// Retro compatibility
-		// TODO remove in v4
 		*ss = surfsharkRetroRegion(*ss)
-	case providers.Torguard:
-		servers := allServers.GetTorguard()
-		countryChoices = validation.ExtractCountries(servers)
-		cityChoices = validation.ExtractCities(servers)
-		hostnameChoices = validation.ExtractHostnames(servers)
-	case providers.VPNUnlimited:
-		servers := allServers.GetVPNUnlimited()
-		countryChoices = validation.ExtractCountries(servers)
-		cityChoices = validation.ExtractCities(servers)
-		hostnameChoices = validation.ExtractHostnames(servers)
-	case providers.Vyprvpn:
-		servers := allServers.GetVyprvpn()
-		regionChoices = validation.ExtractRegions(servers)
-	case providers.Wevpn:
-		servers := allServers.GetWevpn()
-		cityChoices = validation.ExtractCities(servers)
-		hostnameChoices = validation.ExtractHostnames(servers)
-	case providers.Windscribe:
-		servers := allServers.GetWindscribe()
-		regionChoices = validation.ExtractRegions(servers)
-		cityChoices = validation.ExtractCities(servers)
-		hostnameChoices = validation.ExtractHostnames(servers)
-	default:
-		return nil, nil, nil, nil, nil, nil, fmt.Errorf("%w: %s", ErrVPNProviderNameNotValid, vpnServiceProvider)
 	}
 
-	return countryChoices, regionChoices, cityChoices,
-		ispChoices, nameChoices, hostnameChoices, nil
+	return filterChoices, nil
 }
 
 // validateServerFilters validates filters against the choices given as arguments.
 // Set an argument to nil to pass the check for a particular filter.
-func validateServerFilters(settings ServerSelection,
-	countryChoices, regionChoices, cityChoices, ispChoices,
-	nameChoices, hostnameChoices []string) (err error) {
-	if err := helpers.AreAllOneOf(settings.Countries, countryChoices); err != nil {
+func validateServerFilters(settings ServerSelection, filterChoices models.FilterChoices) (err error) {
+	if err := helpers.AreAllOneOf(settings.Countries, filterChoices.Countries); err != nil {
 		return fmt.Errorf("%w: %s", ErrCountryNotValid, err)
 	}
 
-	if err := helpers.AreAllOneOf(settings.Regions, regionChoices); err != nil {
+	if err := helpers.AreAllOneOf(settings.Regions, filterChoices.Regions); err != nil {
 		return fmt.Errorf("%w: %s", ErrRegionNotValid, err)
 	}
 
-	if err := helpers.AreAllOneOf(settings.Cities, cityChoices); err != nil {
+	if err := helpers.AreAllOneOf(settings.Cities, filterChoices.Cities); err != nil {
 		return fmt.Errorf("%w: %s", ErrCityNotValid, err)
 	}
 
-	if err := helpers.AreAllOneOf(settings.ISPs, ispChoices); err != nil {
+	if err := helpers.AreAllOneOf(settings.ISPs, filterChoices.ISPs); err != nil {
 		return fmt.Errorf("%w: %s", ErrISPNotValid, err)
 	}
 
-	if err := helpers.AreAllOneOf(settings.Hostnames, hostnameChoices); err != nil {
+	if err := helpers.AreAllOneOf(settings.Hostnames, filterChoices.Hostnames); err != nil {
 		return fmt.Errorf("%w: %s", ErrHostnameNotValid, err)
 	}
 
-	if err := helpers.AreAllOneOf(settings.Names, nameChoices); err != nil {
+	if err := helpers.AreAllOneOf(settings.Names, filterChoices.Names); err != nil {
 		return fmt.Errorf("%w: %s", ErrNameNotValid, err)
 	}
 
@@ -293,18 +202,19 @@ func validateServerFilters(settings ServerSelection,
 func (ss *ServerSelection) copy() (copied ServerSelection) {
 	return ServerSelection{
 		VPN:          ss.VPN,
-		TargetIP:     helpers.CopyIP(ss.TargetIP),
-		Countries:    helpers.CopyStringSlice(ss.Countries),
-		Regions:      helpers.CopyStringSlice(ss.Regions),
-		Cities:       helpers.CopyStringSlice(ss.Cities),
-		ISPs:         helpers.CopyStringSlice(ss.ISPs),
-		Hostnames:    helpers.CopyStringSlice(ss.Hostnames),
-		Names:        helpers.CopyStringSlice(ss.Names),
-		Numbers:      helpers.CopyUint16Slice(ss.Numbers),
-		OwnedOnly:    helpers.CopyBoolPtr(ss.OwnedOnly),
-		FreeOnly:     helpers.CopyBoolPtr(ss.FreeOnly),
-		StreamOnly:   helpers.CopyBoolPtr(ss.StreamOnly),
-		MultiHopOnly: helpers.CopyBoolPtr(ss.MultiHopOnly),
+		TargetIP:     ss.TargetIP,
+		Countries:    helpers.CopySlice(ss.Countries),
+		Regions:      helpers.CopySlice(ss.Regions),
+		Cities:       helpers.CopySlice(ss.Cities),
+		ISPs:         helpers.CopySlice(ss.ISPs),
+		Hostnames:    helpers.CopySlice(ss.Hostnames),
+		Names:        helpers.CopySlice(ss.Names),
+		Numbers:      helpers.CopySlice(ss.Numbers),
+		OwnedOnly:    helpers.CopyPointer(ss.OwnedOnly),
+		FreeOnly:     helpers.CopyPointer(ss.FreeOnly),
+		PremiumOnly:  helpers.CopyPointer(ss.PremiumOnly),
+		StreamOnly:   helpers.CopyPointer(ss.StreamOnly),
+		MultiHopOnly: helpers.CopyPointer(ss.MultiHopOnly),
 		OpenVPN:      ss.OpenVPN.copy(),
 		Wireguard:    ss.Wireguard.copy(),
 	}
@@ -313,17 +223,18 @@ func (ss *ServerSelection) copy() (copied ServerSelection) {
 func (ss *ServerSelection) mergeWith(other ServerSelection) {
 	ss.VPN = helpers.MergeWithString(ss.VPN, other.VPN)
 	ss.TargetIP = helpers.MergeWithIP(ss.TargetIP, other.TargetIP)
-	ss.Countries = helpers.MergeStringSlices(ss.Countries, other.Countries)
-	ss.Regions = helpers.MergeStringSlices(ss.Regions, other.Regions)
-	ss.Cities = helpers.MergeStringSlices(ss.Cities, other.Cities)
-	ss.ISPs = helpers.MergeStringSlices(ss.ISPs, other.ISPs)
-	ss.Hostnames = helpers.MergeStringSlices(ss.Hostnames, other.Hostnames)
-	ss.Names = helpers.MergeStringSlices(ss.Names, other.Names)
-	ss.Numbers = helpers.MergeUint16Slices(ss.Numbers, other.Numbers)
-	ss.OwnedOnly = helpers.MergeWithBool(ss.OwnedOnly, other.OwnedOnly)
-	ss.FreeOnly = helpers.MergeWithBool(ss.FreeOnly, other.FreeOnly)
-	ss.StreamOnly = helpers.MergeWithBool(ss.StreamOnly, other.StreamOnly)
-	ss.MultiHopOnly = helpers.MergeWithBool(ss.MultiHopOnly, other.MultiHopOnly)
+	ss.Countries = helpers.MergeSlices(ss.Countries, other.Countries)
+	ss.Regions = helpers.MergeSlices(ss.Regions, other.Regions)
+	ss.Cities = helpers.MergeSlices(ss.Cities, other.Cities)
+	ss.ISPs = helpers.MergeSlices(ss.ISPs, other.ISPs)
+	ss.Hostnames = helpers.MergeSlices(ss.Hostnames, other.Hostnames)
+	ss.Names = helpers.MergeSlices(ss.Names, other.Names)
+	ss.Numbers = helpers.MergeSlices(ss.Numbers, other.Numbers)
+	ss.OwnedOnly = helpers.MergeWithPointer(ss.OwnedOnly, other.OwnedOnly)
+	ss.FreeOnly = helpers.MergeWithPointer(ss.FreeOnly, other.FreeOnly)
+	ss.PremiumOnly = helpers.MergeWithPointer(ss.PremiumOnly, other.PremiumOnly)
+	ss.StreamOnly = helpers.MergeWithPointer(ss.StreamOnly, other.StreamOnly)
+	ss.MultiHopOnly = helpers.MergeWithPointer(ss.MultiHopOnly, other.MultiHopOnly)
 
 	ss.OpenVPN.mergeWith(other.OpenVPN)
 	ss.Wireguard.mergeWith(other.Wireguard)
@@ -332,28 +243,30 @@ func (ss *ServerSelection) mergeWith(other ServerSelection) {
 func (ss *ServerSelection) overrideWith(other ServerSelection) {
 	ss.VPN = helpers.OverrideWithString(ss.VPN, other.VPN)
 	ss.TargetIP = helpers.OverrideWithIP(ss.TargetIP, other.TargetIP)
-	ss.Countries = helpers.OverrideWithStringSlice(ss.Countries, other.Countries)
-	ss.Regions = helpers.OverrideWithStringSlice(ss.Regions, other.Regions)
-	ss.Cities = helpers.OverrideWithStringSlice(ss.Cities, other.Cities)
-	ss.ISPs = helpers.OverrideWithStringSlice(ss.ISPs, other.ISPs)
-	ss.Hostnames = helpers.OverrideWithStringSlice(ss.Hostnames, other.Hostnames)
-	ss.Names = helpers.OverrideWithStringSlice(ss.Names, other.Names)
-	ss.Numbers = helpers.OverrideWithUint16Slice(ss.Numbers, other.Numbers)
-	ss.OwnedOnly = helpers.OverrideWithBool(ss.OwnedOnly, other.OwnedOnly)
-	ss.FreeOnly = helpers.OverrideWithBool(ss.FreeOnly, other.FreeOnly)
-	ss.StreamOnly = helpers.OverrideWithBool(ss.StreamOnly, other.StreamOnly)
-	ss.MultiHopOnly = helpers.OverrideWithBool(ss.MultiHopOnly, other.MultiHopOnly)
+	ss.Countries = helpers.OverrideWithSlice(ss.Countries, other.Countries)
+	ss.Regions = helpers.OverrideWithSlice(ss.Regions, other.Regions)
+	ss.Cities = helpers.OverrideWithSlice(ss.Cities, other.Cities)
+	ss.ISPs = helpers.OverrideWithSlice(ss.ISPs, other.ISPs)
+	ss.Hostnames = helpers.OverrideWithSlice(ss.Hostnames, other.Hostnames)
+	ss.Names = helpers.OverrideWithSlice(ss.Names, other.Names)
+	ss.Numbers = helpers.OverrideWithSlice(ss.Numbers, other.Numbers)
+	ss.OwnedOnly = helpers.OverrideWithPointer(ss.OwnedOnly, other.OwnedOnly)
+	ss.FreeOnly = helpers.OverrideWithPointer(ss.FreeOnly, other.FreeOnly)
+	ss.PremiumOnly = helpers.OverrideWithPointer(ss.PremiumOnly, other.PremiumOnly)
+	ss.StreamOnly = helpers.OverrideWithPointer(ss.StreamOnly, other.StreamOnly)
+	ss.MultiHopOnly = helpers.OverrideWithPointer(ss.MultiHopOnly, other.MultiHopOnly)
 	ss.OpenVPN.overrideWith(other.OpenVPN)
 	ss.Wireguard.overrideWith(other.Wireguard)
 }
 
 func (ss *ServerSelection) setDefaults(vpnProvider string) {
 	ss.VPN = helpers.DefaultString(ss.VPN, vpn.OpenVPN)
-	ss.TargetIP = helpers.DefaultIP(ss.TargetIP, net.IP{})
-	ss.OwnedOnly = helpers.DefaultBool(ss.OwnedOnly, false)
-	ss.FreeOnly = helpers.DefaultBool(ss.FreeOnly, false)
-	ss.StreamOnly = helpers.DefaultBool(ss.StreamOnly, false)
-	ss.MultiHopOnly = helpers.DefaultBool(ss.MultiHopOnly, false)
+	ss.TargetIP = helpers.DefaultIP(ss.TargetIP, netip.IPv4Unspecified())
+	ss.OwnedOnly = helpers.DefaultPointer(ss.OwnedOnly, false)
+	ss.FreeOnly = helpers.DefaultPointer(ss.FreeOnly, false)
+	ss.PremiumOnly = helpers.DefaultPointer(ss.PremiumOnly, false)
+	ss.StreamOnly = helpers.DefaultPointer(ss.StreamOnly, false)
+	ss.MultiHopOnly = helpers.DefaultPointer(ss.MultiHopOnly, false)
 	ss.OpenVPN.setDefaults(vpnProvider)
 	ss.Wireguard.setDefaults()
 }
@@ -365,7 +278,7 @@ func (ss ServerSelection) String() string {
 func (ss ServerSelection) toLinesNode() (node *gotree.Node) {
 	node = gotree.New("Server selection settings:")
 	node.Appendf("VPN type: %s", ss.VPN)
-	if len(ss.TargetIP) > 0 {
+	if !ss.TargetIP.IsUnspecified() {
 		node.Appendf("Target IP address: %s", ss.TargetIP)
 	}
 
@@ -408,6 +321,10 @@ func (ss ServerSelection) toLinesNode() (node *gotree.Node) {
 		node.Appendf("Free only servers: yes")
 	}
 
+	if *ss.PremiumOnly {
+		node.Appendf("Premium only servers: yes")
+	}
+
 	if *ss.StreamOnly {
 		node.Appendf("Stream only servers: yes")
 	}

internal/configuration/settings/settings.go

@@ -3,6 +3,10 @@ package settings
 import (
 	"fmt"
 
+	"github.com/qdm12/gluetun/internal/configuration/settings/helpers"
+	"github.com/qdm12/gluetun/internal/constants/openvpn"
+	"github.com/qdm12/gluetun/internal/constants/providers"
+	"github.com/qdm12/gluetun/internal/constants/vpn"
 	"github.com/qdm12/gluetun/internal/models"
 	"github.com/qdm12/gluetun/internal/pprof"
 	"github.com/qdm12/gotree"
@@ -24,10 +28,14 @@ type Settings struct {
 	Pprof         pprof.Settings
 }
 
+type Storage interface {
+	GetFilterChoices(provider string) models.FilterChoices
+}
+
 // Validate validates all the settings and returns an error
 // if one of them is not valid.
 // TODO v4 remove pointer for receiver (because of Surfshark).
-func (s *Settings) Validate(allServers models.AllServers) (err error) {
+func (s *Settings) Validate(storage Storage, ipv6Supported bool) (err error) {
 	nameToValidation := map[string]func() error{
 		"control server":  s.ControlServer.validate,
 		"dns":             s.DNS.validate,
@@ -42,7 +50,7 @@ func (s *Settings) Validate(allServers models.AllServers) (err error) {
 		"version":         s.Version.validate,
 		// Pprof validation done in pprof constructor
 		"VPN": func() error {
-			return s.VPN.validate(allServers)
+			return s.VPN.Validate(storage, ipv6Supported)
 		},
 	}
 
@@ -69,7 +77,7 @@ func (s *Settings) copy() (copied Settings) {
 		System:        s.System.copy(),
 		Updater:       s.Updater.copy(),
 		Version:       s.Version.copy(),
-		VPN:           s.VPN.copy(),
+		VPN:           s.VPN.Copy(),
 		Pprof:         s.Pprof.Copy(),
 	}
 }
@@ -91,7 +99,7 @@ func (s *Settings) MergeWith(other Settings) {
 }
 
 func (s *Settings) OverrideWith(other Settings,
-	allServers models.AllServers) (err error) {
+	storage Storage, ipv6Supported bool) (err error) {
 	patchedSettings := s.copy()
 	patchedSettings.ControlServer.overrideWith(other.ControlServer)
 	patchedSettings.DNS.overrideWith(other.DNS)
@@ -104,9 +112,9 @@ func (s *Settings) OverrideWith(other Settings,
 	patchedSettings.System.overrideWith(other.System)
 	patchedSettings.Updater.overrideWith(other.Updater)
 	patchedSettings.Version.overrideWith(other.Version)
-	patchedSettings.VPN.overrideWith(other.VPN)
-	patchedSettings.Pprof.MergeWith(other.Pprof)
-	err = patchedSettings.Validate(allServers)
+	patchedSettings.VPN.OverrideWith(other.VPN)
+	patchedSettings.Pprof.OverrideWith(other.Pprof)
+	err = patchedSettings.Validate(storage, ipv6Supported)
 	if err != nil {
 		return err
 	}
@@ -153,3 +161,37 @@ func (s Settings) toLinesNode() (node *gotree.Node) {
 
 	return node
 }
+
+func (s Settings) Warnings() (warnings []string) {
+	if *s.VPN.Provider.Name == providers.HideMyAss {
+		warnings = append(warnings, "HideMyAss dropped support for Linux OpenVPN "+
+			" so this will likely not work anymore. See https://github.com/qdm12/gluetun/issues/1498.")
+	}
+
+	if helpers.IsOneOf(*s.VPN.Provider.Name, providers.SlickVPN) &&
+		s.VPN.Type == vpn.OpenVPN {
+		if s.VPN.OpenVPN.Version == openvpn.Openvpn24 {
+			warnings = append(warnings, "OpenVPN 2.4 uses OpenSSL 1.1.1 "+
+				"which allows the usage of weak security in today's standards. "+
+				"This can be ok if good security is enforced by the VPN provider. "+
+				"However, "+*s.VPN.Provider.Name+" uses weak security so you should use "+
+				"OpenVPN 2.5 to enforce good security practices.")
+		} else {
+			warnings = append(warnings, "OpenVPN 2.5 uses OpenSSL 3 "+
+				"which prohibits the usage of weak security in today's standards. "+
+				*s.VPN.Provider.Name+" uses weak security which is out "+
+				"of Gluetun's control so the only workaround is to allow such weaknesses "+
+				`using the OpenVPN option tls-cipher "DEFAULT:@SECLEVEL=0". `+
+				"You might want to reach to your provider so they upgrade their certificates. "+
+				"Once this is done, you will have to let the Gluetun maintainers know "+
+				"by creating an issue, attaching the new certificate and we will update Gluetun.")
+		}
+	}
+
+	if s.VPN.OpenVPN.Version == openvpn.Openvpn24 {
+		warnings = append(warnings, "OpenVPN 2.4 will be removed in release v3.34.0 (around June 2023). "+
+			"Please create an issue if you have a compelling reason to keep it.")
+	}
+
+	return warnings
+}

internal/configuration/settings/settings_test.go

@@ -34,7 +34,6 @@ func Test_Settings_String(t *testing.T) {
 |       ├── User: [not set]
 |       ├── Password: [not set]
 |       ├── Private Internet Access encryption preset: strong
-|       ├── Tunnel IPv6: no
 |       ├── Network interface: tun0
 |       ├── Run OpenVPN as: root
 |       └── Verbosity level: 1
@@ -67,6 +66,9 @@ func Test_Settings_String(t *testing.T) {
 ├── Health settings:
 |   ├── Server listening address: 127.0.0.1:9999
 |   ├── Target address: cloudflare.com:443
+|   ├── Duration to wait after success: 5s
+|   ├── Read header timeout: 100ms
+|   ├── Read timeout: 500ms
 |   └── VPN wait durations:
 |       ├── Initial duration: 6s
 |       └── Additional duration: 5s

internal/configuration/settings/shadowsocks.go

@@ -21,7 +21,7 @@ func (s Shadowsocks) validate() (err error) {
 
 func (s *Shadowsocks) copy() (copied Shadowsocks) {
 	return Shadowsocks{
-		Enabled:  helpers.CopyBoolPtr(s.Enabled),
+		Enabled:  helpers.CopyPointer(s.Enabled),
 		Settings: s.Settings.Copy(),
 	}
 }
@@ -29,7 +29,7 @@ func (s *Shadowsocks) copy() (copied Shadowsocks) {
 // mergeWith merges the other settings into any
 // unset field of the receiver settings object.
 func (s *Shadowsocks) mergeWith(other Shadowsocks) {
-	s.Enabled = helpers.MergeWithBool(s.Enabled, other.Enabled)
+	s.Enabled = helpers.MergeWithPointer(s.Enabled, other.Enabled)
 	s.Settings.MergeWith(other.Settings)
 }
 
@@ -37,12 +37,12 @@ func (s *Shadowsocks) mergeWith(other Shadowsocks) {
 // settings object with any field set in the other
 // settings.
 func (s *Shadowsocks) overrideWith(other Shadowsocks) {
-	s.Enabled = helpers.OverrideWithBool(s.Enabled, other.Enabled)
+	s.Enabled = helpers.OverrideWithPointer(s.Enabled, other.Enabled)
 	s.Settings.OverrideWith(other.Settings)
 }
 
 func (s *Shadowsocks) setDefaults() {
-	s.Enabled = helpers.DefaultBool(s.Enabled, false)
+	s.Enabled = helpers.DefaultPointer(s.Enabled, false)
 	s.Settings.SetDefaults()
 }
 

internal/configuration/settings/surfshark_retro.go

@@ -3,15 +3,14 @@ package settings
 import (
 	"strings"
 
-	"github.com/qdm12/gluetun/internal/constants"
-	"github.com/qdm12/gluetun/internal/models"
+	"github.com/qdm12/gluetun/internal/provider/surfshark/servers"
 )
 
 func surfsharkRetroRegion(selection ServerSelection) (
 	updatedSelection ServerSelection) {
-	locationData := constants.SurfsharkLocationData()
+	locationData := servers.LocationData()
 
-	retroToLocation := make(map[string]models.SurfsharkLocationData, len(locationData))
+	retroToLocation := make(map[string]servers.ServerLocation, len(locationData))
 	for _, data := range locationData {
 		if data.RetroLoc == "" {
 			continue

internal/configuration/settings/system.go

@@ -19,28 +19,28 @@ func (s System) validate() (err error) {
 
 func (s *System) copy() (copied System) {
 	return System{
-		PUID:     helpers.CopyUint32Ptr(s.PUID),
-		PGID:     helpers.CopyUint32Ptr(s.PGID),
+		PUID:     helpers.CopyPointer(s.PUID),
+		PGID:     helpers.CopyPointer(s.PGID),
 		Timezone: s.Timezone,
 	}
 }
 
 func (s *System) mergeWith(other System) {
-	s.PUID = helpers.MergeWithUint32(s.PUID, other.PUID)
-	s.PGID = helpers.MergeWithUint32(s.PGID, other.PGID)
+	s.PUID = helpers.MergeWithPointer(s.PUID, other.PUID)
+	s.PGID = helpers.MergeWithPointer(s.PGID, other.PGID)
 	s.Timezone = helpers.MergeWithString(s.Timezone, other.Timezone)
 }
 
 func (s *System) overrideWith(other System) {
-	s.PUID = helpers.OverrideWithUint32(s.PUID, other.PUID)
-	s.PGID = helpers.OverrideWithUint32(s.PGID, other.PGID)
+	s.PUID = helpers.OverrideWithPointer(s.PUID, other.PUID)
+	s.PGID = helpers.OverrideWithPointer(s.PGID, other.PGID)
 	s.Timezone = helpers.OverrideWithString(s.Timezone, other.Timezone)
 }
 
 func (s *System) setDefaults() {
 	const defaultID = 1000
-	s.PUID = helpers.DefaultUint32(s.PUID, defaultID)
-	s.PGID = helpers.DefaultUint32(s.PGID, defaultID)
+	s.PUID = helpers.DefaultPointer(s.PUID, defaultID)
+	s.PGID = helpers.DefaultPointer(s.PGID, defaultID)
 }
 
 func (s System) String() string {

internal/configuration/settings/unbound.go

@@ -3,13 +3,12 @@ package settings
 import (
 	"errors"
 	"fmt"
-	"net"
+	"net/netip"
 
 	"github.com/qdm12/dns/pkg/provider"
 	"github.com/qdm12/dns/pkg/unbound"
 	"github.com/qdm12/gluetun/internal/configuration/settings/helpers"
 	"github.com/qdm12/gotree"
-	"inet.af/netaddr"
 )
 
 // Unbound is settings for the Unbound program.
@@ -21,7 +20,7 @@ type Unbound struct {
 	VerbosityDetailsLevel *uint8
 	ValidationLogLevel    *uint8
 	Username              string
-	Allowed               []netaddr.IPPrefix
+	Allowed               []netip.Prefix
 }
 
 func (u *Unbound) setDefaults() {
@@ -31,22 +30,22 @@ func (u *Unbound) setDefaults() {
 		}
 	}
 
-	u.Caching = helpers.DefaultBool(u.Caching, true)
-	u.IPv6 = helpers.DefaultBool(u.IPv6, false)
+	u.Caching = helpers.DefaultPointer(u.Caching, true)
+	u.IPv6 = helpers.DefaultPointer(u.IPv6, false)
 
 	const defaultVerbosityLevel = 1
-	u.VerbosityLevel = helpers.DefaultUint8(u.VerbosityLevel, defaultVerbosityLevel)
+	u.VerbosityLevel = helpers.DefaultPointer(u.VerbosityLevel, defaultVerbosityLevel)
 
 	const defaultVerbosityDetailsLevel = 0
-	u.VerbosityDetailsLevel = helpers.DefaultUint8(u.VerbosityDetailsLevel, defaultVerbosityDetailsLevel)
+	u.VerbosityDetailsLevel = helpers.DefaultPointer(u.VerbosityDetailsLevel, defaultVerbosityDetailsLevel)
 
 	const defaultValidationLogLevel = 0
-	u.ValidationLogLevel = helpers.DefaultUint8(u.ValidationLogLevel, defaultValidationLogLevel)
+	u.ValidationLogLevel = helpers.DefaultPointer(u.ValidationLogLevel, defaultValidationLogLevel)
 
 	if u.Allowed == nil {
-		u.Allowed = []netaddr.IPPrefix{
-			netaddr.IPPrefixFrom(netaddr.IPv4(0, 0, 0, 0), 0),
-			netaddr.IPPrefixFrom(netaddr.IPv6Raw([16]byte{}), 0),
+		u.Allowed = []netip.Prefix{
+			netip.PrefixFrom(netip.AddrFrom4([4]byte{}), 0),
+			netip.PrefixFrom(netip.AddrFrom16([16]byte{}), 0),
 		}
 	}
 
@@ -95,37 +94,37 @@ func (u Unbound) validate() (err error) {
 
 func (u Unbound) copy() (copied Unbound) {
 	return Unbound{
-		Providers:             helpers.CopyStringSlice(u.Providers),
-		Caching:               helpers.CopyBoolPtr(u.Caching),
-		IPv6:                  helpers.CopyBoolPtr(u.IPv6),
-		VerbosityLevel:        helpers.CopyUint8Ptr(u.VerbosityLevel),
-		VerbosityDetailsLevel: helpers.CopyUint8Ptr(u.VerbosityDetailsLevel),
-		ValidationLogLevel:    helpers.CopyUint8Ptr(u.ValidationLogLevel),
+		Providers:             helpers.CopySlice(u.Providers),
+		Caching:               helpers.CopyPointer(u.Caching),
+		IPv6:                  helpers.CopyPointer(u.IPv6),
+		VerbosityLevel:        helpers.CopyPointer(u.VerbosityLevel),
+		VerbosityDetailsLevel: helpers.CopyPointer(u.VerbosityDetailsLevel),
+		ValidationLogLevel:    helpers.CopyPointer(u.ValidationLogLevel),
 		Username:              u.Username,
-		Allowed:               helpers.CopyIPPrefixSlice(u.Allowed),
+		Allowed:               helpers.CopySlice(u.Allowed),
 	}
 }
 
 func (u *Unbound) mergeWith(other Unbound) {
-	u.Providers = helpers.MergeStringSlices(u.Providers, other.Providers)
-	u.Caching = helpers.MergeWithBool(u.Caching, other.Caching)
-	u.IPv6 = helpers.MergeWithBool(u.IPv6, other.IPv6)
-	u.VerbosityLevel = helpers.MergeWithUint8(u.VerbosityLevel, other.VerbosityLevel)
-	u.VerbosityDetailsLevel = helpers.MergeWithUint8(u.VerbosityDetailsLevel, other.VerbosityDetailsLevel)
-	u.ValidationLogLevel = helpers.MergeWithUint8(u.ValidationLogLevel, other.ValidationLogLevel)
+	u.Providers = helpers.MergeSlices(u.Providers, other.Providers)
+	u.Caching = helpers.MergeWithPointer(u.Caching, other.Caching)
+	u.IPv6 = helpers.MergeWithPointer(u.IPv6, other.IPv6)
+	u.VerbosityLevel = helpers.MergeWithPointer(u.VerbosityLevel, other.VerbosityLevel)
+	u.VerbosityDetailsLevel = helpers.MergeWithPointer(u.VerbosityDetailsLevel, other.VerbosityDetailsLevel)
+	u.ValidationLogLevel = helpers.MergeWithPointer(u.ValidationLogLevel, other.ValidationLogLevel)
 	u.Username = helpers.MergeWithString(u.Username, other.Username)
-	u.Allowed = helpers.MergeIPPrefixesSlices(u.Allowed, other.Allowed)
+	u.Allowed = helpers.MergeSlices(u.Allowed, other.Allowed)
 }
 
 func (u *Unbound) overrideWith(other Unbound) {
-	u.Providers = helpers.OverrideWithStringSlice(u.Providers, other.Providers)
-	u.Caching = helpers.OverrideWithBool(u.Caching, other.Caching)
-	u.IPv6 = helpers.OverrideWithBool(u.IPv6, other.IPv6)
-	u.VerbosityLevel = helpers.OverrideWithUint8(u.VerbosityLevel, other.VerbosityLevel)
-	u.VerbosityDetailsLevel = helpers.OverrideWithUint8(u.VerbosityDetailsLevel, other.VerbosityDetailsLevel)
-	u.ValidationLogLevel = helpers.OverrideWithUint8(u.ValidationLogLevel, other.ValidationLogLevel)
+	u.Providers = helpers.OverrideWithSlice(u.Providers, other.Providers)
+	u.Caching = helpers.OverrideWithPointer(u.Caching, other.Caching)
+	u.IPv6 = helpers.OverrideWithPointer(u.IPv6, other.IPv6)
+	u.VerbosityLevel = helpers.OverrideWithPointer(u.VerbosityLevel, other.VerbosityLevel)
+	u.VerbosityDetailsLevel = helpers.OverrideWithPointer(u.VerbosityDetailsLevel, other.VerbosityDetailsLevel)
+	u.ValidationLogLevel = helpers.OverrideWithPointer(u.ValidationLogLevel, other.ValidationLogLevel)
 	u.Username = helpers.OverrideWithString(u.Username, other.Username)
-	u.Allowed = helpers.OverrideWithIPPrefixesSlice(u.Allowed, other.Allowed)
+	u.Allowed = helpers.OverrideWithSlice(u.Allowed, other.Allowed)
 }
 
 func (u Unbound) ToUnboundFormat() (settings unbound.Settings, err error) {
@@ -149,20 +148,30 @@ func (u Unbound) ToUnboundFormat() (settings unbound.Settings, err error) {
 		VerbosityDetailsLevel: *u.VerbosityDetailsLevel,
 		ValidationLogLevel:    *u.ValidationLogLevel,
 		AccessControl: unbound.AccessControlSettings{
-			Allowed: u.Allowed,
+			Allowed: netipPrefixesToNetaddrIPPrefixes(u.Allowed),
 		},
 		Username: u.Username,
 	}, nil
 }
 
-func (u Unbound) GetFirstPlaintextIPv4() (ipv4 net.IP, err error) {
+var (
+	ErrConvertingNetip = errors.New("converting net.IP to netip.Addr failed")
+)
+
+func (u Unbound) GetFirstPlaintextIPv4() (ipv4 netip.Addr, err error) {
 	s := u.Providers[0]
 	provider, err := provider.Parse(s)
 	if err != nil {
-		return nil, err
+		return ipv4, err
 	}
 
-	return provider.DNS().IPv4[0], nil
+	ip := provider.DNS().IPv4[0]
+	ipv4, ok := netip.AddrFromSlice(ip)
+	if !ok {
+		return ipv4, fmt.Errorf("%w: for ip %s (%#v)",
+			ErrConvertingNetip, ip, ip)
+	}
+	return ipv4.Unmap(), nil
 }
 
 func (u Unbound) String() string {

internal/configuration/settings/unbound_test.go

@@ -2,11 +2,11 @@ package settings
 
 import (
 	"encoding/json"
+	"net/netip"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"inet.af/netaddr"
 )
 
 func Test_Unbound_JSON(t *testing.T) {
@@ -20,9 +20,9 @@ func Test_Unbound_JSON(t *testing.T) {
 		VerbosityDetailsLevel: nil,
 		ValidationLogLevel:    uint8Ptr(0),
 		Username:              "user",
-		Allowed: []netaddr.IPPrefix{
-			netaddr.IPPrefixFrom(netaddr.IPv4(0, 0, 0, 0), 0),
-			netaddr.IPPrefixFrom(netaddr.IPv6Raw([16]byte{}), 0),
+		Allowed: []netip.Prefix{
+			netip.PrefixFrom(netip.AddrFrom4([4]byte{}), 0),
+			netip.PrefixFrom(netip.AddrFrom16([16]byte{}), 0),
 		},
 	}
 

internal/configuration/settings/updater.go

@@ -2,7 +2,6 @@ package settings
 
 import (
 	"fmt"
-	"net"
 	"strings"
 	"time"
 
@@ -21,16 +20,15 @@ type Updater struct {
 	Period *time.Duration
 	// DNSAddress is the DNS server address to use
 	// to resolve VPN server hostnames to IP addresses.
-	// It cannot be nil in the internal state.
-	DNSAddress net.IP
+	// It cannot be the empty string in the internal state.
+	DNSAddress string
+	// MinRatio is the minimum ratio of servers to
+	// find per provider, compared to the total current
+	// number of servers. It defaults to 0.8.
+	MinRatio float64
 	// Providers is the list of VPN service providers
 	// to update server information for.
 	Providers []string
-	// CLI is to precise the updater is running in CLI
-	// mode. This is set automatically and cannot be set
-	// by settings sources. It cannot be nil in the
-	// internal state.
-	CLI *bool
 }
 
 func (u Updater) Validate() (err error) {
@@ -40,21 +38,23 @@ func (u Updater) Validate() (err error) {
 			ErrUpdaterPeriodTooSmall, *u.Period, minPeriod)
 	}
 
-	for i, provider := range u.Providers {
-		valid := false
-		for _, validProvider := range providers.All() {
-			if validProvider == providers.Custom {
-				continue
-			}
+	if u.MinRatio <= 0 || u.MinRatio > 1 {
+		return fmt.Errorf("%w: %.2f must be between 0+ and 1",
+			ErrMinRatioNotValid, u.MinRatio)
+	}
 
+	validProviders := providers.All()
+	for _, provider := range u.Providers {
+		valid := false
+		for _, validProvider := range validProviders {
 			if provider == validProvider {
 				valid = true
 				break
 			}
 		}
 		if !valid {
-			return fmt.Errorf("%w: %s at index %d",
-				ErrVPNProviderNameNotValid, provider, i)
+			return fmt.Errorf("%w: %q can only be one of %s",
+				ErrVPNProviderNameNotValid, provider, helpers.ChoicesOrString(validProviders))
 		}
 	}
 
@@ -63,36 +63,41 @@ func (u Updater) Validate() (err error) {
 
 func (u *Updater) copy() (copied Updater) {
 	return Updater{
-		Period:     helpers.CopyDurationPtr(u.Period),
-		DNSAddress: helpers.CopyIP(u.DNSAddress),
-		Providers:  helpers.CopyStringSlice(u.Providers),
-		CLI:        u.CLI,
+		Period:     helpers.CopyPointer(u.Period),
+		DNSAddress: u.DNSAddress,
+		MinRatio:   u.MinRatio,
+		Providers:  helpers.CopySlice(u.Providers),
 	}
 }
 
 // mergeWith merges the other settings into any
 // unset field of the receiver settings object.
 func (u *Updater) mergeWith(other Updater) {
-	u.Period = helpers.MergeWithDuration(u.Period, other.Period)
-	u.DNSAddress = helpers.MergeWithIP(u.DNSAddress, other.DNSAddress)
-	u.Providers = helpers.MergeStringSlices(u.Providers, other.Providers)
-	u.CLI = helpers.MergeWithBool(u.CLI, other.CLI)
+	u.Period = helpers.MergeWithPointer(u.Period, other.Period)
+	u.DNSAddress = helpers.MergeWithString(u.DNSAddress, other.DNSAddress)
+	u.MinRatio = helpers.MergeWithNumber(u.MinRatio, other.MinRatio)
+	u.Providers = helpers.MergeSlices(u.Providers, other.Providers)
 }
 
 // overrideWith overrides fields of the receiver
 // settings object with any field set in the other
 // settings.
 func (u *Updater) overrideWith(other Updater) {
-	u.Period = helpers.OverrideWithDuration(u.Period, other.Period)
-	u.DNSAddress = helpers.OverrideWithIP(u.DNSAddress, other.DNSAddress)
-	u.Providers = helpers.OverrideWithStringSlice(u.Providers, other.Providers)
-	u.CLI = helpers.MergeWithBool(u.CLI, other.CLI)
+	u.Period = helpers.OverrideWithPointer(u.Period, other.Period)
+	u.DNSAddress = helpers.OverrideWithString(u.DNSAddress, other.DNSAddress)
+	u.MinRatio = helpers.OverrideWithNumber(u.MinRatio, other.MinRatio)
+	u.Providers = helpers.OverrideWithSlice(u.Providers, other.Providers)
 }
 
 func (u *Updater) SetDefaults(vpnProvider string) {
-	u.Period = helpers.DefaultDuration(u.Period, 0)
-	u.DNSAddress = helpers.DefaultIP(u.DNSAddress, net.IPv4(1, 1, 1, 1))
-	u.CLI = helpers.DefaultBool(u.CLI, false)
+	u.Period = helpers.DefaultPointer(u.Period, 0)
+	u.DNSAddress = helpers.DefaultString(u.DNSAddress, "1.1.1.1:53")
+
+	if u.MinRatio == 0 {
+		const defaultMinRatio = 0.8
+		u.MinRatio = defaultMinRatio
+	}
+
 	if len(u.Providers) == 0 && vpnProvider != providers.Custom {
 		u.Providers = []string{vpnProvider}
 	}
@@ -110,11 +115,8 @@ func (u Updater) toLinesNode() (node *gotree.Node) {
 	node = gotree.New("Server data updater settings:")
 	node.Appendf("Update period: %s", *u.Period)
 	node.Appendf("DNS address: %s", u.DNSAddress)
+	node.Appendf("Minimum ratio: %.1f", u.MinRatio)
 	node.Appendf("Providers to update: %s", strings.Join(u.Providers, ", "))
 
-	if *u.CLI {
-		node.Appendf("CLI mode: enabled")
-	}
-
 	return node
 }

internal/configuration/settings/validation/servers.go

@@ -19,6 +19,9 @@ func ExtractCountries(servers []models.Server) (values []string) {
 	values = make([]string, 0, len(servers))
 	for _, server := range servers {
 		value := server.Country
+		if value == "" {
+			continue
+		}
 		_, alreadySeen := seen[value]
 		if alreadySeen {
 			continue
@@ -35,6 +38,9 @@ func ExtractRegions(servers []models.Server) (values []string) {
 	values = make([]string, 0, len(servers))
 	for _, server := range servers {
 		value := server.Region
+		if value == "" {
+			continue
+		}
 		_, alreadySeen := seen[value]
 		if alreadySeen {
 			continue
@@ -51,6 +57,9 @@ func ExtractCities(servers []models.Server) (values []string) {
 	values = make([]string, 0, len(servers))
 	for _, server := range servers {
 		value := server.City
+		if value == "" {
+			continue
+		}
 		_, alreadySeen := seen[value]
 		if alreadySeen {
 			continue
@@ -67,6 +76,9 @@ func ExtractISPs(servers []models.Server) (values []string) {
 	values = make([]string, 0, len(servers))
 	for _, server := range servers {
 		value := server.ISP
+		if value == "" {
+			continue
+		}
 		_, alreadySeen := seen[value]
 		if alreadySeen {
 			continue
@@ -83,6 +95,9 @@ func ExtractServerNames(servers []models.Server) (values []string) {
 	values = make([]string, 0, len(servers))
 	for _, server := range servers {
 		value := server.ServerName
+		if value == "" {
+			continue
+		}
 		_, alreadySeen := seen[value]
 		if alreadySeen {
 			continue
@@ -99,6 +114,9 @@ func ExtractHostnames(servers []models.Server) (values []string) {
 	values = make([]string, 0, len(servers))
 	for _, server := range servers {
 		value := server.Hostname
+		if value == "" {
+			continue
+		}
 		_, alreadySeen := seen[value]
 		if alreadySeen {
 			continue

internal/configuration/settings/validation/surfshark.go

@@ -1,12 +1,12 @@
 package validation
 
 import (
-	"github.com/qdm12/gluetun/internal/constants"
+	"github.com/qdm12/gluetun/internal/provider/surfshark/servers"
 )
 
 // TODO remove in v4.
 func SurfsharkRetroLocChoices() (choices []string) {
-	locationData := constants.SurfsharkLocationData()
+	locationData := servers.LocationData()
 	choices = make([]string, 0, len(locationData))
 	seen := make(map[string]struct{}, len(locationData))
 	for _, data := range locationData {

internal/configuration/settings/version.go

@@ -19,25 +19,25 @@ func (v Version) validate() (err error) {
 
 func (v *Version) copy() (copied Version) {
 	return Version{
-		Enabled: helpers.CopyBoolPtr(v.Enabled),
+		Enabled: helpers.CopyPointer(v.Enabled),
 	}
 }
 
 // mergeWith merges the other settings into any
 // unset field of the receiver settings object.
 func (v *Version) mergeWith(other Version) {
-	v.Enabled = helpers.MergeWithBool(v.Enabled, other.Enabled)
+	v.Enabled = helpers.MergeWithPointer(v.Enabled, other.Enabled)
 }
 
 // overrideWith overrides fields of the receiver
 // settings object with any field set in the other
 // settings.
 func (v *Version) overrideWith(other Version) {
-	v.Enabled = helpers.OverrideWithBool(v.Enabled, other.Enabled)
+	v.Enabled = helpers.OverrideWithPointer(v.Enabled, other.Enabled)
 }
 
 func (v *Version) setDefaults() {
-	v.Enabled = helpers.DefaultBool(v.Enabled, true)
+	v.Enabled = helpers.DefaultPointer(v.Enabled, true)
 }
 
 func (v Version) String() string {

internal/configuration/settings/vpn.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/qdm12/gluetun/internal/configuration/settings/helpers"
 	"github.com/qdm12/gluetun/internal/constants/vpn"
-	"github.com/qdm12/gluetun/internal/models"
 	"github.com/qdm12/gotree"
 )
 
@@ -21,7 +20,7 @@ type VPN struct {
 }
 
 // TODO v4 remove pointer for receiver (because of Surfshark).
-func (v *VPN) validate(allServers models.AllServers) (err error) {
+func (v *VPN) Validate(storage Storage, ipv6Supported bool) (err error) {
 	// Validate Type
 	validVPNTypes := []string{vpn.OpenVPN, vpn.Wireguard}
 	if !helpers.IsOneOf(v.Type, validVPNTypes...) {
@@ -29,7 +28,7 @@ func (v *VPN) validate(allServers models.AllServers) (err error) {
 			ErrVPNTypeNotValid, v.Type, strings.Join(validVPNTypes, ", "))
 	}
 
-	err = v.Provider.validate(v.Type, allServers)
+	err = v.Provider.validate(v.Type, storage)
 	if err != nil {
 		return fmt.Errorf("provider settings: %w", err)
 	}
@@ -40,7 +39,7 @@ func (v *VPN) validate(allServers models.AllServers) (err error) {
 			return fmt.Errorf("OpenVPN settings: %w", err)
 		}
 	} else {
-		err := v.Wireguard.validate(*v.Provider.Name)
+		err := v.Wireguard.validate(*v.Provider.Name, ipv6Supported)
 		if err != nil {
 			return fmt.Errorf("Wireguard settings: %w", err)
 		}
@@ -49,7 +48,7 @@ func (v *VPN) validate(allServers models.AllServers) (err error) {
 	return nil
 }
 
-func (v *VPN) copy() (copied VPN) {
+func (v *VPN) Copy() (copied VPN) {
 	return VPN{
 		Type:      v.Type,
 		Provider:  v.Provider.copy(),
@@ -65,7 +64,7 @@ func (v *VPN) mergeWith(other VPN) {
 	v.Wireguard.mergeWith(other.Wireguard)
 }
 
-func (v *VPN) overrideWith(other VPN) {
+func (v *VPN) OverrideWith(other VPN) {
 	v.Type = helpers.OverrideWithString(v.Type, other.Type)
 	v.Provider.overrideWith(other.Provider)
 	v.OpenVPN.overrideWith(other.OpenVPN)

internal/configuration/settings/wireguard.go

@@ -2,7 +2,7 @@ package settings
 
 import (
 	"fmt"
-	"net"
+	"net/netip"
 	"regexp"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings/helpers"
@@ -22,22 +22,28 @@ type Wireguard struct {
 	// It cannot be nil in the internal state.
 	PreSharedKey *string
 	// Addresses are the Wireguard interface addresses.
-	Addresses []net.IPNet
+	Addresses []netip.Prefix
 	// Interface is the name of the Wireguard interface
 	// to create. It cannot be the empty string in the
 	// internal state.
 	Interface string
+	// Implementation is the Wireguard implementation to use.
+	// It can be "auto", "userspace" or "kernelspace".
+	// It defaults to "auto" and cannot be the empty string
+	// in the internal state.
+	Implementation string
 }
 
 var regexpInterfaceName = regexp.MustCompile(`^[a-zA-Z0-9_]+$`)
 
 // Validate validates Wireguard settings.
 // It should only be ran if the VPN type chosen is Wireguard.
-func (w Wireguard) validate(vpnProvider string) (err error) {
+func (w Wireguard) validate(vpnProvider string, ipv6Supported bool) (err error) {
 	if !helpers.IsOneOf(vpnProvider,
 		providers.Custom,
 		providers.Ivpn,
 		providers.Mullvad,
+		providers.Surfshark,
 		providers.Windscribe,
 	) {
 		// do not validate for VPN provider not supporting Wireguard
@@ -46,13 +52,19 @@ func (w Wireguard) validate(vpnProvider string) (err error) {
 
 	// Validate PrivateKey
 	if *w.PrivateKey == "" {
-		return ErrWireguardPrivateKeyNotSet
+		return fmt.Errorf("%w", ErrWireguardPrivateKeyNotSet)
 	}
 	_, err = wgtypes.ParseKey(*w.PrivateKey)
 	if err != nil {
 		return fmt.Errorf("private key is not valid: %w", err)
 	}
 
+	if vpnProvider == providers.Airvpn {
+		if *w.PreSharedKey == "" {
+			return fmt.Errorf("%w", ErrWireguardPreSharedKeyNotSet)
+		}
+	}
+
 	// Validate PreSharedKey
 	if *w.PreSharedKey != "" { // Note: this is optional
 		_, err = wgtypes.ParseKey(*w.PreSharedKey)
@@ -63,13 +75,18 @@ func (w Wireguard) validate(vpnProvider string) (err error) {
 
 	// Validate Addresses
 	if len(w.Addresses) == 0 {
-		return ErrWireguardInterfaceAddressNotSet
+		return fmt.Errorf("%w", ErrWireguardInterfaceAddressNotSet)
 	}
 	for i, ipNet := range w.Addresses {
-		if ipNet.IP == nil || ipNet.Mask == nil {
+		if !ipNet.IsValid() {
 			return fmt.Errorf("%w: for address at index %d: %s",
 				ErrWireguardInterfaceAddressNotSet, i, ipNet.String())
 		}
+
+		if !ipv6Supported && ipNet.Addr().Is6() {
+			return fmt.Errorf("%w: address %s",
+				ErrWireguardInterfaceAddressIPv6, ipNet)
+		}
 	}
 
 	// Validate interface
@@ -78,36 +95,46 @@ func (w Wireguard) validate(vpnProvider string) (err error) {
 			ErrWireguardInterfaceNotValid, w.Interface, regexpInterfaceName)
 	}
 
+	validImplementations := []string{"auto", "userspace", "kernelspace"}
+	if !helpers.IsOneOf(w.Implementation, validImplementations...) {
+		return fmt.Errorf("%w: %s must be one of %s", ErrWireguardImplementationNotValid,
+			w.Implementation, helpers.ChoicesOrString(validImplementations))
+	}
+
 	return nil
 }
 
 func (w *Wireguard) copy() (copied Wireguard) {
 	return Wireguard{
-		PrivateKey:   helpers.CopyStringPtr(w.PrivateKey),
-		PreSharedKey: helpers.CopyStringPtr(w.PreSharedKey),
-		Addresses:    helpers.CopyIPNetSlice(w.Addresses),
-		Interface:    w.Interface,
+		PrivateKey:     helpers.CopyPointer(w.PrivateKey),
+		PreSharedKey:   helpers.CopyPointer(w.PreSharedKey),
+		Addresses:      helpers.CopySlice(w.Addresses),
+		Interface:      w.Interface,
+		Implementation: w.Implementation,
 	}
 }
 
 func (w *Wireguard) mergeWith(other Wireguard) {
-	w.PrivateKey = helpers.MergeWithStringPtr(w.PrivateKey, other.PrivateKey)
-	w.PreSharedKey = helpers.MergeWithStringPtr(w.PreSharedKey, other.PreSharedKey)
-	w.Addresses = helpers.MergeIPNetsSlices(w.Addresses, other.Addresses)
+	w.PrivateKey = helpers.MergeWithPointer(w.PrivateKey, other.PrivateKey)
+	w.PreSharedKey = helpers.MergeWithPointer(w.PreSharedKey, other.PreSharedKey)
+	w.Addresses = helpers.MergeSlices(w.Addresses, other.Addresses)
 	w.Interface = helpers.MergeWithString(w.Interface, other.Interface)
+	w.Implementation = helpers.MergeWithString(w.Implementation, other.Implementation)
 }
 
 func (w *Wireguard) overrideWith(other Wireguard) {
-	w.PrivateKey = helpers.OverrideWithStringPtr(w.PrivateKey, other.PrivateKey)
-	w.PreSharedKey = helpers.OverrideWithStringPtr(w.PreSharedKey, other.PreSharedKey)
-	w.Addresses = helpers.OverrideWithIPNetsSlice(w.Addresses, other.Addresses)
+	w.PrivateKey = helpers.OverrideWithPointer(w.PrivateKey, other.PrivateKey)
+	w.PreSharedKey = helpers.OverrideWithPointer(w.PreSharedKey, other.PreSharedKey)
+	w.Addresses = helpers.OverrideWithSlice(w.Addresses, other.Addresses)
 	w.Interface = helpers.OverrideWithString(w.Interface, other.Interface)
+	w.Implementation = helpers.OverrideWithString(w.Implementation, other.Implementation)
 }
 
 func (w *Wireguard) setDefaults() {
-	w.PrivateKey = helpers.DefaultStringPtr(w.PrivateKey, "")
-	w.PreSharedKey = helpers.DefaultStringPtr(w.PreSharedKey, "")
+	w.PrivateKey = helpers.DefaultPointer(w.PrivateKey, "")
+	w.PreSharedKey = helpers.DefaultPointer(w.PreSharedKey, "")
 	w.Interface = helpers.DefaultString(w.Interface, "wg0")
+	w.Implementation = helpers.DefaultString(w.Implementation, "auto")
 }
 
 func (w Wireguard) String() string {
@@ -134,5 +161,9 @@ func (w Wireguard) toLinesNode() (node *gotree.Node) {
 
 	node.Appendf("Network interface: %s", w.Interface)
 
+	if w.Implementation != "auto" {
+		node.Appendf("Implementation: %s", w.Implementation)
+	}
+
 	return node
 }

internal/configuration/settings/wireguardselection.go

@@ -2,7 +2,7 @@ package settings
 
 import (
 	"fmt"
-	"net"
+	"net/netip"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings/helpers"
 	"github.com/qdm12/gluetun/internal/constants/providers"
@@ -15,11 +15,11 @@ type WireguardSelection struct {
 	// It is only used with VPN providers generating Wireguard
 	// configurations specific to each server and user.
 	// To indicate it should not be used, it should be set
-	// to the empty net.IP{} slice. It can never be nil
+	// to netaddr.IPv4Unspecified(). It can never be the zero value
 	// in the internal state.
-	EndpointIP net.IP
+	EndpointIP netip.Addr
 	// EndpointPort is a the server port to use for the VPN server.
-	// It is optional for VPN providers IVPN, Mullvad
+	// It is optional for VPN providers IVPN, Mullvad, Surfshark
 	// and Windscribe, and compulsory for the others.
 	// When optional, it can be set to 0 to indicate not use
 	// a custom endpoint port. It cannot be nil in the internal
@@ -36,10 +36,12 @@ type WireguardSelection struct {
 func (w WireguardSelection) validate(vpnProvider string) (err error) {
 	// Validate EndpointIP
 	switch vpnProvider {
-	case providers.Ivpn, providers.Mullvad, providers.Windscribe: // endpoint IP addresses are baked in
+	case providers.Airvpn, providers.Ivpn, providers.Mullvad,
+		providers.Surfshark, providers.Windscribe:
+		// endpoint IP addresses are baked in
 	case providers.Custom:
-		if len(w.EndpointIP) == 0 {
-			return ErrWireguardEndpointIPNotSet
+		if !w.EndpointIP.IsValid() || w.EndpointIP.IsUnspecified() {
+			return fmt.Errorf("%w", ErrWireguardEndpointIPNotSet)
 		}
 	default: // Providers not supporting Wireguard
 	}
@@ -49,9 +51,14 @@ func (w WireguardSelection) validate(vpnProvider string) (err error) {
 	// EndpointPort is required
 	case providers.Custom:
 		if *w.EndpointPort == 0 {
-			return ErrWireguardEndpointPortNotSet
+			return fmt.Errorf("%w", ErrWireguardEndpointPortNotSet)
 		}
-	case providers.Ivpn, providers.Mullvad, providers.Windscribe:
+	// EndpointPort cannot be set
+	case providers.Surfshark:
+		if *w.EndpointPort != 0 {
+			return fmt.Errorf("%w", ErrWireguardEndpointPortSet)
+		}
+	case providers.Airvpn, providers.Ivpn, providers.Mullvad, providers.Windscribe:
 		// EndpointPort is optional and can be 0
 		if *w.EndpointPort == 0 {
 			break // no custom endpoint port set
@@ -61,6 +68,8 @@ func (w WireguardSelection) validate(vpnProvider string) (err error) {
 		}
 		var allowed []uint16
 		switch vpnProvider {
+		case providers.Airvpn:
+			allowed = []uint16{1637, 47107}
 		case providers.Ivpn:
 			allowed = []uint16{2049, 2050, 53, 30587, 41893, 48574, 58237}
 		case providers.Windscribe:
@@ -78,10 +87,12 @@ func (w WireguardSelection) validate(vpnProvider string) (err error) {
 
 	// Validate PublicKey
 	switch vpnProvider {
-	case providers.Ivpn, providers.Mullvad, providers.Windscribe: // public keys are baked in
+	case providers.Ivpn, providers.Mullvad,
+		providers.Surfshark, providers.Windscribe:
+		// public keys are baked in
 	case providers.Custom:
 		if w.PublicKey == "" {
-			return ErrWireguardPublicKeyNotSet
+			return fmt.Errorf("%w", ErrWireguardPublicKeyNotSet)
 		}
 	default: // Providers not supporting Wireguard
 	}
@@ -98,27 +109,27 @@ func (w WireguardSelection) validate(vpnProvider string) (err error) {
 
 func (w *WireguardSelection) copy() (copied WireguardSelection) {
 	return WireguardSelection{
-		EndpointIP:   helpers.CopyIP(w.EndpointIP),
-		EndpointPort: helpers.CopyUint16Ptr(w.EndpointPort),
+		EndpointIP:   w.EndpointIP,
+		EndpointPort: helpers.CopyPointer(w.EndpointPort),
 		PublicKey:    w.PublicKey,
 	}
 }
 
 func (w *WireguardSelection) mergeWith(other WireguardSelection) {
 	w.EndpointIP = helpers.MergeWithIP(w.EndpointIP, other.EndpointIP)
-	w.EndpointPort = helpers.MergeWithUint16(w.EndpointPort, other.EndpointPort)
+	w.EndpointPort = helpers.MergeWithPointer(w.EndpointPort, other.EndpointPort)
 	w.PublicKey = helpers.MergeWithString(w.PublicKey, other.PublicKey)
 }
 
 func (w *WireguardSelection) overrideWith(other WireguardSelection) {
 	w.EndpointIP = helpers.OverrideWithIP(w.EndpointIP, other.EndpointIP)
-	w.EndpointPort = helpers.OverrideWithUint16(w.EndpointPort, other.EndpointPort)
+	w.EndpointPort = helpers.OverrideWithPointer(w.EndpointPort, other.EndpointPort)
 	w.PublicKey = helpers.OverrideWithString(w.PublicKey, other.PublicKey)
 }
 
 func (w *WireguardSelection) setDefaults() {
-	w.EndpointIP = helpers.DefaultIP(w.EndpointIP, net.IP{})
-	w.EndpointPort = helpers.DefaultUint16(w.EndpointPort, 0)
+	w.EndpointIP = helpers.DefaultIP(w.EndpointIP, netip.IPv4Unspecified())
+	w.EndpointPort = helpers.DefaultPointer(w.EndpointPort, 0)
 }
 
 func (w WireguardSelection) String() string {
@@ -128,7 +139,7 @@ func (w WireguardSelection) String() string {
 func (w WireguardSelection) toLinesNode() (node *gotree.Node) {
 	node = gotree.New("Wireguard selection settings:")
 
-	if len(w.EndpointIP) > 0 {
+	if !w.EndpointIP.IsUnspecified() {
 		node.Appendf("Endpoint IP address: %s", w.EndpointIP)
 	}
 

internal/configuration/sources/env/dns.go

@@ -2,13 +2,13 @@ package env
 
 import (
 	"fmt"
-	"net"
+	"net/netip"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 )
 
-func (r *Reader) readDNS() (dns settings.DNS, err error) {
-	dns.ServerAddress, err = r.readDNSServerAddress()
+func (s *Source) readDNS() (dns settings.DNS, err error) {
+	dns.ServerAddress, err = s.readDNSServerAddress()
 	if err != nil {
 		return dns, err
 	}
@@ -18,7 +18,7 @@ func (r *Reader) readDNS() (dns settings.DNS, err error) {
 		return dns, fmt.Errorf("environment variable DNS_KEEP_NAMESERVER: %w", err)
 	}
 
-	dns.DoT, err = r.readDoT()
+	dns.DoT, err = s.readDoT()
 	if err != nil {
 		return dns, fmt.Errorf("DoT settings: %w", err)
 	}
@@ -26,22 +26,22 @@ func (r *Reader) readDNS() (dns settings.DNS, err error) {
 	return dns, nil
 }
 
-func (r *Reader) readDNSServerAddress() (address net.IP, err error) {
-	key, s := r.getEnvWithRetro("DNS_ADDRESS", "DNS_PLAINTEXT_ADDRESS")
-	if s == "" {
-		return nil, nil
+func (s *Source) readDNSServerAddress() (address netip.Addr, err error) {
+	key, value := s.getEnvWithRetro("DNS_ADDRESS", "DNS_PLAINTEXT_ADDRESS")
+	if value == "" {
+		return address, nil
 	}
 
-	address = net.ParseIP(s)
-	if address == nil {
-		return nil, fmt.Errorf("environment variable %s: %w: %s", key, ErrIPAddressParse, s)
+	address, err = netip.ParseAddr(value)
+	if err != nil {
+		return address, fmt.Errorf("environment variable %s: %w", key, err)
 	}
 
 	// TODO remove in v4
-	if !address.Equal(net.IPv4(127, 0, 0, 1)) { //nolint:gomnd
-		r.warner.Warn(key + " is set to " + s +
+	if address.Unmap().Compare(netip.AddrFrom4([4]byte{127, 0, 0, 1})) != 0 {
+		s.warner.Warn(key + " is set to " + value +
 			" so the DNS over TLS (DoT) server will not be used." +
-			" The default value changed to 127.0.0.1 so it uses the internal DoT server." +
+			" The default value changed to 127.0.0.1 so it uses the internal DoT serves." +
 			" If the DoT server fails to start, the IPv4 address of the first plaintext DNS server" +
 			" corresponding to the first DoT provider chosen is used.")
 	}

internal/configuration/sources/env/dnsblacklist.go

@@ -3,19 +3,19 @@ package env
 import (
 	"errors"
 	"fmt"
+	"net/netip"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 	"github.com/qdm12/govalid/binary"
-	"inet.af/netaddr"
 )
 
-func (r *Reader) readDNSBlacklist() (blacklist settings.DNSBlacklist, err error) {
+func (s *Source) readDNSBlacklist() (blacklist settings.DNSBlacklist, err error) {
 	blacklist.BlockMalicious, err = envToBoolPtr("BLOCK_MALICIOUS")
 	if err != nil {
 		return blacklist, fmt.Errorf("environment variable BLOCK_MALICIOUS: %w", err)
 	}
 
-	blacklist.BlockSurveillance, err = r.readBlockSurveillance()
+	blacklist.BlockSurveillance, err = s.readBlockSurveillance()
 	if err != nil {
 		return blacklist, err
 	}
@@ -36,8 +36,8 @@ func (r *Reader) readDNSBlacklist() (blacklist settings.DNSBlacklist, err error)
 	return blacklist, nil
 }
 
-func (r *Reader) readBlockSurveillance() (blocked *bool, err error) {
-	key, value := r.getEnvWithRetro("BLOCK_SURVEILLANCE", "BLOCK_NSA")
+func (s *Source) readBlockSurveillance() (blocked *bool, err error) {
+	key, value := s.getEnvWithRetro("BLOCK_SURVEILLANCE", "BLOCK_NSA")
 	if value == "" {
 		return nil, nil //nolint:nilnil
 	}
@@ -55,24 +55,24 @@ var (
 	ErrPrivateAddressNotValid = errors.New("private address is not a valid IP or CIDR range")
 )
 
-func readDoTPrivateAddresses() (ips []netaddr.IP,
-	ipPrefixes []netaddr.IPPrefix, err error) {
+func readDoTPrivateAddresses() (ips []netip.Addr,
+	ipPrefixes []netip.Prefix, err error) {
 	privateAddresses := envToCSV("DOT_PRIVATE_ADDRESS")
 	if len(privateAddresses) == 0 {
 		return nil, nil, nil
 	}
 
-	ips = make([]netaddr.IP, 0, len(privateAddresses))
-	ipPrefixes = make([]netaddr.IPPrefix, 0, len(privateAddresses))
+	ips = make([]netip.Addr, 0, len(privateAddresses))
+	ipPrefixes = make([]netip.Prefix, 0, len(privateAddresses))
 
 	for _, privateAddress := range privateAddresses {
-		ip, err := netaddr.ParseIP(privateAddress)
+		ip, err := netip.ParseAddr(privateAddress)
 		if err == nil {
 			ips = append(ips, ip)
 			continue
 		}
 
-		ipPrefix, err := netaddr.ParseIPPrefix(privateAddress)
+		ipPrefix, err := netip.ParsePrefix(privateAddress)
 		if err == nil {
 			ipPrefixes = append(ipPrefixes, ipPrefix)
 			continue

internal/configuration/sources/env/dot.go

@@ -6,7 +6,7 @@ import (
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 )
 
-func (r *Reader) readDoT() (dot settings.DoT, err error) {
+func (s *Source) readDoT() (dot settings.DoT, err error) {
 	dot.Enabled, err = envToBoolPtr("DOT")
 	if err != nil {
 		return dot, fmt.Errorf("environment variable DOT: %w", err)
@@ -22,7 +22,7 @@ func (r *Reader) readDoT() (dot settings.DoT, err error) {
 		return dot, err
 	}
 
-	dot.Blacklist, err = r.readDNSBlacklist()
+	dot.Blacklist, err = s.readDNSBlacklist()
 	if err != nil {
 		return dot, err
 	}

internal/configuration/sources/env/firewall.go

@@ -3,13 +3,13 @@ package env
 import (
 	"errors"
 	"fmt"
-	"net"
+	"net/netip"
 	"strconv"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 )
 
-func (r *Reader) readFirewall() (firewall settings.Firewall, err error) {
+func (s *Source) readFirewall() (firewall settings.Firewall, err error) {
 	vpnInputPortStrings := envToCSV("FIREWALL_VPN_INPUT_PORTS")
 	firewall.VPNInputPorts, err = stringsToPorts(vpnInputPortStrings)
 	if err != nil {
@@ -22,9 +22,9 @@ func (r *Reader) readFirewall() (firewall settings.Firewall, err error) {
 		return firewall, fmt.Errorf("environment variable FIREWALL_INPUT_PORTS: %w", err)
 	}
 
-	outboundSubnetsKey, _ := r.getEnvWithRetro("FIREWALL_OUTBOUND_SUBNETS", "EXTRA_SUBNETS")
+	outboundSubnetsKey, _ := s.getEnvWithRetro("FIREWALL_OUTBOUND_SUBNETS", "EXTRA_SUBNETS")
 	outboundSubnetStrings := envToCSV(outboundSubnetsKey)
-	firewall.OutboundSubnets, err = stringsToIPNets(outboundSubnetStrings)
+	firewall.OutboundSubnets, err = stringsToNetipPrefixes(outboundSubnetStrings)
 	if err != nil {
 		return firewall, fmt.Errorf("environment variable %s: %w", outboundSubnetsKey, err)
 	}
@@ -65,18 +65,16 @@ func stringsToPorts(ss []string) (ports []uint16, err error) {
 	return ports, nil
 }
 
-func stringsToIPNets(ss []string) (ipNets []net.IPNet, err error) {
+func stringsToNetipPrefixes(ss []string) (ipPrefixes []netip.Prefix, err error) {
 	if len(ss) == 0 {
 		return nil, nil
 	}
-	ipNets = make([]net.IPNet, len(ss))
+	ipPrefixes = make([]netip.Prefix, len(ss))
 	for i, s := range ss {
-		ip, ipNet, err := net.ParseCIDR(s)
+		ipPrefixes[i], err = netip.ParsePrefix(s)
 		if err != nil {
-			return nil, fmt.Errorf("cannot parse IP network %q: %w", s, err)
+			return nil, fmt.Errorf("parsing IP network %q: %w", s, err)
 		}
-		ipNet.IP = ip
-		ipNets[i] = *ipNet
 	}
-	return ipNets, nil
+	return ipPrefixes, nil
 }

internal/configuration/sources/env/health.go

@@ -2,24 +2,30 @@ package env
 
 import (
 	"fmt"
-	"os"
 	"time"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 )
 
-func (r *Reader) ReadHealth() (health settings.Health, err error) {
-	health.ServerAddress = os.Getenv("HEALTH_SERVER_ADDRESS")
-	_, health.TargetAddress = r.getEnvWithRetro("HEALTH_TARGET_ADDRESS", "HEALTH_ADDRESS_TO_PING")
+func (s *Source) ReadHealth() (health settings.Health, err error) {
+	health.ServerAddress = getCleanedEnv("HEALTH_SERVER_ADDRESS")
+	_, health.TargetAddress = s.getEnvWithRetro("HEALTH_TARGET_ADDRESS", "HEALTH_ADDRESS_TO_PING")
 
-	health.VPN.Initial, err = r.readDurationWithRetro(
+	successWaitPtr, err := envToDurationPtr("HEALTH_SUCCESS_WAIT_DURATION")
+	if err != nil {
+		return health, fmt.Errorf("environment variable HEALTH_SUCCESS_WAIT_DURATION: %w", err)
+	} else if successWaitPtr != nil {
+		health.SuccessWait = *successWaitPtr
+	}
+
+	health.VPN.Initial, err = s.readDurationWithRetro(
 		"HEALTH_VPN_DURATION_INITIAL",
 		"HEALTH_OPENVPN_DURATION_INITIAL")
 	if err != nil {
 		return health, err
 	}
 
-	health.VPN.Addition, err = r.readDurationWithRetro(
+	health.VPN.Addition, err = s.readDurationWithRetro(
 		"HEALTH_VPN_DURATION_ADDITION",
 		"HEALTH_OPENVPN_DURATION_ADDITION")
 	if err != nil {
@@ -29,14 +35,14 @@ func (r *Reader) ReadHealth() (health settings.Health, err error) {
 	return health, nil
 }
 
-func (r *Reader) readDurationWithRetro(envKey, retroEnvKey string) (d *time.Duration, err error) {
-	envKey, s := r.getEnvWithRetro(envKey, retroEnvKey)
-	if s == "" {
+func (s *Source) readDurationWithRetro(envKey, retroEnvKey string) (d *time.Duration, err error) {
+	envKey, value := s.getEnvWithRetro(envKey, retroEnvKey)
+	if value == "" {
 		return nil, nil //nolint:nilnil
 	}
 
 	d = new(time.Duration)
-	*d, err = time.ParseDuration(s)
+	*d, err = time.ParseDuration(value)
 	if err != nil {
 		return nil, fmt.Errorf("environment variable %s: %w", envKey, err)
 	}

internal/configuration/sources/env/helpers.go

@@ -1,7 +1,6 @@
 package env
 
 import (
-	"encoding/base64"
 	"fmt"
 	"os"
 	"strconv"
@@ -12,24 +11,35 @@ import (
 	"github.com/qdm12/govalid/integer"
 )
 
+// getCleanedEnv returns an environment variable value with
+// surrounding spaces and trailing new line characters removed.
+func getCleanedEnv(envKey string) (value string) {
+	value = os.Getenv(envKey)
+	value = strings.TrimSpace(value)
+	value = strings.TrimSuffix(value, "\r\n")
+	value = strings.TrimSuffix(value, "\n")
+	return value
+}
+
 func envToCSV(envKey string) (values []string) {
-	csv := os.Getenv(envKey)
+	csv := getCleanedEnv(envKey)
 	if csv == "" {
 		return nil
 	}
 	return lowerAndSplit(csv)
 }
 
-func envToInt(envKey string) (n int, err error) {
-	s := os.Getenv(envKey)
+func envToFloat64(envKey string) (f float64, err error) {
+	s := getCleanedEnv(envKey)
 	if s == "" {
 		return 0, nil
 	}
-	return strconv.Atoi(s)
+	const bits = 64
+	return strconv.ParseFloat(s, bits)
 }
 
 func envToStringPtr(envKey string) (stringPtr *string) {
-	s := os.Getenv(envKey)
+	s := getCleanedEnv(envKey)
 	if s == "" {
 		return nil
 	}
@@ -37,7 +47,7 @@ func envToStringPtr(envKey string) (stringPtr *string) {
 }
 
 func envToBoolPtr(envKey string) (boolPtr *bool, err error) {
-	s := os.Getenv(envKey)
+	s := getCleanedEnv(envKey)
 	if s == "" {
 		return nil, nil //nolint:nilnil
 	}
@@ -49,7 +59,7 @@ func envToBoolPtr(envKey string) (boolPtr *bool, err error) {
 }
 
 func envToIntPtr(envKey string) (intPtr *int, err error) {
-	s := os.Getenv(envKey)
+	s := getCleanedEnv(envKey)
 	if s == "" {
 		return nil, nil //nolint:nilnil
 	}
@@ -61,7 +71,7 @@ func envToIntPtr(envKey string) (intPtr *int, err error) {
 }
 
 func envToUint8Ptr(envKey string) (uint8Ptr *uint8, err error) {
-	s := os.Getenv(envKey)
+	s := getCleanedEnv(envKey)
 	if s == "" {
 		return nil, nil //nolint:nilnil
 	}
@@ -78,7 +88,7 @@ func envToUint8Ptr(envKey string) (uint8Ptr *uint8, err error) {
 }
 
 func envToUint16Ptr(envKey string) (uint16Ptr *uint16, err error) {
-	s := os.Getenv(envKey)
+	s := getCleanedEnv(envKey)
 	if s == "" {
 		return nil, nil //nolint:nilnil
 	}
@@ -95,7 +105,7 @@ func envToUint16Ptr(envKey string) (uint16Ptr *uint16, err error) {
 }
 
 func envToDurationPtr(envKey string) (durationPtr *time.Duration, err error) {
-	s := os.Getenv(envKey)
+	s := getCleanedEnv(envKey)
 	if s == "" {
 		return nil, nil //nolint:nilnil
 	}
@@ -114,21 +124,12 @@ func lowerAndSplit(csv string) (values []string) {
 	return strings.Split(csv, ",")
 }
 
-func decodeBase64(b64String string) (decoded string, err error) {
-	b, err := base64.StdEncoding.DecodeString(b64String)
-	if err != nil {
-		return "", fmt.Errorf("cannot decode base64 string %q: %w",
-			b64String, err)
-	}
-	return string(b), nil
-}
-
 func unsetEnvKeys(envKeys []string, err error) (newErr error) {
 	newErr = err
 	for _, envKey := range envKeys {
 		unsetErr := os.Unsetenv(envKey)
 		if unsetErr != nil && newErr == nil {
-			newErr = fmt.Errorf("cannot unset environment variable %s: %w", envKey, unsetErr)
+			newErr = fmt.Errorf("unsetting environment variable %s: %w", envKey, unsetErr)
 		}
 	}
 	return newErr

internal/configuration/sources/env/helpers_test.go

@@ -20,7 +20,3 @@ func setTestEnv(t *testing.T, key, value string) {
 	})
 	require.NoError(t, err)
 }
-
-func TestXxx(t *testing.T) {
-	t.Log(int(^uint32(0)))
-}

internal/configuration/sources/env/httproxy.go

@@ -7,12 +7,12 @@ import (
 	"github.com/qdm12/govalid/binary"
 )
 
-func (r *Reader) readHTTPProxy() (httpProxy settings.HTTPProxy, err error) {
-	httpProxy.User = r.readHTTProxyUser()
-	httpProxy.Password = r.readHTTProxyPassword()
-	httpProxy.ListeningAddress = r.readHTTProxyListeningAddress()
+func (s *Source) readHTTPProxy() (httpProxy settings.HTTPProxy, err error) {
+	httpProxy.User = s.readHTTProxyUser()
+	httpProxy.Password = s.readHTTProxyPassword()
+	httpProxy.ListeningAddress = s.readHTTProxyListeningAddress()
 
-	httpProxy.Enabled, err = r.readHTTProxyEnabled()
+	httpProxy.Enabled, err = s.readHTTProxyEnabled()
 	if err != nil {
 		return httpProxy, err
 	}
@@ -22,7 +22,7 @@ func (r *Reader) readHTTPProxy() (httpProxy settings.HTTPProxy, err error) {
 		return httpProxy, fmt.Errorf("environment variable HTTPPROXY_STEALTH: %w", err)
 	}
 
-	httpProxy.Log, err = r.readHTTProxyLog()
+	httpProxy.Log, err = s.readHTTProxyLog()
 	if err != nil {
 		return httpProxy, err
 	}
@@ -30,38 +30,38 @@ func (r *Reader) readHTTPProxy() (httpProxy settings.HTTPProxy, err error) {
 	return httpProxy, nil
 }
 
-func (r *Reader) readHTTProxyUser() (user *string) {
-	_, s := r.getEnvWithRetro("HTTPPROXY_USER", "PROXY_USER", "TINYPROXY_USER")
-	if s != "" {
-		return &s
+func (s *Source) readHTTProxyUser() (user *string) {
+	_, value := s.getEnvWithRetro("HTTPPROXY_USER", "PROXY_USER", "TINYPROXY_USER")
+	if value != "" {
+		return &value
 	}
 	return nil
 }
 
-func (r *Reader) readHTTProxyPassword() (user *string) {
-	_, s := r.getEnvWithRetro("HTTPPROXY_PASSWORD", "PROXY_PASSWORD", "TINYPROXY_PASSWORD")
-	if s != "" {
-		return &s
+func (s *Source) readHTTProxyPassword() (user *string) {
+	_, value := s.getEnvWithRetro("HTTPPROXY_PASSWORD", "PROXY_PASSWORD", "TINYPROXY_PASSWORD")
+	if value != "" {
+		return &value
 	}
 	return nil
 }
 
-func (r *Reader) readHTTProxyListeningAddress() (listeningAddress string) {
-	key, value := r.getEnvWithRetro("HTTPPROXY_LISTENING_ADDRESS", "PROXY_PORT", "TINYPROXY_PORT", "HTTPPROXY_PORT")
+func (s *Source) readHTTProxyListeningAddress() (listeningAddress string) {
+	key, value := s.getEnvWithRetro("HTTPPROXY_LISTENING_ADDRESS", "PROXY_PORT", "TINYPROXY_PORT", "HTTPPROXY_PORT")
 	if key == "HTTPPROXY_LISTENING_ADDRESS" {
 		return value
 	}
 	return ":" + value
 }
 
-func (r *Reader) readHTTProxyEnabled() (enabled *bool, err error) {
-	key, s := r.getEnvWithRetro("HTTPPROXY", "PROXY", "TINYPROXY")
-	if s == "" {
+func (s *Source) readHTTProxyEnabled() (enabled *bool, err error) {
+	key, value := s.getEnvWithRetro("HTTPPROXY", "PROXY", "TINYPROXY")
+	if value == "" {
 		return nil, nil //nolint:nilnil
 	}
 
 	enabled = new(bool)
-	*enabled, err = binary.Validate(s)
+	*enabled, err = binary.Validate(value)
 	if err != nil {
 		return nil, fmt.Errorf("environment variable %s: %w", key, err)
 	}
@@ -69,9 +69,9 @@ func (r *Reader) readHTTProxyEnabled() (enabled *bool, err error) {
 	return enabled, nil
 }
 
-func (r *Reader) readHTTProxyLog() (enabled *bool, err error) {
-	key, s := r.getEnvWithRetro("HTTPPROXY_LOG", "PROXY_LOG_LEVEL", "TINYPROXY_LOG")
-	if s == "" {
+func (s *Source) readHTTProxyLog() (enabled *bool, err error) {
+	key, value := s.getEnvWithRetro("HTTPPROXY_LOG", "PROXY_LOG_LEVEL", "TINYPROXY_LOG")
+	if value == "" {
 		return nil, nil //nolint:nilnil
 	}
 
@@ -82,7 +82,7 @@ func (r *Reader) readHTTProxyLog() (enabled *bool, err error) {
 	}
 
 	enabled = new(bool)
-	*enabled, err = binary.Validate(s, binaryOptions...)
+	*enabled, err = binary.Validate(value, binaryOptions...)
 	if err != nil {
 		return nil, fmt.Errorf("environment variable %s: %w", key, err)
 	}

internal/configuration/sources/env/log.go

@@ -3,7 +3,6 @@ package env
 import (
 	"errors"
 	"fmt"
-	"os"
 	"strings"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings"
@@ -20,7 +19,7 @@ func readLog() (log settings.Log, err error) {
 }
 
 func readLogLevel() (level *log.Level, err error) {
-	s := os.Getenv("LOG_LEVEL")
+	s := getCleanedEnv("LOG_LEVEL")
 	if s == "" {
 		return nil, nil //nolint:nilnil
 	}

internal/configuration/sources/env/openvpn.go

@@ -2,60 +2,51 @@ package env
 
 import (
 	"fmt"
-	"os"
 	"strings"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 	"github.com/qdm12/govalid/binary"
 )
 
-func (r *Reader) readOpenVPN() (
+func (s *Source) readOpenVPN() (
 	openVPN settings.OpenVPN, err error) {
 	defer func() {
-		err = unsetEnvKeys([]string{"OPENVPN_CLIENTKEY", "OPENVPN_CLIENTCRT"}, err)
+		err = unsetEnvKeys([]string{"OPENVPN_KEY", "OPENVPN_CERT",
+			"OPENVPN_KEY_PASSPHRASE", "OPENVPN_ENCRYPTED_KEY"}, err)
 	}()
 
-	openVPN.Version = os.Getenv("OPENVPN_VERSION")
-	openVPN.User = r.readOpenVPNUser()
-	openVPN.Password = r.readOpenVPNPassword()
-	confFile := os.Getenv("OPENVPN_CUSTOM_CONFIG")
+	openVPN.Version = getCleanedEnv("OPENVPN_VERSION")
+	openVPN.User = s.readOpenVPNUser()
+	openVPN.Password = s.readOpenVPNPassword()
+	confFile := getCleanedEnv("OPENVPN_CUSTOM_CONFIG")
 	if confFile != "" {
 		openVPN.ConfFile = &confFile
 	}
 
-	ciphersKey, _ := r.getEnvWithRetro("OPENVPN_CIPHERS", "OPENVPN_CIPHER")
+	ciphersKey, _ := s.getEnvWithRetro("OPENVPN_CIPHERS", "OPENVPN_CIPHER")
 	openVPN.Ciphers = envToCSV(ciphersKey)
 
-	auth := os.Getenv("OPENVPN_AUTH")
+	auth := getCleanedEnv("OPENVPN_AUTH")
 	if auth != "" {
 		openVPN.Auth = &auth
 	}
 
-	openVPN.ClientCrt, err = readBase64OrNil("OPENVPN_CLIENTCRT")
-	if err != nil {
-		return openVPN, fmt.Errorf("environment variable OPENVPN_CLIENTCRT: %w", err)
-	}
+	openVPN.Cert = envToStringPtr("OPENVPN_CERT")
+	openVPN.Key = envToStringPtr("OPENVPN_KEY")
+	openVPN.EncryptedKey = envToStringPtr("OPENVPN_ENCRYPTED_KEY")
 
-	openVPN.ClientKey, err = readBase64OrNil("OPENVPN_CLIENTKEY")
-	if err != nil {
-		return openVPN, fmt.Errorf("environment variable OPENVPN_CLIENTKEY: %w", err)
-	}
+	openVPN.KeyPassphrase = s.readOpenVPNKeyPassphrase()
 
-	openVPN.PIAEncPreset = r.readPIAEncryptionPreset()
-
-	openVPN.IPv6, err = envToBoolPtr("OPENVPN_IPV6")
-	if err != nil {
-		return openVPN, fmt.Errorf("environment variable OPENVPN_IPV6: %w", err)
-	}
+	openVPN.PIAEncPreset = s.readPIAEncryptionPreset()
 
 	openVPN.MSSFix, err = envToUint16Ptr("OPENVPN_MSSFIX")
 	if err != nil {
 		return openVPN, fmt.Errorf("environment variable OPENVPN_MSSFIX: %w", err)
 	}
 
-	_, openVPN.Interface = r.getEnvWithRetro("VPN_INTERFACE", "OPENVPN_INTERFACE")
+	_, openVPN.Interface = s.getEnvWithRetro("VPN_INTERFACE", "OPENVPN_INTERFACE")
 
-	openVPN.ProcessUser, err = r.readOpenVPNProcessUser()
+	openVPN.ProcessUser, err = s.readOpenVPNProcessUser()
 	if err != nil {
 		return openVPN, err
 	}
@@ -65,7 +56,7 @@ func (r *Reader) readOpenVPN() (
 		return openVPN, fmt.Errorf("environment variable OPENVPN_VERBOSITY: %w", err)
 	}
 
-	flagsStr := os.Getenv("OPENVPN_FLAGS")
+	flagsStr := getCleanedEnv("OPENVPN_FLAGS")
 	if flagsStr != "" {
 		openVPN.Flags = strings.Fields(flagsStr)
 	}
@@ -73,33 +64,39 @@ func (r *Reader) readOpenVPN() (
 	return openVPN, nil
 }
 
-func (r *Reader) readOpenVPNUser() (user string) {
-	_, user = r.getEnvWithRetro("OPENVPN_USER", "USER")
+func (s *Source) readOpenVPNUser() (user *string) {
+	user = new(string)
+	_, *user = s.getEnvWithRetro("OPENVPN_USER", "USER")
+	if *user == "" {
+		return nil
+	}
+
 	// Remove spaces in user ID to simplify user's life, thanks @JeordyR
-	return strings.ReplaceAll(user, " ", "")
+	*user = strings.ReplaceAll(*user, " ", "")
+	return user
 }
 
-func (r *Reader) readOpenVPNPassword() (password string) {
-	_, password = r.getEnvWithRetro("OPENVPN_PASSWORD", "PASSWORD")
+func (s *Source) readOpenVPNPassword() (password *string) {
+	password = new(string)
+	_, *password = s.getEnvWithRetro("OPENVPN_PASSWORD", "PASSWORD")
+	if *password == "" {
+		return nil
+	}
+
 	return password
 }
 
-func readBase64OrNil(envKey string) (valueOrNil *string, err error) {
-	value := os.Getenv(envKey)
-	if value == "" {
-		return nil, nil //nolint:nilnil
+func (s *Source) readOpenVPNKeyPassphrase() (passphrase *string) {
+	passphrase = new(string)
+	*passphrase = getCleanedEnv("OPENVPN_KEY_PASSPHRASE")
+	if *passphrase == "" {
+		return nil
 	}
-
-	decoded, err := decodeBase64(value)
-	if err != nil {
-		return nil, err
-	}
-
-	return &decoded, nil
+	return passphrase
 }
 
-func (r *Reader) readPIAEncryptionPreset() (presetPtr *string) {
-	_, preset := r.getEnvWithRetro(
+func (s *Source) readPIAEncryptionPreset() (presetPtr *string) {
+	_, preset := s.getEnvWithRetro(
 		"PRIVATE_INTERNET_ACCESS_OPENVPN_ENCRYPTION_PRESET",
 		"PIA_ENCRYPTION", "ENCRYPTION")
 	if preset != "" {
@@ -108,8 +105,8 @@ func (r *Reader) readPIAEncryptionPreset() (presetPtr *string) {
 	return nil
 }
 
-func (r *Reader) readOpenVPNProcessUser() (processUser string, err error) {
-	key, value := r.getEnvWithRetro("OPENVPN_PROCESS_USER", "OPENVPN_ROOT")
+func (s *Source) readOpenVPNProcessUser() (processUser string, err error) {
+	key, value := s.getEnvWithRetro("OPENVPN_PROCESS_USER", "OPENVPN_ROOT")
 	if key == "OPENVPN_PROCESS_USER" {
 		return value, nil
 	}

internal/configuration/sources/env/openvpnselection.go

@@ -3,7 +3,6 @@ package env
 import (
 	"errors"
 	"fmt"
-	"os"
 	"strings"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings"
@@ -11,32 +10,32 @@ import (
 	"github.com/qdm12/govalid/port"
 )
 
-func (r *Reader) readOpenVPNSelection() (
+func (s *Source) readOpenVPNSelection() (
 	selection settings.OpenVPNSelection, err error) {
-	confFile := os.Getenv("OPENVPN_CUSTOM_CONFIG")
+	confFile := getCleanedEnv("OPENVPN_CUSTOM_CONFIG")
 	if confFile != "" {
 		selection.ConfFile = &confFile
 	}
 
-	selection.TCP, err = r.readOpenVPNProtocol()
+	selection.TCP, err = s.readOpenVPNProtocol()
 	if err != nil {
 		return selection, err
 	}
 
-	selection.CustomPort, err = r.readOpenVPNCustomPort()
+	selection.CustomPort, err = s.readOpenVPNCustomPort()
 	if err != nil {
 		return selection, err
 	}
 
-	selection.PIAEncPreset = r.readPIAEncryptionPreset()
+	selection.PIAEncPreset = s.readPIAEncryptionPreset()
 
 	return selection, nil
 }
 
 var ErrOpenVPNProtocolNotValid = errors.New("OpenVPN protocol is not valid")
 
-func (r *Reader) readOpenVPNProtocol() (tcp *bool, err error) {
-	envKey, protocol := r.getEnvWithRetro("OPENVPN_PROTOCOL", "PROTOCOL")
+func (s *Source) readOpenVPNProtocol() (tcp *bool, err error) {
+	envKey, protocol := s.getEnvWithRetro("OPENVPN_PROTOCOL", "PROTOCOL")
 
 	switch strings.ToLower(protocol) {
 	case "":
@@ -51,14 +50,14 @@ func (r *Reader) readOpenVPNProtocol() (tcp *bool, err error) {
 	}
 }
 
-func (r *Reader) readOpenVPNCustomPort() (customPort *uint16, err error) {
-	key, s := r.getEnvWithRetro("VPN_ENDPOINT_PORT", "PORT", "OPENVPN_PORT")
-	if s == "" {
+func (s *Source) readOpenVPNCustomPort() (customPort *uint16, err error) {
+	key, value := s.getEnvWithRetro("VPN_ENDPOINT_PORT", "PORT", "OPENVPN_PORT")
+	if value == "" {
 		return nil, nil //nolint:nilnil
 	}
 
 	customPort = new(uint16)
-	*customPort, err = port.Validate(s)
+	*customPort, err = port.Validate(value)
 	if err != nil {
 		return nil, fmt.Errorf("environment variable %s: %w", key, err)
 	}

internal/configuration/sources/env/portforward.go

@@ -6,9 +6,10 @@ import (
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 )
 
-func (r *Reader) readPortForward() (
+func (s *Source) readPortForward() (
 	portForwarding settings.PortForwarding, err error) {
-	key, _ := r.getEnvWithRetro(
+	key, _ := s.getEnvWithRetro(
+		"VPN_PORT_FORWARDING",
 		"PRIVATE_INTERNET_ACCESS_VPN_PORT_FORWARDING",
 		"PORT_FORWARDING")
 	portForwarding.Enabled, err = envToBoolPtr(key)
@@ -16,7 +17,8 @@ func (r *Reader) readPortForward() (
 		return portForwarding, fmt.Errorf("environment variable %s: %w", key, err)
 	}
 
-	_, value := r.getEnvWithRetro(
+	_, value := s.getEnvWithRetro(
+		"VPN_PORT_FORWARDING_STATUS_FILE",
 		"PRIVATE_INTERNET_ACCESS_VPN_PORT_FORWARDING_STATUS_FILE",
 		"PORT_FORWARDING_STATUS_FILE")
 	if value != "" {

internal/configuration/sources/env/pprof.go

@@ -2,7 +2,6 @@ package env
 
 import (
 	"fmt"
-	"os"
 
 	"github.com/qdm12/gluetun/internal/pprof"
 )
@@ -13,17 +12,17 @@ func readPprof() (settings pprof.Settings, err error) {
 		return settings, fmt.Errorf("environment variable PPROF_ENABLED: %w", err)
 	}
 
-	settings.BlockProfileRate, err = envToInt("PPROF_BLOCK_PROFILE_RATE")
+	settings.BlockProfileRate, err = envToIntPtr("PPROF_BLOCK_PROFILE_RATE")
 	if err != nil {
 		return settings, fmt.Errorf("environment variable PPROF_BLOCK_PROFILE_RATE: %w", err)
 	}
 
-	settings.MutexProfileRate, err = envToInt("PPROF_MUTEX_PROFILE_RATE")
+	settings.MutexProfileRate, err = envToIntPtr("PPROF_MUTEX_PROFILE_RATE")
 	if err != nil {
 		return settings, fmt.Errorf("environment variable PPROF_MUTEX_PROFILE_RATE: %w", err)
 	}
 
-	settings.HTTPServer.Address = os.Getenv("PPROF_HTTP_SERVER_ADDRESS")
+	settings.HTTPServer.Address = getCleanedEnv("PPROF_HTTP_SERVER_ADDRESS")
 
 	return settings, nil
 }

internal/configuration/sources/env/provider.go

@@ -2,7 +2,6 @@ package env
 
 import (
 	"fmt"
-	"os"
 	"strings"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings"
@@ -10,19 +9,19 @@ import (
 	"github.com/qdm12/gluetun/internal/constants/vpn"
 )
 
-func (r *Reader) readProvider(vpnType string) (provider settings.Provider, err error) {
-	provider.Name = r.readVPNServiceProvider(vpnType)
+func (s *Source) readProvider(vpnType string) (provider settings.Provider, err error) {
+	provider.Name = s.readVPNServiceProvider(vpnType)
 	var providerName string
 	if provider.Name != nil {
 		providerName = *provider.Name
 	}
 
-	provider.ServerSelection, err = r.readServerSelection(providerName, vpnType)
+	provider.ServerSelection, err = s.readServerSelection(providerName, vpnType)
 	if err != nil {
 		return provider, fmt.Errorf("server selection: %w", err)
 	}
 
-	provider.PortForwarding, err = r.readPortForward()
+	provider.PortForwarding, err = s.readPortForward()
 	if err != nil {
 		return provider, fmt.Errorf("port forwarding: %w", err)
 	}
@@ -30,17 +29,20 @@ func (r *Reader) readProvider(vpnType string) (provider settings.Provider, err e
 	return provider, nil
 }
 
-func (r *Reader) readVPNServiceProvider(vpnType string) (vpnProviderPtr *string) {
-	_, s := r.getEnvWithRetro("VPN_SERVICE_PROVIDER", "VPNSP")
-	s = strings.ToLower(s)
-	switch {
-	case vpnType != vpn.Wireguard &&
-		os.Getenv("OPENVPN_CUSTOM_CONFIG") != "": // retro compatibility
-		return stringPtr(providers.Custom)
-	case s == "":
+func (s *Source) readVPNServiceProvider(vpnType string) (vpnProviderPtr *string) {
+	_, value := s.getEnvWithRetro("VPN_SERVICE_PROVIDER", "VPNSP")
+	if value == "" {
+		if vpnType != vpn.Wireguard && getCleanedEnv("OPENVPN_CUSTOM_CONFIG") != "" {
+			// retro compatibility
+			return stringPtr(providers.Custom)
+		}
 		return nil
-	case s == "pia": // retro compatibility
+	}
+
+	value = strings.ToLower(value)
+	if value == "pia" { // retro compatibility
 		return stringPtr(providers.PrivateInternetAccess)
 	}
-	return stringPtr(s)
+
+	return stringPtr(value)
 }

internal/configuration/sources/env/publicip.go

@@ -2,25 +2,24 @@ package env
 
 import (
 	"fmt"
-	"os"
 	"time"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 )
 
-func (r *Reader) readPublicIP() (publicIP settings.PublicIP, err error) {
+func (s *Source) readPublicIP() (publicIP settings.PublicIP, err error) {
 	publicIP.Period, err = readPublicIPPeriod()
 	if err != nil {
 		return publicIP, err
 	}
 
-	publicIP.IPFilepath = r.readPublicIPFilepath()
+	publicIP.IPFilepath = s.readPublicIPFilepath()
 
 	return publicIP, nil
 }
 
 func readPublicIPPeriod() (period *time.Duration, err error) {
-	s := os.Getenv("PUBLICIP_PERIOD")
+	s := getCleanedEnv("PUBLICIP_PERIOD")
 	if s == "" {
 		return nil, nil //nolint:nilnil
 	}
@@ -34,10 +33,10 @@ func readPublicIPPeriod() (period *time.Duration, err error) {
 	return period, nil
 }
 
-func (r *Reader) readPublicIPFilepath() (filepath *string) {
-	_, s := r.getEnvWithRetro("PUBLICIP_FILE", "IP_STATUS_FILE")
-	if s != "" {
-		return &s
+func (s *Source) readPublicIPFilepath() (filepath *string) {
+	_, value := s.getEnvWithRetro("PUBLICIP_FILE", "IP_STATUS_FILE")
+	if value != "" {
+		return &value
 	}
 	return nil
 }

internal/configuration/sources/env/reader.go

@@ -1,15 +1,10 @@
 package env
 
 import (
-	"os"
-
 	"github.com/qdm12/gluetun/internal/configuration/settings"
-	"github.com/qdm12/gluetun/internal/configuration/sources"
 )
 
-var _ sources.Source = (*Reader)(nil)
-
-type Reader struct {
+type Source struct {
 	warner Warner
 }
 
@@ -17,36 +12,36 @@ type Warner interface {
 	Warn(s string)
 }
 
-func New(warner Warner) *Reader {
-	return &Reader{
+func New(warner Warner) *Source {
+	return &Source{
 		warner: warner,
 	}
 }
 
-func (r *Reader) String() string { return "environment variables" }
+func (s *Source) String() string { return "environment variables" }
 
-func (r *Reader) Read() (settings settings.Settings, err error) {
-	settings.VPN, err = r.readVPN()
+func (s *Source) Read() (settings settings.Settings, err error) {
+	settings.VPN, err = s.readVPN()
 	if err != nil {
 		return settings, err
 	}
 
-	settings.Firewall, err = r.readFirewall()
+	settings.Firewall, err = s.readFirewall()
 	if err != nil {
 		return settings, err
 	}
 
-	settings.System, err = r.readSystem()
+	settings.System, err = s.readSystem()
 	if err != nil {
 		return settings, err
 	}
 
-	settings.Health, err = r.ReadHealth()
+	settings.Health, err = s.ReadHealth()
 	if err != nil {
 		return settings, err
 	}
 
-	settings.HTTPProxy, err = r.readHTTPProxy()
+	settings.HTTPProxy, err = s.readHTTPProxy()
 	if err != nil {
 		return settings, err
 	}
@@ -56,7 +51,7 @@ func (r *Reader) Read() (settings settings.Settings, err error) {
 		return settings, err
 	}
 
-	settings.PublicIP, err = r.readPublicIP()
+	settings.PublicIP, err = s.readPublicIP()
 	if err != nil {
 		return settings, err
 	}
@@ -71,17 +66,17 @@ func (r *Reader) Read() (settings settings.Settings, err error) {
 		return settings, err
 	}
 
-	settings.Shadowsocks, err = r.readShadowsocks()
+	settings.Shadowsocks, err = s.readShadowsocks()
 	if err != nil {
 		return settings, err
 	}
 
-	settings.DNS, err = r.readDNS()
+	settings.DNS, err = s.readDNS()
 	if err != nil {
 		return settings, err
 	}
 
-	settings.ControlServer, err = r.readControlServer()
+	settings.ControlServer, err = s.readControlServer()
 	if err != nil {
 		return settings, err
 	}
@@ -94,8 +89,8 @@ func (r *Reader) Read() (settings settings.Settings, err error) {
 	return settings, nil
 }
 
-func (r *Reader) onRetroActive(oldKey, newKey string) {
-	r.warner.Warn(
+func (s *Source) onRetroActive(oldKey, newKey string) {
+	s.warner.Warn(
 		"You are using the old environment variable " + oldKey +
 			", please consider changing it to " + newKey)
 }
@@ -106,17 +101,17 @@ func (r *Reader) onRetroActive(oldKey, newKey string) {
 // and end on returning the value corresponding to the currentKey.
 // Note retroKeys should be in order from oldest to most
 // recent retro-compatibility key.
-func (r *Reader) getEnvWithRetro(currentKey string,
+func (s *Source) getEnvWithRetro(currentKey string,
 	retroKeys ...string) (key, value string) {
 	// We check retro-compatibility keys first since
 	// the current key might be set in the Dockerfile.
 	for _, key = range retroKeys {
-		value = os.Getenv(key)
+		value = getCleanedEnv(key)
 		if value != "" {
-			r.onRetroActive(key, currentKey)
+			s.onRetroActive(key, currentKey)
 			return key, value
 		}
 	}
 
-	return currentKey, os.Getenv(currentKey)
+	return currentKey, getCleanedEnv(currentKey)
 }

internal/configuration/sources/env/server.go

@@ -2,25 +2,24 @@ package env
 
 import (
 	"fmt"
-	"os"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 	"github.com/qdm12/govalid/binary"
 )
 
-func (r *Reader) readControlServer() (controlServer settings.ControlServer, err error) {
+func (s *Source) readControlServer() (controlServer settings.ControlServer, err error) {
 	controlServer.Log, err = readControlServerLog()
 	if err != nil {
 		return controlServer, err
 	}
 
-	controlServer.Address = r.readControlServerAddress()
+	controlServer.Address = s.readControlServerAddress()
 
 	return controlServer, nil
 }
 
 func readControlServerLog() (enabled *bool, err error) {
-	s := os.Getenv("HTTP_CONTROL_SERVER_LOG")
+	s := getCleanedEnv("HTTP_CONTROL_SERVER_LOG")
 	if s == "" {
 		return nil, nil //nolint:nilnil
 	}
@@ -33,17 +32,17 @@ func readControlServerLog() (enabled *bool, err error) {
 	return &log, nil
 }
 
-func (r *Reader) readControlServerAddress() (address *string) {
-	key, s := r.getEnvWithRetro("HTTP_CONTROL_SERVER_ADDRESS", "HTTP_CONTROL_SERVER_PORT")
-	if s == "" {
+func (s *Source) readControlServerAddress() (address *string) {
+	key, value := s.getEnvWithRetro("HTTP_CONTROL_SERVER_ADDRESS", "HTTP_CONTROL_SERVER_PORT")
+	if value == "" {
 		return nil
 	}
 
 	if key == "HTTP_CONTROL_SERVER_ADDRESS" {
-		return &s
+		return &value
 	}
 
 	address = new(string)
-	*address = ":" + s
+	*address = ":" + value
 	return address
 }

internal/configuration/sources/env/serverselection.go

@@ -3,8 +3,7 @@ package env
 import (
 	"errors"
 	"fmt"
-	"net"
-	"os"
+	"net/netip"
 	"strconv"
 	"strings"
 
@@ -16,44 +15,45 @@ var (
 	ErrServerNumberNotValid = errors.New("server number is not valid")
 )
 
-func (r *Reader) readServerSelection(vpnProvider, vpnType string) (
+func (s *Source) readServerSelection(vpnProvider, vpnType string) (
 	ss settings.ServerSelection, err error) {
 	ss.VPN = vpnType
 
-	ss.TargetIP, err = r.readOpenVPNTargetIP()
+	ss.TargetIP, err = s.readOpenVPNTargetIP()
 	if err != nil {
 		return ss, err
 	}
 
-	countriesKey, _ := r.getEnvWithRetro("SERVER_COUNTRIES", "COUNTRY")
+	countriesKey, _ := s.getEnvWithRetro("SERVER_COUNTRIES", "COUNTRY")
 	ss.Countries = envToCSV(countriesKey)
 	if vpnProvider == providers.Cyberghost && len(ss.Countries) == 0 {
 		// Retro-compatibility for Cyberghost using the REGION variable
 		ss.Countries = envToCSV("REGION")
 		if len(ss.Countries) > 0 {
-			r.onRetroActive("REGION", "SERVER_COUNTRIES")
+			s.onRetroActive("REGION", "SERVER_COUNTRIES")
 		}
 	}
 
-	regionsKey, _ := r.getEnvWithRetro("SERVER_REGIONS", "REGION")
+	regionsKey, _ := s.getEnvWithRetro("SERVER_REGIONS", "REGION")
 	ss.Regions = envToCSV(regionsKey)
 
-	citiesKey, _ := r.getEnvWithRetro("SERVER_CITIES", "CITY")
+	citiesKey, _ := s.getEnvWithRetro("SERVER_CITIES", "CITY")
 	ss.Cities = envToCSV(citiesKey)
 
 	ss.ISPs = envToCSV("ISP")
 
-	hostnamesKey, _ := r.getEnvWithRetro("SERVER_HOSTNAMES", "SERVER_HOSTNAME")
+	hostnamesKey, _ := s.getEnvWithRetro("SERVER_HOSTNAMES", "SERVER_HOSTNAME")
 	ss.Hostnames = envToCSV(hostnamesKey)
 
-	serverNamesKey, _ := r.getEnvWithRetro("SERVER_NAMES", "SERVER_NAME")
+	serverNamesKey, _ := s.getEnvWithRetro("SERVER_NAMES", "SERVER_NAME")
 	ss.Names = envToCSV(serverNamesKey)
 
-	if csv := os.Getenv("SERVER_NUMBER"); csv != "" {
+	if csv := getCleanedEnv("SERVER_NUMBER"); csv != "" {
 		numbersStrings := strings.Split(csv, ",")
 		numbers := make([]uint16, len(numbersStrings))
 		for i, numberString := range numbersStrings {
-			number, err := strconv.Atoi(numberString)
+			const base, bitSize = 10, 16
+			number, err := strconv.ParseInt(numberString, base, bitSize)
 			if err != nil {
 				return ss, fmt.Errorf("%w: %s",
 					ErrServerNumberNotValid, numberString)
@@ -67,7 +67,7 @@ func (r *Reader) readServerSelection(vpnProvider, vpnType string) (
 	}
 
 	// Mullvad only
-	ss.OwnedOnly, err = r.readOwnedOnly()
+	ss.OwnedOnly, err = s.readOwnedOnly()
 	if err != nil {
 		return ss, err
 	}
@@ -78,6 +78,12 @@ func (r *Reader) readServerSelection(vpnProvider, vpnType string) (
 		return ss, fmt.Errorf("environment variable FREE_ONLY: %w", err)
 	}
 
+	// VPNSecure only
+	ss.PremiumOnly, err = envToBoolPtr("PREMIUM_ONLY")
+	if err != nil {
+		return ss, fmt.Errorf("environment variable PREMIUM_ONLY: %w", err)
+	}
+
 	// VPNUnlimited only
 	ss.MultiHopOnly, err = envToBoolPtr("MULTIHOP_ONLY")
 	if err != nil {
@@ -90,12 +96,12 @@ func (r *Reader) readServerSelection(vpnProvider, vpnType string) (
 		return ss, fmt.Errorf("environment variable STREAM_ONLY: %w", err)
 	}
 
-	ss.OpenVPN, err = r.readOpenVPNSelection()
+	ss.OpenVPN, err = s.readOpenVPNSelection()
 	if err != nil {
 		return ss, err
 	}
 
-	ss.Wireguard, err = r.readWireguardSelection()
+	ss.Wireguard, err = s.readWireguardSelection()
 	if err != nil {
 		return ss, err
 	}
@@ -107,23 +113,22 @@ var (
 	ErrInvalidIP = errors.New("invalid IP address")
 )
 
-func (r *Reader) readOpenVPNTargetIP() (ip net.IP, err error) {
-	envKey, s := r.getEnvWithRetro("VPN_ENDPOINT_IP", "OPENVPN_TARGET_IP")
-	if s == "" {
-		return nil, nil
+func (s *Source) readOpenVPNTargetIP() (ip netip.Addr, err error) {
+	envKey, value := s.getEnvWithRetro("VPN_ENDPOINT_IP", "OPENVPN_TARGET_IP")
+	if value == "" {
+		return ip, nil
 	}
 
-	ip = net.ParseIP(s)
-	if ip == nil {
-		return nil, fmt.Errorf("environment variable %s: %w: %s",
-			envKey, ErrInvalidIP, s)
+	ip, err = netip.ParseAddr(value)
+	if err != nil {
+		return ip, fmt.Errorf("environment variable %s: %w", envKey, err)
 	}
 
 	return ip, nil
 }
 
-func (r *Reader) readOwnedOnly() (ownedOnly *bool, err error) {
-	envKey, _ := r.getEnvWithRetro("OWNED_ONLY", "OWNED")
+func (s *Source) readOwnedOnly() (ownedOnly *bool, err error) {
+	envKey, _ := s.getEnvWithRetro("OWNED_ONLY", "OWNED")
 	ownedOnly, err = envToBoolPtr(envKey)
 	if err != nil {
 		return nil, fmt.Errorf("environment variable %s: %w", envKey, err)

internal/configuration/sources/env/shadowsocks.go

@@ -7,25 +7,25 @@ import (
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 )
 
-func (r *Reader) readShadowsocks() (shadowsocks settings.Shadowsocks, err error) {
+func (s *Source) readShadowsocks() (shadowsocks settings.Shadowsocks, err error) {
 	shadowsocks.Enabled, err = envToBoolPtr("SHADOWSOCKS")
 	if err != nil {
 		return shadowsocks, fmt.Errorf("environment variable SHADOWSOCKS: %w", err)
 	}
 
-	shadowsocks.Address = r.readShadowsocksAddress()
+	shadowsocks.Address = s.readShadowsocksAddress()
 	shadowsocks.LogAddresses, err = envToBoolPtr("SHADOWSOCKS_LOG")
 	if err != nil {
 		return shadowsocks, fmt.Errorf("environment variable SHADOWSOCKS_LOG: %w", err)
 	}
-	shadowsocks.CipherName = r.readShadowsocksCipher()
+	shadowsocks.CipherName = s.readShadowsocksCipher()
 	shadowsocks.Password = envToStringPtr("SHADOWSOCKS_PASSWORD")
 
 	return shadowsocks, nil
 }
 
-func (r *Reader) readShadowsocksAddress() (address string) {
-	key, value := r.getEnvWithRetro("SHADOWSOCKS_LISTENING_ADDRESS", "SHADOWSOCKS_PORT")
+func (s *Source) readShadowsocksAddress() (address string) {
+	key, value := s.getEnvWithRetro("SHADOWSOCKS_LISTENING_ADDRESS", "SHADOWSOCKS_PORT")
 	if value == "" {
 		return ""
 	}
@@ -38,7 +38,7 @@ func (r *Reader) readShadowsocksAddress() (address string) {
 	return ":" + value
 }
 
-func (r *Reader) readShadowsocksCipher() (cipher string) {
-	_, cipher = r.getEnvWithRetro("SHADOWSOCKS_CIPHER", "SHADOWSOCKS_METHOD")
+func (s *Source) readShadowsocksCipher() (cipher string) {
+	_, cipher = s.getEnvWithRetro("SHADOWSOCKS_CIPHER", "SHADOWSOCKS_METHOD")
 	return strings.ToLower(cipher)
 }

internal/configuration/sources/env/system.go

@@ -3,7 +3,6 @@ package env
 import (
 	"errors"
 	"fmt"
-	"os"
 	"strconv"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings"
@@ -15,27 +14,27 @@ var (
 	ErrSystemTimezoneNotValid = errors.New("timezone is not valid")
 )
 
-func (r *Reader) readSystem() (system settings.System, err error) {
-	system.PUID, err = r.readID("PUID", "UID")
+func (s *Source) readSystem() (system settings.System, err error) {
+	system.PUID, err = s.readID("PUID", "UID")
 	if err != nil {
 		return system, err
 	}
 
-	system.PGID, err = r.readID("PGID", "GID")
+	system.PGID, err = s.readID("PGID", "GID")
 	if err != nil {
 		return system, err
 	}
 
-	system.Timezone = os.Getenv("TZ")
+	system.Timezone = getCleanedEnv("TZ")
 
 	return system, nil
 }
 
 var ErrSystemIDNotValid = errors.New("system ID is not valid")
 
-func (r *Reader) readID(key, retroKey string) (
+func (s *Source) readID(key, retroKey string) (
 	id *uint32, err error) {
-	idEnvKey, idString := r.getEnvWithRetro(key, retroKey)
+	idEnvKey, idString := s.getEnvWithRetro(key, retroKey)
 	if idString == "" {
 		return nil, nil //nolint:nilnil
 	}

internal/configuration/sources/env/system_test.go

@@ -74,8 +74,8 @@ func Test_Reader_readID(t *testing.T) {
 			setTestEnv(t, key, testCase.keyValue)
 			setTestEnv(t, retroKey, testCase.retroValue)
 
-			reader := &Reader{}
-			id, err := reader.readID(key, retroKey)
+			source := &Source{}
+			id, err := source.readID(key, retroKey)
 
 			assert.ErrorIs(t, err, testCase.errWrapped)
 			if err != nil {

internal/configuration/sources/env/updater.go

@@ -2,8 +2,6 @@ package env
 
 import (
 	"fmt"
-	"net"
-	"os"
 	"time"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings"
@@ -20,13 +18,18 @@ func readUpdater() (updater settings.Updater, err error) {
 		return updater, err
 	}
 
+	updater.MinRatio, err = envToFloat64("UPDATER_MIN_RATIO")
+	if err != nil {
+		return updater, fmt.Errorf("environment variable UPDATER_MIN_RATIO: %w", err)
+	}
+
 	updater.Providers = envToCSV("UPDATER_VPN_SERVICE_PROVIDERS")
 
 	return updater, nil
 }
 
 func readUpdaterPeriod() (period *time.Duration, err error) {
-	s := os.Getenv("UPDATER_PERIOD")
+	s := getCleanedEnv("UPDATER_PERIOD")
 	if s == "" {
 		return nil, nil //nolint:nilnil
 	}
@@ -38,11 +41,11 @@ func readUpdaterPeriod() (period *time.Duration, err error) {
 	return period, nil
 }
 
-func readUpdaterDNSAddress() (ip net.IP, err error) {
+func readUpdaterDNSAddress() (address string, err error) {
 	// TODO this is currently using Cloudflare in
 	// plaintext to not be blocked by DNS over TLS by default.
 	// If a plaintext address is set in the DNS settings, this one will be used.
 	// use custom future encrypted DNS written in Go without blocking
 	// as it's too much trouble to start another parallel unbound instance for now.
-	return nil, nil
+	return "", nil
 }

internal/configuration/sources/env/version.go

@@ -2,7 +2,6 @@ package env
 
 import (
 	"fmt"
-	"os"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 	"github.com/qdm12/govalid/binary"
@@ -18,7 +17,7 @@ func readVersion() (version settings.Version, err error) {
 }
 
 func readVersionEnabled() (enabled *bool, err error) {
-	s := os.Getenv("VERSION_INFORMATION")
+	s := getCleanedEnv("VERSION_INFORMATION")
 	if s == "" {
 		return nil, nil //nolint:nilnil
 	}

internal/configuration/sources/env/vpn.go

@@ -2,26 +2,25 @@ package env
 
 import (
 	"fmt"
-	"os"
 	"strings"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 )
 
-func (r *Reader) readVPN() (vpn settings.VPN, err error) {
-	vpn.Type = strings.ToLower(os.Getenv("VPN_TYPE"))
+func (s *Source) readVPN() (vpn settings.VPN, err error) {
+	vpn.Type = strings.ToLower(getCleanedEnv("VPN_TYPE"))
 
-	vpn.Provider, err = r.readProvider(vpn.Type)
+	vpn.Provider, err = s.readProvider(vpn.Type)
 	if err != nil {
 		return vpn, fmt.Errorf("VPN provider: %w", err)
 	}
 
-	vpn.OpenVPN, err = r.readOpenVPN()
+	vpn.OpenVPN, err = s.readOpenVPN()
 	if err != nil {
 		return vpn, fmt.Errorf("OpenVPN: %w", err)
 	}
 
-	vpn.Wireguard, err = r.readWireguard()
+	vpn.Wireguard, err = s.readWireguard()
 	if err != nil {
 		return vpn, fmt.Errorf("wireguard: %w", err)
 	}

internal/configuration/sources/env/wireguard.go

@@ -2,41 +2,42 @@ package env
 
 import (
 	"fmt"
-	"net"
+	"net/netip"
+	"os"
 	"strings"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 )
 
-func (r *Reader) readWireguard() (wireguard settings.Wireguard, err error) {
+func (s *Source) readWireguard() (wireguard settings.Wireguard, err error) {
 	defer func() {
 		err = unsetEnvKeys([]string{"WIREGUARD_PRIVATE_KEY", "WIREGUARD_PRESHARED_KEY"}, err)
 	}()
 	wireguard.PrivateKey = envToStringPtr("WIREGUARD_PRIVATE_KEY")
 	wireguard.PreSharedKey = envToStringPtr("WIREGUARD_PRESHARED_KEY")
-	_, wireguard.Interface = r.getEnvWithRetro("VPN_INTERFACE", "WIREGUARD_INTERFACE")
-	wireguard.Addresses, err = r.readWireguardAddresses()
+	_, wireguard.Interface = s.getEnvWithRetro("VPN_INTERFACE", "WIREGUARD_INTERFACE")
+	wireguard.Implementation = os.Getenv("WIREGUARD_IMPLEMENTATION")
+	wireguard.Addresses, err = s.readWireguardAddresses()
 	if err != nil {
 		return wireguard, err // already wrapped
 	}
 	return wireguard, nil
 }
 
-func (r *Reader) readWireguardAddresses() (addresses []net.IPNet, err error) {
-	key, addressesCSV := r.getEnvWithRetro("WIREGUARD_ADDRESSES", "WIREGUARD_ADDRESS")
+func (s *Source) readWireguardAddresses() (addresses []netip.Prefix, err error) {
+	key, addressesCSV := s.getEnvWithRetro("WIREGUARD_ADDRESSES", "WIREGUARD_ADDRESS")
 	if addressesCSV == "" {
 		return nil, nil
 	}
 
 	addressStrings := strings.Split(addressesCSV, ",")
-	addresses = make([]net.IPNet, len(addressStrings))
+	addresses = make([]netip.Prefix, len(addressStrings))
 	for i, addressString := range addressStrings {
-		ip, ipNet, err := net.ParseCIDR(addressString)
+		addressString = strings.TrimSpace(addressString)
+		addresses[i], err = netip.ParsePrefix(addressString)
 		if err != nil {
 			return nil, fmt.Errorf("environment variable %s: %w", key, err)
 		}
-		ipNet.IP = ip
-		addresses[i] = *ipNet
 	}
 
 	return addresses, nil

internal/configuration/sources/env/wireguardselection.go

@@ -1,57 +1,52 @@
 package env
 
 import (
-	"errors"
 	"fmt"
-	"net"
-	"os"
+	"net/netip"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 	"github.com/qdm12/govalid/port"
 )
 
-func (r *Reader) readWireguardSelection() (
+func (s *Source) readWireguardSelection() (
 	selection settings.WireguardSelection, err error) {
-	selection.EndpointIP, err = r.readWireguardEndpointIP()
+	selection.EndpointIP, err = s.readWireguardEndpointIP()
 	if err != nil {
 		return selection, err
 	}
 
-	selection.EndpointPort, err = r.readWireguardCustomPort()
+	selection.EndpointPort, err = s.readWireguardCustomPort()
 	if err != nil {
 		return selection, err
 	}
 
-	selection.PublicKey = os.Getenv("WIREGUARD_PUBLIC_KEY")
+	selection.PublicKey = getCleanedEnv("WIREGUARD_PUBLIC_KEY")
 
 	return selection, nil
 }
 
-var ErrIPAddressParse = errors.New("cannot parse IP address")
-
-func (r *Reader) readWireguardEndpointIP() (endpointIP net.IP, err error) {
-	key, s := r.getEnvWithRetro("VPN_ENDPOINT_IP", "WIREGUARD_ENDPOINT_IP")
-	if s == "" {
-		return nil, nil
+func (s *Source) readWireguardEndpointIP() (endpointIP netip.Addr, err error) {
+	key, value := s.getEnvWithRetro("VPN_ENDPOINT_IP", "WIREGUARD_ENDPOINT_IP")
+	if value == "" {
+		return endpointIP, nil
 	}
 
-	endpointIP = net.ParseIP(s)
-	if endpointIP == nil {
-		return nil, fmt.Errorf("environment variable %s: %w: %s",
-			key, ErrIPAddressParse, s)
+	endpointIP, err = netip.ParseAddr(value)
+	if err != nil {
+		return endpointIP, fmt.Errorf("environment variable %s: %w", key, err)
 	}
 
 	return endpointIP, nil
 }
 
-func (r *Reader) readWireguardCustomPort() (customPort *uint16, err error) {
-	key, s := r.getEnvWithRetro("VPN_ENDPOINT_PORT", "WIREGUARD_ENDPOINT_PORT")
-	if s == "" {
+func (s *Source) readWireguardCustomPort() (customPort *uint16, err error) {
+	key, value := s.getEnvWithRetro("VPN_ENDPOINT_PORT", "WIREGUARD_ENDPOINT_PORT")
+	if value == "" {
 		return nil, nil //nolint:nilnil
 	}
 
 	customPort = new(uint16)
-	*customPort, err = port.Validate(s)
+	*customPort, err = port.Validate(value)
 	if err != nil {
 		return nil, fmt.Errorf("environment variable %s: %w", key, err)
 	}

internal/configuration/sources/files/health.go

@@ -2,4 +2,4 @@ package files
 
 import "github.com/qdm12/gluetun/internal/configuration/settings"
 
-func (r *Reader) ReadHealth() (settings settings.Health, err error) { return settings, nil }
+func (s *Source) ReadHealth() (settings settings.Health, err error) { return settings, nil }

internal/configuration/sources/files/helpers.go

@@ -1,9 +1,12 @@
 package files
 
 import (
+	"fmt"
 	"io"
 	"os"
 	"strings"
+
+	"github.com/qdm12/gluetun/internal/openvpn/extract"
 )
 
 // ReadFromFile reads the content of the file as a string.
@@ -32,3 +35,21 @@ func ReadFromFile(filepath string) (s *string, err error) {
 	content = strings.TrimSuffix(content, "\n")
 	return &content, nil
 }
+
+func readPEMFile(filepath string) (base64Ptr *string, err error) {
+	pemData, err := ReadFromFile(filepath)
+	if err != nil {
+		return nil, fmt.Errorf("reading file: %w", err)
+	}
+
+	if pemData == nil {
+		return nil, nil //nolint:nilnil
+	}
+
+	base64Data, err := extract.PEM([]byte(*pemData))
+	if err != nil {
+		return nil, fmt.Errorf("extracting base64 encoded data from PEM content: %w", err)
+	}
+
+	return &base64Data, nil
+}

internal/configuration/sources/files/openvpn.go

@@ -11,18 +11,23 @@ const (
 	OpenVPNClientKeyPath = "/gluetun/client.key"
 	// OpenVPNClientCertificatePath is the OpenVPN client certificate filepath.
 	OpenVPNClientCertificatePath = "/gluetun/client.crt"
+	openVPNEncryptedKey          = "/gluetun/openvpn_encrypted_key"
 )
 
-func (r *Reader) readOpenVPN() (settings settings.OpenVPN, err error) {
-	settings.ClientKey, err = ReadFromFile(OpenVPNClientKeyPath)
+func (s *Source) readOpenVPN() (settings settings.OpenVPN, err error) {
+	settings.Key, err = readPEMFile(OpenVPNClientKeyPath)
 	if err != nil {
 		return settings, fmt.Errorf("client key: %w", err)
 	}
 
-	settings.ClientCrt, err = ReadFromFile(OpenVPNClientCertificatePath)
+	settings.Cert, err = readPEMFile(OpenVPNClientCertificatePath)
 	if err != nil {
 		return settings, fmt.Errorf("client certificate: %w", err)
 	}
+	settings.EncryptedKey, err = readPEMFile(openVPNEncryptedKey)
+	if err != nil {
+		return settings, fmt.Errorf("reading encrypted key file: %w", err)
+	}
 
 	return settings, nil
 }

internal/configuration/sources/files/reader.go

@@ -2,26 +2,23 @@ package files
 
 import (
 	"github.com/qdm12/gluetun/internal/configuration/settings"
-	"github.com/qdm12/gluetun/internal/configuration/sources"
 )
 
-var _ sources.Source = (*Reader)(nil)
+type Source struct{}
 
-type Reader struct{}
-
-func New() *Reader {
-	return &Reader{}
+func New() *Source {
+	return &Source{}
 }
 
-func (r *Reader) String() string { return "files" }
+func (s *Source) String() string { return "files" }
 
-func (r *Reader) Read() (settings settings.Settings, err error) {
-	settings.VPN, err = r.readVPN()
+func (s *Source) Read() (settings settings.Settings, err error) {
+	settings.VPN, err = s.readVPN()
 	if err != nil {
 		return settings, err
 	}
 
-	settings.System, err = r.readSystem()
+	settings.System, err = s.readSystem()
 	if err != nil {
 		return settings, err
 	}

internal/configuration/sources/files/system.go

@@ -4,7 +4,7 @@ import (
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 )
 
-func (r *Reader) readSystem() (system settings.System, err error) {
+func (s *Source) readSystem() (system settings.System, err error) {
 	// TODO timezone from /etc/localtime
 	return system, nil
 }

internal/configuration/sources/files/vpn.go

@@ -6,8 +6,8 @@ import (
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 )
 
-func (r *Reader) readVPN() (vpn settings.VPN, err error) {
-	vpn.OpenVPN, err = r.readOpenVPN()
+func (s *Source) readVPN() (vpn settings.VPN, err error) {
+	vpn.OpenVPN, err = s.readOpenVPN()
 	if err != nil {
 		return vpn, fmt.Errorf("OpenVPN: %w", err)
 	}