diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-27 06:53:57 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-27 06:53:57 +0000 |
| commit | 5d966ccd358df9c1f70b1f402b8148366ce18359 (patch) | |
| tree | 9396a5d1b3886f8b2b3454d6157cea182041867b | |
| parent | 23e2ec6bf28920aa55da1f0382b2a9a6eb27f412 (diff) | |
| parent | 7bf92b368fae70c835c729515f9dac1fb766c185 (diff) | |
| download | gitlab-ce-5d966ccd358df9c1f70b1f402b8148366ce18359.tar.gz | |
Merge branch 'ldap_check' into 'master'
gitlab:ldap:check uses LDAP user filter
| -rw-r--r-- | lib/tasks/gitlab/check.rake | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index 071760c0c36..3b9b2531bf7 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -677,7 +677,20 @@ namespace :gitlab do end def filter - Net::LDAP::Filter.present?(ldap_config.uid) + uid_filter = Net::LDAP::Filter.present?(ldap_config.uid) + if user_filter + Net::LDAP::Filter.join(uid_filter, user_filter) + else + uid_filter + end + end + + def user_filter + if ldap_config['user_filter'] && ldap_config.user_filter.present? + Net::LDAP::Filter.construct(ldap_config.user_filter) + else + nil + end end def ldap |