|
| 1 | +From 70f398a64b207c0f9da5c11ac414e32d2097e79e Mon Sep 17 00:00:00 2001 |
| 2 | +From: Sreenivasulu Malavathula <v-smalavathu@microsoft.com> |
| 3 | +Date: Mon, 24 Mar 2025 18:07:18 -0500 |
| 4 | +Subject: [PATCH] Addressing CVE-2024-51744 |
| 5 | +Upstream Patch Reference: https://github.com/golang-jwt/jwt/commit/7b1c1c00a171c6c79bbdb40e4ce7d197060c1c2c |
| 6 | + |
| 7 | +--- |
| 8 | + .../github.com/form3tech-oss/jwt-go/parser.go | 36 +++++++++++-------- |
| 9 | + vendor/github.com/golang-jwt/jwt/parser.go | 36 +++++++++++-------- |
| 10 | + 2 files changed, 42 insertions(+), 30 deletions(-) |
| 11 | + |
| 12 | +diff --git a/vendor/github.com/form3tech-oss/jwt-go/parser.go b/vendor/github.com/form3tech-oss/jwt-go/parser.go |
| 13 | +index d6901d9..bfb480c 100644 |
| 14 | +--- a/vendor/github.com/form3tech-oss/jwt-go/parser.go |
| 15 | ++++ b/vendor/github.com/form3tech-oss/jwt-go/parser.go |
| 16 | +@@ -14,12 +14,21 @@ type Parser struct { |
| 17 | + } |
| 18 | + |
| 19 | + // Parse, validate, and return a token. |
| 20 | +-// keyFunc will receive the parsed token and should return the key for validating. |
| 21 | +-// If everything is kosher, err will be nil |
| 22 | ++// Parse parses, validates, verifies the signature and returns the parsed token. keyFunc will |
| 23 | ++// receive the parsed token and should return the key for validating. |
| 24 | + func (p *Parser) Parse(tokenString string, keyFunc Keyfunc) (*Token, error) { |
| 25 | + return p.ParseWithClaims(tokenString, MapClaims{}, keyFunc) |
| 26 | + } |
| 27 | + |
| 28 | ++// ParseWithClaims parses, validates, and verifies like Parse, but supplies a default object |
| 29 | ++// implementing the Claims interface. This provides default values which can be overridden and |
| 30 | ++// allows a caller to use their own type, rather than the default MapClaims implementation of |
| 31 | ++// Claims. |
| 32 | ++// |
| 33 | ++// Note: If you provide a custom claim implementation that embeds one of the standard claims (such |
| 34 | ++// as RegisteredClaims), make sure that a) you either embed a non-pointer version of the claims or |
| 35 | ++// b) if you are using a pointer, allocate the proper memory for it before passing in the overall |
| 36 | ++// claims, otherwise you might run into a panic. |
| 37 | + func (p *Parser) ParseWithClaims(tokenString string, claims Claims, keyFunc Keyfunc) (*Token, error) { |
| 38 | + token, parts, err := p.ParseUnverified(tokenString, claims) |
| 39 | + if err != nil { |
| 40 | +@@ -56,12 +65,17 @@ func (p *Parser) ParseWithClaims(tokenString string, claims Claims, keyFunc Keyf |
| 41 | + return token, &ValidationError{Inner: err, Errors: ValidationErrorUnverifiable} |
| 42 | + } |
| 43 | + |
| 44 | ++ // Perform validation |
| 45 | ++ token.Signature = parts[2] |
| 46 | ++ if err := token.Method.Verify(strings.Join(parts[0:2], "."), token.Signature, key); err != nil { |
| 47 | ++ return token, &ValidationError{Inner: err, Errors: ValidationErrorSignatureInvalid} |
| 48 | ++ } |
| 49 | ++ |
| 50 | + vErr := &ValidationError{} |
| 51 | + |
| 52 | + // Validate Claims |
| 53 | + if !p.SkipClaimsValidation { |
| 54 | + if err := token.Claims.Valid(); err != nil { |
| 55 | +- |
| 56 | + // If the Claims Valid returned an error, check if it is a validation error, |
| 57 | + // If it was another error type, create a ValidationError with a generic ClaimsInvalid flag set |
| 58 | + if e, ok := err.(*ValidationError); !ok { |
| 59 | +@@ -69,22 +83,14 @@ func (p *Parser) ParseWithClaims(tokenString string, claims Claims, keyFunc Keyf |
| 60 | + } else { |
| 61 | + vErr = e |
| 62 | + } |
| 63 | ++ return token, vErr |
| 64 | + } |
| 65 | + } |
| 66 | + |
| 67 | +- // Perform validation |
| 68 | +- token.Signature = parts[2] |
| 69 | +- if err = token.Method.Verify(strings.Join(parts[0:2], "."), token.Signature, key); err != nil { |
| 70 | +- vErr.Inner = err |
| 71 | +- vErr.Errors |= ValidationErrorSignatureInvalid |
| 72 | +- } |
| 73 | +- |
| 74 | +- if vErr.valid() { |
| 75 | +- token.Valid = true |
| 76 | +- return token, nil |
| 77 | +- } |
| 78 | ++ // No errors so far, token is valid. |
| 79 | ++ token.Valid = true |
| 80 | + |
| 81 | +- return token, vErr |
| 82 | ++ return token, nil |
| 83 | + } |
| 84 | + |
| 85 | + // WARNING: Don't use this method unless you know what you're doing |
| 86 | +diff --git a/vendor/github.com/golang-jwt/jwt/parser.go b/vendor/github.com/golang-jwt/jwt/parser.go |
| 87 | +index d6901d9..bfb480c 100644 |
| 88 | +--- a/vendor/github.com/golang-jwt/jwt/parser.go |
| 89 | ++++ b/vendor/github.com/golang-jwt/jwt/parser.go |
| 90 | +@@ -14,12 +14,21 @@ type Parser struct { |
| 91 | + } |
| 92 | + |
| 93 | + // Parse, validate, and return a token. |
| 94 | +-// keyFunc will receive the parsed token and should return the key for validating. |
| 95 | +-// If everything is kosher, err will be nil |
| 96 | ++// Parse parses, validates, verifies the signature and returns the parsed token. keyFunc will |
| 97 | ++// receive the parsed token and should return the key for validating. |
| 98 | + func (p *Parser) Parse(tokenString string, keyFunc Keyfunc) (*Token, error) { |
| 99 | + return p.ParseWithClaims(tokenString, MapClaims{}, keyFunc) |
| 100 | + } |
| 101 | + |
| 102 | ++// ParseWithClaims parses, validates, and verifies like Parse, but supplies a default object |
| 103 | ++// implementing the Claims interface. This provides default values which can be overridden and |
| 104 | ++// allows a caller to use their own type, rather than the default MapClaims implementation of |
| 105 | ++// Claims. |
| 106 | ++// |
| 107 | ++// Note: If you provide a custom claim implementation that embeds one of the standard claims (such |
| 108 | ++// as RegisteredClaims), make sure that a) you either embed a non-pointer version of the claims or |
| 109 | ++// b) if you are using a pointer, allocate the proper memory for it before passing in the overall |
| 110 | ++// claims, otherwise you might run into a panic. |
| 111 | + func (p *Parser) ParseWithClaims(tokenString string, claims Claims, keyFunc Keyfunc) (*Token, error) { |
| 112 | + token, parts, err := p.ParseUnverified(tokenString, claims) |
| 113 | + if err != nil { |
| 114 | +@@ -56,12 +65,17 @@ func (p *Parser) ParseWithClaims(tokenString string, claims Claims, keyFunc Keyf |
| 115 | + return token, &ValidationError{Inner: err, Errors: ValidationErrorUnverifiable} |
| 116 | + } |
| 117 | + |
| 118 | ++ // Perform validation |
| 119 | ++ token.Signature = parts[2] |
| 120 | ++ if err := token.Method.Verify(strings.Join(parts[0:2], "."), token.Signature, key); err != nil { |
| 121 | ++ return token, &ValidationError{Inner: err, Errors: ValidationErrorSignatureInvalid} |
| 122 | ++ } |
| 123 | ++ |
| 124 | + vErr := &ValidationError{} |
| 125 | + |
| 126 | + // Validate Claims |
| 127 | + if !p.SkipClaimsValidation { |
| 128 | + if err := token.Claims.Valid(); err != nil { |
| 129 | +- |
| 130 | + // If the Claims Valid returned an error, check if it is a validation error, |
| 131 | + // If it was another error type, create a ValidationError with a generic ClaimsInvalid flag set |
| 132 | + if e, ok := err.(*ValidationError); !ok { |
| 133 | +@@ -69,22 +83,14 @@ func (p *Parser) ParseWithClaims(tokenString string, claims Claims, keyFunc Keyf |
| 134 | + } else { |
| 135 | + vErr = e |
| 136 | + } |
| 137 | ++ return token, vErr |
| 138 | + } |
| 139 | + } |
| 140 | + |
| 141 | +- // Perform validation |
| 142 | +- token.Signature = parts[2] |
| 143 | +- if err = token.Method.Verify(strings.Join(parts[0:2], "."), token.Signature, key); err != nil { |
| 144 | +- vErr.Inner = err |
| 145 | +- vErr.Errors |= ValidationErrorSignatureInvalid |
| 146 | +- } |
| 147 | +- |
| 148 | +- if vErr.valid() { |
| 149 | +- token.Valid = true |
| 150 | +- return token, nil |
| 151 | +- } |
| 152 | ++ // No errors so far, token is valid. |
| 153 | ++ token.Valid = true |
| 154 | + |
| 155 | +- return token, vErr |
| 156 | ++ return token, nil |
| 157 | + } |
| 158 | + |
| 159 | + // WARNING: Don't use this method unless you know what you're doing |
| 160 | +-- |
| 161 | +2.45.2 |
| 162 | + |
0 commit comments