fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:上下文

Browse Source
This commit is contained in:
momo
2023-08-25 16:53:33 +08:00
parent bb77d8f9aa 7a02b3242e
commit 5cba35bdc7
30 changed files with 537 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
utils/auth/confirmation_link_test.go
View File

@@ -25,7 +25,7 @@ func BenchmarkConfirmationLink(b *testing.B) {
cl := NewConfirmationLink[Register](key, "http://localhost:9900/api/auth/oauth2/register")
for i := 0; i < b.N; i++ {
uri, _ := cl.Generate(&Register{Id: 39, Password: "21dsadsad", platform: "google", Expired: time.Now()})
uri, _ := cl.Generate(&Register{Id: 39, Password: "21dsadsad", platform: "google", Expired: time.Now().UTC()})
u, _ := url.Parse(uri)
token := u.Query()["token"]
cl.Decrypt(token[0])
@@ -125,7 +125,7 @@ func TestConfirmationLink(t *testing.T) {
key := "21321321"
cl := NewConfirmationLink[Register](key, "http://localhost:9900/api/auth/oauth2/register")
uri, _ := cl.Generate(&Register{Id: 39, Password: "21dsadsad", platform: "google", Expired: time.Now()})
uri, _ := cl.Generate(&Register{Id: 39, Password: "21dsadsad", platform: "google", Expired: time.Now().UTC()})
log.Println(uri)
u, _ := url.Parse(uri)

53
utils/auth/jwt_token.go
View File

@@ -5,14 +5,17 @@ import (
"encoding/json"
"errors"
"fmt"
"log"
"net/http"
"strings"
)
var DefaultJwtSecret uint64 = 21321321321
func ParseJwtTokenHeader[T any](r *http.Request) (string, *T, error) {
//TODO:
var u T
return "", &u, nil
// var u T
// return "", &u, nil
AuthKey := r.Header.Get("Authorization")
if AuthKey == "" {
@@ -28,7 +31,51 @@ func ParseJwtTokenHeader[T any](r *http.Request) (string, *T, error) {
return "", nil, fmt.Errorf("Invalid JWT token")
}
payload, err := base64.URLEncoding.DecodeString(parts[1])
payload, err := base64.RawURLEncoding.DecodeString(parts[1])
if err != nil {
return "", nil, fmt.Errorf("Error unmarshalling JWT DecodeString: %s", err.Error())
}
var p T
err = json.Unmarshal(payload, &p)
if err != nil {
return "", nil, fmt.Errorf("Error unmarshalling JWT payload: %s", err)
}
return AuthKey, &p, nil
// token, err := jwt.Parse(AuthKey, func(token *jwt.Token) (interface{}, error) {
// // 检查签名方法是否为 HS256
// if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
// return nil, fmt.Errorf("unexpected signing method: %v", token.Header["alg"])
// }
// // 返回用于验证签名的密钥
// return []byte(svcCtx.Config.Auth.AccessSecret), nil
// })
// if err != nil {
// return nil, errors.New(fmt.Sprint("Error parsing token:", err))
// }
// // 验证成功返回
// if claims, ok := token.Claims.(jwt.MapClaims); ok && token.Valid {
// return claims, nil
// }
// return nil, errors.New(fmt.Sprint("Invalid token", err))
}
func TParseJwtTokenHeader[T any](AuthKey string) (string, *T, error) {
//TODO:
// var u T
// return "", &u, nil
parts := strings.Split(AuthKey, ".")
if len(parts) != 3 {
return "", nil, fmt.Errorf("Invalid JWT token")
}
payload, err := base64.RawURLEncoding.DecodeString(parts[1])
log.Println(string(payload))
if err != nil {
return "", nil, fmt.Errorf("Error unmarshalling JWT DecodeString: %s", err.Error())
}

2
utils/auth/register.go
View File

@@ -20,6 +20,7 @@ type RegisterToken struct {
Email string // email
Password string // 密码
Platform string // 平台
TraceId string //链路Id
CreateAt time.Time // 创建时间
}
@@ -29,6 +30,7 @@ type ResetToken struct {
Wid string // websocket 通道id
Email string // email
OldPassword string // 旧密码
TraceId string //链路Id
CreateAt time.Time // 创建时间
}

2
utils/auth/user.go
View File

@@ -216,7 +216,7 @@ func getJwtClaims(AuthKey string, AccessSecret *string) (jwt.MapClaims, error) {
func PasswordHash(pwd string) string {
h := sha256.New()
h.Write([]byte(pwd))
return base64.URLEncoding.EncodeToString(h.Sum(nil))
return base64.RawURLEncoding.EncodeToString(h.Sum(nil))
}
func CheckValueRange[T comparable](v T, rangevalues ...T) bool {

8
utils/auth/user_test.go
View File

@@ -11,7 +11,7 @@ import (
// TestGenJwt 测试jwt序列化
func TestGenJwt(t *testing.T) {
now := time.Now().Unix()
now := time.Now().UTC().Unix()
secret := "fusen123"
a, err := GenerateJwtToken(&secret, 3600, now, 123, 1234)
if err != nil {
@@ -34,7 +34,7 @@ func TestGenJwt(t *testing.T) {
}
func TestGenBackendJwt(t *testing.T) {
now := time.Now().Unix()
now := time.Now().UTC().Unix()
secret := "fusen_backend_2023"
a, err := GenerateBackendJwtToken(&secret, 3600*24*7, now, 1, 1)
if err != nil {
@@ -60,10 +60,10 @@ func TestCase1(t *testing.T) {
a := sha256.New()
a.Write([]byte("fusen_backend_3021"))
base64.URLEncoding.EncodeToString(a.Sum(nil))
base64.RawURLEncoding.EncodeToString(a.Sum(nil))
as := fmt.Sprintf("%x", a.Sum(nil))
log.Println(as, len(as), base64.URLEncoding.EncodeToString(a.Sum(nil)))
log.Println(as, len(as), base64.RawURLEncoding.EncodeToString(a.Sum(nil)))
// b := sha256.New().Sum([]byte("fusen_backend_2022"))
// bs := fmt.Sprintf("%x", b)

74
utils/basic/request_parse.go
View File

@@ -2,7 +2,9 @@ package basic
import (
"errors"
"log"
"fusenapi/shared"
"fusenapi/utils/auth"
"net/http"
"reflect"
@@ -10,10 +12,9 @@ import (
"github.com/golang-jwt/jwt"
"github.com/zeromicro/go-zero/core/logx"
"github.com/zeromicro/go-zero/rest/httpx"
"gorm.io/gorm"
)
var DefaultJwtSecret uint64 = 21321321321
type IJWTParse interface {
ParseJwtToken(r *http.Request) (jwt.MapClaims, error)
}
@@ -52,6 +53,7 @@ func NormalAfterLogic(w http.ResponseWriter, r *http.Request, resp *Response) {
}
func RequestParse(w http.ResponseWriter, r *http.Request, svcCtx any, LogicRequest any) (*auth.UserInfo, error) {
<<<<<<< HEAD
// log.Println(io.ReadAll(r.Body))
// token, info, err := auth.ParseJwtTokenHeader[auth.UserInfo](r) //解析Token头, 和payload信息
@@ -112,7 +114,73 @@ func RequestParse(w http.ResponseWriter, r *http.Request, svcCtx any, LogicReque
// // 白板用户
// userinfo = &auth.UserInfo{UserId: 0, GuestId: 0}
// }
=======
var userinfo *auth.UserInfo
>>>>>>> 7a02b3242e440880fd2afaada55a10d50823ee92
var err error
// log.Println(io.ReadAll(r.Body))
token, info, err := auth.ParseJwtTokenHeader[auth.UserInfo](r) //解析Token头, 和payload信息
if err != nil {
logx.Error(err)
return nil, err
}
if token == "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MjQyOTM0NjIsImd1ZXN0X2lkIjozNiwiaWF0IjozMTUzNjAwMCwidXNlcl9pZCI6MH0.T7PuRSrinlJu7ZZ1DVqUJLWXhY_6R1lXiUHaNdw35hU" {
userinfo = info
} else {
var secret uint64 = 0
if info != nil {
if info.IsUser() {
// us, err := state.GetUserState(info.UserId) //获取缓存的用户状态
reflect.ValueOf(svcCtx)
ctxValue := reflect.ValueOf(svcCtx).FieldByName("MysqlConn")
gdb := ctxValue.Interface().(*gorm.DB)
us, err := shared.GetUserState(info.UserId, gdb)
if err != nil {
logx.Error(err)
return nil, err
}
secret = us.PwdHash // 获取密码的hash做jwt, 便于重置密码的使用
} else if info.IsGuest() {
secret = auth.DefaultJwtSecret //获取默认的hash
}
}
if secret != 0 {
claims, err := auth.ParseJwtTokenUint64Secret(token, secret)
// 如果解析JWT token出错,则返回未授权的JSON响应并记录错误消息
if err != nil {
log.Println(token)
httpx.OkJsonCtx(r.Context(), w, &Response{
Code: 401, // 返回401状态码,表示未授权
Message: "unauthorized", // 返回未授权信息
})
logx.Info("unauthorized:", err.Error()) // 记录错误日志
return nil, err
}
if claims != nil {
// 从token中获取对应的用户信息
userinfo, err = auth.GetUserInfoFormMapClaims(claims)
// 如果获取用户信息出错,则返回未授权的JSON响应并记录错误消息
if err != nil {
httpx.OkJsonCtx(r.Context(), w, &Response{
Code: 401,
Message: "unauthorized",
})
logx.Info("unauthorized:", err.Error())
return nil, err
}
}
} else {
// 白板用户
userinfo = &auth.UserInfo{UserId: 0, GuestId: 0}
}
}
// 如果端点有请求结构体，则使用httpx.Parse方法从HTTP请求体中解析请求数据
if err = httpx.Parse(r, LogicRequest); err != nil {
httpx.OkJsonCtx(r.Context(), w, &Response{
@@ -122,7 +190,7 @@ func RequestParse(w http.ResponseWriter, r *http.Request, svcCtx any, LogicReque
logx.Error(err)
return nil, err
}
userinfo := &auth.UserInfo{UserId: 39}
// userinfo := &auth.UserInfo{UserId: 39}
return userinfo, err
}

12
utils/basic/request_parse_test.go Normal file
View File

@@ -0,0 +1,12 @@
package basic
import (
"fusenapi/utils/auth"
"log"
"testing"
)
func TestRequestParse(t *testing.T) {
a, us, err := auth.TParseJwtTokenHeader[auth.UserInfo]("saTGjruwq7SG4vnQVEo3vsZvbfhzx8zZ3zWA+8nWVdid5tssnYQNECiP+pYCK6YhZ+LRH8m7f7JXrgyqtpYQMOhVOcNWTYAClk0Jnft6+QIPegzY9+v4k7eVMiWf5c/x")
log.Println(a, us, err)
}

2
utils/encryption_decryption/aes_crt.go
View File

@@ -27,7 +27,7 @@ func NewSecretCRT[T any](key string, iv string) *SecretCRT[T] {
s := &SecretCRT[T]{
derivationKey: DerivationKeyV1,
iv: []byte(iv),
EncDec: base64.URLEncoding,
EncDec: base64.RawURLEncoding,
}
s.secretKey = s.derivationKey(key)
return s

2
utils/encryption_decryption/aes_gcm.go
View File

@@ -49,7 +49,7 @@ func NewSecretGCM[T any](key string) *SecretGCM[T] {
s := &SecretGCM[T]{
srcKey: key,
derivationKey: DerivationKeyV1,
EncDec: base64.URLEncoding,
EncDec: base64.RawURLEncoding,
}
s.secretKey = s.derivationKey(s.srcKey)
return s

2
utils/id_generator/unique_number.go
View File

@@ -8,6 +8,6 @@ import (
)
func GenSnNum() string {
a := fmt.Sprintf("%s%.8d", time.Now().Format("20060102150405.000"), rand.Intn(1000000))
a := fmt.Sprintf("%s%.8d", time.Now().UTC().Format("20060102150405.000"), rand.Intn(1000000))
return strings.ReplaceAll(a, ".", "")
}

2
utils/image/image_size.go
View File

@@ -60,7 +60,7 @@ func ThousandFaceImageFormat(req *ThousandFaceImageFormatReq) {
req.Cover = ""
req.CoverDefault = req.CoverImg
if req.Size >= 200 && len(coverSlice) >= 2 && len(coverImgSlice) >= 2 {
req.CoverImg = fmt.Sprintf("%s/test/%d/%d_%d.png?%d", constants.DOMAIN_RENDER_IMG_NAME, req.UserId, req.UserId, req.ProductId, time.Now().Unix())
req.CoverImg = fmt.Sprintf("%s/test/%d/%d_%d.png?%d", constants.DOMAIN_RENDER_IMG_NAME, req.UserId, req.UserId, req.ProductId, time.Now().UTC().Unix())
req.CoverDefault = fmt.Sprintf("%s_%d.%s", coverImgSlice[0], req.Size, coverImgSlice[1])
}
}

11
utils/websocket_data/render_data.go
View File

@@ -27,14 +27,13 @@ type RenderData struct {
// websocket发送渲染完的数据
type RenderImageRspMsg struct {
RenderId string `json:"render_id"` //渲染id
Image string `json:"image"` //渲染结果图片
RenderId string `json:"render_id"` //渲染id
Image string `json:"image"` //渲染结果图片
RenderProcessTime RenderProcessTime `json:"render_process_time"` //流程耗时
}
type RenderProcessTime struct {
CombineTakesTime string `json:"combine_takes_time"` //合图需要时间
UnityRenderTakesTime string `json:"unity_render_takes_time"` //unity渲染用时
UploadCombineImageTakesTime string `json:"upload_combine_image_takes_time"` //上传刀版图耗时
UploadUnityRenderImageTakesTime string `json:"upload_unity_render_image_takes_time"` //上传unity渲染结果图时间
}
type ThirdPartyLoginRspMsg struct {
//websocket三方登录的通知数据
Token string `json:"token"`
}

67
utils/wevent/base_event.go Normal file
View File

@@ -0,0 +1,67 @@
package wevent
import (
"time"
)
// 和前端交流的事件机制
type EventType string
const (
UserEmailRegister EventType = "E_USER_EMAIL_REGISTER" // 用户注册
)
// WebsocketEvent 所有事件都必须继承这个结构体
type WebsocketEvent struct {
Type EventType `json:"event_type"` // 事件
SenderTime time.Time `json:"sender_time"` // 发送的时间, 可能用来统计时间
TraceId string `json:"trace_id"` // 链路ID
Code int `json:"code"` // 状态码
Message string `json:"msg"` // 描述
Data any `json:"data"` // 关注的数据
}
// NewWebsocketEvent 创建一个Websocket事件
func NewWebsocketEvent(etype EventType, TraceId string) *WebsocketEvent {
return &WebsocketEvent{
Type: etype,
SenderTime: time.Now().UTC(),
TraceId: TraceId,
}
}
// NewWebsocketEventSuccess 创建一个Websocket事件伴随Code(200)
func NewWebsocketEventSuccess(etype EventType, TraceId string) *WebsocketEvent {
return &WebsocketEvent{
Type: etype,
SenderTime: time.Now().UTC(),
TraceId: TraceId,
Code: 200,
Message: "success",
}
}
func (event *WebsocketEvent) WithData(data any) *WebsocketEvent {
event.Data = data
return event
}
func (event *WebsocketEvent) WithMessgae(msg string) *WebsocketEvent {
event.Message = msg
return event
}
func (event *WebsocketEvent) WithCode(code int) *WebsocketEvent {
event.Code = code
return event
}
func (event *WebsocketEvent) WithTraceId(traceId string) *WebsocketEvent {
event.TraceId = traceId
return event
}
func (event *WebsocketEvent) WithSenderTime(senderTime time.Time) *WebsocketEvent {
event.SenderTime = senderTime
return event
}

6
utils/wevent/event.go Normal file
View File

@@ -0,0 +1,6 @@
package wevent
// 用户注册成功的事件关注的数据
type DataEmailRegister struct {
JwtToken string `json:"token"` // 注册成功的事件码
}

14
utils/wevent/event_test.go Normal file
View File

@@ -0,0 +1,14 @@
package wevent
import (
"encoding/json"
"log"
"testing"
"github.com/google/uuid"
)
func TestEvent(t *testing.T) {
data, _ := json.Marshal(NewWebsocketEvent(UserEmailRegister, uuid.NewString()).WithCode(200))
log.Println(string(data))
}