From 5794dc96efa7008348dbda80a974ba7eadb9817e Mon Sep 17 00:00:00 2001 From: erio Date: Sat, 18 Apr 2026 21:55:29 +0800 Subject: [PATCH] fix(lint): resolve 6 golangci-lint issues blocking CI - safe/safe.go: pass context.Background() to slog.LogAttrs (SA1012) - capture_fingerprint/main.go: wrap ln/raw Close() defers to swallow err - capture_fingerprint/peek_conn.go, serve_h2.go: ignore bytes.Buffer.Write return (cannot fail) - verify_fingerprint/main.go: wrap resp.Body.Close() defer These were pre-existing issues on release/custom-0.1.114 also failing on v0.1.114.1. Fixing now so the current CI run turns green. --- backend/internal/pkg/safe/safe.go | 3 ++- backend/tools/capture_fingerprint/main.go | 4 ++-- backend/tools/capture_fingerprint/peek_conn.go | 2 +- backend/tools/capture_fingerprint/serve_h2.go | 2 +- backend/tools/verify_fingerprint/main.go | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/backend/internal/pkg/safe/safe.go b/backend/internal/pkg/safe/safe.go index b176c37b09..e1d490bfcd 100644 --- a/backend/internal/pkg/safe/safe.go +++ b/backend/internal/pkg/safe/safe.go @@ -7,6 +7,7 @@ package safe import ( + "context" "log/slog" "runtime/debug" ) @@ -61,5 +62,5 @@ func logPanic(event string, attrs []slog.Attr, panicValue any) { slog.Any("panic", panicValue), slog.String("stack", string(debug.Stack())), ) - slog.LogAttrs(nil, slog.LevelError, event+panicSuffix, logAttrs...) + slog.LogAttrs(context.Background(), slog.LevelError, event+panicSuffix, logAttrs...) } diff --git a/backend/tools/capture_fingerprint/main.go b/backend/tools/capture_fingerprint/main.go index 146cf115f6..0071c7f4ca 100644 --- a/backend/tools/capture_fingerprint/main.go +++ b/backend/tools/capture_fingerprint/main.go @@ -49,7 +49,7 @@ func main() { if err != nil { log.Fatalf("listen %s: %v", *addr, err) } - defer ln.Close() + defer func() { _ = ln.Close() }() logStartupBanner(*addr) acceptLoop(ln, tlsCfg, *outFile) @@ -80,7 +80,7 @@ func acceptLoop(ln net.Listener, tlsCfg *ctls.Config, outFile string) { } func handleConn(raw net.Conn, tlsCfg *ctls.Config, outFile string) { - defer raw.Close() + defer func() { _ = raw.Close() }() _ = raw.SetDeadline(time.Now().Add(30 * time.Second)) capture := &Capture{ diff --git a/backend/tools/capture_fingerprint/peek_conn.go b/backend/tools/capture_fingerprint/peek_conn.go index b1d2454158..f6f8426ea5 100644 --- a/backend/tools/capture_fingerprint/peek_conn.go +++ b/backend/tools/capture_fingerprint/peek_conn.go @@ -27,7 +27,7 @@ func (p *peekConn) peek(n int) ([]byte, error) { if _, err := io.ReadFull(p.Conn, chunk); err != nil { return nil, err } - p.buf.Write(chunk) + _, _ = p.buf.Write(chunk) return chunk, nil } diff --git a/backend/tools/capture_fingerprint/serve_h2.go b/backend/tools/capture_fingerprint/serve_h2.go index 54ef4cfa9f..b0b541ac06 100644 --- a/backend/tools/capture_fingerprint/serve_h2.go +++ b/backend/tools/capture_fingerprint/serve_h2.go @@ -186,7 +186,7 @@ func (s *h2Session) handleData(f *http2.DataFrame) { if len(data) > need { data = data[:need] } - buf.Write(data) + _, _ = buf.Write(data) } if f.StreamEnded() { // Attach body preview back to the matching request. diff --git a/backend/tools/verify_fingerprint/main.go b/backend/tools/verify_fingerprint/main.go index 8a7ae6c806..f716c60af1 100644 --- a/backend/tools/verify_fingerprint/main.go +++ b/backend/tools/verify_fingerprint/main.go @@ -73,7 +73,7 @@ func main() { fmt.Printf("check capture server log for ClientHello details\n") return } - defer resp.Body.Close() + defer func() { _ = resp.Body.Close() }() body, _ := io.ReadAll(resp.Body) fmt.Printf("status=%d body=%s\n", resp.StatusCode, body) }