diff --git a/controllers/token.go b/controllers/token.go index a8a167e0..7deb1eab 100644 --- a/controllers/token.go +++ b/controllers/token.go @@ -340,7 +340,7 @@ func (c *ApiController) IntrospectToken() { if application.TokenFormat == "JWT-Standard" { jwtToken, err := object.ParseStandardJwtTokenByApplication(tokenValue, application) - if err != nil || jwtToken.Valid() != nil { + if err != nil { // and token revoked case. but we not implement // TODO: 2022-03-03 add token revoked check, when we implemented the Token Revocation(rfc7009) Specs. // refs: https://tools.ietf.org/html/rfc7009 @@ -365,7 +365,7 @@ func (c *ApiController) IntrospectToken() { } } else { jwtToken, err := object.ParseJwtTokenByApplication(tokenValue, application) - if err != nil || jwtToken.Valid() != nil { + if err != nil { // and token revoked case. but we not implement // TODO: 2022-03-03 add token revoked check, when we implemented the Token Revocation(rfc7009) Specs. // refs: https://tools.ietf.org/html/rfc7009 diff --git a/go.mod b/go.mod index 8b0d19fe..c114fe82 100644 --- a/go.mod +++ b/go.mod @@ -32,7 +32,7 @@ require ( github.com/go-sql-driver/mysql v1.6.0 github.com/go-telegram-bot-api/telegram-bot-api v4.6.4+incompatible github.com/go-webauthn/webauthn v0.10.2 - github.com/golang-jwt/jwt/v4 v4.5.0 + github.com/golang-jwt/jwt/v5 v5.2.2 github.com/google/uuid v1.6.0 github.com/json-iterator/go v1.1.12 github.com/lestrrat-go/jwx v1.2.29 @@ -132,7 +132,7 @@ require ( github.com/go-webauthn/x v0.1.9 // indirect github.com/goccy/go-json v0.10.2 // indirect github.com/golang-jwt/jwt v3.2.2+incompatible // indirect - github.com/golang-jwt/jwt/v5 v5.2.1 // indirect + github.com/golang-jwt/jwt/v4 v4.5.0 // indirect github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect diff --git a/go.sum b/go.sum index 8d990960..477dd313 100644 --- a/go.sum +++ b/go.sum @@ -419,8 +419,8 @@ github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzq github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= -github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk= -github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= +github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8= +github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g= diff --git a/object/saml_idp.go b/object/saml_idp.go index c21b6372..bd35215d 100644 --- a/object/saml_idp.go +++ b/object/saml_idp.go @@ -30,7 +30,7 @@ import ( "time" "github.com/beevik/etree" - "github.com/golang-jwt/jwt/v4" + "github.com/golang-jwt/jwt/v5" "github.com/google/uuid" saml "github.com/russellhaering/gosaml2" dsig "github.com/russellhaering/goxmldsig" diff --git a/object/token_jwt.go b/object/token_jwt.go index 1ee9e079..ef8706d7 100644 --- a/object/token_jwt.go +++ b/object/token_jwt.go @@ -21,7 +21,7 @@ import ( "time" "github.com/casdoor/casdoor/util" - "github.com/golang-jwt/jwt/v4" + "github.com/golang-jwt/jwt/v5" ) type Claims struct { diff --git a/object/token_standard_jwt.go b/object/token_standard_jwt.go index 7ef81739..3a292aa7 100644 --- a/object/token_standard_jwt.go +++ b/object/token_standard_jwt.go @@ -19,7 +19,7 @@ import ( "strings" "github.com/casdoor/casdoor/util" - "github.com/golang-jwt/jwt/v4" + "github.com/golang-jwt/jwt/v5" ) type ClaimsStandard struct {