Ldap check recognize ldap user filter.

2014-03-26 15:38:14 +01:00 · 2014-03-26 15:38:14 +01:00 · 7bf92b368f
parent 78a7a9b0be
commit 7bf92b368f
1 changed files with 14 additions and 1 deletions
--- 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