Browse Source

chore: fix lint issues

pull/162/head
Moroka8 3 weeks ago
parent
commit
f9868ba245
  1. 2
      pkg/clientcore/captcha_v2_slider.go
  2. 5
      pkg/clientcore/main.go
  3. 2
      pkg/clientcore/slider_captcha.go
  4. 4
      pkg/clientcore/wrap_test.go
  5. 4
      server/udp_listener.go
  6. 10
      server/wrap.go

2
pkg/clientcore/captcha_v2_slider.go

@ -8,7 +8,7 @@ import (
"fmt"
"image"
"image/color"
_ "image/jpeg"
_ "image/jpeg" // register JPEG decoder
"log"
"math"
mathrand "math/rand"

5
pkg/clientcore/main.go

@ -1930,6 +1930,7 @@ func oneTurnConnection(ctx context.Context, turnParams *turnParams, peer *net.UD
wg := sync.WaitGroup{}
wg.Add(1)
turnctx, turncancel := context.WithCancel(ctx)
defer turncancel()
stats := &throughputStats{}
go stats.logEvery(turnctx, fmt.Sprintf("[STREAM %d] TURN", streamID), "to-turn", "from-turn")
@ -2201,8 +2202,8 @@ func Run(ctx context.Context, cfg Config) error {
if captchaSolverVersion != "v1" && captchaSolverVersion != "v2" {
captchaSolverVersion = "v2"
}
if err := setLocalCaptchaHost(cfg.CaptchaHost); err != nil {
return err
if captchaHostErr := setLocalCaptchaHost(cfg.CaptchaHost); captchaHostErr != nil {
return captchaHostErr
}
autoCaptchaSliderPOC = !manualCaptcha

2
pkg/clientcore/slider_captcha.go

@ -8,7 +8,7 @@ import (
"fmt"
"image"
"image/color"
_ "image/jpeg"
_ "image/jpeg" // register JPEG decoder
"io"
"log"
"math/rand"

4
pkg/clientcore/wrap_test.go

@ -170,7 +170,7 @@ func TestUnwrapRejectsTamperedPacket(t *testing.T) {
wire[wrapHeaderLen+1] ^= 0xFF
dst := make([]byte, 1600)
if _, err := server.unwrapPacket(wire, dst); err == nil {
if _, unwrapErr := server.unwrapPacket(wire, dst); unwrapErr == nil {
t.Fatalf("unwrapPacket accepted tampered ciphertext")
}
@ -180,7 +180,7 @@ func TestUnwrapRejectsTamperedPacket(t *testing.T) {
}
wire = wire[:n]
wire[8] ^= 0x01
if _, err := server.unwrapPacket(wire, dst); err == nil {
if _, unwrapErr := server.unwrapPacket(wire, dst); unwrapErr == nil {
t.Fatalf("unwrapPacket accepted tampered AAD")
}
}

4
server/udp_listener.go

@ -134,7 +134,9 @@ func (l *udpPacketListener) readLoop() {
func (l *udpPacketListener) dispatchMsg(raddr net.Addr, buf []byte) {
conn, ok := l.getConn(raddr, buf)
if ok {
_, _ = conn.buffer.Write(buf)
if _, err := conn.buffer.Write(buf); err != nil {
debugf("udp listener buffer write failed: %v", err)
}
}
}

10
server/wrap.go

@ -114,7 +114,10 @@ type wrapPacketConn struct {
}
func (c *wrapPacketConn) ReadFrom(p []byte) (int, net.Addr, error) {
bp := bufPool.Get().(*[]byte)
bp, ok := bufPool.Get().(*[]byte)
if !ok {
return 0, nil, errors.New("wrap: buffer pool returned invalid type")
}
buf := *bp
need := len(p) + wrapOverhead
if cap(buf) < need {
@ -149,7 +152,10 @@ func (c *wrapPacketConn) ReadFrom(p []byte) (int, net.Addr, error) {
func (c *wrapPacketConn) WriteTo(p []byte, addr net.Addr) (int, error) {
wireLen := wrapOverhead + len(p)
bp := bufPool.Get().(*[]byte)
bp, ok := bufPool.Get().(*[]byte)
if !ok {
return 0, errors.New("wrap: buffer pool returned invalid type")
}
out := *bp
if cap(out) < wireLen {
out = make([]byte, wireLen)

Loading…
Cancel
Save