From 849d16c37bbba6f0fd823d9a5eb1f3b6c15253b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Wed, 29 Jun 2022 12:26:13 +0800 Subject: [PATCH] Add more lint --- .golangci.yml | 40 ++++++++++++++++++++- common/buf/pool.go | 41 +++++++++++++-------- common/buf/ptr.go | 1 + common/cache/lrucache.go | 2 +- common/cond.go | 4 +-- common/exceptions/error.go | 1 + common/x/list/list.go | 2 +- format.go | 3 +- protocol/http/link.go | 10 ++++++ protocol/http/listener.go | 5 --- protocol/socks/packet.go | 10 +++--- protocol/socks/socks5/protocol.go | 60 +++++++++++++++---------------- protocol/trojan/service.go | 3 +- 13 files changed, 118 insertions(+), 64 deletions(-) create mode 100644 protocol/http/link.go diff --git a/.golangci.yml b/.golangci.yml index 5193892..19bd0f5 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -2,5 +2,43 @@ run: timeout: 5m linters: + enable-all: true disable: - - errcheck \ No newline at end of file + - errcheck + - wrapcheck + - varnamelen + - stylecheck + - nonamedreturns + - nlreturn + - ireturn + - gomnd + - exhaustivestruct + - ifshort + - goerr113 + - gochecknoglobals + - forcetypeassert + - exhaustruct + - exhaustive + - cyclop + - containedctx + - wsl + - nestif + - lll + - funlen + - goconst + - godot + - gocognit + - golint + - goimports + +linters-settings: + revive: + rules: + - name: var-naming + disabled: true + govet: + enable-all: true + disable: + - composites + - fieldalignment + - shadow \ No newline at end of file diff --git a/common/buf/pool.go b/common/buf/pool.go index 439a13e..6106e2e 100644 --- a/common/buf/pool.go +++ b/common/buf/pool.go @@ -10,29 +10,40 @@ func Put(buf []byte) error { func Make(size int) []byte { var buffer []byte - if size <= 16 { + switch { + case size <= 2: + buffer = make([]byte, 2) + case size <= 4: + buffer = make([]byte, 4) + case size <= 8: + buffer = make([]byte, 8) + case size <= 16: buffer = make([]byte, 16) - } else if size <= 32 { + case size <= 32: buffer = make([]byte, 32) - } else if size <= 64 { + case size <= 64: buffer = make([]byte, 64) - } else if size <= 128 { + case size <= 128: buffer = make([]byte, 128) - } else if size <= 256 { + case size <= 256: buffer = make([]byte, 256) - } else if size <= 512 { + case size <= 512: buffer = make([]byte, 512) - } else if size <= 1024 { + case size <= 1024: buffer = make([]byte, 1024) - } else if size <= 4*1024 { - buffer = make([]byte, 4*1024) - } else if size <= 16*1024 { - buffer = make([]byte, 16*1024) - } else if size <= 20*1024 { - buffer = make([]byte, 20*1024) - } else if size <= 65535 { + case size <= 2048: + buffer = make([]byte, 2048) + case size <= 4096: + buffer = make([]byte, 4096) + case size <= 8192: + buffer = make([]byte, 8192) + case size <= 16384: + buffer = make([]byte, 16384) + case size <= 32768: + buffer = make([]byte, 32768) + case size <= 65535: buffer = make([]byte, 65535) - } else { + default: return make([]byte, size) } return buffer[:size] diff --git a/common/buf/ptr.go b/common/buf/ptr.go index 0e883a2..1c26a93 100644 --- a/common/buf/ptr.go +++ b/common/buf/ptr.go @@ -17,6 +17,7 @@ var dbgvars any // go.info.runtime.dbgvars: relocation target go.info.[]github.com/sagernet/sing/common/buf.dbgVar not defined // var dbgvars []dbgVar +//nolint:gochecknoinits func init() { debugVars := *(*[]dbgVar)(unsafe.Pointer(&dbgvars)) for _, v := range debugVars { diff --git a/common/cache/lrucache.go b/common/cache/lrucache.go index 0642bbf..fa0375e 100644 --- a/common/cache/lrucache.go +++ b/common/cache/lrucache.go @@ -191,7 +191,7 @@ func (c *LruCache[K, V]) StoreWithExpire(key K, value V, expires time.Time) { c.cache[key] = c.lru.PushBack(e) if c.maxSize > 0 { - if len := c.lru.Len(); len > c.maxSize { + if n := c.lru.Len(); n > c.maxSize { c.deleteElement(c.lru.Front()) } } diff --git a/common/cond.go b/common/cond.go index 8f4be74..091ea39 100644 --- a/common/cond.go +++ b/common/cond.go @@ -140,7 +140,7 @@ func Must1(_ any, err error) { } } -func Must2(_ any, _ any, err error) { +func Must2(_, _ any, err error) { if err != nil { panic(err) } @@ -168,8 +168,6 @@ func Close(closers ...any) error { retErr = err } continue - } - switch c := closer.(type) { case WithUpstream: err := Close(c.Upstream()) if err != nil { diff --git a/common/exceptions/error.go b/common/exceptions/error.go index 8527b16..a820b4c 100644 --- a/common/exceptions/error.go +++ b/common/exceptions/error.go @@ -1,3 +1,4 @@ +//nolint:errorlint package exceptions import ( diff --git a/common/x/list/list.go b/common/x/list/list.go index d9956fc..8b316e4 100644 --- a/common/x/list/list.go +++ b/common/x/list/list.go @@ -5,10 +5,10 @@ // Package list implements a doubly linked list. // // To iterate over a list (where l is a *List[T]): +// // for e := l.Front(); e != nil; e = e.Next() { // // do something with e.Value // } -// package list // Element is an element of a linked list. diff --git a/format.go b/format.go index e590bcd..8f2a2e2 100644 --- a/format.go +++ b/format.go @@ -1,6 +1,7 @@ -package sing +package shadowsocks //go:generate go install -v mvdan.cc/gofumpt@latest //go:generate go install -v github.com/daixiang0/gci@latest //go:generate gofumpt -l -w . +//go:generate gofmt -s -w . //go:generate gci write . diff --git a/protocol/http/link.go b/protocol/http/link.go new file mode 100644 index 0000000..a1cec77 --- /dev/null +++ b/protocol/http/link.go @@ -0,0 +1,10 @@ +package http + +import ( + "bufio" + "net/http" + _ "unsafe" // for linkname +) + +//go:linkname ReadRequest net/http.readRequest +func ReadRequest(b *bufio.Reader) (req *http.Request, err error) diff --git a/protocol/http/listener.go b/protocol/http/listener.go index 9a45fd6..96b6dd9 100644 --- a/protocol/http/listener.go +++ b/protocol/http/listener.go @@ -1,14 +1,12 @@ package http import ( - "bufio" "context" "encoding/base64" "net" "net/http" "strings" "time" - _ "unsafe" "github.com/sagernet/sing/common" "github.com/sagernet/sing/common/auth" @@ -131,9 +129,6 @@ func HandleRequest(ctx context.Context, request *http.Request, conn net.Conn, au } } -//go:linkname ReadRequest net/http.readRequest -func ReadRequest(b *bufio.Reader) (req *http.Request, err error) - func removeHopByHopHeaders(header http.Header) { // Strip hop-by-hop header based on RFC: // http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.5.1 diff --git a/protocol/socks/packet.go b/protocol/socks/packet.go index f5ded3c..0919536 100644 --- a/protocol/socks/packet.go +++ b/protocol/socks/packet.go @@ -10,11 +10,11 @@ import ( N "github.com/sagernet/sing/common/network" ) -//+----+------+------+----------+----------+----------+ -//|RSV | FRAG | ATYP | DST.ADDR | DST.PORT | DATA | -//+----+------+------+----------+----------+----------+ -//| 2 | 1 | 1 | Variable | 2 | Variable | -//+----+------+------+----------+----------+----------+ +// +----+------+------+----------+----------+----------+ +// |RSV | FRAG | ATYP | DST.ADDR | DST.PORT | DATA | +// +----+------+------+----------+----------+----------+ +// | 2 | 1 | 1 | Variable | 2 | Variable | +// +----+------+------+----------+----------+----------+ type AssociatePacketConn struct { N.PacketConn diff --git a/protocol/socks/socks5/protocol.go b/protocol/socks/socks5/protocol.go index 92d6280..6dfdc02 100644 --- a/protocol/socks/socks5/protocol.go +++ b/protocol/socks/socks5/protocol.go @@ -35,11 +35,11 @@ const ( ReplyCodeAddressTypeUnsupported byte = 8 ) -//+----+----------+----------+ -//|VER | NMETHODS | METHODS | -//+----+----------+----------+ -//| 1 | 1 | 1 to 255 | -//+----+----------+----------+ +// +----+----------+----------+ +// |VER | NMETHODS | METHODS | +// +----+----------+----------+ +// | 1 | 1 | 1 to 255 | +// +----+----------+----------+ type AuthRequest struct { Methods []byte @@ -78,11 +78,11 @@ func ReadAuthRequest0(reader io.Reader) (request AuthRequest, err error) { return } -//+----+--------+ -//|VER | METHOD | -//+----+--------+ -//| 1 | 1 | -//+----+--------+ +// +----+--------+ +// |VER | METHOD | +// +----+--------+ +// | 1 | 1 | +// +----+--------+ type AuthResponse struct { Method byte @@ -105,11 +105,11 @@ func ReadAuthResponse(reader io.Reader) (response AuthResponse, err error) { return } -//+----+------+----------+------+----------+ -//|VER | ULEN | UNAME | PLEN | PASSWD | -//+----+------+----------+------+----------+ -//| 1 | 1 | 1 to 255 | 1 | 1 to 255 | -//+----+------+----------+------+----------+ +// +----+------+----------+------+----------+ +// |VER | ULEN | UNAME | PLEN | PASSWD | +// +----+------+----------+------+----------+ +// | 1 | 1 | 1 to 255 | 1 | 1 to 255 | +// +----+------+----------+------+----------+ type UsernamePasswordAuthRequest struct { Username string @@ -148,11 +148,11 @@ func ReadUsernamePasswordAuthRequest(reader io.Reader) (request UsernamePassword return } -//+----+--------+ -//|VER | STATUS | -//+----+--------+ -//| 1 | 1 | -//+----+--------+ +// +----+--------+ +// |VER | STATUS | +// +----+--------+ +// | 1 | 1 | +// +----+--------+ type UsernamePasswordAuthResponse struct { Status byte @@ -179,11 +179,11 @@ func ReadUsernamePasswordAuthResponse(reader io.Reader) (response UsernamePasswo return } -//+----+-----+-------+------+----------+----------+ -//|VER | CMD | RSV | ATYP | DST.ADDR | DST.PORT | -//+----+-----+-------+------+----------+----------+ -//| 1 | 1 | X'00' | 1 | Variable | 2 | -//+----+-----+-------+------+----------+----------+ +// +----+-----+-------+------+----------+----------+ +// |VER | CMD | RSV | ATYP | DST.ADDR | DST.PORT | +// +----+-----+-------+------+----------+----------+ +// | 1 | 1 | X'00' | 1 | Variable | 2 | +// +----+-----+-------+------+----------+----------+ type Request struct { Command byte @@ -227,11 +227,11 @@ func ReadRequest(reader io.Reader) (request Request, err error) { return } -//+----+-----+-------+------+----------+----------+ -//|VER | REP | RSV | ATYP | BND.ADDR | BND.PORT | -//+----+-----+-------+------+----------+----------+ -//| 1 | 1 | X'00' | 1 | Variable | 2 | -//+----+-----+-------+------+----------+----------+ +// +----+-----+-------+------+----------+----------+ +// |VER | REP | RSV | ATYP | BND.ADDR | BND.PORT | +// +----+-----+-------+------+----------+----------+ +// | 1 | 1 | X'00' | 1 | Variable | 2 | +// +----+-----+-------+------+----------+----------+ type Response struct { ReplyCode byte diff --git a/protocol/trojan/service.go b/protocol/trojan/service.go index 81b5c8d..c3e23f2 100644 --- a/protocol/trojan/service.go +++ b/protocol/trojan/service.go @@ -59,9 +59,8 @@ func (s *Service[K]) RemoveUser(user K) bool { delete(s.users, user) delete(s.keys, key) return true - } else { - return false } + return false } func (s *Service[K]) ResetUsers() {