Merge pull request #96 from lildude/lildude/multiple-ldap-servers

Add support for passing a list of ldap servers

README.md

@@ -28,6 +28,7 @@ There are a few configuration options required to use this adapter:
 
 * host: is the host address where the ldap server lives.
 * port: is the port where the ldap server lives.
+* hosts: (optional) an enumerable of pairs of hosts and corresponding ports with which to attempt opening connections (default [[host, port]]). Overrides host and port if set.
 * encryption: is the encryption protocol, disabled by default. The valid options are `ssl` and `tls`.
 * uid: is the field name in the ldap server used to authenticate your users, in ActiveDirectory this is `sAMAccountName`.
 

lib/github/ldap.rb

@@ -61,6 +61,9 @@ class Ldap
     #
     # host: required string ldap server host address
     # port: required string or number ldap server port
+    # hosts: an enumerable of pairs of hosts and corresponding ports with
+    #   which to attempt opening connections (default [[host, port]]). Overrides
+    #   host and port if set.
     # encryption: optional string. `ssl` or `tls`. nil by default
     # admin_user: optional string ldap administrator user dn for authentication
     # admin_password: optional string ldap administrator user password
@@ -88,6 +91,7 @@ def initialize(options = {})
       @connection = Net::LDAP.new({
         host: options[:host],
         port: options[:port],
+        hosts: options[:hosts],
         instrumentation_service: options[:instrumentation_service]
       })
 

test/ldap_test.rb

@@ -9,6 +9,21 @@ def test_connection_with_default_options
     assert @ldap.test_connection, "Ldap connection expected to succeed"
   end
 
+  def test_connection_with_list_of_hosts_with_one_valid_host
+    ldap = GitHub::Ldap.new(options.merge(hosts: [["localhost", options[:port]]]))
+    assert ldap.test_connection, "Ldap connection expected to succeed"
+  end
+
+  def test_connection_with_list_of_hosts_with_first_valid
+    ldap = GitHub::Ldap.new(options.merge(hosts: [["localhost", options[:port]], ["invalid.local", options[:port]]]))
+    assert ldap.test_connection, "Ldap connection expected to succeed"
+  end
+
+  def test_connection_with_list_of_hosts_with_first_invalid
+    ldap = GitHub::Ldap.new(options.merge(hosts: [["invalid.local", options[:port]], ["localhost", options[:port]]]))
+    assert ldap.test_connection, "Ldap connection expected to succeed"
+  end
+
   def test_simple_tls
     assert_equal :simple_tls, @ldap.check_encryption(:ssl)
     assert_equal :simple_tls, @ldap.check_encryption('SSL')