maxmustermann/minio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

support startTLS with serverName TLSConfig (#12219)

Browse source 
fixes #12216
This commit is contained in:
Harshavardhana 2021-05-04 20:13:24 -07:00 committed by GitHub
parent 67001e3ce9
commit 3a0e7347ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
cmd/config/identity/ldap/config.go
View file

@ -386,7 +386,9 @@ func (l *Config) Connect() (ldapConn *ldap.Conn, err error) {
return nil, errors.New("LDAP is not configured") return nil, errors.New("LDAP is not configured")
} }
if _, _, err = net.SplitHostPort(l.ServerAddr); err != nil { serverHost, _, err := net.SplitHostPort(l.ServerAddr)
if err != nil {
serverHost = l.ServerAddr
// User default LDAP port if none specified "636" // User default LDAP port if none specified "636"
l.ServerAddr = net.JoinHostPort(l.ServerAddr, "636") l.ServerAddr = net.JoinHostPort(l.ServerAddr, "636")
} }
@ -395,22 +397,22 @@ func (l *Config) Connect() (ldapConn *ldap.Conn, err error) {
return ldap.Dial("tcp", l.ServerAddr) return ldap.Dial("tcp", l.ServerAddr)
} }
tlsConfig := &tls.Config{
InsecureSkipVerify: l.tlsSkipVerify,
RootCAs: l.rootCAs,
ServerName: serverHost,
}
if l.serverStartTLS { if l.serverStartTLS {
conn, err := ldap.Dial("tcp", l.ServerAddr) conn, err := ldap.Dial("tcp", l.ServerAddr)
if err != nil { if err != nil {
return nil, err return nil, err
} }
err = conn.StartTLS(&tls.Config{ err = conn.StartTLS(tlsConfig)
InsecureSkipVerify: l.tlsSkipVerify,
RootCAs: l.rootCAs,
})
return conn, err return conn, err
} }
return ldap.DialTLS("tcp", l.ServerAddr, &tls.Config{ return ldap.DialTLS("tcp", l.ServerAddr, tlsConfig)
InsecureSkipVerify: l.tlsSkipVerify,
RootCAs: l.rootCAs,
})
} }
// GetExpiryDuration - return parsed expiry duration. // GetExpiryDuration - return parsed expiry duration.