lsm/mindoc
1
0
Fork 0
mirror of https://github.com/mindoc-org/mindoc.git synced 2025-09-19 18:22:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor, replace beego.Error with logs.Error

Browse Source
This commit is contained in:
shiqstone
2021-03-30 14:24:14 +08:00
parent 0d5d2e4b38
commit 782ea44388
31 changed files with 454 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
utils/ldap.go
View File

@@ -3,7 +3,7 @@ package utils
import (
"errors"
"fmt"
"github.com/astaxie/beego"
"github.com/astaxie/beego/logs"
"gopkg.in/ldap.v2"
)
@@ -24,14 +24,14 @@ func ValidLDAPLogin(password string) (result bool, err error) {
err = nil
lc, err := ldap.Dial("tcp", fmt.Sprintf("%s:%d", "192.168.3.104", 389))
if err != nil {
beego.Error("Dial => ", err)
logs.Error("Dial => ", err)
return
}
defer lc.Close()
err = lc.Bind("cn=admin,dc=minho,dc=com", "123456")
if err != nil {
beego.Error("Bind => ", err)
logs.Error("Bind => ", err)
return
}
searchRequest := ldap.NewSearchRequest(
@@ -43,7 +43,7 @@ func ValidLDAPLogin(password string) (result bool, err error) {
)
searchResult, err := lc.Search(searchRequest)
if err != nil {
beego.Error("Search => ", err)
logs.Error("Search => ", err)
return
}
if len(searchResult.Entries) != 1 {
@@ -58,7 +58,7 @@ func ValidLDAPLogin(password string) (result bool, err error) {
if err == nil {
result = true
} else {
beego.Error("Bind2 => ", err)
logs.Error("Bind2 => ", err)
err = nil
}
return
@@ -67,7 +67,7 @@ func ValidLDAPLogin(password string) (result bool, err error) {
func AddMember(account, password string) error {
lc, err := ldap.Dial("tcp", fmt.Sprintf("%s:%d", "192.168.3.104", 389))
if err != nil {
beego.Error("Dial => ", err)
logs.Error("Dial => ", err)
return err
}
@@ -84,33 +84,33 @@ func AddMember(account, password string) error {
err = lc.Bind(user, "")
if err != nil {
beego.Error("Bind => ", err)
logs.Error("Bind => ", err)
return err
}
passwordModifyRequest := ldap.NewPasswordModifyRequest(user, "", "1q2w3e__ABC")
_, err = lc.PasswordModify(passwordModifyRequest)
if err != nil {
beego.Error("PasswordModify => ", err)
logs.Error("PasswordModify => ", err)
return err
}
return nil
}
beego.Error("Add => ", err)
logs.Error("Add => ", err)
return err
}
func ModifyPassword(account, old_password, new_password string) error {
l, err := ldap.Dial("tcp", fmt.Sprintf("%s:%d", "192.168.3.104", 389))
if err != nil {
beego.Error("Dial => ", err)
logs.Error("Dial => ", err)
}
defer l.Close()
user := fmt.Sprintf("cn=%s,dc=minho,dc=com", account)
err = l.Bind(user, old_password)
if err != nil {
beego.Error("Bind => ", err)
logs.Error("Bind => ", err)
return err
}
@@ -118,7 +118,7 @@ func ModifyPassword(account, old_password, new_password string) error {
_, err = l.PasswordModify(passwordModifyRequest)
if err != nil {
beego.Error(fmt.Sprintf("Password could not be changed: %s", err.Error()))
logs.Error(fmt.Sprintf("Password could not be changed: %s", err.Error()))
return err
}
return nil