Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ldap: Include server name is tls config #105

Closed
wants to merge 1 commit into from
Closed

ldap: Include server name is tls config #105

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 26 additions & 20 deletions ldap/ldap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,30 +68,37 @@ func (l *Config) Clone() (cloned Config) {
return cloned
}

func (l *Config) connect(ldapAddr string) (ldapConn *ldap.Conn, err error) {
func (l *Config) connect(ldapHost, ldapPort string) (ldapConn *ldap.Conn, err error) {
tlsConfig := &tls.Config{
ServerName: ldapHost,
InsecureSkipVerify: l.TLSSkipVerify,
RootCAs: l.RootCAs,
}

if l.ServerInsecure {
ldapConn, err = ldap.Dial("tcp", ldapAddr)
} else {
if l.ServerStartTLS {
ldapConn, err = ldap.Dial("tcp", ldapAddr)
} else {
ldapConn, err = ldap.DialTLS("tcp", ldapAddr, tlsConfig)
}
scheme := "ldaps"
dialOpts := []ldap.DialOpt{ldap.DialWithTLSConfig(tlsConfig)}
if l.ServerInsecure || l.ServerStartTLS {
scheme = "ldap"
dialOpts = nil
}
ldapURL := fmt.Sprintf("%s://%s:%s", scheme, ldapHost, ldapPort)

ldapConn, err = ldap.DialURL(ldapURL, dialOpts...)
if err != nil {
return nil, fmt.Errorf("LDAP connection error: %w", err)
}

if ldapConn != nil {
ldapConn.SetTimeout(30 * time.Second) // Change default timeout to 30 seconds.
if l.ServerStartTLS {
err = ldapConn.StartTLS(tlsConfig)
if l.ServerStartTLS {
err = ldapConn.StartTLS(tlsConfig)
if err != nil {
ldapConn.Close()
return nil, fmt.Errorf("LDAP StartTLS error: %w", err)
}
}

return ldapConn, err
ldapConn.SetTimeout(30 * time.Second) // Change default timeout to 30 seconds.

return ldapConn, nil
}

// Connect connect to ldap server.
Expand All @@ -118,17 +125,18 @@ func (l *Config) Connect() (ldapConn *ldap.Conn, err error) {
// No SRV Record lookup case.
ldapAddr := l.ServerAddr

_, _, err = net.SplitHostPort(ldapAddr)
var ldapHost, ldapPort string
ldapHost, ldapPort, err = net.SplitHostPort(ldapAddr)
if err != nil {
if strings.Contains(err.Error(), "missing port in address") {
// Use default LDAP port if none specified "636"
ldapAddr = net.JoinHostPort(ldapAddr, "636")
ldapHost, ldapPort = ldapAddr, "636"
} else {
return nil, err
}
}

return l.connect(ldapAddr)
return l.connect(ldapHost, ldapPort)
}

// SRV Record lookup is enabled.
Expand All @@ -141,9 +149,7 @@ func (l *Config) Connect() (ldapConn *ldap.Conn, err error) {

// Return a connection to the first server to which we could connect.
for _, addr := range addrs {
ldapAddr := fmt.Sprintf("%s:%d", addr.Target, addr.Port)

ldapConn, err = l.connect(ldapAddr)
ldapConn, err = l.connect(addr.Target, fmt.Sprintf("%d", addr.Port))
if err == nil {
return ldapConn, nil
}
Expand Down
Loading