Skip to content

chore(handles/auth): improve error response #2148

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

Merged
xrgzs merged 2 commits into from
Feb 19, 2026
Merged

chore(handles/auth): improve error response #2148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
336707e
chore(handles/auth): improve error response
xrgzs Feb 19, 2026
c2c4c84
Apply suggestion from @xrgzs
xrgzs Feb 19, 2026
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
10 changes: 9 additions & 1 deletion internal/model/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,15 @@ const (
ADMIN
)

const StaticHashSalt = "https://github.com/alist-org/alist"
const (
StaticHashSalt = "https://github.com/alist-org/alist"

InvalidUsernameOrPassword = "Invalid username or password"
Invalid2FACode = "Invalid 2FA code"
TooManyAttempts = "Too many unsuccessful sign-in attempts have been made using an incorrect username or password, Try again later."
GuestCannotUpdateProfile = "Guest user can not update profile"
GuestCannotGenerate2FA = "Guest user can not generate 2FA code"
)

var LoginCache = cache.NewMemCache[int]()

Expand Down
19 changes: 10 additions & 9 deletions server/handles/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,35 +45,36 @@ func loginHash(c *gin.Context, req *LoginReq) {
ip := c.ClientIP()
count, ok := model.LoginCache.Get(ip)
if ok && count >= model.DefaultMaxAuthRetries {
common.ErrorStrResp(c, "Too many unsuccessful sign-in attempts have been made using an incorrect username or password, Try again later.", 429)
common.ErrorStrResp(c, model.TooManyAttempts, 429)
model.LoginCache.Expire(ip, model.DefaultLockDuration)
return
}
// check username
user, err := op.GetUserByName(req.Username)
if err != nil {
common.ErrorResp(c, err, 400)
common.ErrorStrResp(c, model.InvalidUsernameOrPassword, 401)
model.LoginCache.Set(ip, count+1)
return
}
// validate password hash
if err := user.ValidatePwdStaticHash(req.Password); err != nil {
common.ErrorResp(c, err, 400)
common.ErrorStrResp(c, model.InvalidUsernameOrPassword, 401)
model.LoginCache.Set(ip, count+1)
return
}
// check 2FA
if user.OtpSecret != "" {
if !totp.Validate(req.OtpCode, user.OtpSecret) {
common.ErrorStrResp(c, "Invalid 2FA code", 402)
// 402 - need opt
common.ErrorStrResp(c, model.Invalid2FACode, 402)
model.LoginCache.Set(ip, count+1)
return
}
}
// generate token
token, err := common.GenerateToken(user)
if err != nil {
common.ErrorResp(c, err, 400, true)
common.ErrorResp(c, err, 500, true)
return
}
common.SuccessResp(c, gin.H{"token": token})
Expand Down Expand Up @@ -107,7 +108,7 @@ func UpdateCurrent(c *gin.Context) {
}
user := c.Request.Context().Value(conf.UserKey).(*model.User)
if user.IsGuest() {
common.ErrorStrResp(c, "Guest user can not update profile", 403)
common.ErrorStrResp(c, model.GuestCannotUpdateProfile, 403)
return
}
user.Username = req.Username
Expand All @@ -125,7 +126,7 @@ func UpdateCurrent(c *gin.Context) {
func Generate2FA(c *gin.Context) {
user := c.Request.Context().Value(conf.UserKey).(*model.User)
if user.IsGuest() {
common.ErrorStrResp(c, "Guest user can not generate 2FA code", 403)
common.ErrorStrResp(c, model.GuestCannotGenerate2FA, 403)
return
}
key, err := totp.Generate(totp.GenerateOpts{
Expand Down Expand Up @@ -164,11 +165,11 @@ func Verify2FA(c *gin.Context) {
}
user := c.Request.Context().Value(conf.UserKey).(*model.User)
if user.IsGuest() {
common.ErrorStrResp(c, "Guest user can not generate 2FA code", 403)
common.ErrorStrResp(c, model.GuestCannotGenerate2FA, 403)
return
}
if !totp.Validate(req.Code, req.Secret) {
common.ErrorStrResp(c, "Invalid 2FA code", 400)
common.ErrorStrResp(c, model.Invalid2FACode, 400)
return
}
user.OtpSecret = req.Secret
Expand Down