Skip to content

Commit 65ccff5

Browse files
authored
Update go deps (#19665)
* update gitea.com/go-chi/binding * update github.com/42wim/sshsig * update github.com/PuerkitoBio/goquery * update github.com/blevesearch/bleve/v2 * update github.com/caddyserver/certmagic * update github.com/duo-labs/webauthn * update github.com/editorconfig/editorconfig-core-go/v2 * update github.com/emirpasic/gods * update github.com/gliderlabs/ssh * update github.com/go-chi/cors * update github.com/go-enry/go-enry/v2 * update github.com/go-git/go-git/v5 * update github.com/go-ldap/ldap/v3 * update github.com/golang-jwt/jwt/v4 * update github.com/google/pprof * update github.com/klauspost/compress * update github.com/lib/pq * update github.com/markbates/goth * update github.com/minio/minio-go/v7 * update github.com/olivere/elastic/v7 * update github.com/unrolled/render * update github.com/urfave/cli * update github.com/xanzy/go-gitlab * update github.com/yuin/goldmark * adopt breaking changes of certmagic
1 parent 443675d commit 65ccff5

File tree

3 files changed

+146
-120
lines changed

3 files changed

+146
-120
lines changed

cmd/web_acme.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func runACME(listenAddr string, m http.Handler) error {
6666
log.Warn("Failed to parse CA Root certificate, using default CA trust: %v", err)
6767
}
6868
}
69-
myACME := certmagic.NewACMEManager(magic, certmagic.ACMEManager{
69+
myACME := certmagic.NewACMEIssuer(magic, certmagic.ACMEIssuer{
7070
CA: setting.AcmeURL,
7171
TrustedRoots: certPool,
7272
Email: setting.AcmeEmail,

go.mod

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,24 @@ require (
1414
github.com/NYTimes/gziphandler v1.1.1
1515
github.com/PuerkitoBio/goquery v1.8.0
1616
github.com/alecthomas/chroma v0.10.0
17-
github.com/blevesearch/bleve/v2 v2.3.1
18-
github.com/caddyserver/certmagic v0.15.4
17+
github.com/blevesearch/bleve/v2 v2.3.2
18+
github.com/caddyserver/certmagic v0.16.1
1919
github.com/chi-middleware/proxy v1.1.1
2020
github.com/denisenkom/go-mssqldb v0.12.0
2121
github.com/djherbis/buffer v1.2.0
2222
github.com/djherbis/nio/v3 v3.0.1
23-
github.com/duo-labs/webauthn v0.0.0-20220223184316-4d1cf2d34051
23+
github.com/duo-labs/webauthn v0.0.0-20220330035159-03696f3d4499
2424
github.com/dustin/go-humanize v1.0.0
25-
github.com/editorconfig/editorconfig-core-go/v2 v2.4.3
26-
github.com/emirpasic/gods v1.12.0
25+
github.com/editorconfig/editorconfig-core-go/v2 v2.4.4
26+
github.com/emirpasic/gods v1.18.1
2727
github.com/ethantkoenig/rupture v1.0.1
28-
github.com/gliderlabs/ssh v0.3.3
28+
github.com/gliderlabs/ssh v0.3.4
2929
github.com/go-chi/chi/v5 v5.0.7
30-
github.com/go-chi/cors v1.2.0
31-
github.com/go-enry/go-enry/v2 v2.8.0
30+
github.com/go-chi/cors v1.2.1
31+
github.com/go-enry/go-enry/v2 v2.8.2
3232
github.com/go-git/go-billy/v5 v5.3.1
3333
github.com/go-git/go-git/v5 v5.4.3-0.20210630082519-b4368b2a2ca4
34-
github.com/go-ldap/ldap/v3 v3.4.2
34+
github.com/go-ldap/ldap/v3 v3.4.3
3535
github.com/go-redis/redis/v8 v8.11.5
3636
github.com/go-sql-driver/mysql v1.6.0
3737
github.com/go-swagger/go-swagger v0.29.0
@@ -40,9 +40,9 @@ require (
4040
github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f
4141
github.com/gogs/cron v0.0.0-20171120032916-9f6c956d3e14
4242
github.com/gogs/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85
43-
github.com/golang-jwt/jwt/v4 v4.3.0
43+
github.com/golang-jwt/jwt/v4 v4.4.1
4444
github.com/google/go-github/v39 v39.2.0
45-
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1
45+
github.com/google/pprof v0.0.0-20220509035851-59ca7ad80af3
4646
github.com/google/uuid v1.3.0
4747
github.com/gorilla/feeds v1.1.1
4848
github.com/gorilla/sessions v1.2.1
@@ -53,46 +53,46 @@ require (
5353
github.com/json-iterator/go v1.1.12
5454
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
5555
github.com/keybase/go-crypto v0.0.0-20200123153347-de78d2cb44f4
56-
github.com/klauspost/compress v1.15.0
57-
github.com/klauspost/cpuid/v2 v2.0.11
58-
github.com/lib/pq v1.10.4
56+
github.com/klauspost/compress v1.15.3
57+
github.com/klauspost/cpuid/v2 v2.0.12
58+
github.com/lib/pq v1.10.5
5959
github.com/lunny/dingtalk_webhook v0.0.0-20171025031554-e3534c89ef96
60-
github.com/markbates/goth v1.69.0
60+
github.com/markbates/goth v1.72.0
6161
github.com/mattn/go-isatty v0.0.14
6262
github.com/mattn/go-sqlite3 v1.14.12
6363
github.com/mholt/archiver/v3 v3.5.1
6464
github.com/microcosm-cc/bluemonday v1.0.18
65-
github.com/minio/minio-go/v7 v7.0.23
65+
github.com/minio/minio-go/v7 v7.0.26
6666
github.com/msteinert/pam v1.0.0
6767
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
6868
github.com/niklasfasching/go-org v1.6.2
6969
github.com/oliamb/cutter v0.2.2
70-
github.com/olivere/elastic/v7 v7.0.31
70+
github.com/olivere/elastic/v7 v7.0.32
7171
github.com/pkg/errors v0.9.1
7272
github.com/pquerna/otp v1.3.0
7373
github.com/prometheus/client_golang v1.12.1
7474
github.com/quasoft/websspi v1.1.2
7575
github.com/santhosh-tekuri/jsonschema/v5 v5.0.0
7676
github.com/sergi/go-diff v1.2.0
7777
github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546
78-
github.com/stretchr/testify v1.7.0
78+
github.com/stretchr/testify v1.7.1
7979
github.com/syndtr/goleveldb v1.0.0
8080
github.com/tstranex/u2f v1.0.0
8181
github.com/unrolled/render v1.4.1
82-
github.com/urfave/cli v1.22.5
83-
github.com/xanzy/go-gitlab v0.58.0
82+
github.com/urfave/cli v1.22.9
83+
github.com/xanzy/go-gitlab v0.64.0
8484
github.com/yohcop/openid-go v1.0.0
85-
github.com/yuin/goldmark v1.4.11
85+
github.com/yuin/goldmark v1.4.12
8686
github.com/yuin/goldmark-highlighting v0.0.0-20220208100518-594be1970594
8787
github.com/yuin/goldmark-meta v1.1.0
8888
go.jolheiser.com/hcaptcha v0.0.4
8989
go.jolheiser.com/pwn v0.0.3
90-
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd
91-
golang.org/x/net v0.0.0-20220225172249-27dd8689420f
92-
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b
93-
golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9
90+
golang.org/x/crypto v0.0.0-20220507011949-2cf3adece122
91+
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4
92+
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5
93+
golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6
9494
golang.org/x/text v0.3.7
95-
golang.org/x/tools v0.1.9
95+
golang.org/x/tools v0.1.10
9696
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
9797
gopkg.in/ini.v1 v1.66.4
9898
gopkg.in/yaml.v2 v2.4.0
@@ -106,7 +106,7 @@ require (
106106
cloud.google.com/go v0.99.0 // indirect
107107
github.com/Azure/go-ntlmssp v0.0.0-20211209120228-48547f28849e // indirect
108108
github.com/Microsoft/go-winio v0.5.2 // indirect
109-
github.com/ProtonMail/go-crypto v0.0.0-20220113124808-70ae35bab23f // indirect
109+
github.com/ProtonMail/go-crypto v0.0.0-20220407094043-a94812496cf5 // indirect
110110
github.com/PuerkitoBio/purell v1.1.1 // indirect
111111
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
112112
github.com/RoaringBitmap/roaring v0.9.4 // indirect
@@ -118,9 +118,10 @@ require (
118118
github.com/aymerick/douceur v0.2.0 // indirect
119119
github.com/beorn7/perks v1.0.1 // indirect
120120
github.com/bgentry/speakeasy v0.1.0 // indirect
121-
github.com/bits-and-blooms/bitset v1.2.1 // indirect
121+
github.com/bits-and-blooms/bitset v1.2.2 // indirect
122122
github.com/blevesearch/bleve_index_api v1.0.1 // indirect
123123
github.com/blevesearch/go-porterstemmer v1.0.3 // indirect
124+
github.com/blevesearch/gtreap v0.1.1 // indirect
124125
github.com/blevesearch/mmap-go v1.0.3 // indirect
125126
github.com/blevesearch/scorch_segment_api/v2 v2.1.0 // indirect
126127
github.com/blevesearch/segment v0.9.0 // indirect
@@ -144,7 +145,7 @@ require (
144145
github.com/couchbase/go-couchbase v0.0.0-20210224140812-5740cd35f448 // indirect
145146
github.com/couchbase/gomemcached v0.1.2 // indirect
146147
github.com/couchbase/goutils v0.0.0-20210118111533-e33d3ffb5401 // indirect
147-
github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
148+
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
148149
github.com/davecgh/go-spew v1.1.1 // indirect
149150
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
150151
github.com/dlclark/regexp2 v1.4.0 // indirect
@@ -153,10 +154,10 @@ require (
153154
github.com/envoyproxy/protoc-gen-validate v0.6.2 // indirect
154155
github.com/felixge/httpsnoop v1.0.2 // indirect
155156
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
156-
github.com/fsnotify/fsnotify v1.5.1 // indirect
157+
github.com/fsnotify/fsnotify v1.5.4 // indirect
157158
github.com/fullstorydev/grpcurl v1.8.1 // indirect
158159
github.com/fxamacker/cbor/v2 v2.4.0 // indirect
159-
github.com/go-asn1-ber/asn1-ber v1.5.3 // indirect
160+
github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect
160161
github.com/go-enry/go-oniguruma v1.2.1 // indirect
161162
github.com/go-git/gcfg v1.5.0 // indirect
162163
github.com/go-openapi/analysis v0.21.2 // indirect
@@ -171,7 +172,7 @@ require (
171172
github.com/go-openapi/swag v0.19.15 // indirect
172173
github.com/go-openapi/validate v0.20.3 // indirect
173174
github.com/go-stack/stack v1.8.1 // indirect
174-
github.com/goccy/go-json v0.9.5 // indirect
175+
github.com/goccy/go-json v0.9.7 // indirect
175176
github.com/gogo/protobuf v1.3.2 // indirect
176177
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
177178
github.com/golang-sql/sqlexp v0.0.0-20170517235910-f1bb20e5a188 // indirect
@@ -191,7 +192,7 @@ require (
191192
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
192193
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
193194
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
194-
github.com/hashicorp/go-retryablehttp v0.7.0 // indirect
195+
github.com/hashicorp/go-retryablehttp v0.7.1 // indirect
195196
github.com/hashicorp/hcl v1.0.0 // indirect
196197
github.com/imdario/mergo v0.3.12 // indirect
197198
github.com/inconshreveable/mousetrap v1.0.0 // indirect
@@ -211,7 +212,7 @@ require (
211212
github.com/mattn/go-runewidth v0.0.13 // indirect
212213
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
213214
github.com/mholt/acmez v1.0.2 // indirect
214-
github.com/miekg/dns v1.1.46 // indirect
215+
github.com/miekg/dns v1.1.48 // indirect
215216
github.com/minio/md5-simd v1.1.2 // indirect
216217
github.com/minio/sha256-simd v1.0.0 // indirect
217218
github.com/mitchellh/go-homedir v1.1.0 // indirect
@@ -231,7 +232,7 @@ require (
231232
github.com/prometheus/procfs v0.7.3 // indirect
232233
github.com/rivo/uniseg v0.2.0 // indirect
233234
github.com/rogpeppe/go-internal v1.8.1 // indirect
234-
github.com/rs/xid v1.3.0 // indirect
235+
github.com/rs/xid v1.4.0 // indirect
235236
github.com/russross/blackfriday/v2 v2.1.0 // indirect
236237
github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
237238
github.com/sirupsen/logrus v1.8.1 // indirect
@@ -243,7 +244,6 @@ require (
243244
github.com/spf13/pflag v1.0.5 // indirect
244245
github.com/spf13/viper v1.10.1 // indirect
245246
github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect
246-
github.com/steveyen/gtreap v0.1.0 // indirect
247247
github.com/subosito/gotenv v1.2.0 // indirect
248248
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
249249
github.com/toqueteos/webbrowser v1.2.0 // indirect
@@ -268,13 +268,13 @@ require (
268268
go.uber.org/atomic v1.9.0 // indirect
269269
go.uber.org/multierr v1.8.0 // indirect
270270
go.uber.org/zap v1.21.0 // indirect
271-
golang.org/x/mod v0.5.1 // indirect
272-
golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect
273-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
271+
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
272+
golang.org/x/time v0.0.0-20220411224347-583f2d630306 // indirect
273+
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
274274
google.golang.org/appengine v1.6.7 // indirect
275275
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
276276
google.golang.org/grpc v1.43.0 // indirect
277-
google.golang.org/protobuf v1.27.1 // indirect
277+
google.golang.org/protobuf v1.28.0 // indirect
278278
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
279279
gopkg.in/cheggaaa/pb.v1 v1.0.28 // indirect
280280
gopkg.in/warnings.v0 v0.1.2 // indirect

0 commit comments

Comments
 (0)