a
/
agola
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

*: migrate to golang-jwt/jwt 

Migrate to the new community maintained version of github.com/dgrijalva/jwt-go
This commit is contained in:
Simone Gotti 2021-09-10 12:33:59 +02:00
parent 97ee680b72
commit 64680468fd
6 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -8,11 +8,11 @@ require (
github.com/Microsoft/hcsshim v0.8.7 // indirect github.com/Microsoft/hcsshim v0.8.7 // indirect
github.com/bmatcuk/doublestar v1.2.2 github.com/bmatcuk/doublestar v1.2.2
github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41 // indirect github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41 // indirect
github.com/dgrijalva/jwt-go v3.2.0+incompatible
github.com/docker/docker v1.13.1 github.com/docker/docker v1.13.1
github.com/elazarl/go-bindata-assetfs v1.0.0 github.com/elazarl/go-bindata-assetfs v1.0.0
github.com/ghodss/yaml v1.0.0 github.com/ghodss/yaml v1.0.0
github.com/go-bindata/go-bindata v1.0.0 github.com/go-bindata/go-bindata v1.0.0
github.com/golang-jwt/jwt/v4 v4.0.0
github.com/google/go-cmp v0.4.0 github.com/google/go-cmp v0.4.0
github.com/google/go-containerregistry v0.0.0-20200212224832-c629a66d7231 github.com/google/go-containerregistry v0.0.0-20200212224832-c629a66d7231
github.com/google/go-github/v29 v29.0.3 github.com/google/go-github/v29 v29.0.3

2
go.sum
View File

@ -158,6 +158,8 @@ github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7a
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d h1:3PaI8p3seN09VjbTYC/QWlUZdZ1qS1zGjy7LH2Wt07I= github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d h1:3PaI8p3seN09VjbTYC/QWlUZdZ1qS1zGjy7LH2Wt07I=
github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
github.com/golang-jwt/jwt/v4 v4.0.0 h1:RAqyYixv1p7uEnocuy8P1nru5wprCh/MH2BIlW5z5/o=
github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903 h1:LbsanbbD6LieFkXbj9YNNBupiGHJgFeLpO0j0Fza1h8= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903 h1:LbsanbbD6LieFkXbj9YNNBupiGHJgFeLpO0j0Fza1h8=

2
internal/services/common/jwt.go
View File

@ -19,7 +19,7 @@ import (
"encoding/json" "encoding/json"
"time" "time"
jwt "github.com/dgrijalva/jwt-go" "github.com/golang-jwt/jwt/v4"
errors "golang.org/x/xerrors" errors "golang.org/x/xerrors"
) )

2
internal/services/gateway/action/user.go
View File

@ -30,7 +30,7 @@ import (
csapitypes "agola.io/agola/services/configstore/api/types" csapitypes "agola.io/agola/services/configstore/api/types"
cstypes "agola.io/agola/services/configstore/types" cstypes "agola.io/agola/services/configstore/types"
jwt "github.com/dgrijalva/jwt-go" "github.com/golang-jwt/jwt/v4"
errors "golang.org/x/xerrors" errors "golang.org/x/xerrors"
) )

2
internal/services/gateway/gateway.go
View File

@ -32,7 +32,7 @@ import (
csclient "agola.io/agola/services/configstore/client" csclient "agola.io/agola/services/configstore/client"
rsclient "agola.io/agola/services/runservice/client" rsclient "agola.io/agola/services/runservice/client"
jwt "github.com/dgrijalva/jwt-go" "github.com/golang-jwt/jwt/v4"
ghandlers "github.com/gorilla/handlers" ghandlers "github.com/gorilla/handlers"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"go.uber.org/zap" "go.uber.org/zap"

4
internal/services/gateway/handlers/auth.go
View File

@ -22,8 +22,8 @@ import (
"agola.io/agola/internal/services/common" "agola.io/agola/internal/services/common"
csclient "agola.io/agola/services/configstore/client" csclient "agola.io/agola/services/configstore/client"
jwt "github.com/dgrijalva/jwt-go" "github.com/golang-jwt/jwt/v4"
jwtrequest "github.com/dgrijalva/jwt-go/request" jwtrequest "github.com/golang-jwt/jwt/v4/request"
"go.uber.org/zap" "go.uber.org/zap"
errors "golang.org/x/xerrors" errors "golang.org/x/xerrors"
) )