From 07efea612bd3de7bd5de4732bbc918559240bcdc Mon Sep 17 00:00:00 2001 From: Quentin McGaw Date: Sun, 12 Jul 2020 19:15:05 +0000 Subject: [PATCH] Minor changes - Remove unneeded string conversions - Remove resolve-retry infinite openvpn configuration (unneeded) - Add cover on single tests and single test files for Vscode --- .devcontainer/devcontainer.json | 4 +++- .vscode/settings.json | 4 +++- internal/dns/conf.go | 2 +- internal/provider/cyberghost.go | 4 ++-- internal/provider/mullvad.go | 4 ++-- internal/provider/pia.go | 4 ++-- internal/provider/surfshark.go | 5 ++--- internal/provider/windscribe.go | 5 ++--- 8 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 0ca4bdfb..6b3f7c1b 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -108,6 +108,8 @@ "-v", // "-race" ], - "go.testTimeout": "600s" + "go.testTimeout": "600s", + "go.coverOnSingleTestFile": true, + "go.coverOnSingleTest": true } } \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 1d3fcecc..9a2a8242 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -85,5 +85,7 @@ "-v", // "-race" ], - "go.testTimeout": "600s" + "go.testTimeout": "600s", + "go.coverOnSingleTestFile": true, + "go.coverOnSingleTest": true } \ No newline at end of file diff --git a/internal/dns/conf.go b/internal/dns/conf.go index 36e43954..37ce282e 100644 --- a/internal/dns/conf.go +++ b/internal/dns/conf.go @@ -122,7 +122,7 @@ func generateUnboundConf(settings settings.DNS, client network.Client, logger lo providerData := constants.DNSProviderMapping()[provider] for _, IP := range providerData.IPs { forwardZoneLines = append(forwardZoneLines, - fmt.Sprintf(" forward-addr: %s@853#%s", IP.String(), providerData.Host)) + fmt.Sprintf(" forward-addr: %s@853#%s", IP, providerData.Host)) } } lines = append(lines, forwardZoneLines...) diff --git a/internal/provider/cyberghost.go b/internal/provider/cyberghost.go index f3e71cee..c51e9ca3 100644 --- a/internal/provider/cyberghost.go +++ b/internal/provider/cyberghost.go @@ -81,7 +81,7 @@ func (c *cyberghost) BuildConf(connections []models.OpenVPNConnection, verbosity // Modified variables fmt.Sprintf("verb %d", verbosity), fmt.Sprintf("auth-user-pass %s", constants.OpenVPNAuthConf), - fmt.Sprintf("proto %s", string(connections[0].Protocol)), + fmt.Sprintf("proto %s", connections[0].Protocol), fmt.Sprintf("cipher %s", cipher), fmt.Sprintf("auth %s", auth), } @@ -92,7 +92,7 @@ func (c *cyberghost) BuildConf(connections []models.OpenVPNConnection, verbosity lines = append(lines, "user nonrootuser") } for _, connection := range connections { - lines = append(lines, fmt.Sprintf("remote %s %d", connection.IP.String(), connection.Port)) + lines = append(lines, fmt.Sprintf("remote %s %d", connection.IP, connection.Port)) } lines = append(lines, []string{ "", diff --git a/internal/provider/mullvad.go b/internal/provider/mullvad.go index 91e63623..c8a9e946 100644 --- a/internal/provider/mullvad.go +++ b/internal/provider/mullvad.go @@ -79,14 +79,14 @@ func (m *mullvad) BuildConf(connections []models.OpenVPNConnection, verbosity, u // Modified variables fmt.Sprintf("verb %d", verbosity), fmt.Sprintf("auth-user-pass %s", constants.OpenVPNAuthConf), - fmt.Sprintf("proto %s", string(connections[0].Protocol)), + fmt.Sprintf("proto %s", connections[0].Protocol), fmt.Sprintf("cipher %s", cipher), } if !root { lines = append(lines, "user nonrootuser") } for _, connection := range connections { - lines = append(lines, fmt.Sprintf("remote %s %d", connection.IP.String(), connection.Port)) + lines = append(lines, fmt.Sprintf("remote %s %d", connection.IP, connection.Port)) } lines = append(lines, []string{ "", diff --git a/internal/provider/pia.go b/internal/provider/pia.go index 4fa55455..2c080170 100644 --- a/internal/provider/pia.go +++ b/internal/provider/pia.go @@ -126,7 +126,7 @@ func (p *pia) BuildConf(connections []models.OpenVPNConnection, verbosity, uid, // Modified variables fmt.Sprintf("verb %d", verbosity), fmt.Sprintf("auth-user-pass %s", constants.OpenVPNAuthConf), - fmt.Sprintf("proto %s", string(connections[0].Protocol)), + fmt.Sprintf("proto %s", connections[0].Protocol), fmt.Sprintf("cipher %s", cipher), fmt.Sprintf("auth %s", auth), } @@ -137,7 +137,7 @@ func (p *pia) BuildConf(connections []models.OpenVPNConnection, verbosity, uid, lines = append(lines, "user nonrootuser") } for _, connection := range connections { - lines = append(lines, fmt.Sprintf("remote %s %d", connection.IP.String(), connection.Port)) + lines = append(lines, fmt.Sprintf("remote %s %d", connection.IP, connection.Port)) } lines = append(lines, []string{ "", diff --git a/internal/provider/surfshark.go b/internal/provider/surfshark.go index f3071e10..fa92d52a 100644 --- a/internal/provider/surfshark.go +++ b/internal/provider/surfshark.go @@ -72,7 +72,6 @@ func (s *surfshark) BuildConf(connections []models.OpenVPNConnection, verbosity, "remote-cert-tls server", // Surfshark specific - "resolv-retry infinite", "tun-mtu 1500", "tun-mtu-extra 32", "mssfix 1450", @@ -95,7 +94,7 @@ func (s *surfshark) BuildConf(connections []models.OpenVPNConnection, verbosity, // Modified variables fmt.Sprintf("verb %d", verbosity), fmt.Sprintf("auth-user-pass %s", constants.OpenVPNAuthConf), - fmt.Sprintf("proto %s", string(connections[0].Protocol)), + fmt.Sprintf("proto %s", connections[0].Protocol), fmt.Sprintf("cipher %s", cipher), fmt.Sprintf("auth %s", auth), } @@ -103,7 +102,7 @@ func (s *surfshark) BuildConf(connections []models.OpenVPNConnection, verbosity, lines = append(lines, "user nonrootuser") } for _, connection := range connections { - lines = append(lines, fmt.Sprintf("remote %s %d", connection.IP.String(), connection.Port)) + lines = append(lines, fmt.Sprintf("remote %s %d", connection.IP, connection.Port)) } lines = append(lines, []string{ "", diff --git a/internal/provider/windscribe.go b/internal/provider/windscribe.go index 6911cfd9..b8799e96 100644 --- a/internal/provider/windscribe.go +++ b/internal/provider/windscribe.go @@ -73,7 +73,6 @@ func (w *windscribe) BuildConf(connections []models.OpenVPNConnection, verbosity "remote-cert-tls server", // Windscribe specific - "resolv-retry infinite", "comp-lzo", "key-direction 1", "script-security 2", @@ -89,7 +88,7 @@ func (w *windscribe) BuildConf(connections []models.OpenVPNConnection, verbosity // Modified variables fmt.Sprintf("verb %d", verbosity), fmt.Sprintf("auth-user-pass %s", constants.OpenVPNAuthConf), - fmt.Sprintf("proto %s", string(connections[0].Protocol)), + fmt.Sprintf("proto %s", connections[0].Protocol), fmt.Sprintf("cipher %s", cipher), fmt.Sprintf("auth %s", auth), } @@ -100,7 +99,7 @@ func (w *windscribe) BuildConf(connections []models.OpenVPNConnection, verbosity lines = append(lines, "user nonrootuser") } for _, connection := range connections { - lines = append(lines, fmt.Sprintf("remote %s %d", connection.IP.String(), connection.Port)) + lines = append(lines, fmt.Sprintf("remote %s %d", connection.IP, connection.Port)) } lines = append(lines, []string{ "",