evan/next-terminal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- 增加一定时间内登录失败次数的限制

Browse Source 
- 增加离线会话保存时间限制
- 完成需求「使会话详情的路径栏可写」close 69
- 修复bug「Ubuntu系统RDP不能正常显示」close 66
- 修复bug「使用guacd接入ssh时，第一个按键被忽略」 close 70
This commit is contained in:
dushixiang
2021-02-23 18:50:13 +08:00
parent 6e2f9e9d90
commit cc9ed70822
15 changed files with 176 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
pkg/api/account.go
View File

@ -46,19 +46,35 @@ func LoginEndpoint(c echo.Context) error {
}
user, err := model.FindUserByUsername(loginAccount.Username)
// 存储登录失败次数信息
loginFailCountKey := loginAccount.Username
v, ok := global.Cache.Get(loginFailCountKey)
if !ok {
v = 1
}
count := v.(int)
if count >= 5 {
return Fail(c, -1, "登录失败次数过多，请稍后再试")
}
if err != nil {
return Fail(c, -1, "您输入的账号或密码不正确")
count++
global.Cache.Set(loginFailCountKey, count, time.Minute*time.Duration(5))
return FailWithData(c, -1, "您输入的账号或密码不正确", count)
}
if err := utils.Encoder.Match([]byte(user.Password), []byte(loginAccount.Password)); err != nil {
return Fail(c, -1, "您输入的账号或密码不正确")
count++
global.Cache.Set(loginFailCountKey, count, time.Minute*time.Duration(5))
return FailWithData(c, -1, "您输入的账号或密码不正确", count)
}
if user.TOTPSecret != "" && user.TOTPSecret != "-" {
return Fail(c, 0, "")
}
token, err := Login(c, loginAccount, user)
token, err := LoginSuccess(c, loginAccount, user)
if err != nil {
return err
}
@ -66,7 +82,7 @@ func LoginEndpoint(c echo.Context) error {
return Success(c, token)
}
func Login(c echo.Context, loginAccount LoginAccount, user model.User) (token string, err error) {
func LoginSuccess(c echo.Context, loginAccount LoginAccount, user model.User) (token string, err error) {
token = strings.Join([]string{utils.UUID(), utils.UUID(), utils.UUID(), utils.UUID()}, "")
authorization := Authorization{
@ -75,11 +91,13 @@ func Login(c echo.Context, loginAccount LoginAccount, user model.User) (token st
User: user,
}
cacheKey := strings.Join([]string{Token, token}, ":")
if authorization.Remember {
// 记住登录有效期两周
global.Cache.Set(token, authorization, RememberEffectiveTime)
global.Cache.Set(cacheKey, authorization, RememberEffectiveTime)
} else {
global.Cache.Set(token, authorization, NotRememberEffectiveTime)
global.Cache.Set(cacheKey, authorization, NotRememberEffectiveTime)
}
// 保存登录日志
@ -107,20 +125,37 @@ func loginWithTotpEndpoint(c echo.Context) error {
return err
}
// 存储登录失败次数信息
loginFailCountKey := loginAccount.Username
v, ok := global.Cache.Get(loginFailCountKey)
if !ok {
v = 1
}
count := v.(int)
if count >= 5 {
return Fail(c, -1, "登录失败次数过多，请稍后再试")
}
user, err := model.FindUserByUsername(loginAccount.Username)
if err != nil {
return Fail(c, -1, "您输入的账号或密码不正确")
count++
global.Cache.Set(loginFailCountKey, count, time.Minute*time.Duration(5))
return FailWithData(c, -1, "您输入的账号或密码不正确", count)
}
if err := utils.Encoder.Match([]byte(user.Password), []byte(loginAccount.Password)); err != nil {
return Fail(c, -1, "您输入的账号或密码不正确")
count++
global.Cache.Set(loginFailCountKey, count, time.Minute*time.Duration(5))
return FailWithData(c, -1, "您输入的账号或密码不正确", count)
}
if !totp.Validate(loginAccount.TOTP, user.TOTPSecret) {
return Fail(c, -2, "您的TOTP不匹配")
count++
global.Cache.Set(loginFailCountKey, count, time.Minute*time.Duration(5))
return FailWithData(c, -1, "您输入双因素认证授权码不正确", count)
}
token, err := Login(c, loginAccount, user)
token, err := LoginSuccess(c, loginAccount, user)
if err != nil {
return err
}