diff --git a/.golangci.yml b/.golangci.yml index 1627a4d2..a11e549e 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -20,14 +20,6 @@ issues: text: "newCipherDESCBCBlock returns interface \\(github\\.com\\/youmark\\/pkcs8\\.Cipher\\)" linters: - ireturn - - path: "internal\\/configuration" - text: "printf: non-constant format string in call to \\(\\*github.com\\/qdm12\\/gotree\\.Node\\)\\.Appendf" - linters: - - govet - - path: "internal\\/configuration" - text: "non-constant format string in call to github\\.com\\/qdm12\\/gotree\\.New" - linters: - - govet linters: enable: diff --git a/go.mod b/go.mod index 15163717..5c2bdf8f 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/qdm12/gosettings v0.4.2 github.com/qdm12/goshutdown v0.3.0 github.com/qdm12/gosplash v0.2.0 - github.com/qdm12/gotree v0.2.0 + github.com/qdm12/gotree v0.3.0 github.com/qdm12/log v0.1.0 github.com/qdm12/ss-server v0.6.0 github.com/stretchr/testify v1.9.0 diff --git a/go.sum b/go.sum index 3ff3d714..ec83d072 100644 --- a/go.sum +++ b/go.sum @@ -68,8 +68,8 @@ github.com/qdm12/goshutdown v0.3.0 h1:pqBpJkdwlZlfTEx4QHtS8u8CXx6pG0fVo6S1N0MpSE github.com/qdm12/goshutdown v0.3.0/go.mod h1:EqZ46No00kCTZ5qzdd3qIzY6ayhMt24QI8Mh8LVQYmM= github.com/qdm12/gosplash v0.2.0 h1:DOxCEizbW6ZG+FgpH2oK1atT6bM8MHL9GZ2ywSS4zZY= github.com/qdm12/gosplash v0.2.0/go.mod h1:k+1PzhO0th9cpX4q2Nneu4xTsndXqrM/x7NTIYmJ4jo= -github.com/qdm12/gotree v0.2.0 h1:+58ltxkNLUyHtATFereAcOjBVfY6ETqRex8XK90Fb/c= -github.com/qdm12/gotree v0.2.0/go.mod h1:1SdFaqKZuI46U1apbXIf25pDMNnrPuYLEqMF/qL4lY4= +github.com/qdm12/gotree v0.3.0 h1:Q9f4C571EFK7ZEsPkEL2oGZX7I+ZhVxhh1ZSydW+5yI= +github.com/qdm12/gotree v0.3.0/go.mod h1:iz06uXmRR4Aq9v6tX7mosXStO/yGHxRA1hbyD0UVeYw= github.com/qdm12/log v0.1.0 h1:jYBd/xscHYpblzZAd2kjZp2YmuYHjAAfbTViJWxoPTw= github.com/qdm12/log v0.1.0/go.mod h1:Vchi5M8uBvHfPNIblN4mjXn/oSbiWguQIbsgF1zdQPI= github.com/qdm12/ss-server v0.6.0 h1:OaOdCIBXx0z3DGHPT6Th0v88vGa3MtAS4oRgUsDHGZE= diff --git a/internal/cli/clientkey.go b/internal/cli/clientkey.go index e6df02c9..2b428232 100644 --- a/internal/cli/clientkey.go +++ b/internal/cli/clientkey.go @@ -27,9 +27,6 @@ func (c *CLI) ClientKey(args []string) error { if err := file.Close(); err != nil { return err } - if err != nil { - return err - } s := string(data) s = strings.ReplaceAll(s, "\n", "") s = strings.ReplaceAll(s, "\r", "") diff --git a/internal/configuration/settings/dnsblacklist.go b/internal/configuration/settings/dnsblacklist.go index 05b14716..80e1853a 100644 --- a/internal/configuration/settings/dnsblacklist.go +++ b/internal/configuration/settings/dnsblacklist.go @@ -101,30 +101,30 @@ func (b DNSBlacklist) toLinesNode() (node *gotree.Node) { node.Appendf("Block surveillance: %s", gosettings.BoolToYesNo(b.BlockSurveillance)) if len(b.AllowedHosts) > 0 { - allowedHostsNode := node.Appendf("Allowed hosts:") + allowedHostsNode := node.Append("Allowed hosts:") for _, host := range b.AllowedHosts { - allowedHostsNode.Appendf(host) + allowedHostsNode.Append(host) } } if len(b.AddBlockedHosts) > 0 { - blockedHostsNode := node.Appendf("Blocked hosts:") + blockedHostsNode := node.Append("Blocked hosts:") for _, host := range b.AddBlockedHosts { - blockedHostsNode.Appendf(host) + blockedHostsNode.Append(host) } } if len(b.AddBlockedIPs) > 0 { - blockedIPsNode := node.Appendf("Blocked IP addresses:") + blockedIPsNode := node.Append("Blocked IP addresses:") for _, ip := range b.AddBlockedIPs { - blockedIPsNode.Appendf(ip.String()) + blockedIPsNode.Append(ip.String()) } } if len(b.AddBlockedIPPrefixes) > 0 { - blockedIPPrefixesNode := node.Appendf("Blocked IP networks:") + blockedIPPrefixesNode := node.Append("Blocked IP networks:") for _, ipNetwork := range b.AddBlockedIPPrefixes { - blockedIPPrefixesNode.Appendf(ipNetwork.String()) + blockedIPPrefixesNode.Append(ipNetwork.String()) } } diff --git a/internal/configuration/settings/dot.go b/internal/configuration/settings/dot.go index 157bfc3c..3e0feb14 100644 --- a/internal/configuration/settings/dot.go +++ b/internal/configuration/settings/dot.go @@ -127,9 +127,9 @@ func (d DoT) toLinesNode() (node *gotree.Node) { } node.Appendf("Update period: %s", update) - upstreamResolvers := node.Appendf("Upstream resolvers:") + upstreamResolvers := node.Append("Upstream resolvers:") for _, provider := range d.Providers { - upstreamResolvers.Appendf(provider) + upstreamResolvers.Append(provider) } node.Appendf("Caching: %s", gosettings.BoolToYesNo(d.Caching)) diff --git a/internal/configuration/settings/openvpnselection.go b/internal/configuration/settings/openvpnselection.go index 0e95a1f9..4f681c9f 100644 --- a/internal/configuration/settings/openvpnselection.go +++ b/internal/configuration/settings/openvpnselection.go @@ -193,9 +193,6 @@ func (o *OpenVPNSelection) read(r *reader.Reader) (err error) { o.ConfFile = r.Get("OPENVPN_CUSTOM_CONFIG", reader.ForceLowercase(false)) o.Protocol = r.String("OPENVPN_PROTOCOL", reader.RetroKeys("PROTOCOL")) - if err != nil { - return err - } o.CustomPort, err = r.Uint16Ptr("OPENVPN_ENDPOINT_PORT", reader.RetroKeys("PORT", "OPENVPN_PORT", "VPN_ENDPOINT_PORT")) diff --git a/internal/configuration/settings/wireguard.go b/internal/configuration/settings/wireguard.go index a4c3460e..f8afb976 100644 --- a/internal/configuration/settings/wireguard.go +++ b/internal/configuration/settings/wireguard.go @@ -215,12 +215,12 @@ func (w Wireguard) toLinesNode() (node *gotree.Node) { addressesNode := node.Appendf("Interface addresses:") for _, address := range w.Addresses { - addressesNode.Appendf(address.String()) + addressesNode.Append(address.String()) } allowedIPsNode := node.Appendf("Allowed IPs:") for _, allowedIP := range w.AllowedIPs { - allowedIPsNode.Appendf(allowedIP.String()) + allowedIPsNode.Append(allowedIP.String()) } if *w.PersistentKeepaliveInterval > 0 {