mirrors/pinniped
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/pinniped.git synced 2026-09-07 00:27:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2061 from vmware-tanzu/aa/fix-comments

Browse Source 
refactor and fix comments
This commit is contained in:
Ashish Amarnath
2024-09-23 14:27:00 -07:00
committed by GitHub
parent 65b93f0822 ab2c2e30cb
commit 1a1aac7d09
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/upstreamldap/upstreamldap.go
+9 -9
View File
@@ -330,18 +330,12 @@ func (p *Provider) dialTLS(ctx context.Context, addr endpointaddr.HostPort) (Con
return conn, nil
}
// dialTLS is a default implementation of the Dialer, used when Dialer is nil and ConnectionProtocol is StartTLS.
// dialStartTLS is a default implementation of the Dialer, used when Dialer is nil and ConnectionProtocol is StartTLS.
// Unfortunately, the go-ldap library does not seem to support dialing with a context.Context,
// so we implement it ourselves, heavily inspired by ldap.DialURL.
func (p *Provider) dialStartTLS(ctx context.Context, addr endpointaddr.HostPort) (Conn, error) {
tlsConfig, err := p.tlsConfig()
if err != nil {
return nil, ldap.NewError(ldap.ErrorNetwork, err)
}
// Unfortunately, this seems to be required for StartTLS, even though it is not needed for regular TLS.
tlsConfig.ServerName = addr.Host
// start with a plaintext tcp connection which will then be upgraded to
// and LDAP connection over TLS.
c, err := netDialer().DialContext(ctx, "tcp", addr.Endpoint())
if err != nil {
return nil, ldap.NewError(ldap.ErrorNetwork, err)
@@ -349,6 +343,12 @@ func (p *Provider) dialStartTLS(ctx context.Context, addr endpointaddr.HostPort)
conn := ldap.NewConn(c, false)
conn.Start()
tlsConfig, err := p.tlsConfig()
if err != nil {
return nil, ldap.NewError(ldap.ErrorNetwork, err)
}
// Unfortunately, this seems to be required for StartTLS, even though it is not needed for regular TLS.
tlsConfig.ServerName = addr.Host
err = conn.StartTLS(tlsConfig)
if err != nil {
return nil, err