Commit 7bf92b368fae70c835c729515f9dac1fb766c185
1 parent
78a7a9b0
Exists in
spb-stable
and in
3 other branches
Ldap check recognize ldap user filter.
Showing
1 changed file
with
14 additions
and
1 deletions
Show diff stats
lib/tasks/gitlab/check.rake
| @@ -677,7 +677,20 @@ namespace :gitlab do | @@ -677,7 +677,20 @@ namespace :gitlab do | ||
| 677 | end | 677 | end |
| 678 | 678 | ||
| 679 | def filter | 679 | def filter |
| 680 | - Net::LDAP::Filter.present?(ldap_config.uid) | 680 | + uid_filter = Net::LDAP::Filter.present?(ldap_config.uid) |
| 681 | + if user_filter | ||
| 682 | + Net::LDAP::Filter.join(uid_filter, user_filter) | ||
| 683 | + else | ||
| 684 | + uid_filter | ||
| 685 | + end | ||
| 686 | + end | ||
| 687 | + | ||
| 688 | + def user_filter | ||
| 689 | + if ldap_config['user_filter'] && ldap_config.user_filter.present? | ||
| 690 | + Net::LDAP::Filter.construct(ldap_config.user_filter) | ||
| 691 | + else | ||
| 692 | + nil | ||
| 693 | + end | ||
| 681 | end | 694 | end |
| 682 | 695 | ||
| 683 | def ldap | 696 | def ldap |