mirrors/maddy
1
0
Fork 0
mirror of https://github.com/foxcpp/maddy.git synced 2025-04-04 05:37:34 +03:00
Code Issues Projects Releases Packages Wiki Activity

auth/ldap: Fix "bind unauth" config directive parsing

Browse source 
UnauthenticatedBind accept a string argument since some
go-ldap version. A breaking change that was not
detected on version upgrade, apparently.

See #529.
This commit is contained in:
fox.cpp 2022-09-11 20:39:00 +03:00
parent 1463886fc2
commit f8bad12434
No known key found for this signature in database
GPG key ID: 5B991F6215D2FCC0
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
internal/auth/ldap/ldap.go
View file

@ -107,7 +107,14 @@ func readBindDirective(c *config.Map, n config.Node) (interface{}, error) {
case "off":
return func(*ldap.Conn) error { return nil }, nil
case "unauth":
return (*ldap.Conn).UnauthenticatedBind, nil
if len(n.Args) == 2 {
return func(c *ldap.Conn) error {
return c.UnauthenticatedBind(n.Args[1])
}, nil
}
return func(c *ldap.Conn) error {
return c.UnauthenticatedBind("maddy-auth")
}, nil
case "plain":
if len(n.Args) != 3 {
return nil, fmt.Errorf("auth.ldap: username and password expected for plaintext bind")
@ -145,7 +152,7 @@ func (a *Auth) newConn() (*ldap.Conn, error) {
conn, err = ldap.DialURL(u, ldap.DialWithDialer(a.dialer), ldap.DialWithTLSConfig(tlsCfg))
if err != nil {
a.log.Msg("cannot contact directory server", err, "url", u)
a.log.Error("cannot contact directory server", err, "url", u)
continue
}
break