2016-07-25 20:00:28 +00:00
|
|
|
// Package ldap implements strategies for authenticating using the LDAP protocol.
|
|
|
|
package ldap
|
|
|
|
|
|
|
|
import (
|
2017-03-08 18:33:19 +00:00
|
|
|
"context"
|
2016-10-21 00:17:43 +00:00
|
|
|
"crypto/tls"
|
|
|
|
"crypto/x509"
|
|
|
|
"encoding/json"
|
2016-07-25 20:00:28 +00:00
|
|
|
"fmt"
|
2016-10-21 00:17:43 +00:00
|
|
|
"io/ioutil"
|
|
|
|
"net"
|
2016-07-25 20:00:28 +00:00
|
|
|
|
|
|
|
"gopkg.in/ldap.v2"
|
|
|
|
|
2018-09-03 06:44:44 +00:00
|
|
|
"github.com/dexidp/dex/connector"
|
2019-02-22 12:19:23 +00:00
|
|
|
"github.com/dexidp/dex/pkg/log"
|
2016-07-25 20:00:28 +00:00
|
|
|
)
|
|
|
|
|
2016-10-21 00:17:43 +00:00
|
|
|
// Config holds the configuration parameters for the LDAP connector. The LDAP
|
|
|
|
// connectors require executing two queries, the first to find the user based on
|
|
|
|
// the username and password given to the connector. The second to use the user
|
|
|
|
// entry to search for groups.
|
|
|
|
//
|
|
|
|
// An example config:
|
|
|
|
//
|
|
|
|
// type: ldap
|
|
|
|
// config:
|
|
|
|
// host: ldap.example.com:636
|
|
|
|
// # The following field is required if using port 389.
|
|
|
|
// # insecureNoSSL: true
|
|
|
|
// rootCA: /etc/dex/ldap.ca
|
|
|
|
// bindDN: uid=seviceaccount,cn=users,dc=example,dc=com
|
|
|
|
// bindPW: password
|
|
|
|
// userSearch:
|
|
|
|
// # Would translate to the query "(&(objectClass=person)(uid=<username>))"
|
|
|
|
// baseDN: cn=users,dc=example,dc=com
|
|
|
|
// filter: "(objectClass=person)"
|
|
|
|
// username: uid
|
|
|
|
// idAttr: uid
|
|
|
|
// emailAttr: mail
|
|
|
|
// nameAttr: name
|
2019-10-10 14:43:41 +00:00
|
|
|
// preferredUsernameAttr: uid
|
2016-10-21 00:17:43 +00:00
|
|
|
// groupSearch:
|
connector/ldap: add multiple user to group mapping
Add an ability to fetch user's membership from
groups of a different type by specifying multiple
group attribute to user attribute value matchers
in the Dex config:
userMatchers:
- userAttr: uid
groupAttr: memberUid
- userAttr: DN
groupAttr: member
In other words the user's groups can be fetched now from
ldap structure similar to the following:
dn: cn=john,ou=People,dc=example,dc=org
objectClass: person
objectClass: inetOrgPerson
sn: doe
cn: john
uid: johndoe
mail: johndoe@example.com
userpassword: bar
dn: cn=qa,ou=Groups,ou=Portland,dc=example,dc=org
objectClass: groupOfNames
cn: qa
member: cn=john,ou=People,dc=example,dc=org
dn: cn=logger,ou=UnixGroups,ou=Portland,dc=example,dc=org
objectClass: posixGroup
gidNumber: 1000
cn: logger
memberUid: johndoe
Signed-off-by: Vitaliy Dmitriev <vi7alya@gmail.com>
2020-01-03 09:40:08 +00:00
|
|
|
// # Would translate to the separate query per user matcher pair and aggregate results into a single group list:
|
|
|
|
// # "(&(|(objectClass=posixGroup)(objectClass=groupOfNames))(memberUid=<user uid>))"
|
|
|
|
// # "(&(|(objectClass=posixGroup)(objectClass=groupOfNames))(member=<user DN>))"
|
2016-10-21 00:17:43 +00:00
|
|
|
// baseDN: cn=groups,dc=example,dc=com
|
connector/ldap: add multiple user to group mapping
Add an ability to fetch user's membership from
groups of a different type by specifying multiple
group attribute to user attribute value matchers
in the Dex config:
userMatchers:
- userAttr: uid
groupAttr: memberUid
- userAttr: DN
groupAttr: member
In other words the user's groups can be fetched now from
ldap structure similar to the following:
dn: cn=john,ou=People,dc=example,dc=org
objectClass: person
objectClass: inetOrgPerson
sn: doe
cn: john
uid: johndoe
mail: johndoe@example.com
userpassword: bar
dn: cn=qa,ou=Groups,ou=Portland,dc=example,dc=org
objectClass: groupOfNames
cn: qa
member: cn=john,ou=People,dc=example,dc=org
dn: cn=logger,ou=UnixGroups,ou=Portland,dc=example,dc=org
objectClass: posixGroup
gidNumber: 1000
cn: logger
memberUid: johndoe
Signed-off-by: Vitaliy Dmitriev <vi7alya@gmail.com>
2020-01-03 09:40:08 +00:00
|
|
|
// filter: "(|(objectClass=posixGroup)(objectClass=groupOfNames))"
|
|
|
|
// userMatchers:
|
|
|
|
// - userAttr: uid
|
|
|
|
// groupAttr: memberUid
|
|
|
|
// # Use if full DN is needed and not available as any other attribute
|
|
|
|
// # Will only work if "DN" attribute does not exist in the record:
|
|
|
|
// - userAttr: DN
|
|
|
|
// groupAttr: member
|
2016-10-21 00:17:43 +00:00
|
|
|
// nameAttr: name
|
|
|
|
//
|
connector/ldap: add multiple user to group mapping
Add an ability to fetch user's membership from
groups of a different type by specifying multiple
group attribute to user attribute value matchers
in the Dex config:
userMatchers:
- userAttr: uid
groupAttr: memberUid
- userAttr: DN
groupAttr: member
In other words the user's groups can be fetched now from
ldap structure similar to the following:
dn: cn=john,ou=People,dc=example,dc=org
objectClass: person
objectClass: inetOrgPerson
sn: doe
cn: john
uid: johndoe
mail: johndoe@example.com
userpassword: bar
dn: cn=qa,ou=Groups,ou=Portland,dc=example,dc=org
objectClass: groupOfNames
cn: qa
member: cn=john,ou=People,dc=example,dc=org
dn: cn=logger,ou=UnixGroups,ou=Portland,dc=example,dc=org
objectClass: posixGroup
gidNumber: 1000
cn: logger
memberUid: johndoe
Signed-off-by: Vitaliy Dmitriev <vi7alya@gmail.com>
2020-01-03 09:40:08 +00:00
|
|
|
|
|
|
|
type UserMatcher struct {
|
|
|
|
UserAttr string `json:"userAttr"`
|
|
|
|
GroupAttr string `json:"groupAttr"`
|
|
|
|
}
|
|
|
|
|
2016-07-25 20:00:28 +00:00
|
|
|
type Config struct {
|
2016-10-21 00:17:43 +00:00
|
|
|
// The host and optional port of the LDAP server. If port isn't supplied, it will be
|
|
|
|
// guessed based on the TLS configuration. 389 or 636.
|
2016-11-03 21:32:23 +00:00
|
|
|
Host string `json:"host"`
|
2016-10-21 00:17:43 +00:00
|
|
|
|
|
|
|
// Required if LDAP host does not use TLS.
|
2016-11-03 21:32:23 +00:00
|
|
|
InsecureNoSSL bool `json:"insecureNoSSL"`
|
2016-10-21 00:17:43 +00:00
|
|
|
|
2016-11-18 21:40:41 +00:00
|
|
|
// Don't verify the CA.
|
|
|
|
InsecureSkipVerify bool `json:"insecureSkipVerify"`
|
|
|
|
|
2017-04-12 21:13:34 +00:00
|
|
|
// Connect to the insecure port then issue a StartTLS command to negotiate a
|
|
|
|
// secure connection. If unsupplied secure connections will use the LDAPS
|
|
|
|
// protocol.
|
|
|
|
StartTLS bool `json:"startTLS"`
|
|
|
|
|
2016-10-21 00:17:43 +00:00
|
|
|
// Path to a trusted root certificate file.
|
2016-11-03 21:32:23 +00:00
|
|
|
RootCA string `json:"rootCA"`
|
2018-09-22 04:15:11 +00:00
|
|
|
// Path to a client cert file generated by rootCA.
|
|
|
|
ClientCert string `json:"clientCert"`
|
|
|
|
// Path to a client private key file generated by rootCA.
|
|
|
|
ClientKey string `json:"clientKey"`
|
2016-11-03 23:28:23 +00:00
|
|
|
// Base64 encoded PEM data containing root CAs.
|
|
|
|
RootCAData []byte `json:"rootCAData"`
|
|
|
|
|
2016-10-21 00:17:43 +00:00
|
|
|
// BindDN and BindPW for an application service account. The connector uses these
|
|
|
|
// credentials to search for users and groups.
|
2016-11-03 21:32:23 +00:00
|
|
|
BindDN string `json:"bindDN"`
|
|
|
|
BindPW string `json:"bindPW"`
|
2016-10-21 00:17:43 +00:00
|
|
|
|
2017-11-07 09:28:21 +00:00
|
|
|
// UsernamePrompt allows users to override the username attribute (displayed
|
|
|
|
// in the username/password prompt). If unset, the handler will use
|
|
|
|
// "Username".
|
|
|
|
UsernamePrompt string `json:"usernamePrompt"`
|
|
|
|
|
2016-10-21 00:17:43 +00:00
|
|
|
// User entry search configuration.
|
|
|
|
UserSearch struct {
|
2018-01-14 12:34:45 +00:00
|
|
|
// BaseDN to start the search from. For example "cn=users,dc=example,dc=com"
|
2016-11-03 21:32:23 +00:00
|
|
|
BaseDN string `json:"baseDN"`
|
2016-10-21 00:17:43 +00:00
|
|
|
|
|
|
|
// Optional filter to apply when searching the directory. For example "(objectClass=person)"
|
2016-11-03 21:32:23 +00:00
|
|
|
Filter string `json:"filter"`
|
2016-10-21 00:17:43 +00:00
|
|
|
|
|
|
|
// Attribute to match against the inputted username. This will be translated and combined
|
|
|
|
// with the other filter as "(<attr>=<username>)".
|
2016-11-03 21:32:23 +00:00
|
|
|
Username string `json:"username"`
|
2016-10-21 00:17:43 +00:00
|
|
|
|
|
|
|
// Can either be:
|
|
|
|
// * "sub" - search the whole sub tree
|
|
|
|
// * "one" - only search one level
|
2016-11-03 21:32:23 +00:00
|
|
|
Scope string `json:"scope"`
|
2016-10-21 00:17:43 +00:00
|
|
|
|
|
|
|
// A mapping of attributes on the user entry to claims.
|
2019-10-10 14:43:41 +00:00
|
|
|
IDAttr string `json:"idAttr"` // Defaults to "uid"
|
|
|
|
EmailAttr string `json:"emailAttr"` // Defaults to "mail"
|
|
|
|
NameAttr string `json:"nameAttr"` // No default.
|
|
|
|
PreferredUsernameAttrAttr string `json:"preferredUsernameAttr"` // No default.
|
2019-01-09 03:01:42 +00:00
|
|
|
|
|
|
|
// If this is set, the email claim of the id token will be constructed from the idAttr and
|
|
|
|
// value of emailSuffix. This should not include the @ character.
|
|
|
|
EmailSuffix string `json:"emailSuffix"` // No default.
|
2016-11-03 21:32:23 +00:00
|
|
|
} `json:"userSearch"`
|
2016-10-21 00:17:43 +00:00
|
|
|
|
|
|
|
// Group search configuration.
|
|
|
|
GroupSearch struct {
|
2018-01-14 12:34:45 +00:00
|
|
|
// BaseDN to start the search from. For example "cn=groups,dc=example,dc=com"
|
2016-11-03 21:32:23 +00:00
|
|
|
BaseDN string `json:"baseDN"`
|
2016-10-21 00:17:43 +00:00
|
|
|
|
|
|
|
// Optional filter to apply when searching the directory. For example "(objectClass=posixGroup)"
|
2016-11-03 21:32:23 +00:00
|
|
|
Filter string `json:"filter"`
|
2016-10-21 00:17:43 +00:00
|
|
|
|
2016-11-03 21:32:23 +00:00
|
|
|
Scope string `json:"scope"` // Defaults to "sub"
|
2016-10-21 00:17:43 +00:00
|
|
|
|
2020-01-07 13:55:13 +00:00
|
|
|
// DEPRECATED config options. Those are left for backward compatibility.
|
|
|
|
// See "UserMatchers" below for the current group to user matching implementation
|
|
|
|
// TODO: should be eventually removed from the code
|
|
|
|
UserAttr string `json:"userAttr"`
|
|
|
|
GroupAttr string `json:"groupAttr"`
|
|
|
|
|
connector/ldap: add multiple user to group mapping
Add an ability to fetch user's membership from
groups of a different type by specifying multiple
group attribute to user attribute value matchers
in the Dex config:
userMatchers:
- userAttr: uid
groupAttr: memberUid
- userAttr: DN
groupAttr: member
In other words the user's groups can be fetched now from
ldap structure similar to the following:
dn: cn=john,ou=People,dc=example,dc=org
objectClass: person
objectClass: inetOrgPerson
sn: doe
cn: john
uid: johndoe
mail: johndoe@example.com
userpassword: bar
dn: cn=qa,ou=Groups,ou=Portland,dc=example,dc=org
objectClass: groupOfNames
cn: qa
member: cn=john,ou=People,dc=example,dc=org
dn: cn=logger,ou=UnixGroups,ou=Portland,dc=example,dc=org
objectClass: posixGroup
gidNumber: 1000
cn: logger
memberUid: johndoe
Signed-off-by: Vitaliy Dmitriev <vi7alya@gmail.com>
2020-01-03 09:40:08 +00:00
|
|
|
// Array of the field pairs used to match a user to a group.
|
|
|
|
// See the "UserMatcher" struct for the exact field names
|
2016-10-21 00:17:43 +00:00
|
|
|
//
|
connector/ldap: add multiple user to group mapping
Add an ability to fetch user's membership from
groups of a different type by specifying multiple
group attribute to user attribute value matchers
in the Dex config:
userMatchers:
- userAttr: uid
groupAttr: memberUid
- userAttr: DN
groupAttr: member
In other words the user's groups can be fetched now from
ldap structure similar to the following:
dn: cn=john,ou=People,dc=example,dc=org
objectClass: person
objectClass: inetOrgPerson
sn: doe
cn: john
uid: johndoe
mail: johndoe@example.com
userpassword: bar
dn: cn=qa,ou=Groups,ou=Portland,dc=example,dc=org
objectClass: groupOfNames
cn: qa
member: cn=john,ou=People,dc=example,dc=org
dn: cn=logger,ou=UnixGroups,ou=Portland,dc=example,dc=org
objectClass: posixGroup
gidNumber: 1000
cn: logger
memberUid: johndoe
Signed-off-by: Vitaliy Dmitriev <vi7alya@gmail.com>
2020-01-03 09:40:08 +00:00
|
|
|
// Each pair adds an additional requirement to the filter that an attribute in the group
|
2016-10-21 00:17:43 +00:00
|
|
|
// match the user's attribute value. For example that the "members" attribute of
|
|
|
|
// a group matches the "uid" of the user. The exact filter being added is:
|
|
|
|
//
|
connector/ldap: add multiple user to group mapping
Add an ability to fetch user's membership from
groups of a different type by specifying multiple
group attribute to user attribute value matchers
in the Dex config:
userMatchers:
- userAttr: uid
groupAttr: memberUid
- userAttr: DN
groupAttr: member
In other words the user's groups can be fetched now from
ldap structure similar to the following:
dn: cn=john,ou=People,dc=example,dc=org
objectClass: person
objectClass: inetOrgPerson
sn: doe
cn: john
uid: johndoe
mail: johndoe@example.com
userpassword: bar
dn: cn=qa,ou=Groups,ou=Portland,dc=example,dc=org
objectClass: groupOfNames
cn: qa
member: cn=john,ou=People,dc=example,dc=org
dn: cn=logger,ou=UnixGroups,ou=Portland,dc=example,dc=org
objectClass: posixGroup
gidNumber: 1000
cn: logger
memberUid: johndoe
Signed-off-by: Vitaliy Dmitriev <vi7alya@gmail.com>
2020-01-03 09:40:08 +00:00
|
|
|
// (userMatchers[n].<groupAttr>=userMatchers[n].<userAttr value>)
|
2016-10-21 00:17:43 +00:00
|
|
|
//
|
connector/ldap: add multiple user to group mapping
Add an ability to fetch user's membership from
groups of a different type by specifying multiple
group attribute to user attribute value matchers
in the Dex config:
userMatchers:
- userAttr: uid
groupAttr: memberUid
- userAttr: DN
groupAttr: member
In other words the user's groups can be fetched now from
ldap structure similar to the following:
dn: cn=john,ou=People,dc=example,dc=org
objectClass: person
objectClass: inetOrgPerson
sn: doe
cn: john
uid: johndoe
mail: johndoe@example.com
userpassword: bar
dn: cn=qa,ou=Groups,ou=Portland,dc=example,dc=org
objectClass: groupOfNames
cn: qa
member: cn=john,ou=People,dc=example,dc=org
dn: cn=logger,ou=UnixGroups,ou=Portland,dc=example,dc=org
objectClass: posixGroup
gidNumber: 1000
cn: logger
memberUid: johndoe
Signed-off-by: Vitaliy Dmitriev <vi7alya@gmail.com>
2020-01-03 09:40:08 +00:00
|
|
|
UserMatchers []UserMatcher `json:"userMatchers"`
|
2016-10-21 00:17:43 +00:00
|
|
|
|
|
|
|
// The attribute of the group that represents its name.
|
2016-11-03 21:32:23 +00:00
|
|
|
NameAttr string `json:"nameAttr"`
|
|
|
|
} `json:"groupSearch"`
|
2016-10-21 00:17:43 +00:00
|
|
|
}
|
|
|
|
|
2017-08-11 17:17:30 +00:00
|
|
|
func scopeString(i int) string {
|
|
|
|
switch i {
|
|
|
|
case ldap.ScopeBaseObject:
|
|
|
|
return "base"
|
|
|
|
case ldap.ScopeSingleLevel:
|
|
|
|
return "one"
|
|
|
|
case ldap.ScopeWholeSubtree:
|
|
|
|
return "sub"
|
|
|
|
default:
|
|
|
|
return ""
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-10-21 00:17:43 +00:00
|
|
|
func parseScope(s string) (int, bool) {
|
|
|
|
// NOTE(ericchiang): ScopeBaseObject doesn't really make sense for us because we
|
|
|
|
// never know the user's or group's DN.
|
|
|
|
switch s {
|
|
|
|
case "", "sub":
|
|
|
|
return ldap.ScopeWholeSubtree, true
|
|
|
|
case "one":
|
|
|
|
return ldap.ScopeSingleLevel, true
|
|
|
|
}
|
|
|
|
return 0, false
|
|
|
|
}
|
|
|
|
|
2020-01-07 13:55:13 +00:00
|
|
|
// Build a list of group attr name to user attr value matchers.
|
|
|
|
// Function exists here to allow backward compatibility between old and new
|
|
|
|
// group to user matching implementations.
|
|
|
|
// See "Config.GroupSearch.UserMatchers" comments for the details
|
|
|
|
func (c *ldapConnector) userMatchers() []UserMatcher {
|
|
|
|
if len(c.GroupSearch.UserMatchers) > 0 && c.GroupSearch.UserMatchers[0].UserAttr != "" {
|
|
|
|
return c.GroupSearch.UserMatchers[:]
|
|
|
|
} else {
|
|
|
|
return []UserMatcher{
|
|
|
|
{
|
|
|
|
UserAttr: c.GroupSearch.UserAttr,
|
|
|
|
GroupAttr: c.GroupSearch.GroupAttr,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-07-25 20:00:28 +00:00
|
|
|
// Open returns an authentication strategy using LDAP.
|
2019-02-22 12:19:23 +00:00
|
|
|
func (c *Config) Open(id string, logger log.Logger) (connector.Connector, error) {
|
2016-11-22 23:35:46 +00:00
|
|
|
conn, err := c.OpenConnector(logger)
|
2016-11-03 23:28:23 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
return connector.Connector(conn), nil
|
|
|
|
}
|
|
|
|
|
2016-11-18 21:40:41 +00:00
|
|
|
type refreshData struct {
|
|
|
|
Username string `json:"username"`
|
|
|
|
Entry ldap.Entry `json:"entry"`
|
|
|
|
}
|
|
|
|
|
2016-11-03 23:28:23 +00:00
|
|
|
// OpenConnector is the same as Open but returns a type with all implemented connector interfaces.
|
2019-02-22 12:19:23 +00:00
|
|
|
func (c *Config) OpenConnector(logger log.Logger) (interface {
|
2016-11-03 23:28:23 +00:00
|
|
|
connector.Connector
|
|
|
|
connector.PasswordConnector
|
2016-11-18 21:40:41 +00:00
|
|
|
connector.RefreshConnector
|
2016-11-03 23:28:23 +00:00
|
|
|
}, error) {
|
2017-04-10 22:02:40 +00:00
|
|
|
return c.openConnector(logger)
|
|
|
|
}
|
|
|
|
|
2019-02-22 12:19:23 +00:00
|
|
|
func (c *Config) openConnector(logger log.Logger) (*ldapConnector, error) {
|
2016-10-21 00:17:43 +00:00
|
|
|
requiredFields := []struct {
|
|
|
|
name string
|
|
|
|
val string
|
|
|
|
}{
|
|
|
|
{"host", c.Host},
|
|
|
|
{"userSearch.baseDN", c.UserSearch.BaseDN},
|
|
|
|
{"userSearch.username", c.UserSearch.Username},
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, field := range requiredFields {
|
|
|
|
if field.val == "" {
|
|
|
|
return nil, fmt.Errorf("ldap: missing required field %q", field.name)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
var (
|
|
|
|
host string
|
|
|
|
err error
|
|
|
|
)
|
|
|
|
if host, _, err = net.SplitHostPort(c.Host); err != nil {
|
|
|
|
host = c.Host
|
|
|
|
if c.InsecureNoSSL {
|
|
|
|
c.Host = c.Host + ":389"
|
|
|
|
} else {
|
|
|
|
c.Host = c.Host + ":636"
|
|
|
|
}
|
2016-07-25 20:00:28 +00:00
|
|
|
}
|
2016-10-21 00:17:43 +00:00
|
|
|
|
2016-11-18 21:40:41 +00:00
|
|
|
tlsConfig := &tls.Config{ServerName: host, InsecureSkipVerify: c.InsecureSkipVerify}
|
2016-11-03 23:28:23 +00:00
|
|
|
if c.RootCA != "" || len(c.RootCAData) != 0 {
|
|
|
|
data := c.RootCAData
|
|
|
|
if len(data) == 0 {
|
|
|
|
var err error
|
|
|
|
if data, err = ioutil.ReadFile(c.RootCA); err != nil {
|
|
|
|
return nil, fmt.Errorf("ldap: read ca file: %v", err)
|
|
|
|
}
|
2016-10-21 00:17:43 +00:00
|
|
|
}
|
|
|
|
rootCAs := x509.NewCertPool()
|
|
|
|
if !rootCAs.AppendCertsFromPEM(data) {
|
|
|
|
return nil, fmt.Errorf("ldap: no certs found in ca file")
|
|
|
|
}
|
|
|
|
tlsConfig.RootCAs = rootCAs
|
|
|
|
}
|
2018-09-22 04:15:11 +00:00
|
|
|
|
|
|
|
if c.ClientKey != "" && c.ClientCert != "" {
|
|
|
|
cert, err := tls.LoadX509KeyPair(c.ClientCert, c.ClientKey)
|
|
|
|
if err != nil {
|
|
|
|
return nil, fmt.Errorf("ldap: load client cert failed: %v", err)
|
|
|
|
}
|
|
|
|
tlsConfig.Certificates = append(tlsConfig.Certificates, cert)
|
|
|
|
}
|
2016-10-21 00:17:43 +00:00
|
|
|
userSearchScope, ok := parseScope(c.UserSearch.Scope)
|
|
|
|
if !ok {
|
|
|
|
return nil, fmt.Errorf("userSearch.Scope unknown value %q", c.UserSearch.Scope)
|
|
|
|
}
|
|
|
|
groupSearchScope, ok := parseScope(c.GroupSearch.Scope)
|
|
|
|
if !ok {
|
2017-04-14 03:30:05 +00:00
|
|
|
return nil, fmt.Errorf("groupSearch.Scope unknown value %q", c.GroupSearch.Scope)
|
2016-07-25 20:00:28 +00:00
|
|
|
}
|
2016-11-22 23:35:46 +00:00
|
|
|
return &ldapConnector{*c, userSearchScope, groupSearchScope, tlsConfig, logger}, nil
|
2016-07-25 20:00:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
type ldapConnector struct {
|
|
|
|
Config
|
2016-10-21 00:17:43 +00:00
|
|
|
|
|
|
|
userSearchScope int
|
|
|
|
groupSearchScope int
|
|
|
|
|
|
|
|
tlsConfig *tls.Config
|
2016-11-22 23:35:46 +00:00
|
|
|
|
2019-02-22 12:19:23 +00:00
|
|
|
logger log.Logger
|
2016-07-25 20:00:28 +00:00
|
|
|
}
|
|
|
|
|
2016-11-18 21:40:41 +00:00
|
|
|
var (
|
|
|
|
_ connector.PasswordConnector = (*ldapConnector)(nil)
|
|
|
|
_ connector.RefreshConnector = (*ldapConnector)(nil)
|
|
|
|
)
|
2016-08-03 04:14:24 +00:00
|
|
|
|
2016-10-21 00:17:43 +00:00
|
|
|
// do initializes a connection to the LDAP directory and passes it to the
|
|
|
|
// provided function. It then performs appropriate teardown or reuse before
|
|
|
|
// returning.
|
2016-11-18 21:40:41 +00:00
|
|
|
func (c *ldapConnector) do(ctx context.Context, f func(c *ldap.Conn) error) error {
|
|
|
|
// TODO(ericchiang): support context here
|
2016-10-21 00:17:43 +00:00
|
|
|
var (
|
|
|
|
conn *ldap.Conn
|
|
|
|
err error
|
|
|
|
)
|
2017-04-12 21:13:34 +00:00
|
|
|
switch {
|
|
|
|
case c.InsecureNoSSL:
|
|
|
|
conn, err = ldap.Dial("tcp", c.Host)
|
|
|
|
case c.StartTLS:
|
2016-10-21 00:17:43 +00:00
|
|
|
conn, err = ldap.Dial("tcp", c.Host)
|
2017-04-12 21:13:34 +00:00
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("failed to connect: %v", err)
|
|
|
|
}
|
|
|
|
if err := conn.StartTLS(c.tlsConfig); err != nil {
|
|
|
|
return fmt.Errorf("start TLS failed: %v", err)
|
|
|
|
}
|
|
|
|
default:
|
2016-10-21 00:17:43 +00:00
|
|
|
conn, err = ldap.DialTLS("tcp", c.Host, c.tlsConfig)
|
|
|
|
}
|
2016-07-25 20:00:28 +00:00
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("failed to connect: %v", err)
|
|
|
|
}
|
|
|
|
defer conn.Close()
|
|
|
|
|
2016-10-21 00:17:43 +00:00
|
|
|
// If bindDN and bindPW are empty this will default to an anonymous bind.
|
|
|
|
if err := conn.Bind(c.BindDN, c.BindPW); err != nil {
|
2018-11-13 08:40:40 +00:00
|
|
|
if c.BindDN == "" && c.BindPW == "" {
|
|
|
|
return fmt.Errorf("ldap: initial anonymous bind failed: %v", err)
|
|
|
|
}
|
2016-10-21 00:17:43 +00:00
|
|
|
return fmt.Errorf("ldap: initial bind for user %q failed: %v", c.BindDN, err)
|
|
|
|
}
|
|
|
|
|
2016-07-25 20:00:28 +00:00
|
|
|
return f(conn)
|
|
|
|
}
|
|
|
|
|
connector/ldap: fix case where groups are listed on the user entity
Support schemas that determine membership by having fields on the
user entity, instead of listing users on a groups entity. E.g. the
following schema is now supported when it wasn't previously:
cn=eric,cn=user,dn=exapmle,dn=com
objectClass=myPerson
cn: eric
uid: eric
email: eric@example.com
memberOf: foo
memberOf: bar
cn=foo,cn=group,dn=exapmle,dn=com
objectClass=myGroup
cn: foo
cn=bar,cn=group,dn=exapmle,dn=com
objectClass=myGroup
cn: bar
2017-04-11 16:48:48 +00:00
|
|
|
func getAttrs(e ldap.Entry, name string) []string {
|
2016-10-21 00:17:43 +00:00
|
|
|
for _, a := range e.Attributes {
|
|
|
|
if a.Name != name {
|
|
|
|
continue
|
|
|
|
}
|
connector/ldap: fix case where groups are listed on the user entity
Support schemas that determine membership by having fields on the
user entity, instead of listing users on a groups entity. E.g. the
following schema is now supported when it wasn't previously:
cn=eric,cn=user,dn=exapmle,dn=com
objectClass=myPerson
cn: eric
uid: eric
email: eric@example.com
memberOf: foo
memberOf: bar
cn=foo,cn=group,dn=exapmle,dn=com
objectClass=myGroup
cn: foo
cn=bar,cn=group,dn=exapmle,dn=com
objectClass=myGroup
cn: bar
2017-04-11 16:48:48 +00:00
|
|
|
return a.Values
|
2016-10-21 00:17:43 +00:00
|
|
|
}
|
2016-11-18 21:16:50 +00:00
|
|
|
if name == "DN" {
|
connector/ldap: fix case where groups are listed on the user entity
Support schemas that determine membership by having fields on the
user entity, instead of listing users on a groups entity. E.g. the
following schema is now supported when it wasn't previously:
cn=eric,cn=user,dn=exapmle,dn=com
objectClass=myPerson
cn: eric
uid: eric
email: eric@example.com
memberOf: foo
memberOf: bar
cn=foo,cn=group,dn=exapmle,dn=com
objectClass=myGroup
cn: foo
cn=bar,cn=group,dn=exapmle,dn=com
objectClass=myGroup
cn: bar
2017-04-11 16:48:48 +00:00
|
|
|
return []string{e.DN}
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func getAttr(e ldap.Entry, name string) string {
|
|
|
|
if a := getAttrs(e, name); len(a) > 0 {
|
|
|
|
return a[0]
|
2016-11-18 21:16:50 +00:00
|
|
|
}
|
2016-10-21 00:17:43 +00:00
|
|
|
return ""
|
|
|
|
}
|
|
|
|
|
2016-11-18 21:40:41 +00:00
|
|
|
func (c *ldapConnector) identityFromEntry(user ldap.Entry) (ident connector.Identity, err error) {
|
|
|
|
// If we're missing any attributes, such as email or ID, we want to report
|
|
|
|
// an error rather than continuing.
|
|
|
|
missing := []string{}
|
|
|
|
|
|
|
|
// Fill the identity struct using the attributes from the user entry.
|
|
|
|
if ident.UserID = getAttr(user, c.UserSearch.IDAttr); ident.UserID == "" {
|
|
|
|
missing = append(missing, c.UserSearch.IDAttr)
|
|
|
|
}
|
2016-12-09 21:22:19 +00:00
|
|
|
|
2016-11-18 21:40:41 +00:00
|
|
|
if c.UserSearch.NameAttr != "" {
|
|
|
|
if ident.Username = getAttr(user, c.UserSearch.NameAttr); ident.Username == "" {
|
|
|
|
missing = append(missing, c.UserSearch.NameAttr)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-10-10 14:43:41 +00:00
|
|
|
if c.UserSearch.PreferredUsernameAttrAttr != "" {
|
|
|
|
if ident.PreferredUsername = getAttr(user, c.UserSearch.PreferredUsernameAttrAttr); ident.PreferredUsername == "" {
|
|
|
|
missing = append(missing, c.UserSearch.PreferredUsernameAttrAttr)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-01-09 03:01:42 +00:00
|
|
|
if c.UserSearch.EmailSuffix != "" {
|
|
|
|
ident.Email = ident.Username + "@" + c.UserSearch.EmailSuffix
|
|
|
|
} else if ident.Email = getAttr(user, c.UserSearch.EmailAttr); ident.Email == "" {
|
|
|
|
missing = append(missing, c.UserSearch.EmailAttr)
|
|
|
|
}
|
|
|
|
// TODO(ericchiang): Let this value be set from an attribute.
|
|
|
|
ident.EmailVerified = true
|
|
|
|
|
2016-11-18 21:40:41 +00:00
|
|
|
if len(missing) != 0 {
|
|
|
|
err := fmt.Errorf("ldap: entry %q missing following required attribute(s): %q", user.DN, missing)
|
|
|
|
return connector.Identity{}, err
|
|
|
|
}
|
|
|
|
return ident, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *ldapConnector) userEntry(conn *ldap.Conn, username string) (user ldap.Entry, found bool, err error) {
|
2016-11-18 23:16:09 +00:00
|
|
|
filter := fmt.Sprintf("(%s=%s)", c.UserSearch.Username, ldap.EscapeFilter(username))
|
2016-10-21 00:17:43 +00:00
|
|
|
if c.UserSearch.Filter != "" {
|
|
|
|
filter = fmt.Sprintf("(&%s%s)", c.UserSearch.Filter, filter)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Initial search.
|
|
|
|
req := &ldap.SearchRequest{
|
|
|
|
BaseDN: c.UserSearch.BaseDN,
|
|
|
|
Filter: filter,
|
|
|
|
Scope: c.userSearchScope,
|
|
|
|
// We only need to search for these specific requests.
|
|
|
|
Attributes: []string{
|
|
|
|
c.UserSearch.IDAttr,
|
|
|
|
c.UserSearch.EmailAttr,
|
|
|
|
// TODO(ericchiang): what if this contains duplicate values?
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
2020-01-07 13:55:13 +00:00
|
|
|
for _, matcher := range c.userMatchers() {
|
connector/ldap: add multiple user to group mapping
Add an ability to fetch user's membership from
groups of a different type by specifying multiple
group attribute to user attribute value matchers
in the Dex config:
userMatchers:
- userAttr: uid
groupAttr: memberUid
- userAttr: DN
groupAttr: member
In other words the user's groups can be fetched now from
ldap structure similar to the following:
dn: cn=john,ou=People,dc=example,dc=org
objectClass: person
objectClass: inetOrgPerson
sn: doe
cn: john
uid: johndoe
mail: johndoe@example.com
userpassword: bar
dn: cn=qa,ou=Groups,ou=Portland,dc=example,dc=org
objectClass: groupOfNames
cn: qa
member: cn=john,ou=People,dc=example,dc=org
dn: cn=logger,ou=UnixGroups,ou=Portland,dc=example,dc=org
objectClass: posixGroup
gidNumber: 1000
cn: logger
memberUid: johndoe
Signed-off-by: Vitaliy Dmitriev <vi7alya@gmail.com>
2020-01-03 09:40:08 +00:00
|
|
|
req.Attributes = append(req.Attributes, matcher.UserAttr)
|
|
|
|
}
|
|
|
|
|
2016-10-21 00:17:43 +00:00
|
|
|
if c.UserSearch.NameAttr != "" {
|
|
|
|
req.Attributes = append(req.Attributes, c.UserSearch.NameAttr)
|
|
|
|
}
|
2017-08-11 17:17:30 +00:00
|
|
|
|
2019-10-10 14:43:41 +00:00
|
|
|
if c.UserSearch.PreferredUsernameAttrAttr != "" {
|
|
|
|
req.Attributes = append(req.Attributes, c.UserSearch.PreferredUsernameAttrAttr)
|
|
|
|
}
|
|
|
|
|
2017-08-11 17:17:30 +00:00
|
|
|
c.logger.Infof("performing ldap search %s %s %s",
|
|
|
|
req.BaseDN, scopeString(req.Scope), req.Filter)
|
2016-11-18 21:40:41 +00:00
|
|
|
resp, err := conn.Search(req)
|
|
|
|
if err != nil {
|
|
|
|
return ldap.Entry{}, false, fmt.Errorf("ldap: search with filter %q failed: %v", req.Filter, err)
|
|
|
|
}
|
2016-10-21 00:17:43 +00:00
|
|
|
|
2016-11-18 21:40:41 +00:00
|
|
|
switch n := len(resp.Entries); n {
|
|
|
|
case 0:
|
2016-12-12 22:54:01 +00:00
|
|
|
c.logger.Errorf("ldap: no results returned for filter: %q", filter)
|
2016-11-18 21:40:41 +00:00
|
|
|
return ldap.Entry{}, false, nil
|
|
|
|
case 1:
|
2017-08-11 17:17:30 +00:00
|
|
|
user = *resp.Entries[0]
|
|
|
|
c.logger.Infof("username %q mapped to entry %s", username, user.DN)
|
|
|
|
return user, true, nil
|
2016-11-18 21:40:41 +00:00
|
|
|
default:
|
|
|
|
return ldap.Entry{}, false, fmt.Errorf("ldap: filter returned multiple (%d) results: %q", n, filter)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *ldapConnector) Login(ctx context.Context, s connector.Scopes, username, password string) (ident connector.Identity, validPass bool, err error) {
|
2017-05-04 22:39:08 +00:00
|
|
|
// make this check to avoid unauthenticated bind to the LDAP server.
|
2017-04-28 21:57:10 +00:00
|
|
|
if password == "" {
|
|
|
|
return connector.Identity{}, false, nil
|
|
|
|
}
|
|
|
|
|
2016-11-18 21:40:41 +00:00
|
|
|
var (
|
|
|
|
// We want to return a different error if the user's password is incorrect vs
|
|
|
|
// if there was an error.
|
|
|
|
incorrectPass = false
|
|
|
|
user ldap.Entry
|
|
|
|
)
|
|
|
|
|
|
|
|
err = c.do(ctx, func(conn *ldap.Conn) error {
|
|
|
|
entry, found, err := c.userEntry(conn, username)
|
2016-10-21 00:17:43 +00:00
|
|
|
if err != nil {
|
2016-11-18 21:40:41 +00:00
|
|
|
return err
|
2016-10-21 00:17:43 +00:00
|
|
|
}
|
2016-11-18 21:40:41 +00:00
|
|
|
if !found {
|
2016-11-01 21:03:22 +00:00
|
|
|
incorrectPass = true
|
|
|
|
return nil
|
2016-10-21 00:17:43 +00:00
|
|
|
}
|
2016-11-18 21:40:41 +00:00
|
|
|
user = entry
|
2016-10-21 00:17:43 +00:00
|
|
|
|
|
|
|
// Try to authenticate as the distinguished name.
|
|
|
|
if err := conn.Bind(user.DN, password); err != nil {
|
|
|
|
// Detect a bad password through the LDAP error code.
|
|
|
|
if ldapErr, ok := err.(*ldap.Error); ok {
|
2018-09-04 10:37:39 +00:00
|
|
|
switch ldapErr.ResultCode {
|
|
|
|
case ldap.LDAPResultInvalidCredentials:
|
2016-12-12 22:54:01 +00:00
|
|
|
c.logger.Errorf("ldap: invalid password for user %q", user.DN)
|
2016-10-21 00:17:43 +00:00
|
|
|
incorrectPass = true
|
|
|
|
return nil
|
2018-09-04 10:37:39 +00:00
|
|
|
case ldap.LDAPResultConstraintViolation:
|
|
|
|
c.logger.Errorf("ldap: constraint violation for user %q: %s", user.DN, ldapErr.Error())
|
|
|
|
incorrectPass = true
|
|
|
|
return nil
|
2016-10-21 00:17:43 +00:00
|
|
|
}
|
2018-09-04 10:37:39 +00:00
|
|
|
} // will also catch all ldap.Error without a case statement above
|
2016-10-21 00:17:43 +00:00
|
|
|
return fmt.Errorf("ldap: failed to bind as dn %q: %v", user.DN, err)
|
|
|
|
}
|
|
|
|
return nil
|
2016-07-25 20:00:28 +00:00
|
|
|
})
|
|
|
|
if err != nil {
|
2016-08-03 04:14:24 +00:00
|
|
|
return connector.Identity{}, false, err
|
2016-07-25 20:00:28 +00:00
|
|
|
}
|
2016-11-01 21:03:22 +00:00
|
|
|
if incorrectPass {
|
|
|
|
return connector.Identity{}, false, nil
|
|
|
|
}
|
2016-07-25 20:00:28 +00:00
|
|
|
|
2016-11-18 21:40:41 +00:00
|
|
|
if ident, err = c.identityFromEntry(user); err != nil {
|
|
|
|
return connector.Identity{}, false, err
|
2016-10-21 00:17:43 +00:00
|
|
|
}
|
|
|
|
|
2016-11-18 21:40:41 +00:00
|
|
|
if s.Groups {
|
|
|
|
groups, err := c.groups(ctx, user)
|
|
|
|
if err != nil {
|
|
|
|
return connector.Identity{}, false, fmt.Errorf("ldap: failed to query groups: %v", err)
|
2016-10-21 00:17:43 +00:00
|
|
|
}
|
2016-11-18 21:40:41 +00:00
|
|
|
ident.Groups = groups
|
2016-10-21 00:17:43 +00:00
|
|
|
}
|
|
|
|
|
2016-11-18 21:40:41 +00:00
|
|
|
if s.OfflineAccess {
|
|
|
|
refresh := refreshData{
|
|
|
|
Username: username,
|
|
|
|
Entry: user,
|
|
|
|
}
|
|
|
|
// Encode entry for follow up requests such as the groups query and
|
|
|
|
// refresh attempts.
|
|
|
|
if ident.ConnectorData, err = json.Marshal(refresh); err != nil {
|
|
|
|
return connector.Identity{}, false, fmt.Errorf("ldap: marshal entry: %v", err)
|
|
|
|
}
|
2016-10-21 00:17:43 +00:00
|
|
|
}
|
|
|
|
|
2016-11-01 21:03:22 +00:00
|
|
|
return ident, true, nil
|
2016-10-21 00:17:43 +00:00
|
|
|
}
|
|
|
|
|
2016-11-18 21:40:41 +00:00
|
|
|
func (c *ldapConnector) Refresh(ctx context.Context, s connector.Scopes, ident connector.Identity) (connector.Identity, error) {
|
|
|
|
var data refreshData
|
|
|
|
if err := json.Unmarshal(ident.ConnectorData, &data); err != nil {
|
2018-11-13 08:40:40 +00:00
|
|
|
return ident, fmt.Errorf("ldap: failed to unmarshal internal data: %v", err)
|
2016-11-18 21:40:41 +00:00
|
|
|
}
|
|
|
|
|
2016-10-21 00:17:43 +00:00
|
|
|
var user ldap.Entry
|
2016-11-18 21:40:41 +00:00
|
|
|
err := c.do(ctx, func(conn *ldap.Conn) error {
|
|
|
|
entry, found, err := c.userEntry(conn, data.Username)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
if !found {
|
|
|
|
return fmt.Errorf("ldap: user not found %q", data.Username)
|
|
|
|
}
|
|
|
|
user = entry
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
if err != nil {
|
|
|
|
return ident, err
|
|
|
|
}
|
|
|
|
if user.DN != data.Entry.DN {
|
|
|
|
return ident, fmt.Errorf("ldap: refresh for username %q expected DN %q got %q", data.Username, data.Entry.DN, user.DN)
|
2016-10-21 00:17:43 +00:00
|
|
|
}
|
|
|
|
|
2016-11-18 21:40:41 +00:00
|
|
|
newIdent, err := c.identityFromEntry(user)
|
|
|
|
if err != nil {
|
|
|
|
return ident, err
|
|
|
|
}
|
|
|
|
newIdent.ConnectorData = ident.ConnectorData
|
|
|
|
|
|
|
|
if s.Groups {
|
|
|
|
groups, err := c.groups(ctx, user)
|
|
|
|
if err != nil {
|
|
|
|
return connector.Identity{}, fmt.Errorf("ldap: failed to query groups: %v", err)
|
|
|
|
}
|
|
|
|
newIdent.Groups = groups
|
|
|
|
}
|
|
|
|
return newIdent, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *ldapConnector) groups(ctx context.Context, user ldap.Entry) ([]string, error) {
|
2016-12-27 19:07:03 +00:00
|
|
|
if c.GroupSearch.BaseDN == "" {
|
|
|
|
c.logger.Debugf("No groups returned for %q because no groups baseDN has been configured.", getAttr(user, c.UserSearch.NameAttr))
|
|
|
|
return nil, nil
|
|
|
|
}
|
|
|
|
|
connector/ldap: fix case where groups are listed on the user entity
Support schemas that determine membership by having fields on the
user entity, instead of listing users on a groups entity. E.g. the
following schema is now supported when it wasn't previously:
cn=eric,cn=user,dn=exapmle,dn=com
objectClass=myPerson
cn: eric
uid: eric
email: eric@example.com
memberOf: foo
memberOf: bar
cn=foo,cn=group,dn=exapmle,dn=com
objectClass=myGroup
cn: foo
cn=bar,cn=group,dn=exapmle,dn=com
objectClass=myGroup
cn: bar
2017-04-11 16:48:48 +00:00
|
|
|
var groups []*ldap.Entry
|
2020-01-07 13:55:13 +00:00
|
|
|
for _, matcher := range c.userMatchers() {
|
connector/ldap: add multiple user to group mapping
Add an ability to fetch user's membership from
groups of a different type by specifying multiple
group attribute to user attribute value matchers
in the Dex config:
userMatchers:
- userAttr: uid
groupAttr: memberUid
- userAttr: DN
groupAttr: member
In other words the user's groups can be fetched now from
ldap structure similar to the following:
dn: cn=john,ou=People,dc=example,dc=org
objectClass: person
objectClass: inetOrgPerson
sn: doe
cn: john
uid: johndoe
mail: johndoe@example.com
userpassword: bar
dn: cn=qa,ou=Groups,ou=Portland,dc=example,dc=org
objectClass: groupOfNames
cn: qa
member: cn=john,ou=People,dc=example,dc=org
dn: cn=logger,ou=UnixGroups,ou=Portland,dc=example,dc=org
objectClass: posixGroup
gidNumber: 1000
cn: logger
memberUid: johndoe
Signed-off-by: Vitaliy Dmitriev <vi7alya@gmail.com>
2020-01-03 09:40:08 +00:00
|
|
|
for _, attr := range getAttrs(user, matcher.UserAttr) {
|
|
|
|
filter := fmt.Sprintf("(%s=%s)", matcher.GroupAttr, ldap.EscapeFilter(attr))
|
|
|
|
if c.GroupSearch.Filter != "" {
|
|
|
|
filter = fmt.Sprintf("(&%s%s)", c.GroupSearch.Filter, filter)
|
|
|
|
}
|
2016-10-21 00:17:43 +00:00
|
|
|
|
connector/ldap: add multiple user to group mapping
Add an ability to fetch user's membership from
groups of a different type by specifying multiple
group attribute to user attribute value matchers
in the Dex config:
userMatchers:
- userAttr: uid
groupAttr: memberUid
- userAttr: DN
groupAttr: member
In other words the user's groups can be fetched now from
ldap structure similar to the following:
dn: cn=john,ou=People,dc=example,dc=org
objectClass: person
objectClass: inetOrgPerson
sn: doe
cn: john
uid: johndoe
mail: johndoe@example.com
userpassword: bar
dn: cn=qa,ou=Groups,ou=Portland,dc=example,dc=org
objectClass: groupOfNames
cn: qa
member: cn=john,ou=People,dc=example,dc=org
dn: cn=logger,ou=UnixGroups,ou=Portland,dc=example,dc=org
objectClass: posixGroup
gidNumber: 1000
cn: logger
memberUid: johndoe
Signed-off-by: Vitaliy Dmitriev <vi7alya@gmail.com>
2020-01-03 09:40:08 +00:00
|
|
|
req := &ldap.SearchRequest{
|
|
|
|
BaseDN: c.GroupSearch.BaseDN,
|
|
|
|
Filter: filter,
|
|
|
|
Scope: c.groupSearchScope,
|
|
|
|
Attributes: []string{c.GroupSearch.NameAttr},
|
|
|
|
}
|
2016-10-21 00:17:43 +00:00
|
|
|
|
connector/ldap: add multiple user to group mapping
Add an ability to fetch user's membership from
groups of a different type by specifying multiple
group attribute to user attribute value matchers
in the Dex config:
userMatchers:
- userAttr: uid
groupAttr: memberUid
- userAttr: DN
groupAttr: member
In other words the user's groups can be fetched now from
ldap structure similar to the following:
dn: cn=john,ou=People,dc=example,dc=org
objectClass: person
objectClass: inetOrgPerson
sn: doe
cn: john
uid: johndoe
mail: johndoe@example.com
userpassword: bar
dn: cn=qa,ou=Groups,ou=Portland,dc=example,dc=org
objectClass: groupOfNames
cn: qa
member: cn=john,ou=People,dc=example,dc=org
dn: cn=logger,ou=UnixGroups,ou=Portland,dc=example,dc=org
objectClass: posixGroup
gidNumber: 1000
cn: logger
memberUid: johndoe
Signed-off-by: Vitaliy Dmitriev <vi7alya@gmail.com>
2020-01-03 09:40:08 +00:00
|
|
|
gotGroups := false
|
|
|
|
if err := c.do(ctx, func(conn *ldap.Conn) error {
|
|
|
|
c.logger.Infof("performing ldap search %s %s %s",
|
|
|
|
req.BaseDN, scopeString(req.Scope), req.Filter)
|
|
|
|
resp, err := conn.Search(req)
|
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("ldap: search failed: %v", err)
|
|
|
|
}
|
|
|
|
gotGroups = len(resp.Entries) != 0
|
|
|
|
groups = append(groups, resp.Entries...)
|
|
|
|
return nil
|
|
|
|
}); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
if !gotGroups {
|
|
|
|
// TODO(ericchiang): Is this going to spam the logs?
|
|
|
|
c.logger.Errorf("ldap: groups search with filter %q returned no groups", filter)
|
connector/ldap: fix case where groups are listed on the user entity
Support schemas that determine membership by having fields on the
user entity, instead of listing users on a groups entity. E.g. the
following schema is now supported when it wasn't previously:
cn=eric,cn=user,dn=exapmle,dn=com
objectClass=myPerson
cn: eric
uid: eric
email: eric@example.com
memberOf: foo
memberOf: bar
cn=foo,cn=group,dn=exapmle,dn=com
objectClass=myGroup
cn: foo
cn=bar,cn=group,dn=exapmle,dn=com
objectClass=myGroup
cn: bar
2017-04-11 16:48:48 +00:00
|
|
|
}
|
2016-10-21 00:17:43 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
var groupNames []string
|
|
|
|
for _, group := range groups {
|
|
|
|
name := getAttr(*group, c.GroupSearch.NameAttr)
|
|
|
|
if name == "" {
|
|
|
|
// Be obnoxious about missing missing attributes. If the group entry is
|
|
|
|
// missing its name attribute, that indicates a misconfiguration.
|
|
|
|
//
|
|
|
|
// In the future we can add configuration options to just log these errors.
|
|
|
|
return nil, fmt.Errorf("ldap: group entity %q missing required attribute %q",
|
|
|
|
group.DN, c.GroupSearch.NameAttr)
|
|
|
|
}
|
|
|
|
|
|
|
|
groupNames = append(groupNames, name)
|
|
|
|
}
|
|
|
|
return groupNames, nil
|
2016-07-25 20:00:28 +00:00
|
|
|
}
|
2017-11-07 09:28:21 +00:00
|
|
|
|
|
|
|
func (c *ldapConnector) Prompt() string {
|
|
|
|
return c.UsernamePrompt
|
|
|
|
}
|