Merge pull request #81 from aleiphoenix/master
use DialTLS instead of StartTLS on ldap.Conn
This commit is contained in:
commit
f5e8755340
@ -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)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user