Check for errors in Adapter#dn_matches_filter?

2bfa02bb · Jacob Vosmaer · 401cac62 · 2bfa02bb
Commit 2bfa02bb authored Mar 28, 2014 by Jacob Vosmaer
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

lib/gitlab/ldap/adapter.rb lib/gitlab/ldap/adapter.rb +6 -1

No files found.
--- a/lib/gitlab/ldap/adapter.rb
+++ b/lib/gitlab/ldap/adapter.rb
@@ -107,7 +107,12 @@ module Gitlab
      end

      def dn_matches_filter?(dn, filter)
-        ldap.search(base: dn, filter: filter, attributes: %w{dn}).any?
+        results = ldap.search(base: dn, filter: filter, attributes: %w{dn})
+        if results.nil?
+          false # Net::LDAP encountered an LDAP error
+        else
+          results.any?
+        end
      end

      private