Merge branch 'ldap_check' into 'master'

gitlab:ldap:check uses LDAP user filter

Merge branch 'ldap_check' into 'master'
gitlab:ldap:check uses LDAP user filter
Dmitriy Zaporozhets
2 parents 23e2ec6b 7bf92b36
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
     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
...	...	@@ -677,7 +677,20 @@ namespace :gitlab do
677	677	end
678	678
679	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	694	end
682	695
683	696	def ldap
...	...