mirror of
https://github.com/qdm12/gluetun.git
synced 2026-05-07 04:20:12 +02:00
Quentin McGaw
199ad77ec9
- Remove `DNS_SERVER` (aka DOT) option: the DNS server forwarder part is now always enabled (see below why) - Remove `DNS_KEEP_NAMESERVER`: the container will always use the built-in DNS server forwarder, because it can handle now local names with local resolvers (see #2970), it can use the `plain` upstream type (see https://github.com/qdm12/gluetun/commit/5ed6e8292278b54bb5081de0e8ccd0d63a275b3c) AND you can use `DNS_UPSTREAM_PLAIN_ADDRESSES` (see below) - Replace `DNS_ADDRESS` with `DNS_UPSTREAM_PLAIN_ADDRESSES`: - New CSV format with port, for example `ip1:port1,ip2:port2` - requires `DNS_UPSTREAM_TYPE=plain` to be set to use `DNS_UPSTREAM_PLAIN_ADDRESSES` (unless using retro `DNS_ADDRESS`) - retrocompatibility with `DNS_ADDRESS`. If set, force upstream type to plain and empty user-picked providers. 127.0.0.1 is now ignored since it's always set to this value internally. - Warning log on using private upstream resolvers updated - Warning log if using a private IP address for the plain DNS server which is not in your local subnets All in all, this greatly simplifies code and available options (less options for the same features is a win). It also allows you to specify multiple plain DNS resolvers on ports other than 53 if needed.
113 lines
3.3 KiB
Go
113 lines
3.3 KiB
Go
package settings
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func Test_Settings_String(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
withDefaults := func(s Settings) Settings {
|
|
s.SetDefaults()
|
|
return s
|
|
}
|
|
|
|
testCases := map[string]struct {
|
|
settings Settings
|
|
s string
|
|
}{
|
|
"default settings": {
|
|
settings: withDefaults(Settings{}),
|
|
s: `Settings summary:
|
|
├── VPN settings:
|
|
| ├── VPN provider settings:
|
|
| | ├── Name: private internet access
|
|
| | └── Server selection settings:
|
|
| | ├── VPN type: openvpn
|
|
| | └── OpenVPN server selection settings:
|
|
| | ├── Protocol: UDP
|
|
| | └── Private Internet Access encryption preset: strong
|
|
| ├── OpenVPN settings:
|
|
| | ├── OpenVPN version: 2.6
|
|
| | ├── User: [not set]
|
|
| | ├── Password: [not set]
|
|
| | ├── Private Internet Access encryption preset: strong
|
|
| | ├── Network interface: tun0
|
|
| | ├── Run OpenVPN as: root
|
|
| | └── Verbosity level: 1
|
|
| └── Path MTU discovery:
|
|
| ├── ICMP addresses:
|
|
| | ├── 1.1.1.1
|
|
| | └── 8.8.8.8
|
|
| └── TCP addresses:
|
|
| ├── 1.1.1.1:53
|
|
| ├── 8.8.8.8:53
|
|
| ├── 1.1.1.1:443
|
|
| ├── 8.8.8.8:443
|
|
| ├── [2606:4700:4700::1111]:53
|
|
| ├── [2001:4860:4860::8888]:53
|
|
| ├── [2606:4700:4700::1111]:443
|
|
| └── [2001:4860:4860::8888]:443
|
|
├── DNS settings:
|
|
| ├── Upstream resolver type: dot
|
|
| ├── Upstream resolvers:
|
|
| | └── Cloudflare
|
|
| ├── Caching: yes
|
|
| ├── IPv6: no
|
|
| ├── Update period: every 24h0m0s
|
|
| └── DNS filtering settings:
|
|
| ├── Block malicious: yes
|
|
| ├── Block ads: no
|
|
| └── Block surveillance: yes
|
|
├── Firewall settings:
|
|
| └── Enabled: yes
|
|
├── Log settings:
|
|
| └── Log level: INFO
|
|
├── Health settings:
|
|
| ├── Server listening address: 127.0.0.1:9999
|
|
| ├── Target addresses:
|
|
| | ├── cloudflare.com:443
|
|
| | └── github.com:443
|
|
| ├── Small health check type: ICMP echo request
|
|
| | └── ICMP target IPs:
|
|
| | ├── 1.1.1.1
|
|
| | └── 8.8.8.8
|
|
| └── Restart VPN on healthcheck failure: yes
|
|
├── Shadowsocks server settings:
|
|
| └── Enabled: no
|
|
├── HTTP proxy settings:
|
|
| └── Enabled: no
|
|
├── Control server settings:
|
|
| ├── Listening address: :8000
|
|
| ├── Logging: yes
|
|
| └── Authentication file path: /gluetun/auth/config.toml
|
|
├── Storage settings:
|
|
| └── Filepath: /gluetun/servers.json
|
|
├── OS Alpine settings:
|
|
| ├── Process UID: 1000
|
|
| └── Process GID: 1000
|
|
├── Public IP settings:
|
|
| ├── IP file path: /tmp/gluetun/ip
|
|
| ├── Public IP data base API: ipinfo
|
|
| └── Public IP data backup APIs:
|
|
| ├── cloudflare
|
|
| ├── ifconfigco
|
|
| └── ip2location
|
|
└── Version settings:
|
|
└── Enabled: yes`,
|
|
},
|
|
}
|
|
|
|
for name, testCase := range testCases {
|
|
t.Run(name, func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
s := testCase.settings.String()
|
|
|
|
assert.Equal(t, testCase.s, s)
|
|
})
|
|
}
|
|
}
|