Fix a bug in custom authentication

lib/casserver/server.rb

@@ -189,35 +189,21 @@ def self.init_authenticators!
         exit 1
       end
 
-      begin
-        # attempt to instantiate the authenticator
-        config[:authenticator] = [config[:authenticator]] unless config[:authenticator].instance_of? Array
-        config[:authenticator].each { |authenticator| auth << authenticator[:class].constantize}
-      rescue NameError
-        if config[:authenticator].instance_of? Array
-          config[:authenticator].each do |authenticator|
-            if !authenticator[:source].nil?
-              # config.yml explicitly names source file
-              require authenticator[:source]
-            else
-              # the authenticator class hasn't yet been loaded, so lets try to load it from the casserver/authenticators directory
-              auth_rb = authenticator[:class].underscore.gsub('cas_server/', '')
-              require 'casserver/'+auth_rb
-            end
-            auth << authenticator[:class].constantize
-          end
-        else
-          if config[:authenticator][:source]
+      # attempt to instantiate the authenticator
+      config[:authenticator] = [config[:authenticator]] unless config[:authenticator].instance_of? Array
+      config[:authenticator].each do |authenticator|
+        begin
+          auth << authenticator[:class].constantize
+        rescue NameError
+          if !authenticator[:source].nil?
             # config.yml explicitly names source file
-            require config[:authenticator][:source]
+            require authenticator[:source]
           else
             # the authenticator class hasn't yet been loaded, so lets try to load it from the casserver/authenticators directory
-            auth_rb = config[:authenticator][:class].underscore.gsub('cas_server/', '')
+            auth_rb = authenticator[:class].underscore.gsub('cas_server/', '')
             require 'casserver/'+auth_rb
           end
-
-          auth << config[:authenticator][:class].constantize
-          config[:authenticator] = [config[:authenticator]]
+          auth << authenticator[:class].constantize
         end
       end
 

spec/authenticators/custom_auth.rb

@@ -0,0 +1,2 @@
+class CASServer::Authenticators::CustomAuth < CASServer::Authenticators::Test
+end

spec/casserver/authenticators/active_resource_spec.rb

@@ -64,7 +64,7 @@
 
       def mock_authenticate identity = nil
         identity = CASServer::Authenticators::Helpers::Identity.new if identity.nil?
-        CASServer::Authenticators::Helpers::Identity.stub!(:authenticate).and_return(identity)
+        CASServer::Authenticators::Helpers::Identity.stub(:authenticate).and_return(identity)
       end
 
       def sample_identity attrs = {}
@@ -87,7 +87,7 @@ def sample_identity attrs = {}
       end
 
       it "should return false when http raises" do
-        CASServer::Authenticators::Helpers::Identity.stub!(:authenticate).and_raise(ActiveResource::ForbiddenAccess.new({}))
+        CASServer::Authenticators::Helpers::Identity.stub(:authenticate).and_raise(ActiveResource::ForbiddenAccess.new({}))
         auth.validate(credentials).should be_false
       end
 

spec/casserver/authenticators/ldap_spec.rb

@@ -11,18 +11,18 @@
     # Trigger autoload to load net ldap
     CASServer::Authenticators::LDAP
 
-    @ldap_entry = mock(Net::LDAP::Entry.new)
-    @ldap_entry.stub!(:[]).and_return("Test")
-
-    @ldap = mock(Net::LDAP)
-    @ldap.stub!(:host=)
-    @ldap.stub!(:port=)
-    @ldap.stub!(:encryption)
-    @ldap.stub!(:bind_as).and_return(true)
-    @ldap.stub!(:authenticate).and_return(true)
-    @ldap.stub!(:search).and_return([@ldap_entry])
-
-    Net::LDAP.stub!(:new).and_return(@ldap)
+    @ldap_entry = double(Net::LDAP::Entry.new)
+    @ldap_entry.stub(:[]).and_return("Test")
+
+    @ldap = double(Net::LDAP)
+    @ldap.stub(:host=)
+    @ldap.stub(:port=)
+    @ldap.stub(:encryption)
+    @ldap.stub(:bind_as).and_return(true)
+    @ldap.stub(:authenticate).and_return(true)
+    @ldap.stub(:search).and_return([@ldap_entry])
+
+    Net::LDAP.stub(:new).and_return(@ldap)
   end
 
   describe '#validate' do

spec/casserver_spec.rb

@@ -139,6 +139,21 @@
       visit "/test/logout"
       page.status_code.should_not == 404
     end
+    it "should load custom authenticator" do
+      load_server("alt_config")
+      app.auth.length.should == 2
+      app.auth.should include CASServer::Authenticators::Test
+      app.auth.should include CASServer::Authenticators::CustomAuth
+    end
+    it "login with custom authenticator" do
+      load_server("alt_config")
+      reset_spec_database
+      visit "/login"
+      fill_in 'username', :with => VALID_USERNAME
+      fill_in 'password', :with => "custom_password"
+      click_button 'login-submit'
+      page.should have_content("You have successfully logged in")
+    end
   end
 
   describe 'validation' do

spec/config/alt_config.yml

@@ -20,8 +20,13 @@ disable_auto_migrations: true
 quiet: true
 
 authenticator:
-  class: CASServer::Authenticators::Test
-  password: spec_password
+  -
+    class: CASServer::Authenticators::Test
+    password: spec_password
+  -
+    class: CASServer::Authenticators::CustomAuth
+    source: authenticators/custom_auth.rb
+    password: custom_password
 
 theme: simple