Skip to content

fix: panic in subscribe logic when token is invalid or user not found #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Catchabox wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: panic in subscribe logic when token is invalid or user not found #105

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions internal/logic/subscribe/subscribeLogic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,17 +163,29 @@ func (l *SubscribeLogic) getSubscribeV2URL() string {
return fmt.Sprintf("https://%s%s", l.ctx.Request.Host, uri)
}

// getUserSubscribe 是本次修改的核心部分
func (l *SubscribeLogic) getUserSubscribe(token string) (*user.Subscribe, error) {
userSub, err := l.svc.UserModel.FindOneSubscribeByToken(l.ctx.Request.Context(), token)
if err != nil {
l.Infow("[Generate Subscribe]find subscribe error: %v", logger.Field("error", err.Error()), logger.Field("token", token))
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find subscribe error: %v", err.Error())
}

// =========================================================
// 修复开始：添加空指针检查 (Fix start)
// =========================================================
if userSub == nil {
l.Infow("[Generate Subscribe] token invalid or user not found", logger.Field("token", token))
return nil, errors.New("subscribe token invalid")
}
// =========================================================
// 修复结束 (Fix end)
// =========================================================

// Ignore expiration check
//if userSub.Status > 1 {
// l.Infow("[Generate Subscribe]subscribe is not available", logger.Field("status", int(userSub.Status)), logger.Field("token", token))
// return nil, errors.Wrapf(xerr.NewErrCode(xerr.SubscribeNotAvailable), "subscribe is not available")
// l.Infow("[Generate Subscribe]subscribe is not available", logger.Field("status", int(userSub.Status)), logger.Field("token", token))
// return nil, errors.Wrapf(xerr.NewErrCode(xerr.SubscribeNotAvailable), "subscribe is not available")
//}

return userSub, nil
Expand Down