🔒 token encryption
This commit is contained in:
@@ -11,6 +11,7 @@ import (
|
|||||||
"github.com/wenlng/go-captcha/v2/slide"
|
"github.com/wenlng/go-captcha/v2/slide"
|
||||||
"log"
|
"log"
|
||||||
"schisandra-cloud-album/api/captcha_api/dto"
|
"schisandra-cloud-album/api/captcha_api/dto"
|
||||||
|
"schisandra-cloud-album/common/constant"
|
||||||
"schisandra-cloud-album/common/redis"
|
"schisandra-cloud-album/common/redis"
|
||||||
"schisandra-cloud-album/common/result"
|
"schisandra-cloud-album/common/result"
|
||||||
"schisandra-cloud-album/global"
|
"schisandra-cloud-album/global"
|
||||||
@@ -44,7 +45,7 @@ func (CaptchaAPI) GenerateRotateCaptcha(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
key := helper.StringToMD5(string(dotsByte))
|
key := helper.StringToMD5(string(dotsByte))
|
||||||
err = redis.Set("user:login:client:"+key, dotsByte, time.Minute).Err()
|
err = redis.Set(constant.UserLoginCaptchaRedisKey+key, dotsByte, time.Minute).Err()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
result.FailWithNull(c)
|
result.FailWithNull(c)
|
||||||
return
|
return
|
||||||
@@ -74,7 +75,7 @@ func (CaptchaAPI) CheckRotateData(c *gin.Context) {
|
|||||||
result.FailWithNull(c)
|
result.FailWithNull(c)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
cacheDataByte, err := redis.Get("user:login:client:" + key).Bytes()
|
cacheDataByte, err := redis.Get(constant.UserLoginCaptchaRedisKey + key).Bytes()
|
||||||
if len(cacheDataByte) == 0 || err != nil {
|
if len(cacheDataByte) == 0 || err != nil {
|
||||||
result.FailWithCodeAndMessage(1011, ginI18n.MustGetMessage(c, "CaptchaExpired"), c)
|
result.FailWithCodeAndMessage(1011, ginI18n.MustGetMessage(c, "CaptchaExpired"), c)
|
||||||
return
|
return
|
||||||
|
@@ -7,6 +7,7 @@ import (
|
|||||||
"github.com/pkg6/go-sms/gateways"
|
"github.com/pkg6/go-sms/gateways"
|
||||||
"github.com/pkg6/go-sms/gateways/aliyun"
|
"github.com/pkg6/go-sms/gateways/aliyun"
|
||||||
"github.com/pkg6/go-sms/gateways/smsbao"
|
"github.com/pkg6/go-sms/gateways/smsbao"
|
||||||
|
"schisandra-cloud-album/common/constant"
|
||||||
"schisandra-cloud-album/common/redis"
|
"schisandra-cloud-album/common/redis"
|
||||||
"schisandra-cloud-album/common/result"
|
"schisandra-cloud-album/common/result"
|
||||||
"schisandra-cloud-album/global"
|
"schisandra-cloud-album/global"
|
||||||
@@ -102,7 +103,7 @@ func (SmsAPI) SendMessageTest(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
code := utils.GenValidateCode(6)
|
code := utils.GenValidateCode(6)
|
||||||
err := redis.Set("user:login:sms:"+phone, code, time.Minute).Err()
|
err := redis.Set(constant.UserLoginSmsRedisKey+phone, code, time.Minute).Err()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
global.LOG.Error(err)
|
global.LOG.Error(err)
|
||||||
result.FailWithMessage(ginI18n.MustGetMessage(c, "CaptchaSendFailed"), c)
|
result.FailWithMessage(ginI18n.MustGetMessage(c, "CaptchaSendFailed"), c)
|
||||||
|
@@ -1,11 +1,14 @@
|
|||||||
package user_api
|
package user_api
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"encoding/json"
|
||||||
ginI18n "github.com/gin-contrib/i18n"
|
ginI18n "github.com/gin-contrib/i18n"
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
|
"github.com/wumansgy/goEncrypt/aes"
|
||||||
"github.com/yitter/idgenerator-go/idgen"
|
"github.com/yitter/idgenerator-go/idgen"
|
||||||
"reflect"
|
"reflect"
|
||||||
"schisandra-cloud-album/api/user_api/dto"
|
"schisandra-cloud-album/api/user_api/dto"
|
||||||
|
"schisandra-cloud-album/common/constant"
|
||||||
"schisandra-cloud-album/common/enum"
|
"schisandra-cloud-album/common/enum"
|
||||||
"schisandra-cloud-album/common/redis"
|
"schisandra-cloud-album/common/redis"
|
||||||
"schisandra-cloud-album/common/result"
|
"schisandra-cloud-album/common/result"
|
||||||
@@ -19,6 +22,9 @@ import (
|
|||||||
|
|
||||||
var userService = service.Service.UserService
|
var userService = service.Service.UserService
|
||||||
var userRoleService = service.Service.UserRoleService
|
var userRoleService = service.Service.UserRoleService
|
||||||
|
var rolePermissionService = service.Service.RolePermissionService
|
||||||
|
var permissionServiceService = service.Service.PermissionService
|
||||||
|
var roleService = service.Service.RoleService
|
||||||
|
|
||||||
// GetUserList
|
// GetUserList
|
||||||
// @Summary 获取所有用户列表
|
// @Summary 获取所有用户列表
|
||||||
@@ -187,7 +193,7 @@ func (UserAPI) PhoneLogin(c *gin.Context) {
|
|||||||
user := userService.QueryUserByPhone(phone)
|
user := userService.QueryUserByPhone(phone)
|
||||||
if reflect.DeepEqual(user, model.ScaAuthUser{}) {
|
if reflect.DeepEqual(user, model.ScaAuthUser{}) {
|
||||||
// 未注册
|
// 未注册
|
||||||
code := redis.Get("user:login:sms:" + phone)
|
code := redis.Get(constant.UserLoginSmsRedisKey + phone)
|
||||||
if code == nil {
|
if code == nil {
|
||||||
result.FailWithMessage(ginI18n.MustGetMessage(c, "CaptchaExpired"), c)
|
result.FailWithMessage(ginI18n.MustGetMessage(c, "CaptchaExpired"), c)
|
||||||
return
|
return
|
||||||
@@ -217,6 +223,36 @@ func (UserAPI) PhoneLogin(c *gin.Context) {
|
|||||||
result.FailWithMessage(ginI18n.MustGetMessage(c, "LoginFailed"), c)
|
result.FailWithMessage(ginI18n.MustGetMessage(c, "LoginFailed"), c)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
permissionIds := rolePermissionService.QueryPermissionIdsByRoleId(ids)
|
||||||
|
permissions, err := permissionServiceService.GetPermissionsByIds(permissionIds)
|
||||||
|
if err != nil {
|
||||||
|
result.FailWithMessage(ginI18n.MustGetMessage(c, "LoginFailed"), c)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
serializedPermissions, err := json.Marshal(permissions)
|
||||||
|
if err != nil {
|
||||||
|
result.FailWithMessage(ginI18n.MustGetMessage(c, "LoginFailed"), c)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
wrong := redis.Set(constant.UserAuthPermissionRedisKey+*addUser.UID, serializedPermissions, 0).Err()
|
||||||
|
if wrong != nil {
|
||||||
|
result.FailWithMessage(ginI18n.MustGetMessage(c, "LoginFailed"), c)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
roleList, err := roleService.GetRoleListByIds(ids)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
serializedRoleList, err := json.Marshal(roleList)
|
||||||
|
if err != nil {
|
||||||
|
result.FailWithMessage(ginI18n.MustGetMessage(c, "LoginFailed"), c)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
er := redis.Set(constant.UserAuthRoleRedisKey+*addUser.UID, serializedRoleList, 0).Err()
|
||||||
|
if er != nil {
|
||||||
|
result.FailWithMessage(ginI18n.MustGetMessage(c, "LoginFailed"), c)
|
||||||
|
return
|
||||||
|
}
|
||||||
accessToken, refreshToken, expiresAt := utils.GenerateAccessTokenAndRefreshToken(utils.JWTPayload{UserID: addUser.UID, RoleID: ids})
|
accessToken, refreshToken, expiresAt := utils.GenerateAccessTokenAndRefreshToken(utils.JWTPayload{UserID: addUser.UID, RoleID: ids})
|
||||||
|
|
||||||
data := dto.ResponseData{
|
data := dto.ResponseData{
|
||||||
@@ -225,7 +261,7 @@ func (UserAPI) PhoneLogin(c *gin.Context) {
|
|||||||
ExpiresAt: expiresAt,
|
ExpiresAt: expiresAt,
|
||||||
UID: addUser.UID,
|
UID: addUser.UID,
|
||||||
}
|
}
|
||||||
fail := redis.Set("user:login:token:"+*addUser.UID, data, time.Hour*24*30).Err()
|
fail := redis.Set(constant.UserLoginTokenRedisKey+*addUser.UID, data, time.Hour*24*7).Err()
|
||||||
if fail != nil {
|
if fail != nil {
|
||||||
result.FailWithMessage(ginI18n.MustGetMessage(c, "LoginFailed"), c)
|
result.FailWithMessage(ginI18n.MustGetMessage(c, "LoginFailed"), c)
|
||||||
return
|
return
|
||||||
@@ -234,7 +270,7 @@ func (UserAPI) PhoneLogin(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
code := redis.Get("user:login:sms:" + phone)
|
code := redis.Get(constant.UserLoginSmsRedisKey + phone)
|
||||||
if code == nil {
|
if code == nil {
|
||||||
result.FailWithMessage(ginI18n.MustGetMessage(c, "CaptchaExpired"), c)
|
result.FailWithMessage(ginI18n.MustGetMessage(c, "CaptchaExpired"), c)
|
||||||
return
|
return
|
||||||
@@ -248,6 +284,36 @@ func (UserAPI) PhoneLogin(c *gin.Context) {
|
|||||||
result.FailWithMessage(ginI18n.MustGetMessage(c, "LoginFailed"), c)
|
result.FailWithMessage(ginI18n.MustGetMessage(c, "LoginFailed"), c)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
permissionIds := rolePermissionService.QueryPermissionIdsByRoleId(ids)
|
||||||
|
permissions, err := permissionServiceService.GetPermissionsByIds(permissionIds)
|
||||||
|
if err != nil {
|
||||||
|
result.FailWithMessage(ginI18n.MustGetMessage(c, "LoginFailed"), c)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
serializedPermissions, err := json.Marshal(permissions)
|
||||||
|
if err != nil {
|
||||||
|
result.FailWithMessage(ginI18n.MustGetMessage(c, "LoginFailed"), c)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
wrong := redis.Set(constant.UserAuthPermissionRedisKey+*user.UID, serializedPermissions, 0).Err()
|
||||||
|
if wrong != nil {
|
||||||
|
result.FailWithMessage(ginI18n.MustGetMessage(c, "LoginFailed"), c)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
roleList, err := roleService.GetRoleListByIds(ids)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
serializedRoleList, err := json.Marshal(roleList)
|
||||||
|
if err != nil {
|
||||||
|
result.FailWithMessage(ginI18n.MustGetMessage(c, "LoginFailed"), c)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
er := redis.Set(constant.UserAuthRoleRedisKey+*user.UID, serializedRoleList, 0).Err()
|
||||||
|
if er != nil {
|
||||||
|
result.FailWithMessage(ginI18n.MustGetMessage(c, "LoginFailed"), c)
|
||||||
|
return
|
||||||
|
}
|
||||||
accessToken, refreshToken, expiresAt := utils.GenerateAccessTokenAndRefreshToken(utils.JWTPayload{UserID: user.UID, RoleID: ids})
|
accessToken, refreshToken, expiresAt := utils.GenerateAccessTokenAndRefreshToken(utils.JWTPayload{UserID: user.UID, RoleID: ids})
|
||||||
|
|
||||||
data := dto.ResponseData{
|
data := dto.ResponseData{
|
||||||
@@ -256,7 +322,7 @@ func (UserAPI) PhoneLogin(c *gin.Context) {
|
|||||||
ExpiresAt: expiresAt,
|
ExpiresAt: expiresAt,
|
||||||
UID: user.UID,
|
UID: user.UID,
|
||||||
}
|
}
|
||||||
fail := redis.Set("user:login:token:"+*user.UID, data, time.Hour*24*30).Err()
|
fail := redis.Set(constant.UserLoginTokenRedisKey+*user.UID, data, time.Hour*24*7).Err()
|
||||||
if fail != nil {
|
if fail != nil {
|
||||||
result.FailWithMessage(ginI18n.MustGetMessage(c, "LoginFailed"), c)
|
result.FailWithMessage(ginI18n.MustGetMessage(c, "LoginFailed"), c)
|
||||||
return
|
return
|
||||||
@@ -277,26 +343,46 @@ func (UserAPI) PhoneLogin(c *gin.Context) {
|
|||||||
// @Success 200 {string} json
|
// @Success 200 {string} json
|
||||||
// @Router /api/auth/token/refresh [post]
|
// @Router /api/auth/token/refresh [post]
|
||||||
func (UserAPI) RefreshHandler(c *gin.Context) {
|
func (UserAPI) RefreshHandler(c *gin.Context) {
|
||||||
refreshToken := c.Query("refresh_token")
|
request := dto.RefreshTokenRequest{}
|
||||||
if refreshToken == "" {
|
err := c.ShouldBindJSON(&request)
|
||||||
result.FailWithMessage("refresh_token不能为空!", c)
|
if err != nil {
|
||||||
|
result.FailWithMessage(ginI18n.MustGetMessage(c, "ParamsError"), c)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
parseRefreshToken, isUpd, err := utils.ParseToken(refreshToken)
|
refreshToken := request.RefreshToken
|
||||||
|
if refreshToken == "" {
|
||||||
|
result.FailWithMessage(ginI18n.MustGetMessage(c, "ParamsError"), c)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
plaintext, err := aes.AesCtrDecryptByHex(refreshToken, []byte(global.CONFIG.Encrypt.Key), []byte(global.CONFIG.Encrypt.IV))
|
||||||
|
if err != nil {
|
||||||
|
global.LOG.Error(err)
|
||||||
|
result.FailWithMessage(ginI18n.MustGetMessage(c, "LoginExpired"), c)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
parseRefreshToken, isUpd, err := utils.ParseToken(string(plaintext))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
global.LOG.Errorln(err)
|
global.LOG.Errorln(err)
|
||||||
result.FailWithMessage(ginI18n.MustGetMessage(c, "LoginExpired"), c)
|
result.FailWithMessage(ginI18n.MustGetMessage(c, "LoginExpired"), c)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if isUpd {
|
if isUpd {
|
||||||
accessTokenString, refreshTokenString, expiresAt := utils.GenerateAccessTokenAndRefreshToken(utils.JWTPayload{UserID: parseRefreshToken.UserID, RoleID: parseRefreshToken.RoleID})
|
accessTokenString, err := utils.GenerateAccessToken(utils.JWTPayload{UserID: parseRefreshToken.UserID, RoleID: parseRefreshToken.RoleID})
|
||||||
|
if err != nil {
|
||||||
|
result.FailWithMessage(ginI18n.MustGetMessage(c, "LoginExpired"), c)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
wrong := redis.Get(constant.UserLoginTokenRedisKey + *parseRefreshToken.UserID).Err()
|
||||||
|
if wrong != nil {
|
||||||
|
result.FailWithMessage(ginI18n.MustGetMessage(c, "LoginExpired"), c)
|
||||||
|
return
|
||||||
|
}
|
||||||
data := dto.ResponseData{
|
data := dto.ResponseData{
|
||||||
AccessToken: accessTokenString,
|
AccessToken: accessTokenString,
|
||||||
RefreshToken: refreshTokenString,
|
RefreshToken: refreshToken,
|
||||||
ExpiresAt: expiresAt,
|
|
||||||
UID: parseRefreshToken.UserID,
|
UID: parseRefreshToken.UserID,
|
||||||
}
|
}
|
||||||
fail := redis.Set("user:login:token:"+*parseRefreshToken.UserID, data, time.Hour*24*30).Err()
|
fail := redis.Set("user:login:token:"+*parseRefreshToken.UserID, data, time.Hour*24*7).Err()
|
||||||
if fail != nil {
|
if fail != nil {
|
||||||
result.FailWithMessage(ginI18n.MustGetMessage(c, "LoginExpired"), c)
|
result.FailWithMessage(ginI18n.MustGetMessage(c, "LoginExpired"), c)
|
||||||
return
|
return
|
||||||
|
9
common/constant/redis_key.go
Normal file
9
common/constant/redis_key.go
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
package constant
|
||||||
|
|
||||||
|
const (
|
||||||
|
UserLoginSmsRedisKey = "user:login:sms:"
|
||||||
|
UserLoginTokenRedisKey = "user:login:token:"
|
||||||
|
UserLoginCaptchaRedisKey = "user:login:captcha:"
|
||||||
|
UserAuthRoleRedisKey = "user:auth:role:"
|
||||||
|
UserAuthPermissionRedisKey = "user:auth:permission:"
|
||||||
|
)
|
8
config/conf_encrypt.go
Normal file
8
config/conf_encrypt.go
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
package config
|
||||||
|
|
||||||
|
type Encrypt struct {
|
||||||
|
Key string `yaml:"key"`
|
||||||
|
IV string `yaml:"iv"`
|
||||||
|
PublicKey string `yaml:"public-key"`
|
||||||
|
PrivateKey string `yaml:"private-key"`
|
||||||
|
}
|
@@ -1,10 +1,11 @@
|
|||||||
package config
|
package config
|
||||||
|
|
||||||
type Config struct {
|
type Config struct {
|
||||||
MySQL MySQL `yaml:"mysql"`
|
MySQL MySQL `yaml:"mysql"`
|
||||||
Logger Logger `yaml:"logger"`
|
Logger Logger `yaml:"logger"`
|
||||||
System System `yaml:"system"`
|
System System `yaml:"system"`
|
||||||
Redis Redis `yaml:"redis"`
|
Redis Redis `yaml:"redis"`
|
||||||
SMS SMS `yaml:"sms"`
|
SMS SMS `yaml:"sms"`
|
||||||
JWT JWT `yaml:"jwt"`
|
JWT JWT `yaml:"jwt"`
|
||||||
|
Encrypt Encrypt `yaml:"encrypt"`
|
||||||
}
|
}
|
||||||
|
1
go.mod
1
go.mod
@@ -61,6 +61,7 @@ require (
|
|||||||
github.com/pkg6/go-sms v0.1.2 // indirect
|
github.com/pkg6/go-sms v0.1.2 // indirect
|
||||||
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
|
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
|
||||||
github.com/ugorji/go/codec v1.2.12 // indirect
|
github.com/ugorji/go/codec v1.2.12 // indirect
|
||||||
|
github.com/wumansgy/goEncrypt v1.1.0 // indirect
|
||||||
github.com/yitter/idgenerator-go v1.3.3 // indirect
|
github.com/yitter/idgenerator-go v1.3.3 // indirect
|
||||||
golang.org/x/arch v0.8.0 // indirect
|
golang.org/x/arch v0.8.0 // indirect
|
||||||
golang.org/x/image v0.18.0 // indirect
|
golang.org/x/image v0.18.0 // indirect
|
||||||
|
5
go.sum
5
go.sum
@@ -127,12 +127,14 @@ github.com/redis/go-redis/v9 v9.6.1 h1:HHDteefn6ZkTtY5fGUE8tj8uy85AHk6zP7CpzIAM0
|
|||||||
github.com/redis/go-redis/v9 v9.6.1/go.mod h1:0C0c6ycQsdpVNQpxb1njEQIqkx5UcsM8FJCQLgE9+RA=
|
github.com/redis/go-redis/v9 v9.6.1/go.mod h1:0C0c6ycQsdpVNQpxb1njEQIqkx5UcsM8FJCQLgE9+RA=
|
||||||
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
|
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
|
||||||
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
|
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
|
||||||
|
github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
|
||||||
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
|
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
|
||||||
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
|
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
|
||||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||||
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
|
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
|
||||||
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
|
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
|
||||||
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
|
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
|
||||||
|
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
|
||||||
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
||||||
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
@@ -155,6 +157,8 @@ github.com/wenlng/go-captcha-assets v1.0.1 h1:AdjRFMKmadPRWRTv0XEYfjDvcaayZ2yExI
|
|||||||
github.com/wenlng/go-captcha-assets v1.0.1/go.mod h1:yQqc7rRbxgLCg+tWtVp+7Y317D1wIZDan/yIwt8wSac=
|
github.com/wenlng/go-captcha-assets v1.0.1/go.mod h1:yQqc7rRbxgLCg+tWtVp+7Y317D1wIZDan/yIwt8wSac=
|
||||||
github.com/wenlng/go-captcha/v2 v2.0.0 h1:7Z4Zy09SIHgvj9e8ZxP4VhYOwg7IHt8kGlVrE5jP5Z8=
|
github.com/wenlng/go-captcha/v2 v2.0.0 h1:7Z4Zy09SIHgvj9e8ZxP4VhYOwg7IHt8kGlVrE5jP5Z8=
|
||||||
github.com/wenlng/go-captcha/v2 v2.0.0/go.mod h1:5hac1em3uXoyC5ipZ0xFv9umNM/waQvYAQdr0cx/h34=
|
github.com/wenlng/go-captcha/v2 v2.0.0/go.mod h1:5hac1em3uXoyC5ipZ0xFv9umNM/waQvYAQdr0cx/h34=
|
||||||
|
github.com/wumansgy/goEncrypt v1.1.0 h1:Krr2FJL4GEsMTBvLfsnoTmgWb7rkGnL4siJ9K2cxMs0=
|
||||||
|
github.com/wumansgy/goEncrypt v1.1.0/go.mod h1:dWgF7mi5Ujmt8V5EoyRqjH6XtZ8wmNQyT4u2uvH8Pyg=
|
||||||
github.com/yitter/idgenerator-go v1.3.3 h1:i6rzmpbCL0vlmr/tuW5+lSQzNuDG9vYBjIYRvnRcHE8=
|
github.com/yitter/idgenerator-go v1.3.3 h1:i6rzmpbCL0vlmr/tuW5+lSQzNuDG9vYBjIYRvnRcHE8=
|
||||||
github.com/yitter/idgenerator-go v1.3.3/go.mod h1:VVjbqFjGUsIkaXVkXEdmx1LiXUL3K1NvyxWPJBPbBpE=
|
github.com/yitter/idgenerator-go v1.3.3/go.mod h1:VVjbqFjGUsIkaXVkXEdmx1LiXUL3K1NvyxWPJBPbBpE=
|
||||||
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
||||||
@@ -184,6 +188,7 @@ golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|||||||
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
|
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
|
||||||
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
||||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
|
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
@@ -21,7 +21,7 @@ func JWTAuthMiddleware() gin.HandlerFunc {
|
|||||||
headerPrefix := global.CONFIG.JWT.HeaderPrefix
|
headerPrefix := global.CONFIG.JWT.HeaderPrefix
|
||||||
accessToken := strings.TrimPrefix(authHeader, headerPrefix+" ")
|
accessToken := strings.TrimPrefix(authHeader, headerPrefix+" ")
|
||||||
|
|
||||||
if accessToken == "undefined" || accessToken == "" {
|
if accessToken == "" {
|
||||||
c.Abort()
|
c.Abort()
|
||||||
result.FailWithMessage(ginI18n.MustGetMessage(c, "AuthVerifyFailed"), c)
|
result.FailWithMessage(ginI18n.MustGetMessage(c, "AuthVerifyFailed"), c)
|
||||||
return
|
return
|
||||||
|
@@ -1,6 +1,7 @@
|
|||||||
package model
|
package model
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"encoding/json"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -29,3 +30,11 @@ type ScaAuthPermission struct {
|
|||||||
func (*ScaAuthPermission) TableName() string {
|
func (*ScaAuthPermission) TableName() string {
|
||||||
return TableNameScaAuthPermission
|
return TableNameScaAuthPermission
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (permission *ScaAuthPermission) MarshalBinary() ([]byte, error) {
|
||||||
|
return json.Marshal(permission)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (permission *ScaAuthPermission) UnmarshalBinary(data []byte) error {
|
||||||
|
return json.Unmarshal(data, permission)
|
||||||
|
}
|
||||||
|
@@ -1,6 +1,7 @@
|
|||||||
package model
|
package model
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"encoding/json"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -22,3 +23,11 @@ type ScaAuthRole struct {
|
|||||||
func (*ScaAuthRole) TableName() string {
|
func (*ScaAuthRole) TableName() string {
|
||||||
return TableNameScaAuthRole
|
return TableNameScaAuthRole
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (role *ScaAuthRole) MarshalBinary() ([]byte, error) {
|
||||||
|
return json.Marshal(role)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (role *ScaAuthRole) UnmarshalBinary(data []byte) error {
|
||||||
|
return json.Unmarshal(data, role)
|
||||||
|
}
|
||||||
|
@@ -17,9 +17,13 @@ func UserRouter(router *gin.RouterGroup) {
|
|||||||
}
|
}
|
||||||
authGroup := router.Group("auth").Use(middleware.JWTAuthMiddleware())
|
authGroup := router.Group("auth").Use(middleware.JWTAuthMiddleware())
|
||||||
{
|
{
|
||||||
authGroup.GET("/user/List", userApi.GetUserList)
|
authGroup.GET("/user/list", userApi.GetUserList)
|
||||||
authGroup.GET("/user/query_by_uuid", userApi.QueryUserByUuid)
|
authGroup.GET("/user/query_by_uuid", userApi.QueryUserByUuid)
|
||||||
authGroup.POST("/token/refresh", userApi.RefreshHandler)
|
|
||||||
|
}
|
||||||
|
tokenGroup := router.Group("token")
|
||||||
|
{
|
||||||
|
tokenGroup.POST("/refresh", userApi.RefreshHandler)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
3
service/permission_service/permission.go
Normal file
3
service/permission_service/permission.go
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
package permission_service
|
||||||
|
|
||||||
|
type PermissionService struct{}
|
15
service/permission_service/permission_service.go
Normal file
15
service/permission_service/permission_service.go
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
package permission_service
|
||||||
|
|
||||||
|
import (
|
||||||
|
"schisandra-cloud-album/global"
|
||||||
|
"schisandra-cloud-album/model"
|
||||||
|
)
|
||||||
|
|
||||||
|
// GetPermissionsByIds 通过权限ID列表获取权限列表
|
||||||
|
func (PermissionService) GetPermissionsByIds(ids []int64) ([]model.ScaAuthPermission, error) {
|
||||||
|
var permissions []model.ScaAuthPermission
|
||||||
|
if err := global.DB.Where("id IN ?", ids).Find(&permissions).Error; err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return permissions, nil
|
||||||
|
}
|
3
service/role_permission_service/role_permission.go
Normal file
3
service/role_permission_service/role_permission.go
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
package role_permission_service
|
||||||
|
|
||||||
|
type RolePermissionService struct{}
|
17
service/role_permission_service/role_permission_service.go
Normal file
17
service/role_permission_service/role_permission_service.go
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
package role_permission_service
|
||||||
|
|
||||||
|
import (
|
||||||
|
"schisandra-cloud-album/global"
|
||||||
|
"schisandra-cloud-album/model"
|
||||||
|
)
|
||||||
|
|
||||||
|
// QueryPermissionIdsByRoleId 通过角色ID列表查询权限ID列表
|
||||||
|
func (RolePermissionService) QueryPermissionIdsByRoleId(roleIds []*int64) []int64 {
|
||||||
|
var permissionIds []int64
|
||||||
|
rolePermission := model.ScaAuthRolePermission{}
|
||||||
|
if err := global.DB.Model(&rolePermission).Where("role_id IN ?", roleIds).Pluck("permission_id", &permissionIds).Error; err != nil {
|
||||||
|
global.LOG.Error(err)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return permissionIds
|
||||||
|
}
|
@@ -5,11 +5,11 @@ import (
|
|||||||
"schisandra-cloud-album/model"
|
"schisandra-cloud-album/model"
|
||||||
)
|
)
|
||||||
|
|
||||||
// GetRoleById : 通过Id获取角色信息
|
// GetRoleListByIds : 通过Id列表获取角色信息列表
|
||||||
func (RoleService) GetRoleById(id int64) (model.ScaAuthRole, error) {
|
func (RoleService) GetRoleListByIds(id []*int64) ([]model.ScaAuthRole, error) {
|
||||||
var role model.ScaAuthRole
|
var roles []model.ScaAuthRole
|
||||||
if err := global.DB.Where("id = ? and deleted = 0", id).First(&role).Error; err != nil {
|
if err := global.DB.Where("id IN ?", id).Find(&roles).Error; err != nil {
|
||||||
return model.ScaAuthRole{}, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return role, nil
|
return roles, nil
|
||||||
}
|
}
|
||||||
|
@@ -1,6 +1,8 @@
|
|||||||
package service
|
package service
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"schisandra-cloud-album/service/permission_service"
|
||||||
|
"schisandra-cloud-album/service/role_permission_service"
|
||||||
"schisandra-cloud-album/service/role_service"
|
"schisandra-cloud-album/service/role_service"
|
||||||
"schisandra-cloud-album/service/user_role_service"
|
"schisandra-cloud-album/service/user_role_service"
|
||||||
"schisandra-cloud-album/service/user_service"
|
"schisandra-cloud-album/service/user_service"
|
||||||
@@ -8,9 +10,11 @@ import (
|
|||||||
|
|
||||||
// Services 统一导出的service
|
// Services 统一导出的service
|
||||||
type Services struct {
|
type Services struct {
|
||||||
UserService user_service.UserService
|
UserService user_service.UserService
|
||||||
RoleService role_service.RoleService
|
RoleService role_service.RoleService
|
||||||
UserRoleService user_role_service.UserRoleService
|
UserRoleService user_role_service.UserRoleService
|
||||||
|
RolePermissionService role_permission_service.RolePermissionService
|
||||||
|
PermissionService permission_service.PermissionService
|
||||||
}
|
}
|
||||||
|
|
||||||
// Service new函数实例化,实例化完成后会返回结构体地指针类型
|
// Service new函数实例化,实例化完成后会返回结构体地指针类型
|
||||||
|
38
utils/jwt.go
38
utils/jwt.go
@@ -1,7 +1,9 @@
|
|||||||
package utils
|
package utils
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"github.com/golang-jwt/jwt/v5"
|
"github.com/golang-jwt/jwt/v5"
|
||||||
|
"github.com/wumansgy/goEncrypt/aes"
|
||||||
"schisandra-cloud-album/global"
|
"schisandra-cloud-album/global"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
@@ -18,19 +20,28 @@ type JWTClaims struct {
|
|||||||
|
|
||||||
var MySecret []byte
|
var MySecret []byte
|
||||||
|
|
||||||
// GenerateToken generates a JWT token with the given payload
|
// GenerateAccessToken generates a JWT token with the given payload
|
||||||
func GenerateToken(payload JWTPayload) (string, error) {
|
func GenerateAccessToken(payload JWTPayload) (string, error) {
|
||||||
MySecret = []byte(global.CONFIG.JWT.Secret)
|
MySecret = []byte(global.CONFIG.JWT.Secret)
|
||||||
claims := JWTClaims{
|
claims := JWTClaims{
|
||||||
JWTPayload: payload,
|
JWTPayload: payload,
|
||||||
RegisteredClaims: jwt.RegisteredClaims{
|
RegisteredClaims: jwt.RegisteredClaims{
|
||||||
ExpiresAt: jwt.NewNumericDate(time.Now().Add(time.Hour * 24)),
|
ExpiresAt: jwt.NewNumericDate(time.Now().Add(time.Hour * 2)),
|
||||||
IssuedAt: jwt.NewNumericDate(time.Now()),
|
IssuedAt: jwt.NewNumericDate(time.Now()),
|
||||||
NotBefore: jwt.NewNumericDate(time.Now()),
|
NotBefore: jwt.NewNumericDate(time.Now()),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
|
token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
|
||||||
return token.SignedString(MySecret)
|
signedString, err := token.SignedString(MySecret)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
accessToken, err := aes.AesCtrEncryptHex([]byte(signedString), []byte(global.CONFIG.Encrypt.Key), []byte(global.CONFIG.Encrypt.IV))
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println(err)
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return accessToken, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// GenerateAccessTokenAndRefreshToken generates a JWT token with the given payload, and returns the accessToken and refreshToken
|
// GenerateAccessTokenAndRefreshToken generates a JWT token with the given payload, and returns the accessToken and refreshToken
|
||||||
@@ -67,13 +78,28 @@ func GenerateAccessTokenAndRefreshToken(payload JWTPayload) (string, string, int
|
|||||||
global.LOG.Error(err)
|
global.LOG.Error(err)
|
||||||
return "", "", 0
|
return "", "", 0
|
||||||
}
|
}
|
||||||
return accessTokenString, refreshTokenString, refreshClaims.ExpiresAt.Time.Unix()
|
accessTokenEncrypted, err := aes.AesCtrEncryptHex([]byte(accessTokenString), []byte(global.CONFIG.Encrypt.Key), []byte(global.CONFIG.Encrypt.IV))
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println(err)
|
||||||
|
return "", "", 0
|
||||||
|
}
|
||||||
|
refreshTokenEncrypted, err := aes.AesCtrEncryptHex([]byte(refreshTokenString), []byte(global.CONFIG.Encrypt.Key), []byte(global.CONFIG.Encrypt.IV))
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println(err)
|
||||||
|
return "", "", 0
|
||||||
|
}
|
||||||
|
return accessTokenEncrypted, refreshTokenEncrypted, refreshClaims.ExpiresAt.Time.Unix()
|
||||||
}
|
}
|
||||||
|
|
||||||
// ParseToken parses a JWT token and returns the payload
|
// ParseToken parses a JWT token and returns the payload
|
||||||
func ParseToken(tokenString string) (*JWTPayload, bool, error) {
|
func ParseToken(tokenString string) (*JWTPayload, bool, error) {
|
||||||
MySecret = []byte(global.CONFIG.JWT.Secret)
|
MySecret = []byte(global.CONFIG.JWT.Secret)
|
||||||
token, err := jwt.ParseWithClaims(tokenString, &JWTClaims{}, func(token *jwt.Token) (interface{}, error) {
|
plaintext, err := aes.AesCtrDecryptByHex(tokenString, []byte(global.CONFIG.Encrypt.Key), []byte(global.CONFIG.Encrypt.IV))
|
||||||
|
if err != nil {
|
||||||
|
global.LOG.Error(err)
|
||||||
|
return nil, false, err
|
||||||
|
}
|
||||||
|
token, err := jwt.ParseWithClaims(string(plaintext), &JWTClaims{}, func(token *jwt.Token) (interface{}, error) {
|
||||||
return MySecret, nil
|
return MySecret, nil
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
Reference in New Issue
Block a user