Add helper to search entries by domain.

calavera · calavera · commit 5c13679d93ac · 2013-07-16T14:13:39.000-07:00
diff --git a/lib/github/ldap/domain.rb b/lib/github/ldap/domain.rb
@@ -36,9 +36,7 @@ def group_filter(group_names)
       def groups(group_names)
         filter = group_filter(group_names)
 
-        @connection.search(base: @base_name,
-          attributes: %w{ou cn dn sAMAccountName member},
-          filter: filter)
+        search(attributes: %w{ou cn dn sAMAccountName member}, filter: filter)
       end
 
       # List the groups that a user is member of.
@@ -51,9 +49,7 @@ def membership(user_dn, group_names)
         or_filters    = group_names.map {|g| Net::LDAP::Filter.eq("cn", g)}.reduce(:|)
         member_filter = Net::LDAP::Filter.eq("member", user_dn) & or_filters
 
-        @connection.search(base: @base_name,
-          attributes: %w{ou cn dn sAMAccountName member},
-          filter: member_filter)
+        search(attributes: %w{ou cn dn sAMAccountName member}, filter: member_filter)
       end
 
       # Check if the user is include in any of the configured groups.
@@ -103,6 +99,19 @@ def authenticate!(login, password, group_names = nil)
 
         return user if user && is_member?(user.dn, group_names)
       end
+
+      # Search entries using this domain as base.
+      #
+      # options: is a Hash with the options for the search.
+      # The base option is always overriden.
+      #
+      # Returns an array with the entries found.
+      # Returns nil if there are no entries.
+      def search(options)
+        options[:base] = @base_name
+
+        @connection.search(options)
+      end
     end
   end
 end
diff --git a/test/domain_test.rb b/test/domain_test.rb
@@ -87,5 +87,18 @@ def test_membership_groups_for_members
     assert_equal 1, groups.size
     assert_equal 'cn=Enterprise,ou=Group,dc=github,dc=com', groups.first.dn
   end
+
+  def test_search
+    assert 1, @domain.search(
+      attributes: %w(uid),
+      filter: Net::LDAP::Filter.eq('uid', 'calavera')).size
+  end
+
+  def test_search_override_base_name
+    assert 1, @domain.search(
+      base: "this base name is incorrect",
+      attributes: %w(uid),
+      filter: Net::LDAP::Filter.eq('uid', 'calavera')).size
+  end
 end
 
