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

Add support for importing LDAP groups #28

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add support for importing LDAP groups #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9afdbb1
Add support for importing LDAP groups
RenWal Jun 10, 2020
81ffc99
Merge pull request #1 from mumble-voip/master
RenWal Apr 7, 2021
1f185a9
Merge branch 'master' into ldap-group-import
RenWal Apr 7, 2021
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
3 changes: 3 additions & 0 deletions Authenticators/LDAP/LDAPauth.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,14 @@ number_attr = roomNumber
display_attr = displayName
group_dn = cn=mumble,ou=Groups,dc=example,dc=com
group_attr = uniqueMember
memberof_attr = memberOf
; Uncomment and set below to provide more info from LDAP
; provide_info = True
; mail_attr = mail
; Uncomment to provide list of registered users from LDAP
; provide_users = True
; Uncomment to provide group memberships from LDAP
; provide_groups = True

; Uncomment to use StartTLS without cert check
; use_start_tls = True
Expand Down
19 changes: 17 additions & 2 deletions Authenticators/LDAP/LDAPauth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,10 @@ def x2bool(s):
('display_attr', str, 'displayName'),
('group_dn', str, 'ou=Groups,dc=example,dc=org'),
('group_attr', str, 'member'),
('memberof_attr', str, 'memberOf'),
('provide_info', x2bool, False),
('mail_attr', str, 'mail'),
('provide_groups', x2bool, False),
('provide_users', x2bool, False),
('use_start_tls', x2bool, False)),

Expand Down Expand Up @@ -510,7 +512,11 @@ def authenticate(self, name, pw, certlist, certhash, strong, current = None):
return (AUTH_REFUSED, None, None)

# Search for the user.
res = ldap_conn.search_s(cfg.ldap.users_dn, ldap.SCOPE_SUBTREE, '(%s=%s)' % (cfg.ldap.username_attr, name), [cfg.ldap.number_attr, cfg.ldap.display_attr])
if cfg.ldap.provide_groups:
attrs = [cfg.ldap.number_attr, cfg.ldap.display_attr, cfg.ldap.memberof_attr]
else:
attrs = [cfg.ldap.number_attr, cfg.ldap.display_attr]
res = ldap_conn.search_s(cfg.ldap.users_dn, ldap.SCOPE_SUBTREE, '(%s=%s)' % (cfg.ldap.username_attr, name), attrs)
if len(res) == 0:
warning("User " + name + " not found")
if cfg.user.reject_on_miss:
Expand All @@ -524,6 +530,14 @@ def authenticate(self, name, pw, certlist, certhash, strong, current = None):
displayName = match[1][cfg.ldap.display_attr][0].decode()
user_dn = match[0]
debug('User match found, display "' + displayName + '" with UID ' + repr(uid))
groups = []
if cfg.ldap.provide_groups and cfg.ldap.memberof_attr in match[1]:
groupsDN = match[1][cfg.ldap.memberof_attr]
for g in groupsDN:
dn = ldap.dn.explode_dn(g, notypes=True)
cn = dn[0]
groups.append(cn)
debug('User has groups ' + str(groups))

# Optionally check groups.
if cfg.ldap.group_dn != "" :
Expand All @@ -536,6 +550,7 @@ def authenticate(self, name, pw, certlist, certhash, strong, current = None):
if len(res) < 1:
debug('User ' + name + ' failed with no group membership')
return (AUTH_REFUSED, None, None)


# Second bind to test user credentials if using bind_dn or discover_dn.
if cfg.ldap.bind_dn or cfg.ldap.discover_dn:
Expand All @@ -560,7 +575,7 @@ def authenticate(self, name, pw, certlist, certhash, strong, current = None):
# Add the user/id combo to cache, then accept:
self.name_uid_cache[displayName] = uid
debug("Login accepted for " + name)
return (uid + cfg.user.id_offset, displayName, [])
return (uid + cfg.user.id_offset, displayName, groups)

@fortifyIceFu((False, None))
@checkSecret
Expand Down