Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
54b0c787
Commit
54b0c787
authored
Mar 03, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ignore case of LDAP user DN when checking group membership.
parent
ee3714d5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
5 deletions
+10
-5
CHANGELOG
CHANGELOG
+1
-0
lib/gitlab/ldap/group.rb
lib/gitlab/ldap/group.rb
+5
-2
spec/lib/gitlab/ldap/access_spec.rb
spec/lib/gitlab/ldap/access_spec.rb
+4
-3
No files found.
CHANGELOG
View file @
54b0c787
...
...
@@ -15,6 +15,7 @@ v 7.9.0 (unreleased)
- Fix mass-unassignment of issues (Robert Speicher)
- Allow user confirmation to be skipped for new users via API
- Add a service to send updates to an Irker gateway (Romain Coltel)
- Ignore case of LDAP user DN when checking group membership.
v 7.8.1
- Fix run of custom post receive hooks
...
...
lib/gitlab/ldap/group.rb
View file @
54b0c787
...
...
@@ -34,9 +34,12 @@ module Gitlab
end
def
has_member?
(
user
)
user_uid
=
user
.
uid
.
downcase
user_dn
=
user
.
dn
.
downcase
if
memberuid?
member_uids
.
include?
(
user
.
uid
)
elsif
member_dns
.
include?
(
user
.
dn
)
member_uids
.
any?
{
|
member_uid
|
member_uid
.
downcase
==
user_uid
}
elsif
member_dns
.
any?
{
|
member_dn
|
member_dn
.
downcase
==
user_dn
}
true
elsif
adapter
.
config
.
active_directory
adapter
.
dn_matches_filter?
(
user
.
dn
,
active_directory_recursive_memberof_filter
)
...
...
spec/lib/gitlab/ldap/access_spec.rb
View file @
54b0c787
...
...
@@ -293,8 +293,8 @@ objectclass: posixGroup
cn: group1
description: GitLab group 1
gidnumber: 21
memberuid:
#{
ldap_user
.
uid
}
memberuid: user2
uniquemember:
#{
ldap_user
.
dn
.
downcase
}
uniquemember: uid=user2,ou=people,dc=example
objectclass: top
objectclass: posixGroup
}
)
...
...
@@ -321,7 +321,8 @@ objectclass: posixGroup
before
do
access
.
stub
(
ldap_user:
ldap_user
)
ldap_user
.
stub
(
:uid
)
{
'user42'
}
ldap_user
.
stub
(
:uid
)
{
'user1'
}
ldap_user
.
stub
(
:dn
)
{
'uid=user1,ou=People,dc=example'
}
end
it
"only returns ldap cns to which the user has access"
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment