Skip to content

Commit a66ff8a

Browse files
6543techknowlogick
andauthored
switch to maintained lib (#16535)
Co-authored-by: Matti R <[email protected]>
1 parent 6a3c785 commit a66ff8a

29 files changed

+151
-170
lines changed

cmd/serv.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"code.gitea.io/gitea/modules/private"
2424
"code.gitea.io/gitea/modules/setting"
2525

26-
"github.com/dgrijalva/jwt-go"
26+
"github.com/golang-jwt/jwt"
2727
jsoniter "github.com/json-iterator/go"
2828
"github.com/kballard/go-shellquote"
2929
"github.com/urfave/cli"

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ require (
2828
github.com/couchbase/goutils v0.0.0-20210118111533-e33d3ffb5401 // indirect
2929
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
3030
github.com/denisenkom/go-mssqldb v0.9.0
31-
github.com/dgrijalva/jwt-go v3.2.0+incompatible
3231
github.com/dlclark/regexp2 v1.4.0 // indirect
3332
github.com/dustin/go-humanize v1.0.0
3433
github.com/editorconfig/editorconfig-core-go/v2 v2.4.1
@@ -53,6 +52,7 @@ require (
5352
github.com/gogs/chardet v0.0.0-20191104214054-4b6791f73a28
5453
github.com/gogs/cron v0.0.0-20171120032916-9f6c956d3e14
5554
github.com/gogs/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85
55+
github.com/golang-jwt/jwt v3.2.1+incompatible
5656
github.com/golang/snappy v0.0.3 // indirect
5757
github.com/google/go-github/v32 v32.1.0
5858
github.com/google/uuid v1.2.0

go.sum

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,6 @@ github.com/denisenkom/go-mssqldb v0.0.0-20191128021309-1d7a30a10f73/go.mod h1:xb
251251
github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
252252
github.com/denisenkom/go-mssqldb v0.9.0 h1:RSohk2RsiZqLZ0zCjtfn3S4Gp4exhpBWHyQ7D0yGjAk=
253253
github.com/denisenkom/go-mssqldb v0.9.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
254-
github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
255254
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
256255
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
257256
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
@@ -496,6 +495,8 @@ github.com/gogs/cron v0.0.0-20171120032916-9f6c956d3e14 h1:yXtpJr/LV6PFu4nTLgfjQ
496495
github.com/gogs/cron v0.0.0-20171120032916-9f6c956d3e14/go.mod h1:jPoNZLWDAqA5N3G5amEoiNbhVrmM+ZQEcnQvNQ2KaZk=
497496
github.com/gogs/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85 h1:UjoPNDAQ5JPCjlxoJd6K8ALZqSDDhk2ymieAZOVaDg0=
498497
github.com/gogs/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85/go.mod h1:fR6z1Ie6rtF7kl/vBYMfgD5/G5B1blui7z426/sj2DU=
498+
github.com/golang-jwt/jwt v3.2.1+incompatible h1:73Z+4BJcrTC+KczS6WvTPvRGOp1WmfEP4Q1lOd9Z/+c=
499+
github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
499500
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
500501
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
501502
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=

models/oauth2_application.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"code.gitea.io/gitea/modules/timeutil"
1818
"code.gitea.io/gitea/modules/util"
1919

20-
"github.com/dgrijalva/jwt-go"
20+
"github.com/golang-jwt/jwt"
2121
uuid "github.com/google/uuid"
2222
"golang.org/x/crypto/bcrypt"
2323
"xorm.io/xorm"

modules/generate/generate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"math/big"
1313
"time"
1414

15-
"github.com/dgrijalva/jwt-go"
15+
"github.com/golang-jwt/jwt"
1616
)
1717

1818
// GetRandomString generate random string by specify chars.

modules/lfs/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"code.gitea.io/gitea/modules/setting"
2222
"code.gitea.io/gitea/modules/storage"
2323

24-
"github.com/dgrijalva/jwt-go"
24+
"github.com/golang-jwt/jwt"
2525
jsoniter "github.com/json-iterator/go"
2626
)
2727

routers/user/oauth.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"code.gitea.io/gitea/modules/web"
2222

2323
"gitea.com/go-chi/binding"
24-
"github.com/dgrijalva/jwt-go"
24+
"github.com/golang-jwt/jwt"
2525
)
2626

2727
const (

vendor/github.com/dgrijalva/jwt-go/MIGRATION_GUIDE.md

Lines changed: 0 additions & 97 deletions
This file was deleted.

vendor/github.com/dgrijalva/jwt-go/.gitignore renamed to vendor/github.com/golang-jwt/jwt/.gitignore

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/dgrijalva/jwt-go/.travis.yml renamed to vendor/github.com/golang-jwt/jwt/.travis.yml

Lines changed: 3 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/dgrijalva/jwt-go/LICENSE renamed to vendor/github.com/golang-jwt/jwt/LICENSE

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/golang-jwt/jwt/MIGRATION_GUIDE.md

Lines changed: 22 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)