From beeeba3388af07f31eb0b5863da187ac7ff935a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Tue, 28 Jun 2022 22:16:48 +0800 Subject: [PATCH] Make linter happy --- .github/workflows/linter.yml | 3 +-- .github/linters/golangci.yml => .golangci.yml | 0 common/auth/auth.go | 5 +++-- common/buf/buffer.go | 4 ++-- common/bufio/buffer.go | 4 ++-- common/bufio/cache.go | 18 +++++++++--------- common/bufio/conn.go | 6 +++--- common/cond.go | 4 ++-- common/network/addr.go | 8 ++------ protocol/trojan/protocol.go | 4 ++-- transport/mixed/pac.go | 1 - transport/udp/listener.go | 2 -- 12 files changed, 26 insertions(+), 33 deletions(-) rename .github/linters/golangci.yml => .golangci.yml (100%) diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index b5ce226..2aa7eca 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -31,5 +31,4 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@v3 with: - version: latest - args: --config=.github/linters/golangci.yml + version: latest \ No newline at end of file diff --git a/.github/linters/golangci.yml b/.golangci.yml similarity index 100% rename from .github/linters/golangci.yml rename to .golangci.yml diff --git a/common/auth/auth.go b/common/auth/auth.go index 98414d8..e8ea911 100644 --- a/common/auth/auth.go +++ b/common/auth/auth.go @@ -9,7 +9,7 @@ type Authenticator interface { Users() []string } -type AuthUser struct { +type User struct { User string Pass string } @@ -26,7 +26,7 @@ func (au *inMemoryAuthenticator) Verify(user string, pass string) bool { func (au *inMemoryAuthenticator) Users() []string { return au.usernames } -func NewAuthenticator(users []AuthUser) Authenticator { +func NewAuthenticator(users []User) Authenticator { if len(users) == 0 { return nil } @@ -34,6 +34,7 @@ func NewAuthenticator(users []AuthUser) Authenticator { au := &inMemoryAuthenticator{storage: &sync.Map{}} for _, user := range users { au.storage.Store(user.User, user.Pass) + au.usernames = append(au.usernames, user.User) } usernames := make([]string, 0, len(users)) au.storage.Range(func(key, value interface{}) bool { diff --git a/common/buf/buffer.go b/common/buf/buffer.go index f7fa705..1f5f879 100644 --- a/common/buf/buffer.go +++ b/common/buf/buffer.go @@ -158,11 +158,11 @@ func (b *Buffer) WriteRandom(size int) []byte { return buffer } -func (b *Buffer) WriteByte(byte byte) error { +func (b *Buffer) WriteByte(d byte) error { if b.IsFull() { return io.ErrShortBuffer } - b.data[b.end] = byte + b.data[b.end] = d b.end++ return nil } diff --git a/common/bufio/buffer.go b/common/bufio/buffer.go index 660e337..4f9ee94 100644 --- a/common/bufio/buffer.go +++ b/common/bufio/buffer.go @@ -68,8 +68,8 @@ func (r *BufferedReader) WriteTo(w io.Writer) (n int64, err error) { return CopyExtendedBuffer(NewExtendedWriter(w), NewExtendedReader(r.upstream), r.buffer) } -func (w *BufferedReader) Upstream() any { - return w.upstream +func (r *BufferedReader) Upstream() any { + return r.upstream } type BufferedWriter struct { diff --git a/common/bufio/cache.go b/common/bufio/cache.go index 5a58bb1..94e7286 100644 --- a/common/bufio/cache.go +++ b/common/bufio/cache.go @@ -92,9 +92,9 @@ func NewCachedReader(upstream io.Reader, buffer *buf.Buffer) *CachedReader { } } -func (c *CachedReader) ReadCached() *buf.Buffer { - buffer := c.buffer - c.buffer = nil +func (r *CachedReader) ReadCached() *buf.Buffer { + buffer := r.buffer + r.buffer = nil return buffer } @@ -123,15 +123,15 @@ func (r *CachedReader) WriteTo(w io.Writer) (n int64, err error) { return } -func (w *CachedReader) Upstream() any { - return w.upstream +func (r *CachedReader) Upstream() any { + return r.upstream } -func (c *CachedReader) ReaderReplaceable() bool { - return c.buffer == nil +func (r *CachedReader) ReaderReplaceable() bool { + return r.buffer == nil } -func (c *CachedReader) Close() error { - c.buffer.Release() +func (r *CachedReader) Close() error { + r.buffer.Release() return nil } diff --git a/common/bufio/conn.go b/common/bufio/conn.go index 8804a60..d9a3345 100644 --- a/common/bufio/conn.go +++ b/common/bufio/conn.go @@ -458,11 +458,11 @@ func (w *ExtendedWriterWrapper) WriteBuffer(buffer *buf.Buffer) error { return common.Error(w.Write(buffer.Bytes())) } -func (r *ExtendedWriterWrapper) Upstream() any { - return r.Writer +func (w *ExtendedWriterWrapper) Upstream() any { + return w.Writer } -func (r *ExtendedReaderWrapper) WriterReplaceable() bool { +func (w *ExtendedReaderWrapper) WriterReplaceable() bool { return true } diff --git a/common/cond.go b/common/cond.go index 7982de4..8f4be74 100644 --- a/common/cond.go +++ b/common/cond.go @@ -35,7 +35,7 @@ func Contains[T comparable](arr []T, target T) bool { } func Map[T any, N any](arr []T, block func(it T) N) []N { - var retArr []N + retArr := make([]N, 0, len(arr)) for index := range arr { retArr = append(retArr, block(arr[index])) } @@ -43,7 +43,7 @@ func Map[T any, N any](arr []T, block func(it T) N) []N { } func MapIndexed[T any, N any](arr []T, block func(index int, it T) N) []N { - var retArr []N + retArr := make([]N, 0, len(arr)) for index := range arr { retArr = append(retArr, block(index, arr[index])) } diff --git a/common/network/addr.go b/common/network/addr.go index 73f523b..ede621e 100644 --- a/common/network/addr.go +++ b/common/network/addr.go @@ -13,9 +13,7 @@ func LocalAddrs() ([]netip.Addr, error) { if err != nil { return nil, err } - return common.Map(interfaceAddrs, func(addr net.Addr) netip.Addr { - return M.AddrFromNetAddr(addr) - }), nil + return common.Map(interfaceAddrs, M.AddrFromNetAddr), nil } func IsPublicAddr(addr netip.Addr) bool { @@ -27,7 +25,5 @@ func LocalPublicAddrs() ([]netip.Addr, error) { if err != nil { return nil, err } - return common.Filter(publicAddrs, func(addr netip.Addr) bool { - return IsPublicAddr(addr) - }), nil + return common.Filter(publicAddrs, IsPublicAddr), nil } diff --git a/protocol/trojan/protocol.go b/protocol/trojan/protocol.go index 0744027..5130d4d 100644 --- a/protocol/trojan/protocol.go +++ b/protocol/trojan/protocol.go @@ -134,7 +134,7 @@ func ClientHandshakeRaw(conn net.Conn, key [KeyLength]byte, command byte, destin if err != nil { return err } - _, err = conn.Write(CRLF[:]) + _, err = conn.Write(CRLF) if err != nil { return err } @@ -146,7 +146,7 @@ func ClientHandshakeRaw(conn net.Conn, key [KeyLength]byte, command byte, destin if err != nil { return err } - _, err = conn.Write(CRLF[:]) + _, err = conn.Write(CRLF) if err != nil { return err } diff --git a/transport/mixed/pac.go b/transport/mixed/pac.go index 65189d6..7835d25 100644 --- a/transport/mixed/pac.go +++ b/transport/mixed/pac.go @@ -5,7 +5,6 @@ import ( ) func newPAC(proxyAddr netip.AddrPort) string { - // TODO: socks4 not supported return ` function FindProxyForURL(url, host) { return "SOCKS5 ` + proxyAddr.String() + `; PROXY ` + proxyAddr.String() + `"; diff --git a/transport/udp/listener.go b/transport/udp/listener.go index e46736f..b8a5fec 100644 --- a/transport/udp/listener.go +++ b/transport/udp/listener.go @@ -206,7 +206,6 @@ func (l *Listener) loop() { l.handler.HandleError(err) } } - } } @@ -261,6 +260,5 @@ func (l *Listener) loopThreadSafe() { l.handler.HandleError(err) } } - } }