From e0850869ba3e709f76924a10edbc63d168f875b1 Mon Sep 17 00:00:00 2001 From: 9seconds Date: Fri, 18 Mar 2022 14:58:08 +0300 Subject: [PATCH] Linting --- internal/cli/run_proxy.go | 3 ++- internal/testlib/mtglib_network_mock.go | 3 ++- ipblocklist/firehol.go | 9 ++++++--- .../client_handshake_fuzz_internal_test.go | 4 ++-- mtglib/internal/obfuscated2/init_test.go | 2 +- .../server_handshake_fuzz_internal_test.go | 2 +- .../obfuscated2/server_handshake_fuzz_test.go | 4 ++-- network/circuit_breaker.go | 15 ++++++++++----- network/network.go | 9 ++++++--- stats/statsd.go | 3 ++- 10 files changed, 34 insertions(+), 20 deletions(-) diff --git a/internal/cli/run_proxy.go b/internal/cli/run_proxy.go index ae06a80..01ec512 100644 --- a/internal/cli/run_proxy.go +++ b/internal/cli/run_proxy.go @@ -89,7 +89,8 @@ func makeAntiReplayCache(conf *config.Config) mtglib.AntiReplayCache { func makeIPBlocklist(conf config.ListConfig, logger mtglib.Logger, ntw mtglib.Network, - updateCallback ipblocklist.FireholUpdateCallback) (mtglib.IPBlocklist, error) { + updateCallback ipblocklist.FireholUpdateCallback, +) (mtglib.IPBlocklist, error) { if !conf.Enabled.Get(false) { return ipblocklist.NewNoop(), nil } diff --git a/internal/testlib/mtglib_network_mock.go b/internal/testlib/mtglib_network_mock.go index a6d08bf..7eb21a4 100644 --- a/internal/testlib/mtglib_network_mock.go +++ b/internal/testlib/mtglib_network_mock.go @@ -25,6 +25,7 @@ func (m *MtglibNetworkMock) DialContext(ctx context.Context, network, address st } func (m *MtglibNetworkMock) MakeHTTPClient(dialFunc func(ctx context.Context, - network, address string) (essentials.Conn, error)) *http.Client { + network, address string) (essentials.Conn, error), +) *http.Client { return m.Called(dialFunc).Get(0).(*http.Client) // nolint: forcetypeassert } diff --git a/ipblocklist/firehol.go b/ipblocklist/firehol.go index d6fa3e8..efe57f0 100644 --- a/ipblocklist/firehol.go +++ b/ipblocklist/firehol.go @@ -155,7 +155,8 @@ func (f *Firehol) update() { func (f *Firehol) updateFromFile(mutex sync.Locker, ranger cidranger.Ranger, - scanner *bufio.Scanner) error { + scanner *bufio.Scanner, +) error { for scanner.Scan() { text := scanner.Text() text = fireholRegexpComment.ReplaceAllLiteralString(text, "") @@ -216,7 +217,8 @@ func NewFirehol(logger mtglib.Logger, network mtglib.Network, downloadConcurrency uint, urls []string, localFiles []string, - updateCallback FireholUpdateCallback) (*Firehol, error) { + updateCallback FireholUpdateCallback, +) (*Firehol, error) { blocklists := []files.File{} for _, v := range localFiles { @@ -245,7 +247,8 @@ func NewFirehol(logger mtglib.Logger, network mtglib.Network, func NewFireholFromFiles(logger mtglib.Logger, downloadConcurrency uint, blocklists []files.File, - updateCallback FireholUpdateCallback) (*Firehol, error) { + updateCallback FireholUpdateCallback, +) (*Firehol, error) { if downloadConcurrency == 0 { downloadConcurrency = DefaultFireholDownloadConcurrency } diff --git a/mtglib/internal/obfuscated2/client_handshake_fuzz_internal_test.go b/mtglib/internal/obfuscated2/client_handshake_fuzz_internal_test.go index 1c9685d..01a8a1e 100644 --- a/mtglib/internal/obfuscated2/client_handshake_fuzz_internal_test.go +++ b/mtglib/internal/obfuscated2/client_handshake_fuzz_internal_test.go @@ -7,10 +7,10 @@ import ( "github.com/stretchr/testify/require" ) -var FuzzClientHandshakeSecret = []byte{1,2,3} +var FuzzClientHandshakeSecret = []byte{1, 2, 3} func FuzzClientHandshake(f *testing.F) { - f.Add([]byte{1,2,3}) + f.Add([]byte{1, 2, 3}) f.Fuzz(func(t *testing.T, frame []byte) { data := bytes.NewReader(frame) diff --git a/mtglib/internal/obfuscated2/init_test.go b/mtglib/internal/obfuscated2/init_test.go index 0cc5c17..50d031c 100644 --- a/mtglib/internal/obfuscated2/init_test.go +++ b/mtglib/internal/obfuscated2/init_test.go @@ -127,7 +127,7 @@ func NewServerHandshakeTestData(t *testing.T) ServerHandshakeTestData { return ServerHandshakeTestData{ connMock: connMock, proxyConn: obfuscated2.Conn{ - Conn: connMock, + Conn: connMock, Encryptor: handshakeEnc, Decryptor: handshakeDec, }, diff --git a/mtglib/internal/obfuscated2/server_handshake_fuzz_internal_test.go b/mtglib/internal/obfuscated2/server_handshake_fuzz_internal_test.go index ca9ad09..125fd9c 100644 --- a/mtglib/internal/obfuscated2/server_handshake_fuzz_internal_test.go +++ b/mtglib/internal/obfuscated2/server_handshake_fuzz_internal_test.go @@ -23,7 +23,7 @@ func FuzzServerGenerateHandshakeFrame(f *testing.F) { assert.NotEqualValues( t, 0, - frame.data[4] | frame.data[5] | frame.data[6] | frame.data[7]) + frame.data[4]|frame.data[5]|frame.data[6]|frame.data[7]) assert.Equal(t, handshakeConnectionType, frame.connectionType()) }) diff --git a/mtglib/internal/obfuscated2/server_handshake_fuzz_test.go b/mtglib/internal/obfuscated2/server_handshake_fuzz_test.go index be1cea6..fb5df81 100644 --- a/mtglib/internal/obfuscated2/server_handshake_fuzz_test.go +++ b/mtglib/internal/obfuscated2/server_handshake_fuzz_test.go @@ -8,7 +8,7 @@ import ( ) func FuzzServerSend(f *testing.F) { - f.Add([]byte{1,2,3,4,5}) + f.Add([]byte{1, 2, 3, 4, 5}) f.Fuzz(func(t *testing.T, data []byte) { handshakeData := NewServerHandshakeTestData(t) @@ -32,7 +32,7 @@ func FuzzServerSend(f *testing.F) { } func FuzzServerReceive(f *testing.F) { - f.Add([]byte{1,2,3,4,5}) + f.Add([]byte{1, 2, 3, 4, 5}) f.Fuzz(func(t *testing.T, data []byte) { handshakeData := NewServerHandshakeTestData(t) diff --git a/network/circuit_breaker.go b/network/circuit_breaker.go index 91e1317..e5f2702 100644 --- a/network/circuit_breaker.go +++ b/network/circuit_breaker.go @@ -36,7 +36,8 @@ func (c *circuitBreakerDialer) Dial(network, address string) (essentials.Conn, e } func (c *circuitBreakerDialer) DialContext(ctx context.Context, - network, address string) (essentials.Conn, error) { + network, address string, +) (essentials.Conn, error) { switch atomic.LoadUint32(&c.state) { case circuitBreakerStateClosed: return c.doClosed(ctx, network, address) @@ -48,7 +49,8 @@ func (c *circuitBreakerDialer) DialContext(ctx context.Context, } func (c *circuitBreakerDialer) doClosed(ctx context.Context, - network, address string) (essentials.Conn, error) { + network, address string, +) (essentials.Conn, error) { conn, err := c.Dialer.DialContext(ctx, network, address) select { @@ -80,7 +82,8 @@ func (c *circuitBreakerDialer) doClosed(ctx context.Context, } func (c *circuitBreakerDialer) doHalfOpened(ctx context.Context, - network, address string) (essentials.Conn, error) { + network, address string, +) (essentials.Conn, error) { if !atomic.CompareAndSwapUint32(&c.halfOpenAttempts, 0, 1) { return nil, ErrCircuitBreakerOpened } @@ -174,14 +177,16 @@ func (c *circuitBreakerDialer) stopTimer(timerRef **time.Timer) { } func (c *circuitBreakerDialer) ensureTimer(timerRef **time.Timer, - timeout time.Duration, callback func()) { + timeout time.Duration, callback func(), +) { if *timerRef == nil { *timerRef = time.AfterFunc(timeout, callback) } } func newCircuitBreakerDialer(baseDialer Dialer, - openThreshold uint32, halfOpenTimeout, resetFailuresTimeout time.Duration) Dialer { + openThreshold uint32, halfOpenTimeout, resetFailuresTimeout time.Duration, +) Dialer { cb := &circuitBreakerDialer{ Dialer: baseDialer, stateMutexChan: make(chan bool, 1), diff --git a/network/network.go b/network/network.go index e42508f..6aecd6a 100644 --- a/network/network.go +++ b/network/network.go @@ -61,7 +61,8 @@ func (n *network) DialContext(ctx context.Context, protocol, address string) (es } func (n *network) MakeHTTPClient(dialFunc func(ctx context.Context, - network, address string) (essentials.Conn, error)) *http.Client { + network, address string) (essentials.Conn, error), +) *http.Client { if dialFunc == nil { dialFunc = n.DialContext } @@ -123,7 +124,8 @@ func (n *network) dnsResolve(protocol, address string) ([]string, error) { // It brings simple DNS cache and DNS-Over-HTTPS when necessary. func NewNetwork(dialer Dialer, userAgent, dohHostname string, - httpTimeout time.Duration) (mtglib.Network, error) { + httpTimeout time.Duration, +) (mtglib.Network, error) { switch { case httpTimeout < 0: return nil, fmt.Errorf("timeout should be positive number %s", httpTimeout) @@ -146,7 +148,8 @@ func NewNetwork(dialer Dialer, func makeHTTPClient(userAgent string, timeout time.Duration, - dialFunc func(ctx context.Context, network, address string) (essentials.Conn, error)) *http.Client { + dialFunc func(ctx context.Context, network, address string) (essentials.Conn, error), +) *http.Client { return &http.Client{ Timeout: timeout, Transport: networkHTTPTransport{ diff --git a/stats/statsd.go b/stats/statsd.go index bd3f6fb..a19f561 100644 --- a/stats/statsd.go +++ b/stats/statsd.go @@ -171,7 +171,8 @@ func (s StatsdFactory) Make() events.Observer { // // Valid tagFormats are 'datadog', 'influxdb' and 'graphite'. func NewStatsd(address string, log logger.StdLikeLogger, - metricPrefix, tagFormat string) (StatsdFactory, error) { + metricPrefix, tagFormat string, +) (StatsdFactory, error) { options := []statsd.Option{ statsd.MetricPrefix(metricPrefix), statsd.Logger(log),