Skip to content

Commit 6f231a7

Browse files
Replace deprecated Webauthn library (#22400)
Fix #22052 Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
1 parent 2220e5d commit 6f231a7

File tree

8 files changed

+59
-462
lines changed

8 files changed

+59
-462
lines changed

assets/go-licenses.json

+15-15
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

+9-48
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ require (
2323
github.com/denisenkom/go-mssqldb v0.12.2
2424
github.com/djherbis/buffer v1.2.0
2525
github.com/djherbis/nio/v3 v3.0.1
26-
github.com/duo-labs/webauthn v0.0.0-20220815211337-00c9fb5711f5
2726
github.com/dustin/go-humanize v1.0.0
2827
github.com/editorconfig/editorconfig-core-go/v2 v2.4.5
2928
github.com/emirpasic/gods v1.18.1
@@ -44,11 +43,12 @@ require (
4443
github.com/go-sql-driver/mysql v1.6.0
4544
github.com/go-swagger/go-swagger v0.30.3
4645
github.com/go-testfixtures/testfixtures/v3 v3.8.1
46+
github.com/go-webauthn/webauthn v0.6.0
4747
github.com/gobwas/glob v0.2.3
4848
github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f
4949
github.com/gogs/cron v0.0.0-20171120032916-9f6c956d3e14
5050
github.com/gogs/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85
51-
github.com/golang-jwt/jwt/v4 v4.4.2
51+
github.com/golang-jwt/jwt/v4 v4.4.3
5252
github.com/google/go-github/v45 v45.2.0
5353
github.com/google/pprof v0.0.0-20220829040838-70bd9ae97f40
5454
github.com/google/uuid v1.3.0
@@ -82,7 +82,7 @@ require (
8282
github.com/santhosh-tekuri/jsonschema/v5 v5.0.1
8383
github.com/sergi/go-diff v1.2.0
8484
github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546
85-
github.com/stretchr/testify v1.8.0
85+
github.com/stretchr/testify v1.8.1
8686
github.com/syndtr/goleveldb v1.0.0
8787
github.com/tstranex/u2f v1.0.0
8888
github.com/unrolled/render v1.5.0
@@ -95,11 +95,11 @@ require (
9595
github.com/yuin/goldmark-meta v1.1.0
9696
go.jolheiser.com/hcaptcha v0.0.4
9797
go.jolheiser.com/pwn v0.0.3
98-
golang.org/x/crypto v0.2.1-0.20221112162523-6fad3dfc1891
99-
golang.org/x/net v0.2.0
98+
golang.org/x/crypto v0.4.0
99+
golang.org/x/net v0.3.0
100100
golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1
101-
golang.org/x/sys v0.2.0
102-
golang.org/x/text v0.4.0
101+
golang.org/x/sys v0.3.0
102+
golang.org/x/text v0.5.0
103103
golang.org/x/tools v0.1.12
104104
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
105105
gopkg.in/ini.v1 v1.67.0
@@ -127,7 +127,6 @@ require (
127127
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
128128
github.com/aymerick/douceur v0.2.0 // indirect
129129
github.com/beorn7/perks v1.0.1 // indirect
130-
github.com/bgentry/speakeasy v0.1.0 // indirect
131130
github.com/bits-and-blooms/bitset v1.3.3 // indirect
132131
github.com/blevesearch/bleve_index_api v1.0.4 // indirect
133132
github.com/blevesearch/geo v0.1.15 // indirect
@@ -146,14 +145,8 @@ require (
146145
github.com/blevesearch/zapx/v15 v15.3.6 // indirect
147146
github.com/boombuler/barcode v1.0.1 // indirect
148147
github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b // indirect
149-
github.com/census-instrumentation/opencensus-proto v0.3.0 // indirect
150148
github.com/cespare/xxhash/v2 v2.1.2 // indirect
151-
github.com/cloudflare/cfssl v1.6.1 // indirect
152149
github.com/cloudflare/circl v1.2.0 // indirect
153-
github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4 // indirect
154-
github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490 // indirect
155-
github.com/coreos/go-semver v0.3.0 // indirect
156-
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
157150
github.com/couchbase/go-couchbase v0.0.0-20210224140812-5740cd35f448 // indirect
158151
github.com/couchbase/gomemcached v0.1.2 // indirect
159152
github.com/couchbase/goutils v0.0.0-20210118111533-e33d3ffb5401 // indirect
@@ -162,11 +155,7 @@ require (
162155
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
163156
github.com/dlclark/regexp2 v1.7.0 // indirect
164157
github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
165-
github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1 // indirect
166-
github.com/envoyproxy/protoc-gen-validate v0.6.2 // indirect
167158
github.com/felixge/httpsnoop v1.0.3 // indirect
168-
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
169-
github.com/fullstorydev/grpcurl v1.8.1 // indirect
170159
github.com/fxamacker/cbor/v2 v2.4.0 // indirect
171160
github.com/go-ap/errors v0.0.0-20220917143055-4283ea5dae18 // indirect
172161
github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect
@@ -183,35 +172,25 @@ require (
183172
github.com/go-openapi/strfmt v0.21.3 // indirect
184173
github.com/go-openapi/swag v0.22.3 // indirect
185174
github.com/go-openapi/validate v0.22.0 // indirect
175+
github.com/go-webauthn/revoke v0.1.6 // indirect
186176
github.com/goccy/go-json v0.10.0 // indirect
187-
github.com/gogo/protobuf v1.3.2 // indirect
188177
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
189178
github.com/golang-sql/sqlexp v0.1.0 // indirect
190179
github.com/golang/geo v0.0.0-20210211234256-740aa86cb551 // indirect
191-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
192-
github.com/golang/mock v1.6.0 // indirect
193180
github.com/golang/protobuf v1.5.2 // indirect
194181
github.com/golang/snappy v0.0.4 // indirect
195-
github.com/google/btree v1.0.1 // indirect
196-
github.com/google/certificate-transparency-go v1.1.2-0.20210511102531-373a877eec92 // indirect
197182
github.com/google/go-querystring v1.1.0 // indirect
183+
github.com/google/go-tpm v0.3.3 // indirect
198184
github.com/gorilla/css v1.0.0 // indirect
199185
github.com/gorilla/handlers v1.5.1 // indirect
200186
github.com/gorilla/mux v1.8.0 // indirect
201187
github.com/gorilla/securecookie v1.1.1 // indirect
202-
github.com/gorilla/websocket v1.4.2 // indirect
203-
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
204-
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
205-
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
206188
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
207189
github.com/hashicorp/go-retryablehttp v0.7.1 // indirect
208190
github.com/hashicorp/hcl v1.0.0 // indirect
209191
github.com/imdario/mergo v0.3.13 // indirect
210-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
211192
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
212193
github.com/jessevdk/go-flags v1.5.0 // indirect
213-
github.com/jhump/protoreflect v1.8.2 // indirect
214-
github.com/jonboulle/clockwork v0.2.2 // indirect
215194
github.com/josharian/intern v1.0.0 // indirect
216195
github.com/kevinburke/ssh_config v1.2.0 // indirect
217196
github.com/klauspost/pgzip v1.2.5 // indirect
@@ -251,16 +230,13 @@ require (
251230
github.com/shopspring/decimal v1.2.0 // indirect
252231
github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
253232
github.com/sirupsen/logrus v1.9.0 // indirect
254-
github.com/soheilhy/cmux v0.1.5 // indirect
255233
github.com/spf13/afero v1.8.2 // indirect
256234
github.com/spf13/cast v1.5.0 // indirect
257-
github.com/spf13/cobra v1.5.0 // indirect
258235
github.com/spf13/jwalterweatherman v1.1.0 // indirect
259236
github.com/spf13/pflag v1.0.5 // indirect
260237
github.com/spf13/viper v1.12.0 // indirect
261238
github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect
262239
github.com/subosito/gotenv v1.3.0 // indirect
263-
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
264240
github.com/toqueteos/webbrowser v1.2.0 // indirect
265241
github.com/ulikunitz/xz v0.5.10 // indirect
266242
github.com/unknwon/com v1.0.1 // indirect
@@ -270,33 +246,18 @@ require (
270246
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
271247
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
272248
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
273-
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
274249
go.etcd.io/bbolt v1.3.6 // indirect
275-
go.etcd.io/etcd/api/v3 v3.5.4 // indirect
276-
go.etcd.io/etcd/client/pkg/v3 v3.5.4 // indirect
277-
go.etcd.io/etcd/client/v2 v2.305.4 // indirect
278-
go.etcd.io/etcd/client/v3 v3.5.4 // indirect
279-
go.etcd.io/etcd/etcdctl/v3 v3.5.0-alpha.0 // indirect
280-
go.etcd.io/etcd/pkg/v3 v3.5.0-alpha.0 // indirect
281-
go.etcd.io/etcd/raft/v3 v3.5.0-alpha.0 // indirect
282-
go.etcd.io/etcd/server/v3 v3.5.0-alpha.0 // indirect
283-
go.etcd.io/etcd/tests/v3 v3.5.0-alpha.0 // indirect
284-
go.etcd.io/etcd/v3 v3.5.0-alpha.0 // indirect
285250
go.mongodb.org/mongo-driver v1.10.1 // indirect
286251
go.uber.org/atomic v1.10.0 // indirect
287252
go.uber.org/multierr v1.8.0 // indirect
288253
go.uber.org/zap v1.23.0 // indirect
289254
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
290255
golang.org/x/time v0.0.0-20220922220347-f3bd1da661af // indirect
291256
google.golang.org/appengine v1.6.7 // indirect
292-
google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90 // indirect
293-
google.golang.org/grpc v1.47.0 // indirect
294257
google.golang.org/protobuf v1.28.1 // indirect
295258
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
296-
gopkg.in/cheggaaa/pb.v1 v1.0.28 // indirect
297259
gopkg.in/warnings.v0 v0.1.2 // indirect
298260
gopkg.in/yaml.v2 v2.4.0 // indirect
299-
sigs.k8s.io/yaml v1.2.0 // indirect
300261
)
301262

302263
replace github.com/hashicorp/go-version => github.com/6543/go-version v1.3.1

0 commit comments

Comments
 (0)