7x31/anylink
1
0
Fork 0
mirror of https://github.com/bjdgyc/anylink.git synced 2025-08-08 10:02:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复用户组停用时的登录问题 + 优化IUserAuth的checkUser参数

Browse Source
This commit is contained in:
lanrenwo
2022-06-07 09:46:45 +08:00
parent f46a30488a
commit 8ede613488
3 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/dbdata/user.go
View File

@@ -66,13 +66,13 @@ func SetUser(v *User) error {
return err
}
// 验证用户登陆信息
// 验证用户登录信息
func CheckUser(name, pwd, group string) error {
// 获取登入的group数据
groupData := &Group{}
err := One("Name", group, groupData)
if err != nil {
return fmt.Errorf("%s %s", name, "No用户组")
if err != nil || groupData.Status != 1 {
return fmt.Errorf("%s - %s", name, "用户组错误")
}
// 初始化Auth
if len(groupData.Auth) == 0 {
@@ -89,10 +89,10 @@ func CheckUser(name, pwd, group string) error {
return fmt.Errorf("%s %s", "未知的认证方式: ", authType)
}
auth := makeInstance(authType).(IUserAuth)
return auth.checkUser(name, pwd, groupData.Auth)
return auth.checkUser(name, pwd, groupData)
}
// 验证本地用户登陆信息
// 验证本地用户登录信息
func checkLocalUser(name, pwd, group string) error {
// TODO 严重问题
// return nil
@@ -110,12 +110,6 @@ func checkLocalUser(name, pwd, group string) error {
if !utils.InArrStr(v.Groups, group) {
return fmt.Errorf("%s %s", name, "用户组错误")
}
groupData := &Group{}
err = One("Name", group, groupData)
if err != nil || groupData.Status != 1 {
return fmt.Errorf("%s - %s", name, "用户组错误")
}
// 判断otp信息
pinCode := pwd
if !v.DisableOtp {