Extract Simple method as AuthAdapter

Author: satoryu

lib/net/ldap/auth_adapter.rb

@@ -0,0 +1,25 @@
+module Net
+  class LDAP
+    class AuthAdapter
+      def self.regiseter(names, adapter)
+        names = Array(names)
+        @adapters ||= {}
+        names.each do |name|
+          @adapters[name] = adapter
+        end
+      end
+
+      def self.[](name)
+        @adapters[name]
+      end
+
+      def initialize(conn)
+        @connection = conn
+      end
+
+      def bind
+        raise "bind method must be overwritten"
+      end
+    end
+  end
+end

lib/net/ldap/auth_adapters/anon.rb

@@ -0,0 +1,3 @@
+require 'net/ldap/auth_adapters/simple'
+
+Net::LDAP::AuthAdapter.register(:anon, Net::LDAP::AuthAdapters::Simple)

lib/net/ldap/auth_adapters/anonymous.rb

@@ -0,0 +1,3 @@
+require 'net/ldap/auth_adapters/simple'
+
+Net::LDAP::AuthAdapter.register(:anonymous, Net::LDAP::AuthAdapters::Simple)

lib/net/ldap/auth_adapters/simple.rb

@@ -0,0 +1,34 @@
+module Net
+  class LDAP
+    module AuthAdapters
+      class Simple < AuthAdapter
+        def bind(auth)
+          user, psw = if auth[:method] == :simple
+                        [auth[:username] || auth[:dn], auth[:password]]
+                      else
+                        ["", ""]
+                      end
+
+          raise Net::LDAP::BindingInformationInvalidError, "Invalid binding information" unless (user && psw)
+
+          message_id = @connection.next_msgid
+          request    = [
+            LdapVersion.to_ber, user.to_ber,
+            psw.to_ber_contextspecific(0)
+          ].to_ber_appsequence(Net::LDAP::PDU::BindRequest)
+
+          @connection.write(request, nil, message_id)
+          pdu = @connection.queued_read(message_id)
+
+          if !pdu || pdu.app_tag != Net::LDAP::PDU::BindResult
+            raise Net::LDAP::NoBindResultError, "no bind result"
+          end
+
+          pdu
+        end
+      end
+    end
+  end
+end
+
+Net::LDAP::AuthAdapter.register(:simple, Net::LDAP::AuthAdapters::Simple)

lib/net/ldap/connection.rb

@@ -250,15 +250,18 @@ def next_msgid
   def bind(auth)
     instrument "bind.net_ldap_connection" do |payload|
       payload[:method] = meth = auth[:method]
-      if [:simple, :anonymous, :anon].include?(meth)
-        bind_simple auth
-      elsif meth == :sasl
-        bind_sasl(auth)
-      elsif meth == :gss_spnego
-        bind_gss_spnego(auth)
-      else
-        raise Net::LDAP::AuthMethodUnsupportedError, "Unsupported auth method (#{meth})"
-      end
+      require "net/ldap/auth_adapters/#{meth}"
+      adapter = Net::LDAP::AuthAdapterp[meth]
+      adapter.bind(auth)
+      # if [:simple, :anonymous, :anon].include?(meth)
+      #   bind_simple auth
+      # elsif meth == :sasl
+      #   bind_sasl(auth)
+      # elsif meth == :gss_spnego
+      #   bind_gss_spnego(auth)
+      # else
+      #   raise Net::LDAP::AuthMethodUnsupportedError, "Unsupported auth method (#{meth})"
+      # end
     end
   end