XinanXf/ferry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #17 from lanyulei/dev

Browse Source 
fix bug.
This commit is contained in:
lyl_task 2020-08-26 14:30:51 +08:00 committed by GitHub
commit 4d3f83244c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/settings.dev.yml
View File

@ -37,8 +37,7 @@ settings:
anonymousquery: 0 anonymousquery: 0
basedn: dc=fdevops,dc=com basedn: dc=fdevops,dc=com
bindpwd: 123456 bindpwd: 123456
binduser: admin binduserdn: admin
bindbasedn:
host: localhost host: localhost
port: 389 port: 389
tls: 0 tls: 0

3
config/settings.yml
View File

@ -41,8 +41,7 @@ settings:
anonymousquery: 0 anonymousquery: 0
basedn: dc=fdevops,dc=com basedn: dc=fdevops,dc=com
bindpwd: 123456 bindpwd: 123456
binduser: admin binduserdn: admin
bindbasedn:
host: localhost host: localhost
port: 389 port: 389
tls: 0 tls: 0

8
pkg/ldap/search.go
View File

@ -54,14 +54,8 @@ func searchRequest(username string) (userInfo *ldap.Entry, err error) {
} }
// 用来获取查询权限的用户。如果 ldap 禁止了匿名查询，那我们就需要先用这个帐户 bind 以下才能开始查询 // 用来获取查询权限的用户。如果 ldap 禁止了匿名查询，那我们就需要先用这个帐户 bind 以下才能开始查询
if !viper.GetBool("settings.ldap.anonymousQuery") { if !viper.GetBool("settings.ldap.anonymousQuery") {
dn := viper.GetString("settings.ldap.baseDn")
if viper.GetString("settings.ldap.bindBaseDn") != "" {
dn = viper.GetString("settings.ldap.bindBaseDn")
}
err = conn.Bind( err = conn.Bind(
fmt.Sprintf("cn=%v,%v", viper.GetString("settings.ldap.bindUserDn"),
viper.GetString("settings.ldap.bindUser"),
dn),
viper.GetString("settings.ldap.bindPwd")) viper.GetString("settings.ldap.bindPwd"))
if err != nil { if err != nil {
logger.Error("用户或密码错误。", err) logger.Error("用户或密码错误。", err)