Unverified Commit 701ce053 authored by kshamajain99's avatar kshamajain99 Committed by Alexander Matyushentsev
Browse files

fix: disable jwt claim audience validation #5381 (#5413)


* fix: disable audience validation
Signed-off-by: default avatarkshamajain99 <kshamajain99@gmail.com>

* update other places
Signed-off-by: default avatarkshamajain99 <kshamajain99@gmail.com>
parent 965825f7
No related merge requests found
Showing with 7 additions and 7 deletions
+7 -7
...@@ -114,7 +114,7 @@ func NewLoginCommand(globalClientOpts *argocdclient.ClientOptions) *cobra.Comman ...@@ -114,7 +114,7 @@ func NewLoginCommand(globalClientOpts *argocdclient.ClientOptions) *cobra.Comman
} }
parser := &jwt.Parser{ parser := &jwt.Parser{
ValidationHelper: jwt.NewValidationHelper(jwt.WithoutClaimsValidation()), ValidationHelper: jwt.NewValidationHelper(jwt.WithoutClaimsValidation(), jwt.WithoutAudienceValidation()),
} }
claims := jwt.MapClaims{} claims := jwt.MapClaims{}
_, _, err := parser.ParseUnverified(tokenString, &claims) _, _, err := parser.ParseUnverified(tokenString, &claims)
......
...@@ -328,14 +328,14 @@ func (c *client) refreshAuthToken(localCfg *localconfig.LocalConfig, ctxName, co ...@@ -328,14 +328,14 @@ func (c *client) refreshAuthToken(localCfg *localconfig.LocalConfig, ctxName, co
return err return err
} }
parser := &jwt.Parser{ parser := &jwt.Parser{
ValidationHelper: jwt.NewValidationHelper(jwt.WithoutClaimsValidation()), ValidationHelper: jwt.NewValidationHelper(jwt.WithoutClaimsValidation(), jwt.WithoutAudienceValidation()),
} }
var claims jwt.StandardClaims var claims jwt.StandardClaims
_, _, err = parser.ParseUnverified(configCtx.User.AuthToken, &claims) _, _, err = parser.ParseUnverified(configCtx.User.AuthToken, &claims)
if err != nil { if err != nil {
return err return err
} }
if claims.Valid(jwt.DefaultValidationHelper) == nil { if claims.Valid(parser.ValidationHelper) == nil {
// token is still valid // token is still valid
return nil return nil
} }
......
...@@ -108,7 +108,7 @@ func (s *Server) CreateToken(ctx context.Context, q *project.ProjectTokenCreateR ...@@ -108,7 +108,7 @@ func (s *Server) CreateToken(ctx context.Context, q *project.ProjectTokenCreateR
return nil, status.Error(codes.InvalidArgument, err.Error()) return nil, status.Error(codes.InvalidArgument, err.Error())
} }
parser := &jwt.Parser{ parser := &jwt.Parser{
ValidationHelper: jwt.NewValidationHelper(jwt.WithoutClaimsValidation()), ValidationHelper: jwt.NewValidationHelper(jwt.WithoutClaimsValidation(), jwt.WithoutAudienceValidation()),
} }
claims := jwt.StandardClaims{} claims := jwt.StandardClaims{}
_, _, err = parser.ParseUnverified(jwtToken, &claims) _, _, err = parser.ParseUnverified(jwtToken, &claims)
......
...@@ -303,7 +303,7 @@ func (sac *ServiceAccountClaims) Valid(helper *jwt.ValidationHelper) error { ...@@ -303,7 +303,7 @@ func (sac *ServiceAccountClaims) Valid(helper *jwt.ValidationHelper) error {
// ParseServiceAccountToken parses a Kubernetes service account token // ParseServiceAccountToken parses a Kubernetes service account token
func ParseServiceAccountToken(token string) (*ServiceAccountClaims, error) { func ParseServiceAccountToken(token string) (*ServiceAccountClaims, error) {
parser := &jwt.Parser{ parser := &jwt.Parser{
ValidationHelper: jwt.NewValidationHelper(jwt.WithoutClaimsValidation()), ValidationHelper: jwt.NewValidationHelper(jwt.WithoutClaimsValidation(), jwt.WithoutAudienceValidation()),
} }
var claims ServiceAccountClaims var claims ServiceAccountClaims
_, _, err := parser.ParseUnverified(token, &claims) _, _, err := parser.ParseUnverified(token, &claims)
......
...@@ -64,7 +64,7 @@ type User struct { ...@@ -64,7 +64,7 @@ type User struct {
// Claims returns the standard claims from the JWT claims // Claims returns the standard claims from the JWT claims
func (u *User) Claims() (*jwt.StandardClaims, error) { func (u *User) Claims() (*jwt.StandardClaims, error) {
parser := &jwt.Parser{ parser := &jwt.Parser{
ValidationHelper: jwt.NewValidationHelper(jwt.WithoutClaimsValidation()), ValidationHelper: jwt.NewValidationHelper(jwt.WithoutClaimsValidation(), jwt.WithoutAudienceValidation()),
} }
claims := jwt.StandardClaims{} claims := jwt.StandardClaims{}
_, _, err := parser.ParseUnverified(u.AuthToken, &claims) _, _, err := parser.ParseUnverified(u.AuthToken, &claims)
......
...@@ -490,7 +490,7 @@ func (mgr *SessionManager) VerifyUsernamePassword(username string, password stri ...@@ -490,7 +490,7 @@ func (mgr *SessionManager) VerifyUsernamePassword(username string, password stri
// We choose how to verify based on the issuer. // We choose how to verify based on the issuer.
func (mgr *SessionManager) VerifyToken(tokenString string) (jwt.Claims, error) { func (mgr *SessionManager) VerifyToken(tokenString string) (jwt.Claims, error) {
parser := &jwt.Parser{ parser := &jwt.Parser{
ValidationHelper: jwt.NewValidationHelper(jwt.WithoutClaimsValidation()), ValidationHelper: jwt.NewValidationHelper(jwt.WithoutClaimsValidation(), jwt.WithoutAudienceValidation()),
} }
var claims jwt.StandardClaims var claims jwt.StandardClaims
_, _, err := parser.ParseUnverified(tokenString, &claims) _, _, err := parser.ParseUnverified(tokenString, &claims)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment