fix(user): 修复解绑设备接口的502错误和安全断言问题
Build docker and publish / build (20.15.1) (push) Successful in 7m4s

修复不安全类型断言可能导致panic的问题,将Redis清理移出事务并添加超时控制
增加代理层超时配置和详细日志,提升接口稳定性
This commit is contained in:
2025-12-01 21:24:11 -08:00
parent 37cec59460
commit 6b65ffb728
7 changed files with 127 additions and 32 deletions
@@ -54,7 +54,7 @@ func (l *BindInviteCodeLogic) BindInviteCode(req *types.BindInviteCodeRequest) e
// 检查是否是自己的邀请码
if referrer.Id == currentUser.Id {
return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "cannot bind your own invite code")
return errors.Wrapf(xerr.NewErrCodeMsg(xerr.InviteCodeError, "不允许绑定自己"), "cannot bind your own invite code")
}
// 更新用户的RefererId
@@ -11,6 +11,8 @@ import (
"github.com/perfect-panel/server/pkg/constant"
"github.com/perfect-panel/server/pkg/logger"
"github.com/perfect-panel/server/pkg/tool"
"github.com/perfect-panel/server/pkg/xerr"
"github.com/pkg/errors"
)
type GetDeviceListLogic struct {
@@ -29,7 +31,10 @@ func NewGetDeviceListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Get
}
func (l *GetDeviceListLogic) GetDeviceList() (resp *types.GetDeviceListResponse, err error) {
userInfo := l.ctx.Value(constant.CtxKeyUser).(*user.User)
userInfo, ok := l.ctx.Value(constant.CtxKeyUser).(*user.User)
if !ok {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidAccess), "Invalid Access")
}
list, count, err := l.svcCtx.UserModel.QueryDeviceList(l.ctx, userInfo.Id)
if err != nil {
return nil, err
@@ -0,0 +1,17 @@
package user
import (
"context"
"testing"
"github.com/perfect-panel/server/internal/svc"
)
func TestGetDeviceList_MissingUserContext(t *testing.T) {
l := NewGetDeviceListLogic(context.Background(), &svc.ServiceContext{})
_, err := l.GetDeviceList()
if err == nil {
t.Fatalf("expected error when user context missing")
}
}
+42 -28
View File
@@ -35,18 +35,24 @@ func NewUnbindDeviceLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Unbi
func (l *UnbindDeviceLogic) UnbindDevice(req *types.UnbindDeviceRequest) error {
// 获取当前 token 登录的用户
userInfo := l.ctx.Value(constant.CtxKeyUser).(*user.User)
u, ok := l.ctx.Value(constant.CtxKeyUser).(*user.User)
if !ok {
return errors.Wrapf(xerr.NewErrCode(xerr.InvalidAccess), "Invalid Access")
}
// 查询解绑设备是否存在
device, err := l.svcCtx.UserModel.FindOneDevice(l.ctx, req.Id)
if err != nil {
return errors.Wrapf(xerr.NewErrCode(xerr.DeviceNotExist), "find device")
}
if device.UserId != userInfo.Id {
return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "device not belong to user")
}
err = l.svcCtx.DB.Transaction(func(tx *gorm.DB) error {
if device.UserId != u.Id {
return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "device not belong to user")
}
l.Infow("开始解绑设备",
logger.Field("device_identifier", device.Identifier),
logger.Field("user_id", u.Id))
start := time.Now()
err = l.svcCtx.DB.Transaction(func(tx *gorm.DB) error {
// 1. 查询设备记录
var device user.Device
err = tx.Model(&device).Where("id = ?", req.Id).First(&device).Error
@@ -77,13 +83,13 @@ func (l *UnbindDeviceLogic) UnbindDevice(req *types.UnbindDeviceRequest) error {
}
// 3.2 记录注册日志
registerLog := log.Register{
AuthMethod: "device",
Identifier: device.Identifier,
RegisterIP: device.Ip,
UserAgent: device.UserAgent,
Timestamp: time.Now().UnixMilli(),
}
registerLog := log.Register{
AuthMethod: "device",
Identifier: device.Identifier,
RegisterIP: device.Ip,
UserAgent: device.UserAgent,
Timestamp: time.Now().UnixMilli(),
}
content, _ := registerLog.Marshal()
if err := tx.Create(&log.SystemLog{
Type: log.TypeRegister.Uint8(),
@@ -123,20 +129,28 @@ func (l *UnbindDeviceLogic) UnbindDevice(req *types.UnbindDeviceRequest) error {
}
// 6. 清理缓存
deviceCacheKey := fmt.Sprintf("%v:%v", config.DeviceCacheKeyKey, device.Identifier)
if sessionId, err := l.svcCtx.Redis.Get(l.ctx, deviceCacheKey).Result(); err == nil && sessionId != "" {
_ = l.svcCtx.Redis.Del(l.ctx, deviceCacheKey).Err()
sessionIdCacheKey := fmt.Sprintf("%v:%v", config.SessionIdKey, sessionId)
_ = l.svcCtx.Redis.Del(l.ctx, sessionIdCacheKey).Err()
}
l.Infow("设备解绑并迁移成功",
logger.Field("device_identifier", device.Identifier),
logger.Field("old_user_id", device.UserId),
logger.Field("new_user_id", newUser.Id))
l.Infow("设备解绑并迁移成功",
logger.Field("device_identifier", device.Identifier),
logger.Field("old_user_id", device.UserId),
logger.Field("new_user_id", newUser.Id))
return nil
})
return err
return nil
})
if err != nil {
return err
}
duration := time.Since(start)
identifier := device.Identifier
ctx, cancel := context.WithTimeout(l.ctx, 2*time.Second)
defer cancel()
deviceCacheKey := fmt.Sprintf("%v:%v", config.DeviceCacheKeyKey, identifier)
if sessionId, rerr := l.svcCtx.Redis.Get(ctx, deviceCacheKey).Result(); rerr == nil && sessionId != "" {
_ = l.svcCtx.Redis.Del(ctx, deviceCacheKey).Err()
sessionIdCacheKey := fmt.Sprintf("%v:%v", config.SessionIdKey, sessionId)
_ = l.svcCtx.Redis.Del(ctx, sessionIdCacheKey).Err()
}
l.Infow("设备解绑完成",
logger.Field("device_identifier", identifier),
logger.Field("elapsed_ms", duration.Milliseconds()))
return nil
}
@@ -0,0 +1,18 @@
package user
import (
"context"
"testing"
"github.com/perfect-panel/server/internal/svc"
"github.com/perfect-panel/server/internal/types"
)
func TestUnbindDevice_MissingUserContext(t *testing.T) {
l := NewUnbindDeviceLogic(context.Background(), &svc.ServiceContext{})
err := l.UnbindDevice(&types.UnbindDeviceRequest{Id: 1})
if err == nil {
t.Fatalf("expected error when user context missing")
}
}