chore(deps): bump github.com/golang-jwt/jwt/v4 from 4.5.0 to 4.5.2 (#3446)
Bumps [github.com/golang-jwt/jwt/v4](https://github.com/golang-jwt/jwt) from 4.5.0 to 4.5.2. - [Release notes](https://github.com/golang-jwt/jwt/releases) - [Changelog](https://github.com/golang-jwt/jwt/blob/main/VERSION_HISTORY.md) - [Commits](https://github.com/golang-jwt/jwt/compare/v4.5.0...v4.5.2) --- updated-dependencies: - dependency-name: github.com/golang-jwt/jwt/v4 dependency-version: 4.5.2 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This commit is contained in:
parent
2c3fb7bec9
commit
950a29bf8d
2
go.mod
2
go.mod
|
|
@ -89,7 +89,7 @@ require (
|
||||||
github.com/emirpasic/gods v1.18.1 // indirect
|
github.com/emirpasic/gods v1.18.1 // indirect
|
||||||
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
|
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
|
||||||
github.com/gogo/protobuf v1.3.2 // indirect
|
github.com/gogo/protobuf v1.3.2 // indirect
|
||||||
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
|
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
|
||||||
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
|
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
|
||||||
github.com/golang/protobuf v1.5.4 // indirect
|
github.com/golang/protobuf v1.5.4 // indirect
|
||||||
github.com/google/uuid v1.6.0 // indirect
|
github.com/google/uuid v1.6.0 // indirect
|
||||||
|
|
|
||||||
3
go.sum
3
go.sum
|
|
@ -237,8 +237,9 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
|
||||||
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
|
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
|
||||||
github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
|
github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
|
||||||
github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
|
github.com/golang-jwt/jwt/v4 v4.2.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/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
|
||||||
|
github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI=
|
||||||
|
github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
|
||||||
github.com/golang-jwt/jwt/v5 v5.2.0 h1:d/ix8ftRUorsN+5eMIlF4T6J8CAt9rch3My2winC1Jw=
|
github.com/golang-jwt/jwt/v5 v5.2.0 h1:d/ix8ftRUorsN+5eMIlF4T6J8CAt9rch3My2winC1Jw=
|
||||||
github.com/golang-jwt/jwt/v5 v5.2.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
|
github.com/golang-jwt/jwt/v5 v5.2.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
|
||||||
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=
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,8 @@ import (
|
||||||
"strings"
|
"strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const tokenDelimiter = "."
|
||||||
|
|
||||||
type Parser struct {
|
type Parser struct {
|
||||||
// If populated, only these methods will be considered valid.
|
// If populated, only these methods will be considered valid.
|
||||||
//
|
//
|
||||||
|
|
@ -36,19 +38,21 @@ func NewParser(options ...ParserOption) *Parser {
|
||||||
return p
|
return p
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parse parses, validates, verifies the signature and returns the parsed token.
|
// Parse parses, validates, verifies the signature and returns the parsed token. keyFunc will
|
||||||
// keyFunc will receive the parsed token and should return the key for validating.
|
// receive the parsed token and should return the key for validating.
|
||||||
func (p *Parser) Parse(tokenString string, keyFunc Keyfunc) (*Token, error) {
|
func (p *Parser) Parse(tokenString string, keyFunc Keyfunc) (*Token, error) {
|
||||||
return p.ParseWithClaims(tokenString, MapClaims{}, keyFunc)
|
return p.ParseWithClaims(tokenString, MapClaims{}, keyFunc)
|
||||||
}
|
}
|
||||||
|
|
||||||
// ParseWithClaims parses, validates, and verifies like Parse, but supplies a default object implementing the Claims
|
// ParseWithClaims parses, validates, and verifies like Parse, but supplies a default object
|
||||||
// interface. This provides default values which can be overridden and allows a caller to use their own type, rather
|
// implementing the Claims interface. This provides default values which can be overridden and
|
||||||
// than the default MapClaims implementation of Claims.
|
// allows a caller to use their own type, rather than the default MapClaims implementation of
|
||||||
|
// Claims.
|
||||||
//
|
//
|
||||||
// Note: If you provide a custom claim implementation that embeds one of the standard claims (such as RegisteredClaims),
|
// Note: If you provide a custom claim implementation that embeds one of the standard claims (such
|
||||||
// make sure that a) you either embed a non-pointer version of the claims or b) if you are using a pointer, allocate the
|
// as RegisteredClaims), make sure that a) you either embed a non-pointer version of the claims or
|
||||||
// proper memory for it before passing in the overall claims, otherwise you might run into a panic.
|
// b) if you are using a pointer, allocate the proper memory for it before passing in the overall
|
||||||
|
// claims, otherwise you might run into a panic.
|
||||||
func (p *Parser) ParseWithClaims(tokenString string, claims Claims, keyFunc Keyfunc) (*Token, error) {
|
func (p *Parser) ParseWithClaims(tokenString string, claims Claims, keyFunc Keyfunc) (*Token, error) {
|
||||||
token, parts, err := p.ParseUnverified(tokenString, claims)
|
token, parts, err := p.ParseUnverified(tokenString, claims)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
@ -85,12 +89,17 @@ func (p *Parser) ParseWithClaims(tokenString string, claims Claims, keyFunc Keyf
|
||||||
return token, &ValidationError{Inner: err, Errors: ValidationErrorUnverifiable}
|
return token, &ValidationError{Inner: err, Errors: ValidationErrorUnverifiable}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Perform validation
|
||||||
|
token.Signature = parts[2]
|
||||||
|
if err := token.Method.Verify(strings.Join(parts[0:2], "."), token.Signature, key); err != nil {
|
||||||
|
return token, &ValidationError{Inner: err, Errors: ValidationErrorSignatureInvalid}
|
||||||
|
}
|
||||||
|
|
||||||
vErr := &ValidationError{}
|
vErr := &ValidationError{}
|
||||||
|
|
||||||
// Validate Claims
|
// Validate Claims
|
||||||
if !p.SkipClaimsValidation {
|
if !p.SkipClaimsValidation {
|
||||||
if err := token.Claims.Valid(); err != nil {
|
if err := token.Claims.Valid(); err != nil {
|
||||||
|
|
||||||
// If the Claims Valid returned an error, check if it is a validation error,
|
// If the Claims Valid returned an error, check if it is a validation error,
|
||||||
// If it was another error type, create a ValidationError with a generic ClaimsInvalid flag set
|
// If it was another error type, create a ValidationError with a generic ClaimsInvalid flag set
|
||||||
if e, ok := err.(*ValidationError); !ok {
|
if e, ok := err.(*ValidationError); !ok {
|
||||||
|
|
@ -98,22 +107,14 @@ func (p *Parser) ParseWithClaims(tokenString string, claims Claims, keyFunc Keyf
|
||||||
} else {
|
} else {
|
||||||
vErr = e
|
vErr = e
|
||||||
}
|
}
|
||||||
|
return token, vErr
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Perform validation
|
// No errors so far, token is valid.
|
||||||
token.Signature = parts[2]
|
token.Valid = true
|
||||||
if err = token.Method.Verify(strings.Join(parts[0:2], "."), token.Signature, key); err != nil {
|
|
||||||
vErr.Inner = err
|
|
||||||
vErr.Errors |= ValidationErrorSignatureInvalid
|
|
||||||
}
|
|
||||||
|
|
||||||
if vErr.valid() {
|
return token, nil
|
||||||
token.Valid = true
|
|
||||||
return token, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
return token, vErr
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ParseUnverified parses the token but doesn't validate the signature.
|
// ParseUnverified parses the token but doesn't validate the signature.
|
||||||
|
|
@ -123,9 +124,10 @@ func (p *Parser) ParseWithClaims(tokenString string, claims Claims, keyFunc Keyf
|
||||||
// It's only ever useful in cases where you know the signature is valid (because it has
|
// It's only ever useful in cases where you know the signature is valid (because it has
|
||||||
// been checked previously in the stack) and you want to extract values from it.
|
// been checked previously in the stack) and you want to extract values from it.
|
||||||
func (p *Parser) ParseUnverified(tokenString string, claims Claims) (token *Token, parts []string, err error) {
|
func (p *Parser) ParseUnverified(tokenString string, claims Claims) (token *Token, parts []string, err error) {
|
||||||
parts = strings.Split(tokenString, ".")
|
var ok bool
|
||||||
if len(parts) != 3 {
|
parts, ok = splitToken(tokenString)
|
||||||
return nil, parts, NewValidationError("token contains an invalid number of segments", ValidationErrorMalformed)
|
if !ok {
|
||||||
|
return nil, nil, NewValidationError("token contains an invalid number of segments", ValidationErrorMalformed)
|
||||||
}
|
}
|
||||||
|
|
||||||
token = &Token{Raw: tokenString}
|
token = &Token{Raw: tokenString}
|
||||||
|
|
@ -175,3 +177,30 @@ func (p *Parser) ParseUnverified(tokenString string, claims Claims) (token *Toke
|
||||||
|
|
||||||
return token, parts, nil
|
return token, parts, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// splitToken splits a token string into three parts: header, claims, and signature. It will only
|
||||||
|
// return true if the token contains exactly two delimiters and three parts. In all other cases, it
|
||||||
|
// will return nil parts and false.
|
||||||
|
func splitToken(token string) ([]string, bool) {
|
||||||
|
parts := make([]string, 3)
|
||||||
|
header, remain, ok := strings.Cut(token, tokenDelimiter)
|
||||||
|
if !ok {
|
||||||
|
return nil, false
|
||||||
|
}
|
||||||
|
parts[0] = header
|
||||||
|
claims, remain, ok := strings.Cut(remain, tokenDelimiter)
|
||||||
|
if !ok {
|
||||||
|
return nil, false
|
||||||
|
}
|
||||||
|
parts[1] = claims
|
||||||
|
// One more cut to ensure the signature is the last part of the token and there are no more
|
||||||
|
// delimiters. This avoids an issue where malicious input could contain additional delimiters
|
||||||
|
// causing unecessary overhead parsing tokens.
|
||||||
|
signature, _, unexpected := strings.Cut(remain, tokenDelimiter)
|
||||||
|
if unexpected {
|
||||||
|
return nil, false
|
||||||
|
}
|
||||||
|
parts[2] = signature
|
||||||
|
|
||||||
|
return parts, true
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -701,7 +701,7 @@ github.com/gogo/protobuf/proto
|
||||||
github.com/gogo/protobuf/protoc-gen-gogo/descriptor
|
github.com/gogo/protobuf/protoc-gen-gogo/descriptor
|
||||||
github.com/gogo/protobuf/sortkeys
|
github.com/gogo/protobuf/sortkeys
|
||||||
github.com/gogo/protobuf/types
|
github.com/gogo/protobuf/types
|
||||||
# github.com/golang-jwt/jwt/v4 v4.5.0
|
# github.com/golang-jwt/jwt/v4 v4.5.2
|
||||||
## explicit; go 1.16
|
## explicit; go 1.16
|
||||||
github.com/golang-jwt/jwt/v4
|
github.com/golang-jwt/jwt/v4
|
||||||
# github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da
|
# github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue