Skip to content

Commit 6936c65

Browse files
thinkgosthinkgos
committed
ci: fix ci
1 parent d1a31a9 commit 6936c65

File tree

8 files changed

+36
-24
lines changed

8 files changed

+36
-24
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ on:
88
paths-ignore:
99
- "**.md"
1010

11+
permissions:
12+
contents: read
13+
1114
env:
1215
GO111MODULE: on
1316
GOPROXY: "https://proxy.golang.org"

‎.github/workflows/codeql.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@ name: CodeQL
33
on:
44
push:
55
paths-ignore:
6-
- '**.md'
6+
- "**.md"
77
pull_request:
88
paths-ignore:
9-
- '**.md'
9+
- "**.md"
1010
schedule:
11-
- cron: '0 5 * * 6'
11+
- cron: "0 5 * * 6"
12+
13+
permissions:
14+
contents: read
1215

1316
jobs:
1417
analyze:
@@ -44,4 +47,4 @@ jobs:
4447
# make release
4548

4649
- name: Perform CodeQL Analysis
47-
uses: github/codeql-action/analyze@v3
50+
uses: github/codeql-action/analyze@v3

‎.github/workflows/lint.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ on:
55
paths-ignore:
66
- "**.md"
77

8+
permissions:
9+
contents: read
10+
811
jobs:
912
golangci:
1013
name: Golangci-Lint

‎.github/workflows/pr_review_dog.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ on:
55
paths-ignore:
66
- "**.md"
77

8+
permissions:
9+
contents: read
10+
811
jobs:
912
golangci-lint:
1013
name: runner / golangci-lint

‎handle.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ func (sf *Server) handleConnect(ctx context.Context, writer io.Writer, request *
128128
dial := sf.dial
129129
if dial == nil {
130130
dial = func(ctx context.Context, net_, addr string) (net.Conn, error) {
131-
return net.Dial(net_, addr)
131+
return net.Dial(net_, addr) // nolint: noctx
132132
}
133133
}
134134
target, err = dial(ctx, "tcp", request.DestAddr.String())
@@ -183,7 +183,7 @@ func (sf *Server) handleAssociate(ctx context.Context, writer io.Writer, request
183183
dial := sf.dial
184184
if dial == nil {
185185
dial = func(_ context.Context, net_, addr string) (net.Conn, error) {
186-
return net.Dial(net_, addr)
186+
return net.Dial(net_, addr) // nolint: noctx
187187
}
188188
}
189189

‎handle_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func (m *MockConn) RemoteAddr() net.Addr {
2828

2929
func TestRequest_Connect(t *testing.T) {
3030
// Create a local listener
31-
l, err := net.Listen("tcp", "127.0.0.1:0")
31+
l, err := net.Listen("tcp", "127.0.0.1:0") // nolint: noctx
3232
require.NoError(t, err)
3333

3434
go func() {
@@ -85,7 +85,7 @@ func TestRequest_Connect(t *testing.T) {
8585

8686
func TestRequest_Connect_RuleFail(t *testing.T) {
8787
// Create a local listener
88-
l, err := net.Listen("tcp", "127.0.0.1:0")
88+
l, err := net.Listen("tcp", "127.0.0.1:0") // nolint: noctx
8989
require.NoError(t, err)
9090

9191
go func() {

‎server.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ func NewServer(opts ...Option) *Server {
9494

9595
// ListenAndServe is used to create a listener and serve on it
9696
func (sf *Server) ListenAndServe(network, addr string) error {
97-
l, err := net.Listen(network, addr)
97+
l, err := net.Listen(network, addr) // nolint: noctx
9898
if err != nil {
9999
return err
100100
}

‎server_test.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
func TestSOCKS5_Connect(t *testing.T) {
2323
t.Run("connect", func(t *testing.T) {
2424
// Create a local listener
25-
l, err := net.Listen("tcp", "127.0.0.1:0")
25+
l, err := net.Listen("tcp", "127.0.0.1:0") // nolint: noctx
2626
require.NoError(t, err)
2727

2828
go func() {
@@ -47,7 +47,7 @@ func TestSOCKS5_Connect(t *testing.T) {
4747
WithDialAndRequest(func(ctx context.Context, network, addr string, request *Request) (net.Conn, error) {
4848
require.Equal(t, network, "tcp")
4949
require.Equal(t, addr, lAddr.String())
50-
return net.Dial(network, addr)
50+
return net.Dial(network, addr) // nolint: noctx
5151
}),
5252
)
5353

@@ -59,7 +59,7 @@ func TestSOCKS5_Connect(t *testing.T) {
5959
time.Sleep(10 * time.Millisecond)
6060

6161
// Get a local conn
62-
conn, err := net.Dial("tcp", "127.0.0.1:12365")
62+
conn, err := net.Dial("tcp", "127.0.0.1:12365") // nolint: noctx
6363
require.NoError(t, err)
6464

6565
// Connect, auth and connec to local
@@ -118,7 +118,7 @@ func TestSOCKS5_Connect(t *testing.T) {
118118

119119
t.Run("connect/customerHandler", func(t *testing.T) {
120120
// Create a local listener
121-
l, err := net.Listen("tcp", "127.0.0.1:0")
121+
l, err := net.Listen("tcp", "127.0.0.1:0") // nolint: noctx
122122
require.NoError(t, err)
123123

124124
go func() {
@@ -143,7 +143,7 @@ func TestSOCKS5_Connect(t *testing.T) {
143143
WithDialAndRequest(func(ctx context.Context, network, addr string, request *Request) (net.Conn, error) {
144144
require.Equal(t, network, "tcp")
145145
require.Equal(t, addr, lAddr.String())
146-
return net.Dial(network, addr)
146+
return net.Dial(network, addr) // nolint: noctx
147147
}),
148148
WithConnectHandle(func(ctx context.Context, writer io.Writer, request *Request) error {
149149
rsp := statute.Reply{
@@ -173,7 +173,7 @@ func TestSOCKS5_Connect(t *testing.T) {
173173
time.Sleep(10 * time.Millisecond)
174174

175175
// Get a local conn
176-
conn, err := net.Dial("tcp", "127.0.0.1:12369")
176+
conn, err := net.Dial("tcp", "127.0.0.1:12369") // nolint: noctx
177177
require.NoError(t, err)
178178

179179
// Connect, auth and connec to local
@@ -234,7 +234,7 @@ func TestSOCKS5_Connect(t *testing.T) {
234234
var middlewareCalled bool
235235

236236
// Create a local listener
237-
l, err := net.Listen("tcp", "127.0.0.1:0")
237+
l, err := net.Listen("tcp", "127.0.0.1:0") // nolint: noctx
238238
require.NoError(t, err)
239239

240240
go func() {
@@ -259,7 +259,7 @@ func TestSOCKS5_Connect(t *testing.T) {
259259
WithDialAndRequest(func(ctx context.Context, network, addr string, request *Request) (net.Conn, error) {
260260
require.Equal(t, network, "tcp")
261261
require.Equal(t, addr, lAddr.String())
262-
return net.Dial(network, addr)
262+
return net.Dial(network, addr) // nolint: noctx
263263
}),
264264
WithConnectMiddleware(func(ctx context.Context, writer io.Writer, request *Request) error {
265265
middlewareCalled = true
@@ -276,7 +276,7 @@ func TestSOCKS5_Connect(t *testing.T) {
276276
time.Sleep(10 * time.Millisecond)
277277

278278
// Get a local conn
279-
conn, err := net.Dial("tcp", "127.0.0.1:12366")
279+
conn, err := net.Dial("tcp", "127.0.0.1:12366") // nolint: noctx
280280
require.NoError(t, err)
281281

282282
// Connect, auth and connec to local
@@ -338,7 +338,7 @@ func TestSOCKS5_Connect(t *testing.T) {
338338
var middlewareCalled bool
339339

340340
// Create a local listener
341-
l, err := net.Listen("tcp", "127.0.0.1:0")
341+
l, err := net.Listen("tcp", "127.0.0.1:0") // nolint: noctx
342342
require.NoError(t, err)
343343

344344
go func() {
@@ -363,7 +363,7 @@ func TestSOCKS5_Connect(t *testing.T) {
363363
WithDialAndRequest(func(ctx context.Context, network, addr string, request *Request) (net.Conn, error) {
364364
require.Equal(t, network, "tcp")
365365
require.Equal(t, addr, lAddr.String())
366-
return net.Dial(network, addr)
366+
return net.Dial(network, addr) // nolint: noctx
367367
}),
368368
WithConnectMiddleware(func(ctx context.Context, writer io.Writer, request *Request) error {
369369
middlewareCalled = true
@@ -380,7 +380,7 @@ func TestSOCKS5_Connect(t *testing.T) {
380380
time.Sleep(10 * time.Millisecond)
381381

382382
// Get a local conn
383-
conn, err := net.Dial("tcp", "127.0.0.1:12367")
383+
conn, err := net.Dial("tcp", "127.0.0.1:12367") // nolint: noctx
384384
require.NoError(t, err)
385385

386386
// Connect, auth and connec to local
@@ -477,7 +477,7 @@ func TestSOCKS5_Associate(t *testing.T) {
477477
time.Sleep(10 * time.Millisecond)
478478

479479
// Get a local conn
480-
conn, err := net.Dial("tcp", "127.0.0.1:12355")
480+
conn, err := net.Dial("tcp", "127.0.0.1:12355") // nolint: noctx
481481
require.NoError(t, err)
482482

483483
// Connect, auth and connec to local
@@ -583,7 +583,7 @@ func TestSOCKS5_Associate(t *testing.T) {
583583
time.Sleep(10 * time.Millisecond)
584584

585585
// Get a local conn
586-
conn, err := net.Dial("tcp", "127.0.0.1:12356")
586+
conn, err := net.Dial("tcp", "127.0.0.1:12356") // nolint: noctx
587587
require.NoError(t, err)
588588

589589
// Connect, auth and connec to local
@@ -646,7 +646,7 @@ func TestSOCKS5_Associate(t *testing.T) {
646646

647647
func Test_SocksWithProxy(t *testing.T) {
648648
// Create a local listener
649-
l, err := net.Listen("tcp", "127.0.0.1:0")
649+
l, err := net.Listen("tcp", "127.0.0.1:0") // nolint: noctx
650650
require.NoError(t, err)
651651

652652
go func() {

0 commit comments

Comments
 (0)