diff --git a/.golangci.yml b/.golangci.yml index 5af912cd..95e6925e 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -20,6 +20,12 @@ issues: - text: "exported: exported var Err*" linters: - revive + - text: "mnd: Magic number: 0644*" + linters: + - gomnd + - text: "mnd: Magic number: 0400*" + linters: + - gomnd linters: disable-all: true enable: diff --git a/internal/configuration/nordvpn.go b/internal/configuration/nordvpn.go index 89a9b3ed..79ed0409 100644 --- a/internal/configuration/nordvpn.go +++ b/internal/configuration/nordvpn.go @@ -69,7 +69,8 @@ func (settings *Provider) readNordvpn(r reader) (err error) { } func readNordVPNServerNumbers(env params.Env) (numbers []uint16, err error) { - possibilities := make([]string, 65537) + const possiblePortsCount = 65537 + possibilities := make([]string, possiblePortsCount) for i := range possibilities { possibilities[i] = fmt.Sprintf("%d", i) } diff --git a/internal/configuration/openvpn.go b/internal/configuration/openvpn.go index c839c53e..cbc005d3 100644 --- a/internal/configuration/openvpn.go +++ b/internal/configuration/openvpn.go @@ -115,7 +115,7 @@ func (settings *OpenVPN) read(r reader) (err error) { return err } - settings.Verbosity, err = r.env.IntRange("OPENVPN_VERBOSITY", 0, 6, params.Default("1")) + settings.Verbosity, err = r.env.IntRange("OPENVPN_VERBOSITY", 0, 6, params.Default("1")) //nolint:gomnd if err != nil { return err } @@ -135,7 +135,8 @@ func (settings *OpenVPN) read(r reader) (err error) { return err } - mssFix, err := r.env.IntRange("OPENVPN_MSSFIX", 0, 10000, params.Default("0")) + const maxMSSFix = 10000 + mssFix, err := r.env.IntRange("OPENVPN_MSSFIX", 0, maxMSSFix, params.Default("0")) if err != nil { return err } diff --git a/internal/configuration/system.go b/internal/configuration/system.go index c20bbc4e..d65827e3 100644 --- a/internal/configuration/system.go +++ b/internal/configuration/system.go @@ -32,13 +32,14 @@ func (settings *System) lines() (lines []string) { } func (settings *System) read(r reader) (err error) { - settings.PUID, err = r.env.IntRange("PUID", 0, 65535, params.Default("1000"), + const maxID = 65535 + settings.PUID, err = r.env.IntRange("PUID", 0, maxID, params.Default("1000"), params.RetroKeys([]string{"UID"}, r.onRetroActive)) if err != nil { return err } - settings.PGID, err = r.env.IntRange("PGID", 0, 65535, params.Default("1000"), + settings.PGID, err = r.env.IntRange("PGID", 0, maxID, params.Default("1000"), params.RetroKeys([]string{"GID"}, r.onRetroActive)) if err != nil { return err diff --git a/internal/configuration/unbound.go b/internal/configuration/unbound.go index b666fd8d..2926b800 100644 --- a/internal/configuration/unbound.go +++ b/internal/configuration/unbound.go @@ -29,19 +29,19 @@ func (settings *DNS) readUnbound(r reader) (err error) { return err } - verbosityLevel, err := r.env.IntRange("DOT_VERBOSITY", 0, 5, params.Default("1")) + verbosityLevel, err := r.env.IntRange("DOT_VERBOSITY", 0, 5, params.Default("1")) //nolint:gomnd if err != nil { return err } settings.Unbound.VerbosityLevel = uint8(verbosityLevel) - verbosityDetailsLevel, err := r.env.IntRange("DOT_VERBOSITY_DETAILS", 0, 4, params.Default("0")) + verbosityDetailsLevel, err := r.env.IntRange("DOT_VERBOSITY_DETAILS", 0, 4, params.Default("0")) //nolint:gomnd if err != nil { return err } settings.Unbound.VerbosityDetailsLevel = uint8(verbosityDetailsLevel) - validationLogLevel, err := r.env.IntRange("DOT_VALIDATION_LOGLEVEL", 0, 2, params.Default("0")) + validationLogLevel, err := r.env.IntRange("DOT_VALIDATION_LOGLEVEL", 0, 2, params.Default("0")) //nolint:gomnd if err != nil { return err } diff --git a/internal/constants/openvpn.go b/internal/constants/openvpn.go index ca179256..6b66b1f8 100644 --- a/internal/constants/openvpn.go +++ b/internal/constants/openvpn.go @@ -1,4 +1,3 @@ -//nolint:revive package constants const ( diff --git a/internal/constants/status.go b/internal/constants/status.go index 015c8bb5..f045c43f 100644 --- a/internal/constants/status.go +++ b/internal/constants/status.go @@ -1,4 +1,3 @@ -//nolint:revive package constants import ( diff --git a/internal/openvpn/tun.go b/internal/openvpn/tun.go index 91e61978..01eaf80c 100644 --- a/internal/openvpn/tun.go +++ b/internal/openvpn/tun.go @@ -23,7 +23,7 @@ func (c *configurator) CheckTUN() error { func (c *configurator) CreateTUN() error { c.logger.Info("creating %s", constants.TunnelDevice) - if err := c.os.MkdirAll("/dev/net", 0751); err != nil { + if err := c.os.MkdirAll("/dev/net", 0751); err != nil { //nolint:gomnd return err } @@ -36,7 +36,7 @@ func (c *configurator) CreateTUN() error { return err } - file, err := c.os.OpenFile(constants.TunnelDevice, os.O_WRONLY, 0666) + file, err := c.os.OpenFile(constants.TunnelDevice, os.O_WRONLY, 0666) //nolint:gomnd if err != nil { return err } diff --git a/internal/updater/providers/nordvpn/name.go b/internal/updater/providers/nordvpn/name.go index 1fbd1518..b00656c3 100644 --- a/internal/updater/providers/nordvpn/name.go +++ b/internal/updater/providers/nordvpn/name.go @@ -19,7 +19,7 @@ func parseServerName(serverName string) (number uint16, err error) { } idString := serverName[i+1:] - idUint64, err := strconv.ParseUint(idString, 10, 16) + idUint64, err := strconv.ParseUint(idString, 10, 16) //nolint:gomnd if err != nil { return 0, fmt.Errorf("%w: %s", ErrInvalidIDInServerName, serverName) }