Skip to content

Commit 5924e6a

Browse files
jwt version upgrade to 4.0.0 (#674)
1 parent e7a7b34 commit 5924e6a

32 files changed

+1845
-125
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.14.13-alpine3.12 AS build-env
1+
FROM golang:1.15.10-alpine3.13 AS build-env
22

33
RUN echo $GOPATH
44

@@ -9,7 +9,7 @@ WORKDIR /go/src/github.com/devtron-labs/devtron
99
ADD . /go/src/github.com/devtron-labs/devtron/
1010
RUN GOOS=linux make
1111

12-
FROM alpine:3.9
12+
FROM alpine:3.13
1313
RUN apk add --no-cache ca-certificates
1414
RUN apk update
1515
RUN apk add git

go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ require (
2020
github.com/coreos/go-oidc v2.1.0+incompatible
2121
github.com/cyphar/filepath-securejoin v0.2.2 // indirect
2222
github.com/davecgh/go-spew v1.1.1
23-
github.com/dgrijalva/jwt-go v3.2.0+incompatible
2423
github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
2524
github.com/elazarl/goproxy v0.0.0-20210110162100-a92cc753f88e // indirect
2625
github.com/emicklei/go-restful v2.11.0+incompatible // indirect
@@ -38,6 +37,7 @@ require (
3837
github.com/gobuffalo/packr v1.30.1 // indirect
3938
github.com/gobwas/glob v0.2.3 // indirect
4039
github.com/gogo/protobuf v1.3.1
40+
github.com/golang-jwt/jwt/v4 v4.0.0
4141
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4242
github.com/golang/protobuf v1.3.2
4343
github.com/google/go-cmp v0.3.0
@@ -83,6 +83,8 @@ require (
8383
github.com/satori/go.uuid v1.2.0
8484
github.com/spf13/pflag v1.0.5 // indirect
8585
github.com/stretchr/testify v1.4.0
86+
github.com/tidwall/gjson v1.8.1
87+
github.com/tidwall/sjson v1.1.7
8688
github.com/valyala/fasttemplate v1.1.0 // indirect
8789
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
8890
github.com/xanzy/go-gitlab v0.16.1

go.sum

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,10 @@ github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7a
182182
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
183183
github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
184184
github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
185+
github.com/golang-jwt/jwt v1.0.2 h1:Nj1npK0K5RnXGo1SxoOixRGAehIZ2326eXuca9gX9A4=
186+
github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
187+
github.com/golang-jwt/jwt/v4 v4.0.0 h1:RAqyYixv1p7uEnocuy8P1nru5wprCh/MH2BIlW5z5/o=
188+
github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
185189
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
186190
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
187191
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
@@ -490,6 +494,15 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
490494
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
491495
github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
492496
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
497+
github.com/tidwall/gjson v1.8.0/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=
498+
github.com/tidwall/gjson v1.8.1 h1:8j5EE9Hrh3l9Od1OIEDAb7IpezNA20UdRngNAj5N0WU=
499+
github.com/tidwall/gjson v1.8.1/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=
500+
github.com/tidwall/match v1.0.3 h1:FQUVvBImDutD8wJLN6c5eMzWtjgONK9MwIBCOrUJKeE=
501+
github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
502+
github.com/tidwall/pretty v1.1.0 h1:K3hMW5epkdAVwibsQEfR/7Zj0Qgt4DxtNumTq/VloO8=
503+
github.com/tidwall/pretty v1.1.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
504+
github.com/tidwall/sjson v1.1.7 h1:sgVPwu/yygHJ2m1pJDLgGM/h+1F5odx5Q9ljG3imRm8=
505+
github.com/tidwall/sjson v1.1.7/go.mod h1:w/yG+ezBeTdUxiKs5NcPicO9diP38nk96QBAbIIGeFs=
493506
github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
494507
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
495508
github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=

pkg/user/UserAuthService.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
"github.com/devtron-labs/devtron/internal/sql/repository"
3434
"github.com/devtron-labs/devtron/internal/util"
3535
"github.com/devtron-labs/devtron/pkg/auth"
36-
"github.com/dgrijalva/jwt-go"
36+
"github.com/golang-jwt/jwt/v4"
3737
"github.com/gorilla/sessions"
3838
"go.uber.org/zap"
3939
"golang.org/x/oauth2"

vendor/github.com/golang-jwt/jwt/v4/.gitignore

Lines changed: 4 additions & 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/v4/LICENSE

Lines changed: 9 additions & 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/v4/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.

vendor/github.com/golang-jwt/jwt/v4/README.md

Lines changed: 113 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)