yvan/Study
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

完善cookie模式

Browse Source
This commit is contained in:
piexlMax
2024-01-04 22:15:54 +08:00
parent 8aefb5db8e
commit 08617f2fd4
7 changed files with 40 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/api/v1/system/sys_jwt_blacklist.go
+3 -4
View File
@@ -4,6 +4,7 @@ import (
"github.com/flipped-aurora/gin-vue-admin/server/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
"github.com/flipped-aurora/gin-vue-admin/server/model/system"
"github.com/flipped-aurora/gin-vue-admin/server/utils"
"github.com/gin-gonic/gin"
"go.uber.org/zap"
)
@@ -19,10 +20,7 @@ type JwtApi struct{}
// @Success 200 {object} response.Response{msg=string} "jwt加入黑名单"
// @Router /jwt/jsonInBlacklist [post]
func (j *JwtApi) JsonInBlacklist(c *gin.Context) {
token, _ := c.Cookie("x-token")
if token == "" {
token = c.Request.Header.Get("x-token")
}
token := utils.GetToken(c)
jwt := system.JwtBlacklist{Jwt: token}
err := jwtService.JsonInBlacklist(jwt)
if err != nil {
@@ -30,5 +28,6 @@ func (j *JwtApi) JsonInBlacklist(c *gin.Context) {
response.FailWithMessage("jwt作废失败", c)
return
}
utils.ClearToken(c)
response.OkWithMessage("jwt作废成功", c)
}
server/api/v1/system/sys_user.go
+3 -13
View File
@@ -1,7 +1,6 @@
package system
import (
"net"
"strconv"
"time"
@@ -75,15 +74,6 @@ func (b *BaseApi) Login(c *gin.Context) {
response.FailWithMessage("验证码错误", c)
}
func (b *BaseApi) SetCookie(c *gin.Context, token string, claims systemReq.CustomClaims) {
// 增加cookie x-token 向来源的web添加
host, _, err := net.SplitHostPort(c.Request.Host)
if err != nil {
host = c.Request.Host
}
c.SetCookie("x-token", token, int(claims.RegisteredClaims.ExpiresAt.Unix()-time.Now().Unix()), "/", host, false, true)
}
// TokenNext 登录以后签发jwt
func (b *BaseApi) TokenNext(c *gin.Context, user system.SysUser) {
j := &utils.JWT{SigningKey: []byte(global.GVA_CONFIG.JWT.SigningKey)} // 唯一签名
@@ -101,7 +91,7 @@ func (b *BaseApi) TokenNext(c *gin.Context, user system.SysUser) {
return
}
if !global.GVA_CONFIG.System.UseMultipoint {
b.SetCookie(c, token, claims)
utils.SetToken(c, token, int(claims.RegisteredClaims.ExpiresAt.Unix()-time.Now().Unix()))
response.OkWithDetailed(systemRes.LoginResponse{
User: user,
Token: token,
@@ -116,7 +106,7 @@ func (b *BaseApi) TokenNext(c *gin.Context, user system.SysUser) {
response.FailWithMessage("设置登录状态失败", c)
return
}
b.SetCookie(c, token, claims)
utils.SetToken(c, token, int(claims.RegisteredClaims.ExpiresAt.Unix()-time.Now().Unix()))
response.OkWithDetailed(systemRes.LoginResponse{
User: user,
Token: token,
@@ -136,7 +126,7 @@ func (b *BaseApi) TokenNext(c *gin.Context, user system.SysUser) {
response.FailWithMessage("设置登录状态失败", c)
return
}
b.SetCookie(c, token, claims)
utils.SetToken(c, token, int(claims.RegisteredClaims.ExpiresAt.Unix()-time.Now().Unix()))
response.OkWithDetailed(systemRes.LoginResponse{
User: user,
Token: token,
server/middleware/jwt.go
+5 -11
View File
@@ -3,7 +3,6 @@ package middleware
import (
"errors"
"github.com/golang-jwt/jwt/v4"
"net"
"strconv"
"time"
@@ -23,10 +22,7 @@ var jwtService = service.ServiceGroupApp.SystemServiceGroup.JwtService
func JWTAuth() gin.HandlerFunc {
return func(c *gin.Context) {
// 我们这里jwt鉴权取头部信息 x-token 登录时回返回token信息 这里前端需要把token存储到cookie或者本地localStorage中 不过需要跟后端协商过期时间 可以约定刷新令牌或者重新登录
token, _ := c.Cookie("x-token")
if token == "" {
token = c.Request.Header.Get("x-token")
}
token := utils.GetToken(c)
if token == "" {
response.FailWithDetailed(gin.H{"reload": true}, "未登录或非法访问", c)
c.Abort()
@@ -34,6 +30,7 @@ func JWTAuth() gin.HandlerFunc {
}
if jwtService.IsBlacklist(token) {
response.FailWithDetailed(gin.H{"reload": true}, "您的帐户异地登陆或令牌失效", c)
utils.ClearToken(c)
c.Abort()
return
}
@@ -43,10 +40,12 @@ func JWTAuth() gin.HandlerFunc {
if err != nil {
if errors.Is(err, utils.TokenExpired) {
response.FailWithDetailed(gin.H{"reload": true}, "授权已过期", c)
utils.ClearToken(c)
c.Abort()
return
}
response.FailWithDetailed(gin.H{"reload": true}, err.Error(), c)
utils.ClearToken(c)
c.Abort()
return
}
@@ -66,12 +65,7 @@ func JWTAuth() gin.HandlerFunc {
newClaims, _ := j.ParseToken(newToken)
c.Header("new-token", newToken)
c.Header("new-expires-at", strconv.FormatInt(newClaims.ExpiresAt.Unix(), 10))
// 增加cookie x-token
host, _, err := net.SplitHostPort(c.Request.Host)
if err != nil {
host = c.Request.Host
}
c.SetCookie("x-token", newToken, int(dr.Seconds()), "/", host, false, true)
utils.SetToken(c, newToken, int(dr.Seconds()))
if global.GVA_CONFIG.System.UseMultipoint {
RedisJwtToken, err := jwtService.GetRedisJWT(newClaims.Username)
if err != nil {
server/utils/clamis.go
+25 -1
View File
@@ -5,13 +5,37 @@ import (
systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
"github.com/gin-gonic/gin"
"github.com/gofrs/uuid/v5"
"net"
)
func GetClaims(c *gin.Context) (*systemReq.CustomClaims, error) {
func ClearToken(c *gin.Context) {
// 增加cookie x-token 向来源的web添加
host, _, err := net.SplitHostPort(c.Request.Host)
if err != nil {
host = c.Request.Host
}
c.SetCookie("x-token", "", -1, "/", host, false, false)
}
func SetToken(c *gin.Context, token string, maxAge int) {
// 增加cookie x-token 向来源的web添加
host, _, err := net.SplitHostPort(c.Request.Host)
if err != nil {
host = c.Request.Host
}
c.SetCookie("x-token", token, maxAge, "/", host, false, false)
}
func GetToken(c *gin.Context) string {
token, _ := c.Cookie("x-token")
if token == "" {
token = c.Request.Header.Get("x-token")
}
return token
}
func GetClaims(c *gin.Context) (*systemReq.CustomClaims, error) {
token := GetToken(c)
j := NewJWT()
claims, err := j.ParseToken(token)
if err != nil {