【优化】租户功能,框架优化

This commit is contained in:
PandaGoAdmin
2022-07-18 18:17:11 +08:00
parent d33bd39570
commit ae38e7bcef
60 changed files with 861 additions and 647 deletions

View File

@@ -2,17 +2,15 @@ package ctx
import (
"errors"
"fmt"
"github.com/dgrijalva/jwt-go"
"pandax/base/config"
"strings"
"time"
)
var (
jwtSecret = []byte(config.Conf.Jwt.Key)
)
type Claims struct {
UserId int64
TenantId int64
UserName string
RoleId int64
RoleKey string
@@ -21,43 +19,116 @@ type Claims struct {
jwt.StandardClaims
}
func CreateToken(claims Claims) (string, error) {
tokenClaims := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
token, err := tokenClaims.SignedString(jwtSecret)
return token, err
type JWT struct {
SignedKeyID string
SignedKey []byte
SignedMethod jwt.SigningMethod
}
func ParseToken(token string) (*Claims, error) {
tokenClaims, err := jwt.ParseWithClaims(token, &Claims{}, func(token *jwt.Token) (any, error) {
return jwtSecret, nil
})
var (
TokenExpired = errors.New("token is expired")
TokenNotValidYet = errors.New("token not active yet")
TokenMalformed = errors.New("that's not even a token")
TokenInvalid = errors.New("couldn't handle this token")
)
if tokenClaims != nil {
if claims, ok := tokenClaims.Claims.(*Claims); ok && tokenClaims.Valid {
return claims, nil
func NewJWT(kid string, key []byte, method jwt.SigningMethod) *JWT {
return &JWT{
SignedKeyID: kid,
SignedKey: key,
SignedMethod: method,
}
}
// CreateToken 创建一个token
func (j *JWT) CreateToken(claims Claims) (string, error) {
token := jwt.NewWithClaims(jwt.SigningMethodHS256, &claims)
var key interface{}
if j.isEs() {
v, err := jwt.ParseECPrivateKeyFromPEM(j.SignedKey)
if err != nil {
return "", err
}
key = v
} else if j.isRsOrPS() {
v, err := jwt.ParseRSAPrivateKeyFromPEM(j.SignedKey)
if err != nil {
return "", err
}
key = v
} else if j.isHs() {
key = j.SignedKey
} else {
return "", errors.New("unsupported sign method")
}
return token.SignedString(key)
}
// ParseToken 解析 token
func (j *JWT) ParseToken(tokenString string) (*Claims, error) {
token, err := jwt.ParseWithClaims(tokenString, &Claims{}, func(token *jwt.Token) (i interface{}, e error) {
if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
return nil, fmt.Errorf("parse error")
}
return j.SignedKey, nil
})
if err != nil {
if ve, ok := err.(*jwt.ValidationError); ok {
if ve.Errors&jwt.ValidationErrorMalformed != 0 {
return nil, TokenMalformed
} else if ve.Errors&jwt.ValidationErrorExpired != 0 {
// Token is expired
return nil, TokenExpired
} else if ve.Errors&jwt.ValidationErrorNotValidYet != 0 {
return nil, TokenNotValidYet
} else {
return nil, TokenInvalid
}
}
}
if token != nil {
if claims, ok := token.Claims.(*Claims); ok && token.Valid {
return claims, nil
}
return nil, TokenInvalid
} else {
return nil, TokenInvalid
}
return nil, err
}
// 更新token
func RefreshToken(tokenString string) (string, error) {
func (j *JWT) RefreshToken(tokenString string) (string, error) {
jwt.TimeFunc = func() time.Time {
return time.Unix(0, 0)
}
token, err := jwt.ParseWithClaims(tokenString, &Claims{}, func(token *jwt.Token) (any, error) {
return jwtSecret, nil
token, err := jwt.ParseWithClaims(tokenString, &Claims{}, func(token *jwt.Token) (interface{}, error) {
return j.SignedKey, nil
})
if err != nil {
return "", err
}
if claims, ok := token.Claims.(*Claims); ok && token.Valid {
jwt.TimeFunc = time.Now
claims.StandardClaims.ExpiresAt = time.Now().Add(1 * time.Hour).Unix()
return CreateToken(*claims)
claims.StandardClaims.ExpiresAt = time.Now().Unix() + 60*60*24*7
return j.CreateToken(*claims)
}
return "", errors.New("Couldn't handle this token:")
return "", TokenInvalid
}
func (a *JWT) isEs() bool {
return strings.HasPrefix(a.SignedMethod.Alg(), "ES")
}
func (a *JWT) isRsOrPS() bool {
isRs := strings.HasPrefix(a.SignedMethod.Alg(), "RS")
isPs := strings.HasPrefix(a.SignedMethod.Alg(), "PS")
return isRs || isPs
}
func (a *JWT) isHs() bool {
return strings.HasPrefix(a.SignedMethod.Alg(), "HS")
}