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

优化代码

Browse Source
This commit is contained in:
bjdgyc
2024-11-06 16:26:21 +08:00
parent 7116aaa5a8
commit 7d1b4b5e22
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/dbdata/user.go
View File

@@ -126,6 +126,14 @@ func checkLocalUser(name, pwd, group string) error {
// }
// }
// 判断用户密码
// 兼容明文密码
if len(v.PinCode) != 60 {
if pwd != v.PinCode {
return fmt.Errorf("%s %s", name, "密码错误")
}
return nil
}
// 密文密码
if !utils.PasswordVerify(pwd, v.PinCode) {
return fmt.Errorf("%s %s", name, "密码错误")
}

7
server/dbdata/user_test.go
View File

@@ -24,7 +24,8 @@ func TestCheckUser(t *testing.T) {
ast.Equal(g.RouteInclude[0].IpMask, "192.168.1.0/255.255.255.0")
// 添加一个用户
u := User{Username: "aaa", Groups: []string{group}, Status: 1}
pincode := "a123456"
u := User{Username: "aaa", PinCode: pincode, Groups: []string{group}, Status: 1}
err = SetUser(&u)
ast.Nil(err)
@@ -37,7 +38,7 @@ func TestCheckUser(t *testing.T) {
// 单独验证密码
u.DisableOtp = true
_ = SetUser(&u)
err = CheckUser("aaa", u.PinCode, group)
err = CheckUser("aaa", pincode, group)
ast.Nil(err)
// 添加一个radius组
@@ -62,7 +63,7 @@ func TestCheckUser(t *testing.T) {
p1 := Policy{Username: "aaa", Status: 1, ClientDns: dns2, RouteInclude: route2}
err = SetPolicy(&p1)
ast.Nil(err)
err = CheckUser("aaa", u.PinCode, group)
err = CheckUser("aaa", pincode, group)
ast.Nil(err)
// 添加一个ldap组
group3 := "group3"