改进
This commit is contained in:
parent
57e57e5028
commit
67f2e24c0a
@ -12,8 +12,9 @@ const (
|
||||
)
|
||||
|
||||
var (
|
||||
ErrNotValidToken = errors.New("无效的 JWT 令牌。")
|
||||
ErrJWTFormatError = errors.New("JWT 格式错误。")
|
||||
ErrNotBearerType = errors.New("不是 Bearer 类型。")
|
||||
ErrEmptyResponse = errors.New("我们的服务器返回了空请求,可能某些环节出了问题。")
|
||||
ErrNotValidToken = errors.New("无效的 JWT 令牌")
|
||||
ErrJWTFormatError = errors.New("JWT 格式错误")
|
||||
ErrNotBearerType = errors.New("不是 Bearer 类型")
|
||||
ErrEmptyResponse = errors.New("我们的服务器返回了空请求,可能某些环节出了问题")
|
||||
ErrTokenError = errors.New("token 类型错误")
|
||||
)
|
||||
|
@ -1,7 +1,6 @@
|
||||
package logic
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"framework_v2/consts"
|
||||
"framework_v2/internal/providers"
|
||||
"framework_v2/internal/providers/jwks"
|
||||
@ -16,11 +15,6 @@ type AuthLogic struct {
|
||||
}
|
||||
|
||||
var (
|
||||
ErrNotValidToken = errors.New("无效的 JWT 令牌")
|
||||
ErrJWTFormatError = errors.New("JWT 格式错误")
|
||||
ErrNotBearerType = errors.New("不是 Bearer 类型")
|
||||
ErrEmptyResponse = errors.New("我们的服务器返回了空请求,可能某些环节出了问题")
|
||||
ErrTokenError = errors.New("token 类型错误")
|
||||
config = *providers.MustGet[providers.GlobalConfig]()
|
||||
logger = *providers.MustGet[zap.Logger]()
|
||||
)
|
||||
@ -41,35 +35,35 @@ func (a *AuthLogic) GinMiddlewareAuth(tokenType models.JWTTokenTypes, c *gin.Con
|
||||
authorization := c.Request.Header.Get(consts.AuthHeader)
|
||||
|
||||
if authorization == "" {
|
||||
return nil, ErrJWTFormatError
|
||||
return nil, consts.ErrJWTFormatError
|
||||
}
|
||||
|
||||
authSplit := strings.Split(authorization, " ")
|
||||
if len(authSplit) != 2 {
|
||||
return nil, ErrJWTFormatError
|
||||
return nil, consts.ErrJWTFormatError
|
||||
}
|
||||
|
||||
if authSplit[0] != consts.AuthPrefix {
|
||||
return nil, ErrNotBearerType
|
||||
return nil, consts.ErrNotBearerType
|
||||
}
|
||||
|
||||
token, err := jwks.ParseJWT(authSplit[1])
|
||||
if err != nil {
|
||||
return nil, ErrNotValidToken
|
||||
return nil, consts.ErrNotValidToken
|
||||
}
|
||||
sub, err = token.Claims.GetSubject()
|
||||
if err != nil {
|
||||
return nil, ErrNotValidToken
|
||||
return nil, consts.ErrNotValidToken
|
||||
}
|
||||
|
||||
// 如果 token.Header 中没有 typ
|
||||
if token.Header["typ"] == "" {
|
||||
return nil, ErrEmptyResponse
|
||||
return nil, consts.ErrEmptyResponse
|
||||
}
|
||||
|
||||
// 验证 token 类型
|
||||
if tokenType != "" && tokenType.String() != token.Header["typ"] {
|
||||
return nil, ErrTokenError
|
||||
return nil, consts.ErrTokenError
|
||||
}
|
||||
|
||||
jwtIdToken.Valid = true
|
||||
|
Loading…
Reference in New Issue
Block a user