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

Merge pull request #81 from aleiphoenix/master

Browse Source 
use DialTLS instead of StartTLS on ldap.Conn
This commit is contained in:
lanyulei 2020-11-04 13:37:20 +08:00 committed by GitHub
commit f5e8755340
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/ldap/connection.go
View File

@ -22,27 +22,20 @@ var conn *ldap.Conn
func ldapConnection() (err error) { func ldapConnection() (err error) {
var ldapConn = fmt.Sprintf("%v:%v", viper.GetString("settings.ldap.host"), viper.GetString("settings.ldap.port")) var ldapConn = fmt.Sprintf("%v:%v", viper.GetString("settings.ldap.host"), viper.GetString("settings.ldap.port"))
conn, err = ldap.Dial( if viper.GetBool("settings.ldap.tls") {
"tcp", tlsconf := &tls.Config{
ldapConn, InsecureSkipVerify: true,
) }
conn, err = ldap.DialTLS("tcp", ldapConn, tlsconf)
} else {
conn, err = ldap.Dial("tcp", ldapConn)
}
if err != nil { if err != nil {
err = errors.New(fmt.Sprintf("无法连接到ldap服务器，%v", err)) err = errors.New(fmt.Sprintf("无法连接到ldap服务器，%v", err))
logger.Error(err) logger.Error(err)
return return
} }
if viper.GetBool("settings.ldap.tls") {
err = conn.StartTLS(&tls.Config{
InsecureSkipVerify: true,
})
if err != nil {
err = errors.New(fmt.Sprintf("升级到加密方式失败，%v", err))
logger.Error(err)
return
}
}
//设置超时时间 //设置超时时间
conn.SetTimeout(5 * time.Second) conn.SetTimeout(5 * time.Second)