Skip to content

Commit dad346c

Browse files
committed
add codeql
update deps Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
1 parent 04282f9 commit dad346c

File tree

12 files changed

+376
-274
lines changed

12 files changed

+376
-274
lines changed

.github/workflows/codeql.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: "Code scanning - action"
2+
3+
on:
4+
push:
5+
pull_request:
6+
schedule:
7+
- cron: '30 1 * * 6'
8+
9+
jobs:
10+
CodeQL-Build:
11+
runs-on: ubuntu-latest
12+
13+
permissions:
14+
security-events: write
15+
16+
steps:
17+
- name: Checkout repository
18+
uses: actions/checkout@v3
19+
with:
20+
fetch-depth: 0
21+
22+
- name: Set up Go
23+
uses: actions/setup-go@v3
24+
with:
25+
go-version: '1.20'
26+
27+
- name: Initialize CodeQL
28+
uses: github/codeql-action/init@v2
29+
with:
30+
languages: go
31+
32+
- name: Autobuild
33+
uses: github/codeql-action/autobuild@v2
34+
35+
- name: Perform CodeQL Analysis
36+
uses: github/codeql-action/analyze@v2

.github/workflows/development.yml

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -242,36 +242,6 @@ jobs:
242242
go build -trimpath -tags nopgxregisterdefaulttypes,bundle -ldflags "-s -w -X github.com/drakkan/sftpgo/v2/internal/version.commit=`git describe --always --abbrev=8 --dirty` -X github.com/drakkan/sftpgo/v2/internal/version.date=`date -u +%FT%TZ`" -o sftpgo
243243
./sftpgo -v
244244
245-
test-goarch-386:
246-
name: Run test cases on 32-bit arch
247-
runs-on: ubuntu-latest
248-
249-
steps:
250-
- uses: actions/checkout@v3
251-
252-
- name: Set up Go
253-
uses: actions/setup-go@v3
254-
with:
255-
go-version: '1.20'
256-
257-
- name: Build
258-
run: |
259-
cd tests/eventsearcher
260-
go build -trimpath -ldflags "-s -w" -o eventsearcher
261-
cd -
262-
cd tests/ipfilter
263-
go build -trimpath -ldflags "-s -w" -o ipfilter
264-
cd -
265-
env:
266-
GOARCH: 386
267-
268-
- name: Run test cases
269-
run: go test -v -tags nopgxregisterdefaulttypes -p 1 -timeout 15m ./... -covermode=atomic
270-
env:
271-
SFTPGO_DATA_PROVIDER__DRIVER: memory
272-
SFTPGO_DATA_PROVIDER__NAME: ''
273-
GOARCH: 386
274-
275245
test-postgresql-mysql-crdb:
276246
name: Test with PgSQL/MySQL/Cockroach
277247
runs-on: ubuntu-latest

examples/ldapauth/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ go 1.20
44

55
require (
66
github.com/go-ldap/ldap/v3 v3.4.4
7-
golang.org/x/crypto v0.6.0
7+
golang.org/x/crypto v0.7.0
88
)
99

1010
require (
1111
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
1212
github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect
13-
golang.org/x/sys v0.5.0 // indirect
13+
golang.org/x/sys v0.6.0 // indirect
1414
)

examples/ldapauth/go.sum

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
1313
github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s=
1414
github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
1515
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
16-
golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
17-
golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
16+
golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A=
17+
golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
1818
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
1919
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
2020
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
2121
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
22-
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
23-
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
22+
golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
23+
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
2424
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
25-
golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=
25+
golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw=
2626
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
2727
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
2828
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

examples/ldapauthserver/go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/rs/zerolog v1.29.0
1111
github.com/spf13/cobra v1.6.1
1212
github.com/spf13/viper v1.15.0
13-
golang.org/x/crypto v0.6.0
13+
golang.org/x/crypto v0.7.0
1414
gopkg.in/natefinch/lumberjack.v2 v2.2.1
1515
)
1616

@@ -25,14 +25,14 @@ require (
2525
github.com/mattn/go-colorable v0.1.13 // indirect
2626
github.com/mattn/go-isatty v0.0.17 // indirect
2727
github.com/mitchellh/mapstructure v1.5.0 // indirect
28-
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
28+
github.com/pelletier/go-toml/v2 v2.0.7 // indirect
2929
github.com/spf13/afero v1.9.4 // indirect
3030
github.com/spf13/cast v1.5.0 // indirect
3131
github.com/spf13/jwalterweatherman v1.1.0 // indirect
3232
github.com/spf13/pflag v1.0.5 // indirect
3333
github.com/subosito/gotenv v1.4.2 // indirect
34-
golang.org/x/sys v0.5.0 // indirect
35-
golang.org/x/text v0.7.0 // indirect
34+
golang.org/x/sys v0.6.0 // indirect
35+
golang.org/x/text v0.8.0 // indirect
3636
gopkg.in/ini.v1 v1.67.0 // indirect
3737
gopkg.in/yaml.v3 v3.0.1 // indirect
3838
)

examples/ldapauthserver/go.sum

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyua
163163
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
164164
github.com/nathanaelle/password/v2 v2.0.1 h1:ItoCTdsuIWzilYmllQPa3DR3YoCXcpfxScWLqr8Ii2s=
165165
github.com/nathanaelle/password/v2 v2.0.1/go.mod h1:eaoT+ICQEPNtikBRIAatN8ThWwMhVG+r1jTw60BvPJk=
166-
github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU=
167-
github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek=
166+
github.com/pelletier/go-toml/v2 v2.0.7 h1:muncTPStnKRos5dpVKULv2FVd4bMOhNePj9CjgDb8Us=
167+
github.com/pelletier/go-toml/v2 v2.0.7/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek=
168168
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
169169
github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
170170
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -221,8 +221,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
221221
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
222222
golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
223223
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
224-
golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
225-
golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
224+
golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A=
225+
golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
226226
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
227227
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
228228
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -346,19 +346,19 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc
346346
golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
347347
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
348348
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
349-
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
350-
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
349+
golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
350+
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
351351
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
352-
golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=
352+
golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw=
353353
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
354354
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
355355
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
356356
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
357357
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
358358
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
359359
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
360-
golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
361-
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
360+
golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
361+
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
362362
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
363363
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
364364
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

go.mod

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.4.0
88
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.0.0
99
github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962
10-
github.com/alexedwards/argon2id v0.0.0-20211130144151-3585854a6387
10+
github.com/alexedwards/argon2id v0.0.0-20230305115115-4b3c3280a736
1111
github.com/aws/aws-sdk-go-v2 v1.17.5
1212
github.com/aws/aws-sdk-go-v2/config v1.18.15
1313
github.com/aws/aws-sdk-go-v2/credentials v1.13.15
@@ -35,7 +35,7 @@ require (
3535
github.com/hashicorp/go-hclog v1.4.0
3636
github.com/hashicorp/go-plugin v1.4.9
3737
github.com/hashicorp/go-retryablehttp v0.7.2
38-
github.com/jackc/pgx/v5 v5.3.1
38+
github.com/jackc/pgx/v5 v5.3.2-0.20230304152536-0dbb0a52ab75
3939
github.com/jlaffaye/ftp v0.0.0-20201112195030-9aae4d151126
4040
github.com/klauspost/compress v1.16.0
4141
github.com/lestrrat-go/jwx/v2 v2.0.8
@@ -66,12 +66,12 @@ require (
6666
github.com/yl2chen/cidranger v1.0.3-0.20210928021809-d1cb2c52f37a
6767
go.etcd.io/bbolt v1.3.7
6868
go.uber.org/automaxprocs v1.5.1
69-
gocloud.dev v0.28.0
70-
golang.org/x/crypto v0.6.0
71-
golang.org/x/net v0.7.0
72-
golang.org/x/oauth2 v0.5.0
73-
golang.org/x/sys v0.5.0
74-
golang.org/x/term v0.5.0
69+
gocloud.dev v0.29.0
70+
golang.org/x/crypto v0.7.0
71+
golang.org/x/net v0.8.0
72+
golang.org/x/oauth2 v0.6.0
73+
golang.org/x/sys v0.6.0
74+
golang.org/x/term v0.6.0
7575
golang.org/x/time v0.3.0
7676
google.golang.org/api v0.111.0
7777
gopkg.in/natefinch/lumberjack.v2 v2.2.1
@@ -152,8 +152,8 @@ require (
152152
github.com/tklauser/numcpus v0.6.0 // indirect
153153
github.com/yusufpapurcu/wmi v1.2.2 // indirect
154154
go.opencensus.io v0.24.0 // indirect
155-
golang.org/x/mod v0.8.0 // indirect
156-
golang.org/x/text v0.7.0 // indirect
155+
golang.org/x/mod v0.9.0 // indirect
156+
golang.org/x/text v0.8.0 // indirect
157157
golang.org/x/tools v0.6.0 // indirect
158158
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
159159
google.golang.org/appengine v1.6.7 // indirect
@@ -165,7 +165,8 @@ require (
165165
)
166166

167167
replace (
168+
github.com/jackc/pgx/v5 => github.com/drakkan/pgx/v5 v5.0.0-20230305135103-d3d9c8a78e56
168169
github.com/jlaffaye/ftp => github.com/drakkan/ftp v0.0.0-20201114075148-9b9adce499a9
169170
github.com/robfig/cron/v3 => github.com/drakkan/cron/v3 v3.0.0-20230222140221-217a1e4d96c0
170-
golang.org/x/crypto => github.com/drakkan/crypto v0.0.0-20230209112458-e15d12511558
171+
golang.org/x/crypto => github.com/drakkan/crypto v0.0.0-20230305062608-96564146159b
171172
)

0 commit comments

Comments
 (0)