authlogic 3.4.3 → 3.4.4

data/test/acts_as_authentic_test/persistence_token_test.rb

@@ -8,25 +8,26 @@ module ActsAsAuthenticTest
       ben.password = "newpass"
       assert_not_equal old_persistence_token, ben.persistence_token
     end
-    
+
     def test_after_password_verification_reset_persistence_token
-      ben = users(:ben)
-      old_persistence_token = ben.persistence_token
-      assert ben.valid_password?(password_for(ben))
-      assert_equal old_persistence_token, ben.persistence_token
-      
+      aaron = users(:aaron)
+      old_persistence_token = aaron.persistence_token
+
+      assert aaron.valid_password?(password_for(aaron))
+      assert_equal old_persistence_token, aaron.reload.persistence_token
+
       # only update it if it is nil
-      assert ben.update_attribute(:persistence_token, nil)
-      assert ben.valid_password?(password_for(ben))
-      assert_not_equal old_persistence_token, ben.persistence_token
+      assert aaron.update_attribute(:persistence_token, nil)
+      assert aaron.valid_password?(password_for(aaron))
+      assert_not_equal old_persistence_token, aaron.persistence_token
     end
-    
+
     def test_before_validate_reset_persistence_token
       u = User.new
       assert !u.valid?
       assert_not_nil u.persistence_token
     end
-    
+
     def test_forget_all
       http_basic_auth_for(users(:ben)) { UserSession.find }
       http_basic_auth_for(users(:zack)) { UserSession.find(:ziggity_zack) }
@@ -36,7 +37,7 @@ module ActsAsAuthenticTest
       assert !UserSession.find
       assert !UserSession.find(:ziggity_zack)
     end
-    
+
     def test_forget
       ben = users(:ben)
       zack = users(:zack)
@@ -52,4 +53,4 @@ module ActsAsAuthenticTest
       assert UserSession.find(:ziggity_zack)
     end
   end
-end
+end

data/test/acts_as_authentic_test/restful_authentication_test.rb

@@ -5,7 +5,7 @@ module ActsAsAuthenticTest
     def test_act_like_restful_authentication_config
       assert !User.act_like_restful_authentication
       assert !Employee.act_like_restful_authentication
-  
+
       User.act_like_restful_authentication = true
       assert User.act_like_restful_authentication
       assert_equal Authlogic::CryptoProviders::Sha1, User.crypto_provider
@@ -15,7 +15,7 @@ module ActsAsAuthenticTest
 
       User.act_like_restful_authentication false
       assert !User.act_like_restful_authentication
-  
+
       User.crypto_provider = Authlogic::CryptoProviders::Sha512
       User.transition_from_crypto_providers = []
     end
@@ -23,18 +23,15 @@ module ActsAsAuthenticTest
     def test_transition_from_restful_authentication_config
       assert !User.transition_from_restful_authentication
       assert !Employee.transition_from_restful_authentication
-      
+
       User.transition_from_restful_authentication = true
       assert User.transition_from_restful_authentication
       assert defined?(::REST_AUTH_SITE_KEY)
       assert_equal '', ::REST_AUTH_SITE_KEY
       assert_equal 1, Authlogic::CryptoProviders::Sha1.stretches
-  
+
       User.transition_from_restful_authentication false
       assert !User.transition_from_restful_authentication
-  
-      User.crypto_provider = Authlogic::CryptoProviders::Sha512
-      User.transition_from_crypto_providers = []
     end
   end
-end
+end

data/test/config_test.rb

@@ -0,0 +1,36 @@
+require 'test_helper'
+
+class ConfigTest < ActiveSupport::TestCase
+  def setup
+    @klass = Class.new {
+      extend Authlogic::Config
+
+      def self.foobar(value = nil)
+        rw_config(:foobar_field, value, 'default_foobar')
+      end
+    }
+
+    @subklass = Class.new(@klass)
+  end
+
+  def test_config
+    assert_equal({}, @klass.acts_as_authentic_config)
+  end
+
+  def test_rw_config_read_with_default
+    assert 'default_foobar', @klass.foobar
+  end
+
+  def test_rw_config_write
+    assert_equal 'my_foobar', @klass.foobar('my_foobar')
+    assert_equal 'my_foobar', @klass.foobar
+
+    assert_equal 'my_new_foobar', @klass.foobar('my_new_foobar')
+    assert_equal 'my_new_foobar', @klass.foobar
+  end
+
+  def test_subclass_rw_config_write
+    assert_equal 'subklass_foobar', @subklass.foobar('subklass_foobar')
+    assert_equal 'default_foobar', @klass.foobar
+  end
+end

data/test/fixtures/users.yml

@@ -1,3 +1,8 @@
+# NB :ben and :zack use the legacy crypto provider (Sha512) ... when they're
+# tested for valid_password?() it will transition their password
+# (re: test/libs/user.rb). This could have unintended side-effects (like auto-
+# resetting their persistence token when checking password) -- one solution
+# is to just switch in users(:aaron) for those tests.
 ben:
   company: binary_logic
   projects: web_services
@@ -10,7 +15,7 @@ ben:
   email: bjohnson@binarylogic.com
   first_name: Ben
   last_name: Johnson
-  
+
 zack:
   company: logic_over_data
   projects: web_services
@@ -28,7 +33,7 @@ aaron:
   projects: web_services
   login: abedra
   crypted_password: <%= Authlogic::CryptoProviders::SCrypt.encrypt("aaronrocks") %>
-  persistence_token: 6cde0674657a8a313ce952df979de2830309aa4c11ca65805dd00bfdc65dbcc2f5e36718660a1d2e68c1a08c276d996763985d2f06fd3d076eb7bc4d97b1e317
+  persistence_token: e3d853f5aa0dacac5c257d03c4e097a3a7f51b182a8fc4f62096d05e939b019855aff0290157ac854e4195f13284ff5223f1996d0fd073e7e360171de54db278
   single_access_token: <%= Authlogic::Random.friendly_token %>
   perishable_token: <%= Authlogic::Random.friendly_token %>
   email: abedra@cigital.com

data/test/gemfiles/Gemfile.rails-4.2.x

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+gemspec :path => "./../.."
+
+gem "activerecord", "~> 4.2.0"
+gem "activesupport", "~> 4.2.0"
+gem 'activerecord-jdbcsqlite3-adapter', :platforms => :jruby
+gem 'sqlite3', :platforms => :ruby

data/test/libs/user.rb

@@ -1,5 +1,7 @@
 class User < ActiveRecord::Base
-  acts_as_authentic
+  acts_as_authentic do |c|
+    c.transition_from_crypto_providers Authlogic::CryptoProviders::Sha512
+  end
   belongs_to :company
   has_and_belongs_to_many :projects
-end
+end

data/test/libs/user_session.rb

@@ -3,3 +3,23 @@ end
 
 class BackOfficeUserSession < Authlogic::Session::Base
 end
+
+class WackyUserSession < Authlogic::Session::Base
+  attr_accessor :counter
+  authenticate_with User
+
+  def initialize
+    @counter = 0
+    super
+  end
+
+  def persist_by_false
+    self.counter += 1
+    return false
+  end
+
+  def persist_by_true
+    self.counter += 1
+    return true
+  end
+end

data/test/session_test/active_record_trickery_test.rb

@@ -7,11 +7,11 @@ module SessionTest
         assert_equal "Some attribute", UserSession.human_attribute_name("some_attribute")
         assert_equal "Some attribute", UserSession.human_attribute_name(:some_attribute)
       end
-    
+
       def test_human_name
         assert_equal "Usersession", UserSession.human_name
       end
-    
+
       def test_i18n_of_human_name
         I18n.backend.store_translations 'en', :authlogic => {:models => {:user_session => "MySession" } }
         assert_equal "MySession", UserSession.human_name
@@ -21,8 +21,14 @@ module SessionTest
         I18n.backend.store_translations 'en', :authlogic => {:models => {:user_session => "MySession" } }
         assert_equal "MySession", UserSession.model_name.human
       end
+
+      def test_model_name
+        assert_equal "UserSession", UserSession.model_name.name
+        assert_equal "user_session", UserSession.model_name.singular
+        assert_equal "user_sessions", UserSession.model_name.plural
+      end
     end
-    
+
     class InstanceMethodsTest < ActiveSupport::TestCase
       def test_new_record
         session = UserSession.new
@@ -49,7 +55,7 @@ module SessionTest
         session.destroy
         assert ! session.persisted?
       end
-      
+
       def test_destroyed?
         session = UserSession.create(users(:ben))
         assert ! session.destroyed?

data/test/session_test/brute_force_protection_test.rb

@@ -6,20 +6,20 @@ module SessionTest
       def test_consecutive_failed_logins_limit
         UserSession.consecutive_failed_logins_limit = 10
         assert_equal 10, UserSession.consecutive_failed_logins_limit
-    
+
         UserSession.consecutive_failed_logins_limit 50
         assert_equal 50, UserSession.consecutive_failed_logins_limit
       end
-      
+
       def test_failed_login_ban_for
         UserSession.failed_login_ban_for = 10
         assert_equal 10, UserSession.failed_login_ban_for
-    
+
         UserSession.failed_login_ban_for 2.hours
         assert_equal 2.hours.to_i, UserSession.failed_login_ban_for
       end
     end
-    
+
     class InstanceMethodsTest < ActiveSupport::TestCase
       def test_under_limit
         ben = users(:ben)
@@ -34,46 +34,48 @@ module SessionTest
         assert ben.save
         assert UserSession.create(:login => ben.login, :password => "benrocks").new_session?
         assert UserSession.create(ben).new_session?
+
+        ben.reload
         ben.updated_at = (UserSession.failed_login_ban_for + 2.hours.to_i).seconds.ago
         assert !UserSession.create(ben).new_session?
       end
-    
+
       def test_exceeding_failed_logins_limit
         UserSession.consecutive_failed_logins_limit = 2
         ben = users(:ben)
-      
+
         2.times do |i|
           session = UserSession.new(:login => ben.login, :password => "badpassword1")
           assert !session.save
           assert session.errors[:password].size > 0
           assert_equal i + 1, ben.reload.failed_login_count
         end
-        
+
         session = UserSession.new(:login => ben.login, :password => "badpassword2")
         assert !session.save
         assert session.errors[:password].size == 0
         assert_equal 3, ben.reload.failed_login_count
-      
+
         UserSession.consecutive_failed_logins_limit = 50
       end
-      
+
       def test_exceeded_ban_for
         UserSession.consecutive_failed_logins_limit = 2
         UserSession.generalize_credentials_error_messages true
         ben = users(:ben)
-      
+
         2.times do |i|
           session = UserSession.new(:login => ben.login, :password => "badpassword1")
           assert !session.save
           assert session.invalid_password?
           assert_equal i + 1, ben.reload.failed_login_count
         end
-        
+
         ActiveRecord::Base.connection.execute("update users set updated_at = '#{1.day.ago.to_s(:db)}' where login = '#{ben.login}'")
         session = UserSession.new(:login => ben.login, :password => "benrocks")
         assert session.save
         assert_equal 0, ben.reload.failed_login_count
-      
+
         UserSession.consecutive_failed_logins_limit = 50
         UserSession.generalize_credentials_error_messages false
       end
@@ -81,21 +83,21 @@ module SessionTest
       def test_exceeded_ban_and_failed_doesnt_ban_again
         UserSession.consecutive_failed_logins_limit = 2
         ben = users(:ben)
-      
+
         2.times do |i|
           session = UserSession.new(:login => ben.login, :password => "badpassword1")
           assert !session.save
           assert session.errors[:password].size > 0
           assert_equal i + 1, ben.reload.failed_login_count
         end
-        
+
         ActiveRecord::Base.connection.execute("update users set updated_at = '#{1.day.ago.to_s(:db)}' where login = '#{ben.login}'")
         session = UserSession.new(:login => ben.login, :password => "badpassword1")
         assert !session.save
         assert_equal 1, ben.reload.failed_login_count
-      
+
         UserSession.consecutive_failed_logins_limit = 50
       end
     end
   end
-end
+end

data/test/session_test/callbacks_test.rb

@@ -1,31 +1,11 @@
 require 'test_helper'
 
-class WackyUserSession < Authlogic::Session::Base
-  attr_accessor :counter
-  authenticate_with User
-
-  def initialize
-    @counter = 0
-    super
-  end
-
-  def persist_by_false
-    self.counter += 1
-    return false
-  end
-
-  def persist_by_true
-    self.counter += 1
-    return true
-  end
-end
-
 module SessionTest
   class CallbacksTest < ActiveSupport::TestCase
     def setup
      WackyUserSession.reset_callbacks(:persist)
     end
-    
+
     def test_no_callbacks
       assert_equal [], WackyUserSession._persist_callbacks.map(&:filter)
       session = WackyUserSession.new
@@ -36,19 +16,19 @@ module SessionTest
     def test_true_callback_cancelling_later_callbacks
       WackyUserSession.persist :persist_by_true, :persist_by_false
       assert_equal [:persist_by_true, :persist_by_false], WackyUserSession._persist_callbacks.map(&:filter)
-  
+
       session = WackyUserSession.new
       session.send(:persist)
       assert_equal 1, session.counter
     end
-  
+
     def test_false_callback_continuing_to_later_callbacks
       WackyUserSession.persist :persist_by_false, :persist_by_true
       assert_equal [:persist_by_false, :persist_by_true], WackyUserSession._persist_callbacks.map(&:filter)
-  
+
       session = WackyUserSession.new
       session.send(:persist)
       assert_equal 2, session.counter
     end
   end
-end
+end

data/test/session_test/foundation_test.rb

@@ -0,0 +1,6 @@
+require 'test_helper'
+
+module SessionTest
+  class FoundationTest < ActiveSupport::TestCase
+  end
+end

data/test/session_test/http_auth_test.rb

@@ -6,7 +6,7 @@ module SessionTest
       def test_allow_http_basic_auth
         UserSession.allow_http_basic_auth = false
         assert_equal false, UserSession.allow_http_basic_auth
-    
+
         UserSession.allow_http_basic_auth true
         assert_equal true, UserSession.allow_http_basic_auth
       end
@@ -20,34 +20,36 @@ module SessionTest
       end
 
       def test_http_basic_auth_realm
+        original_http_basic_auth_realm = UserSession.http_basic_auth_realm
+
         assert_equal 'Application', UserSession.http_basic_auth_realm
 
         UserSession.http_basic_auth_realm = 'TestRealm'
         assert_equal 'TestRealm', UserSession.http_basic_auth_realm
       end
     end
-    
+
     class InstanceMethodsTest < ActiveSupport::TestCase
       def test_persist_persist_by_http_auth
-        ben = users(:ben)
+        aaron = users(:aaron)
         http_basic_auth_for do
           assert !UserSession.find
         end
-        http_basic_auth_for(ben) do
+        http_basic_auth_for(aaron) do
           assert session = UserSession.find
-          assert_equal ben, session.record
-          assert_equal ben.login, session.login
-          assert_equal "benrocks", session.send(:protected_password)
+          assert_equal aaron, session.record
+          assert_equal aaron.login, session.login
+          assert_equal "aaronrocks", session.send(:protected_password)
           assert !controller.http_auth_requested?
         end
         unset_session
         UserSession.request_http_basic_auth = true
         UserSession.http_basic_auth_realm = 'PersistTestRealm'
-        http_basic_auth_for(ben) do
+        http_basic_auth_for(aaron) do
           assert session = UserSession.find
-          assert_equal ben, session.record
-          assert_equal ben.login, session.login
-          assert_equal "benrocks", session.send(:protected_password)
+          assert_equal aaron, session.record
+          assert_equal aaron.login, session.login
+          assert_equal "aaronrocks", session.send(:protected_password)
           assert_equal 'PersistTestRealm', controller.realm
           assert controller.http_auth_requested?
         end