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

sdk/ldap: update interface to use DialURL #20200

Merged
merged 4 commits into from
Apr 17, 2023
Merged

sdk/ldap: update interface to use DialURL #20200

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d3f4c4
sdk/ldap: update interface to use DialURL
jasonodonnell Apr 17, 2023
10aa179
Fix scheme
jasonodonnell Apr 17, 2023
a1bbd03
Fix race condition
jasonodonnell Apr 17, 2023
38bbd7e
Add tls config dialopt
jasonodonnell Apr 17, 2023
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
14 changes: 12 additions & 2 deletions sdk/helper/ldaputil/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,18 @@ func (c *Client) DialLDAP(cfg *ConfigEntry) (Connection, error) {
}

var tlsConfig *tls.Config
dialer := net.Dialer{
Timeout: time.Duration(cfg.ConnectionTimeout) * time.Second,
}

switch u.Scheme {
case "ldap":
if port == "" {
port = "389"
}
conn, err = c.LDAP.Dial("tcp", net.JoinHostPort(host, port))

opt := ldap.DialWithDialer(&dialer)
conn, err = c.LDAP.Dial(net.JoinHostPort(host, port), opt)
if err != nil {
break
}
Expand All @@ -77,7 +83,11 @@ func (c *Client) DialLDAP(cfg *ConfigEntry) (Connection, error) {
if err != nil {
break
}
conn, err = c.LDAP.DialTLS("tcp", net.JoinHostPort(host, port), tlsConfig)
opt := ldap.DialWithTLSDialer(tlsConfig, &dialer)
jasonodonnell marked this conversation as resolved.
Show resolved Hide resolved
conn, err = c.LDAP.Dial(net.JoinHostPort(host, port), opt)
jasonodonnell marked this conversation as resolved.
Show resolved Hide resolved
if err != nil {
break
}
default:
retErr = multierror.Append(retErr, fmt.Errorf("invalid LDAP scheme in url %q", net.JoinHostPort(host, port)))
continue
Expand Down
13 changes: 3 additions & 10 deletions sdk/helper/ldaputil/ldap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
package ldaputil

import (
"crypto/tls"

"github.com/go-ldap/ldap/v3"
)

Expand All @@ -16,16 +14,11 @@ func NewLDAP() LDAP {
// LDAP provides ldap functionality, but through an interface
// rather than statically. This allows faking it for tests.
type LDAP interface {
Dial(network, addr string) (Connection, error)
DialTLS(network, addr string, config *tls.Config) (Connection, error)
Dial(addr string, opts ...ldap.DialOpt) (Connection, error)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe this change will have consequences for both vault-plugin-secrets-openldap and vault-plugin-secrets-ad. I think that is ok though? From what I can see these are only used in tests and it should be easy enough to update the tests if/when we update the sdk/ldaputil dependency.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will, the mocks need updating.

jasonodonnell marked this conversation as resolved.
Show resolved Hide resolved
}

type ldapIfc struct{}

func (l *ldapIfc) Dial(network, addr string) (Connection, error) {
return ldap.Dial(network, addr)
}

func (l *ldapIfc) DialTLS(network, addr string, config *tls.Config) (Connection, error) {
return ldap.DialTLS(network, addr, config)
func (l *ldapIfc) Dial(addr string, opts ...ldap.DialOpt) (Connection, error) {
return ldap.DialURL(addr, opts...)
}