moving jwt-go from github.com/dgrijalva/jwt-go v3.2.0 to github.com/f…

…orm3tech-oss/jwt-go v3.2.2 Signed-off-by: Roland.Ma <[email protected]>
dkeven · Jun 8, 2021 · e6736a4 · e6736a4
1 parent b77beed
commit e6736a4
Show file tree

Hide file tree

Showing 29 changed files with 72 additions and 39 deletions.
diff --git a/go.mod b/go.mod
@@ -20,7 +20,6 @@ require (
 	github.com/coreos/go-oidc v2.1.0+incompatible
 	github.com/davecgh/go-spew v1.1.1
 	github.com/deckarep/golang-set v1.7.1 // indirect
-	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/docker/distribution v2.7.1+incompatible
 	github.com/docker/docker v1.4.2-0.20200203170920-46ec8731fbce
 	github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
@@ -32,6 +31,7 @@ require (
 	github.com/emicklei/go-restful-openapi v1.4.1
 	github.com/emirpasic/gods v1.12.0 // indirect
 	github.com/fatih/structs v1.1.0
+	github.com/form3tech-oss/jwt-go v3.2.2+incompatible
 	github.com/ghodss/yaml v1.0.0
 	github.com/go-ldap/ldap v3.0.3+incompatible
 	github.com/go-logr/logr v0.3.0
@@ -292,6 +292,7 @@ replace (
 	github.com/felixge/httpsnoop => github.com/felixge/httpsnoop v1.0.1
 	github.com/flynn/go-shlex => github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568
 	github.com/fogleman/gg => github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90
+	github.com/form3tech-oss/jwt-go => github.com/form3tech-oss/jwt-go v3.2.2+incompatible
 	github.com/franela/goblin => github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db
 	github.com/franela/goreq => github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8
 	github.com/fsnotify/fsnotify => github.com/fsnotify/fsnotify v1.4.9

diff --git a/go.sum b/go.sum
@@ -235,6 +235,8 @@ github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
+github.com/form3tech-oss/jwt-go v3.2.2+incompatible h1:TcekIExNqud5crz4xD2pavyTgWiPvpYe4Xau31I0PRk=
+github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
 github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=
 github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=

diff --git a/pkg/apiserver/authentication/identityprovider/oidc/oidc.go b/pkg/apiserver/authentication/identityprovider/oidc/oidc.go
@@ -28,7 +28,7 @@ import (
 	"kubesphere.io/kubesphere/pkg/utils/sliceutil"
 
 	"github.com/coreos/go-oidc"
-	"github.com/dgrijalva/jwt-go"
+	"github.com/form3tech-oss/jwt-go"
 	"github.com/mitchellh/mapstructure"
 	"golang.org/x/oauth2"
 

diff --git a/pkg/apiserver/authentication/identityprovider/oidc/oidc_test.go b/pkg/apiserver/authentication/identityprovider/oidc/oidc_test.go
@@ -32,7 +32,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/dgrijalva/jwt-go"
+	"github.com/form3tech-oss/jwt-go"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"

diff --git a/pkg/apiserver/authentication/token/jwt.go b/pkg/apiserver/authentication/token/jwt.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/dgrijalva/jwt-go"
+	"github.com/form3tech-oss/jwt-go"
 	"k8s.io/apiserver/pkg/authentication/user"
 	"k8s.io/klog"
 )

diff --git a/pkg/simple/client/devops/jenkins/request.go b/pkg/simple/client/devops/jenkins/request.go
@@ -29,7 +29,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/dgrijalva/jwt-go"
+	"github.com/form3tech-oss/jwt-go"
 
 	authtoken "kubesphere.io/kubesphere/pkg/apiserver/authentication/token"
 	"kubesphere.io/kubesphere/pkg/simple/client/devops"

diff --git a/staging/src/kubesphere.io/api/go.sum b/staging/src/kubesphere.io/api/go.sum
@@ -54,8 +54,6 @@ github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dgrijalva/jwt-go v3.0.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=

diff --git a/staging/src/kubesphere.io/client-go/go.sum b/staging/src/kubesphere.io/client-go/go.sum
@@ -44,7 +44,6 @@ github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7Do
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=

diff --git a/...or/github.com/dgrijalva/jwt-go/.gitignore → ...ithub.com/form3tech-oss/jwt-go/.gitignore b/...or/github.com/dgrijalva/jwt-go/.gitignore → ...ithub.com/form3tech-oss/jwt-go/.gitignore
diff --git a/...r/github.com/dgrijalva/jwt-go/.travis.yml → ...thub.com/form3tech-oss/jwt-go/.travis.yml b/...r/github.com/dgrijalva/jwt-go/.travis.yml → ...thub.com/form3tech-oss/jwt-go/.travis.yml
diff --git a/vendor/github.com/dgrijalva/jwt-go/LICENSE → ...r/github.com/form3tech-oss/jwt-go/LICENSE b/vendor/github.com/dgrijalva/jwt-go/LICENSE → ...r/github.com/form3tech-oss/jwt-go/LICENSE
diff --git a/...b.com/dgrijalva/jwt-go/MIGRATION_GUIDE.md → ...m/form3tech-oss/jwt-go/MIGRATION_GUIDE.md b/...b.com/dgrijalva/jwt-go/MIGRATION_GUIDE.md → ...m/form3tech-oss/jwt-go/MIGRATION_GUIDE.md
diff --git a/vendor/github.com/dgrijalva/jwt-go/README.md → ...github.com/form3tech-oss/jwt-go/README.md b/vendor/github.com/dgrijalva/jwt-go/README.md → ...github.com/form3tech-oss/jwt-go/README.md
diff --git a/...b.com/dgrijalva/jwt-go/VERSION_HISTORY.md → ...m/form3tech-oss/jwt-go/VERSION_HISTORY.md b/...b.com/dgrijalva/jwt-go/VERSION_HISTORY.md → ...m/form3tech-oss/jwt-go/VERSION_HISTORY.md
diff --git a/vendor/github.com/dgrijalva/jwt-go/claims.go → ...github.com/form3tech-oss/jwt-go/claims.go b/vendor/github.com/dgrijalva/jwt-go/claims.go → ...github.com/form3tech-oss/jwt-go/claims.go
diff --git a/vendor/github.com/dgrijalva/jwt-go/doc.go → ...or/github.com/form3tech-oss/jwt-go/doc.go b/vendor/github.com/dgrijalva/jwt-go/doc.go → ...or/github.com/form3tech-oss/jwt-go/doc.go
diff --git a/vendor/github.com/dgrijalva/jwt-go/ecdsa.go → .../github.com/form3tech-oss/jwt-go/ecdsa.go b/vendor/github.com/dgrijalva/jwt-go/ecdsa.go → .../github.com/form3tech-oss/jwt-go/ecdsa.go
diff --git a/...ithub.com/dgrijalva/jwt-go/ecdsa_utils.go → ...b.com/form3tech-oss/jwt-go/ecdsa_utils.go b/...ithub.com/dgrijalva/jwt-go/ecdsa_utils.go → ...b.com/form3tech-oss/jwt-go/ecdsa_utils.go
diff --git a/vendor/github.com/dgrijalva/jwt-go/errors.go → ...github.com/form3tech-oss/jwt-go/errors.go b/vendor/github.com/dgrijalva/jwt-go/errors.go → ...github.com/form3tech-oss/jwt-go/errors.go
diff --git a/vendor/github.com/dgrijalva/jwt-go/hmac.go → ...r/github.com/form3tech-oss/jwt-go/hmac.go b/vendor/github.com/dgrijalva/jwt-go/hmac.go → ...r/github.com/form3tech-oss/jwt-go/hmac.go
diff --git a/...github.com/dgrijalva/jwt-go/map_claims.go → ...ub.com/form3tech-oss/jwt-go/map_claims.go b/...github.com/dgrijalva/jwt-go/map_claims.go → ...ub.com/form3tech-oss/jwt-go/map_claims.go
diff --git a/vendor/github.com/dgrijalva/jwt-go/none.go → ...r/github.com/form3tech-oss/jwt-go/none.go b/vendor/github.com/dgrijalva/jwt-go/none.go → ...r/github.com/form3tech-oss/jwt-go/none.go
diff --git a/vendor/github.com/dgrijalva/jwt-go/parser.go → ...github.com/form3tech-oss/jwt-go/parser.go b/vendor/github.com/dgrijalva/jwt-go/parser.go → ...github.com/form3tech-oss/jwt-go/parser.go
diff --git a/vendor/github.com/dgrijalva/jwt-go/rsa.go → ...or/github.com/form3tech-oss/jwt-go/rsa.go b/vendor/github.com/dgrijalva/jwt-go/rsa.go → ...or/github.com/form3tech-oss/jwt-go/rsa.go
diff --git a/...or/github.com/dgrijalva/jwt-go/rsa_pss.go → ...ithub.com/form3tech-oss/jwt-go/rsa_pss.go b/...or/github.com/dgrijalva/jwt-go/rsa_pss.go → ...ithub.com/form3tech-oss/jwt-go/rsa_pss.go
diff --git a/.../github.com/dgrijalva/jwt-go/rsa_utils.go → ...hub.com/form3tech-oss/jwt-go/rsa_utils.go b/.../github.com/dgrijalva/jwt-go/rsa_utils.go → ...hub.com/form3tech-oss/jwt-go/rsa_utils.go
diff --git a/...ub.com/dgrijalva/jwt-go/signing_method.go → ...om/form3tech-oss/jwt-go/signing_method.go b/...ub.com/dgrijalva/jwt-go/signing_method.go → ...om/form3tech-oss/jwt-go/signing_method.go
diff --git a/vendor/github.com/dgrijalva/jwt-go/token.go → .../github.com/form3tech-oss/jwt-go/token.go b/vendor/github.com/dgrijalva/jwt-go/token.go → .../github.com/form3tech-oss/jwt-go/token.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -102,8 +102,6 @@ github.com/coreos/go-systemd/journal
 github.com/coreos/pkg/capnslog
 # github.com/davecgh/go-spew v1.1.1 => github.com/davecgh/go-spew v1.1.1
 github.com/davecgh/go-spew/spew
-# github.com/dgrijalva/jwt-go v3.2.0+incompatible => github.com/dgrijalva/jwt-go v3.2.0+incompatible
-github.com/dgrijalva/jwt-go
 # github.com/docker/distribution v2.7.1+incompatible => github.com/docker/distribution v2.7.1+incompatible
 github.com/docker/distribution
 github.com/docker/distribution/digestset
@@ -179,6 +177,8 @@ github.com/exponent-io/jsonpath
 github.com/fatih/color
 # github.com/fatih/structs v1.1.0 => github.com/fatih/structs v1.1.0
 github.com/fatih/structs
+# github.com/form3tech-oss/jwt-go v3.2.2+incompatible => github.com/form3tech-oss/jwt-go v3.2.2+incompatible
+github.com/form3tech-oss/jwt-go
 # github.com/fsnotify/fsnotify v1.4.9 => github.com/fsnotify/fsnotify v1.4.9
 github.com/fsnotify/fsnotify
 # github.com/ghodss/yaml v1.0.0 => github.com/ghodss/yaml v1.0.0
@@ -1590,6 +1590,7 @@ kubesphere.io/api/application/crdinstall
 kubesphere.io/api/application/v1alpha1
 kubesphere.io/api/auditing/v1alpha1
 kubesphere.io/api/cluster/v1alpha1
+kubesphere.io/api/constants
 kubesphere.io/api/devops/crdinstall
 kubesphere.io/api/devops/v1alpha1
 kubesphere.io/api/devops/v1alpha3