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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
d3056feb
Commit
d3056feb
authored
Oct 14, 2014
by
Jan-Willem van der Meer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make sure the filters are applied
parent
b229b0f0
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
8 deletions
+9
-8
lib/gitlab/ldap/authentication.rb
lib/gitlab/ldap/authentication.rb
+9
-8
No files found.
lib/gitlab/ldap/authentication.rb
View file @
d3056feb
...
@@ -48,15 +48,16 @@ module Gitlab
...
@@ -48,15 +48,16 @@ module Gitlab
end
end
def
user_filter
(
login
)
def
user_filter
(
login
)
Net
::
LDAP
::
Filter
.
eq
(
config
.
uid
,
login
).
tap
do
|
filter
|
filter
=
Net
::
LDAP
::
Filter
.
eq
(
config
.
uid
,
login
)
# Apply LDAP user filter if present
# Apply LDAP user filter if present
if
config
.
user_filter
.
present?
if
config
.
user_filter
.
present?
Net
::
LDAP
::
Filter
.
join
(
filter
=
Net
::
LDAP
::
Filter
.
join
(
filter
,
filter
,
Net
::
LDAP
::
Filter
.
construct
(
config
.
user_filter
)
Net
::
LDAP
::
Filter
.
construct
(
config
.
user_filter
)
)
)
end
end
end
filter
end
end
def
user
def
user
...
...
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