Merge pull request #85 from lanyulei/dev

fix: 完善ldap连接。
This commit is contained in:
lanyulei 2020-11-04 13:40:10 +08:00 committed by GitHub
commit b23d8bed66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -37,7 +37,7 @@ settings:
anonymousquery: 0
basedn: dc=fdevops,dc=com
bindpwd: 123456
binduserdn: admin
binduserdn: cn=admin,dc=fdevops,dc=com
host: localhost
port: 389
tls: 0
@ -53,7 +53,7 @@ settings:
maxsize: 10240
path: ./logs/ferry.log
redis:
url: redis://ferry123456@127.0.0.1:6379
url: redis://127.0.0.1:6379
ssl:
key: keystring
pem: temp/pem.pem

View File

@ -23,10 +23,10 @@ func ldapConnection() (err error) {
var ldapConn = fmt.Sprintf("%v:%v", viper.GetString("settings.ldap.host"), viper.GetString("settings.ldap.port"))
if viper.GetBool("settings.ldap.tls") {
tlsconf := &tls.Config{
tlsConf := &tls.Config{
InsecureSkipVerify: true,
}
conn, err = ldap.DialTLS("tcp", ldapConn, tlsconf)
conn, err = ldap.DialTLS("tcp", ldapConn, tlsConf)
} else {
conn, err = ldap.Dial("tcp", ldapConn)
}