remove duplicated jwt tokens validation

Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
This commit is contained in:
Nicola Murino 2024-06-15 16:19:37 +02:00
parent c5c42f072b
commit d650defa08
No known key found for this signature in database
GPG key ID: 935D2952DEC4EECF

View file

@ -23,7 +23,6 @@ import (
"strings" "strings"
"github.com/go-chi/jwtauth/v5" "github.com/go-chi/jwtauth/v5"
"github.com/lestrrat-go/jwx/v2/jwt"
"github.com/rs/xid" "github.com/rs/xid"
"github.com/sftpgo/sdk" "github.com/sftpgo/sdk"
@ -75,12 +74,6 @@ func validateJWTToken(w http.ResponseWriter, r *http.Request, audience tokenAudi
return errInvalidToken return errInvalidToken
} }
err = jwt.Validate(token)
if err != nil {
logger.Debug(logSender, "", "error validating jwt token: %v", err)
doRedirect(http.StatusText(http.StatusUnauthorized), err)
return errInvalidToken
}
if isTokenInvalidated(r) { if isTokenInvalidated(r) {
logger.Debug(logSender, "", "the token has been invalidated") logger.Debug(logSender, "", "the token has been invalidated")
doRedirect("Your token is no longer valid", nil) doRedirect("Your token is no longer valid", nil)
@ -112,7 +105,7 @@ func (s *httpdServer) validateJWTPartialToken(w http.ResponseWriter, r *http.Req
} else { } else {
notFoundFunc = s.renderClientNotFoundPage notFoundFunc = s.renderClientNotFoundPage
} }
if err != nil || token == nil || jwt.Validate(token) != nil { if err != nil || token == nil {
notFoundFunc(w, r, nil) notFoundFunc(w, r, nil)
return errInvalidToken return errInvalidToken
} }