refactor: add optionExpiredAllowed to AuthMiddlewareOptions, add jwtPurposeEqual helper, don't error if expired with ExpiredAllowed and the purposes are different
This commit is contained in:
parent
bee80a9981
commit
2528fd0afe
|
@ -3,6 +3,7 @@ package middleware
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"crypto/ed25519"
|
"crypto/ed25519"
|
||||||
|
"errors"
|
||||||
"net/http"
|
"net/http"
|
||||||
"slices"
|
"slices"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
@ -103,6 +104,7 @@ type AuthMiddlewareOptions struct {
|
||||||
AuthContextKey string
|
AuthContextKey string
|
||||||
Config *config.Manager
|
Config *config.Manager
|
||||||
EmptyAllowed bool
|
EmptyAllowed bool
|
||||||
|
ExpiredAllowed bool
|
||||||
}
|
}
|
||||||
|
|
||||||
func AuthMiddleware(options AuthMiddlewareOptions) func(http.Handler) http.Handler {
|
func AuthMiddleware(options AuthMiddlewareOptions) func(http.Handler) http.Handler {
|
||||||
|
@ -128,7 +130,7 @@ func AuthMiddleware(options AuthMiddlewareOptions) func(http.Handler) http.Handl
|
||||||
claim, err := account.JWTVerifyToken(authToken, domain, options.Identity, func(claim *jwt.RegisteredClaims) error {
|
claim, err := account.JWTVerifyToken(authToken, domain, options.Identity, func(claim *jwt.RegisteredClaims) error {
|
||||||
aud, _ := claim.GetAudience()
|
aud, _ := claim.GetAudience()
|
||||||
|
|
||||||
if options.Purpose != account.JWTPurposeNone && slices.Contains[jwt.ClaimStrings, string](aud, string(options.Purpose)) == false {
|
if options.Purpose != account.JWTPurposeNone && jwtPurposeEqual(aud, options.Purpose) == false {
|
||||||
return account.ErrJWTInvalid
|
return account.ErrJWTInvalid
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -136,7 +138,14 @@ func AuthMiddleware(options AuthMiddlewareOptions) func(http.Handler) http.Handl
|
||||||
})
|
})
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
unauthorized := true
|
||||||
|
if errors.Is(err, jwt.ErrTokenExpired) && options.ExpiredAllowed {
|
||||||
|
unauthorized = false
|
||||||
|
}
|
||||||
|
|
||||||
|
if unauthorized && jwtPurposeEqual(claim.Audience, options.Purpose) == true {
|
||||||
http.Error(w, err.Error(), http.StatusUnauthorized)
|
http.Error(w, err.Error(), http.StatusUnauthorized)
|
||||||
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -213,3 +222,7 @@ func CtxAborted(ctx context.Context) bool {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func jwtPurposeEqual(aud jwt.ClaimStrings, purpose account.JWTPurpose) bool {
|
||||||
|
return slices.Contains[jwt.ClaimStrings, string](aud, string(purpose))
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue