github-ldap 1.0.4 → 1.0.5

data/github-ldap.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "github-ldap"
-  spec.version       = "1.0.4"
+  spec.version       = "1.0.5"
   spec.authors       = ["David Calavera"]
   spec.email         = ["david.calavera@gmail.com"]
   spec.description   = %q{Ldap authentication for humans}

data/lib/github/ldap.rb

@@ -3,27 +3,25 @@ module GitHub
     require 'net/ldap'
     require 'github/ldap/domain'
 
+    attr_reader :connection
+
     def initialize(options = {})
       @uid = options[:uid] || "sAMAccountName"
 
-      @connection = Net::LDAP.new({
-        host: options[:host],
-        port: options[:port]
-      })
+      @connection = Net::LDAP.new({host: options[:host], port: options[:port]})
 
       @connection.authenticate(options[:admin_user], options[:admin_password])
 
-      if encryption = check_encryption(options[:encryptation])
+      if encryption = check_encryption(options[:encryption])
         @connection.encryption(encryption)
       end
     end
 
-    # Check the legacy auth configuration options (before David's war with omniauth)
-    # to determine whether to use encryptation or not.
+    # Determine whether to use encryption or not.
     #
-    # encryptation: is the encryptation method, either 'ssl', 'tls', 'simple_tls' or 'start_tls'.
+    # encryption: is the encryption method, either 'ssl', 'tls', 'simple_tls' or 'start_tls'.
     #
-    # Returns the real encryptation type.
+    # Returns the real encryption type.
     def check_encryption(encryption)
       return unless encryption
 
@@ -38,11 +36,19 @@ module GitHub
     # Utility method to check if the connection with the server can be stablished.
     # It tries to bind with the ldap auth default configuration.
     #
-    # Return true if the connection is successful.
-    # Return false if the authentication settings are not valid.
-    # Raises an Net::LDAP::LdapError if the connection fails.
+    # Returns an OpenStruct with `code` and `message`.
+    # If `code` is 0, the operation succeeded and there is no message.
     def test_connection
       @connection.bind
+      get_last_operation_result
+    end
+
+    # Utility method to get the last operation result with a human friendly message.
+    #
+    # Returns an OpenStruct with `code` and `message`.
+    # If `code` is 0, the operation succeeded and there is no message.
+    def get_last_operation_result
+      @connection.get_operation_result
     end
 
     # Creates a new domain object to perform operations

data/test/ldap_test.rb

@@ -21,11 +21,13 @@ class GitHubLdapTest < Minitest::Test
 
   def test_simple_tls
     assert_equal :simple_tls, @ldap.check_encryption(:ssl)
+    assert_equal :simple_tls, @ldap.check_encryption('SSL')
     assert_equal :simple_tls, @ldap.check_encryption(:simple_tls)
   end
 
   def test_start_tls
     assert_equal :start_tls, @ldap.check_encryption(:tls)
+    assert_equal :start_tls, @ldap.check_encryption('TLS')
     assert_equal :start_tls, @ldap.check_encryption(:start_tls)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: github-ldap
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors: