authlogic 3.8.0 → 4.5.0

data/test/acts_as_authentic_test/restful_authentication_test.rb

@@ -1,7 +1,18 @@
-require 'test_helper'
+# frozen_string_literal: true
+
+require "test_helper"
 
 module ActsAsAuthenticTest
   class RestfulAuthenticationTest < ActiveSupport::TestCase
+    def setup
+      @old_deprecation_behavior = ::ActiveSupport::Deprecation.behavior
+      ::ActiveSupport::Deprecation.behavior = :silence
+    end
+
+    def teardown
+      ::ActiveSupport::Deprecation.behavior = @old_deprecation_behavior
+    end
+
     def test_act_like_restful_authentication_config
       refute User.act_like_restful_authentication
       refute Employee.act_like_restful_authentication
@@ -10,7 +21,7 @@ module ActsAsAuthenticTest
       assert User.act_like_restful_authentication
       assert_equal Authlogic::CryptoProviders::Sha1, User.crypto_provider
       assert defined?(::REST_AUTH_SITE_KEY)
-      assert_equal '', ::REST_AUTH_SITE_KEY
+      assert_equal "", ::REST_AUTH_SITE_KEY
       assert_equal 1, Authlogic::CryptoProviders::Sha1.stretches
 
       User.act_like_restful_authentication false
@@ -27,7 +38,7 @@ module ActsAsAuthenticTest
       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 "", ::REST_AUTH_SITE_KEY
       assert_equal 1, Authlogic::CryptoProviders::Sha1.stretches
 
       User.transition_from_restful_authentication false

data/test/acts_as_authentic_test/session_maintenance_test.rb

@@ -1,24 +1,62 @@
-require 'test_helper'
+# frozen_string_literal: true
+
+require "test_helper"
 
 module ActsAsAuthenticTest
   class SessionMaintenanceTest < ActiveSupport::TestCase
-    def test_maintain_sessions_config
-      assert User.maintain_sessions
-      User.maintain_sessions = false
-      refute User.maintain_sessions
-      User.maintain_sessions true
-      assert User.maintain_sessions
+    def setup
+      User.log_in_after_create = true
+      User.log_in_after_password_change = true
+    end
+
+    def test_log_in_after_create_config
+      assert User.log_in_after_create
+      User.log_in_after_create = false
+      refute User.log_in_after_create
+      User.log_in_after_create = true
+      assert User.log_in_after_create
+    end
+
+    def test_log_in_after_password_change_config
+      assert User.log_in_after_password_change
+      User.log_in_after_password_change = false
+      refute User.log_in_after_password_change
+      User.log_in_after_password_change = true
+      assert User.log_in_after_password_change
     end
 
     def test_login_after_create
+      User.log_in_after_create = true
       user = User.create(
-        :login => "awesome",
-        :password => "saweeeet",
-        :password_confirmation => "saweeeet",
-        :email => "awesome@awesome.com"
+        login: "awesome",
+        password: "saweeeet",
+        password_confirmation: "saweeeet",
+        email: "awesome@awesome.com"
       )
       assert user.persisted?
       assert UserSession.find
+      logged_in_user = UserSession.find.user
+      assert_equal logged_in_user, user
+    end
+
+    def test_no_login_after_create
+      old_user = User.create(
+        login: "awesome",
+        password: "saweeeet",
+        password_confirmation: "saweeeet",
+        email: "awesome@awesome.com"
+      )
+      User.log_in_after_create = false
+      user2 = User.create(
+        login: "awesome2",
+        password: "saweeeet2",
+        password_confirmation: "saweeeet2",
+        email: "awesome2@awesome.com"
+      )
+      assert user2.persisted?
+      logged_in_user = UserSession.find.user
+      assert_not_equal logged_in_user, user2
+      assert_equal logged_in_user, old_user
     end
 
     def test_updating_session_with_failed_magic_state
@@ -30,6 +68,7 @@ module ActsAsAuthenticTest
     end
 
     def test_update_session_after_password_modify
+      User.log_in_after_password_change = true
       ben = users(:ben)
       UserSession.create(ben)
       old_session_key = controller.session["user_credentials"]
@@ -43,6 +82,21 @@ module ActsAsAuthenticTest
       assert_not_equal controller.cookies["user_credentials"], old_cookie_key
     end
 
+    def test_no_update_session_after_password_modify
+      User.log_in_after_password_change = false
+      ben = users(:ben)
+      UserSession.create(ben)
+      old_session_key = controller.session["user_credentials"]
+      old_cookie_key = controller.cookies["user_credentials"]
+      ben.password = "newpasswd"
+      ben.password_confirmation = "newpasswd"
+      assert ben.save
+      assert controller.session["user_credentials"]
+      assert controller.cookies["user_credentials"]
+      assert_equal controller.session["user_credentials"], old_session_key
+      assert_equal controller.cookies["user_credentials"], old_cookie_key
+    end
+
     def test_no_session_update_after_modify
       ben = users(:ben)
       UserSession.create(ben)
@@ -60,10 +114,10 @@ module ActsAsAuthenticTest
       old_session_key = controller.session["user_credentials"]
       old_cookie_key = controller.cookies["user_credentials"]
       user = User.create(
-        :login => "awesome",
-        :password => "saweet", # Password is too short, user invalid
-        :password_confirmation => "saweet",
-        :email => "awesome@saweet.com"
+        login: "awesome",
+        password: "saweet", # Password is too short, user invalid
+        password_confirmation: "saweet",
+        email: "awesome@saweet.com"
       )
       refute user.persisted?
       assert_equal controller.session["user_credentials"], old_session_key

data/test/acts_as_authentic_test/single_access_test.rb

@@ -1,4 +1,6 @@
-require 'test_helper'
+# frozen_string_literal: true
+
+require "test_helper"
 
 module ActsAsAuthenticTest
   class SingleAccessTest < ActiveSupport::TestCase

data/test/adapter_test.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+module Authlogic
+  module ControllerAdapters
+    class AbstractAdapterTest < ActiveSupport::TestCase
+      def test_controller
+        controller = Class.new(MockController) do
+          def controller.an_arbitrary_method
+            "bar"
+          end
+        end.new
+        adapter = Authlogic::ControllerAdapters::AbstractAdapter.new(controller)
+
+        assert_equal controller, adapter.controller
+        assert controller.params.equal?(adapter.params)
+        assert adapter.respond_to?(:an_arbitrary_method)
+        assert_equal "bar", adapter.an_arbitrary_method
+      end
+    end
+  end
+end

data/test/authenticates_many_test.rb

@@ -1,4 +1,6 @@
-require 'test_helper'
+# frozen_string_literal: true
+
+require "test_helper"
 
 class AuthenticatesManyTest < ActiveSupport::TestCase
   def test_employee_sessions

data/test/config_test.rb

@@ -1,4 +1,6 @@
-require 'test_helper'
+# frozen_string_literal: true
+
+require "test_helper"
 
 class ConfigTest < ActiveSupport::TestCase
   def setup
@@ -6,7 +8,7 @@ class ConfigTest < ActiveSupport::TestCase
       extend Authlogic::Config
 
       def self.foobar(value = nil)
-        rw_config(:foobar_field, value, 'default_foobar')
+        rw_config(:foobar_field, value, "default_foobar")
       end
     }
 
@@ -18,19 +20,19 @@ class ConfigTest < ActiveSupport::TestCase
   end
 
   def test_rw_config_read_with_default
-    assert 'default_foobar', @klass.foobar
+    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_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
+    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
+    assert_equal "subklass_foobar", @subklass.foobar("subklass_foobar")
+    assert_equal "default_foobar", @klass.foobar
   end
 end

data/test/crypto_provider_test/aes256_test.rb

@@ -1,4 +1,6 @@
-require 'test_helper'
+# frozen_string_literal: true
+
+require "test_helper"
 
 module CryptoProviderTest
   class AES256Test < ActiveSupport::TestCase

data/test/crypto_provider_test/bcrypt_test.rb

@@ -1,4 +1,6 @@
-require 'test_helper'
+# frozen_string_literal: true
+
+require "test_helper"
 
 module CryptoProviderTest
   class BCryptTest < ActiveSupport::TestCase

data/test/crypto_provider_test/scrypt_test.rb

@@ -1,4 +1,6 @@
-require 'test_helper'
+# frozen_string_literal: true
+
+require "test_helper"
 
 module CryptoProviderTest
   class SCryptTest < ActiveSupport::TestCase

data/test/crypto_provider_test/sha1_test.rb

@@ -1,4 +1,6 @@
-require 'test_helper'
+# frozen_string_literal: true
+
+require "test_helper"
 
 module CryptoProviderTest
   class Sha1Test < ActiveSupport::TestCase

data/test/crypto_provider_test/sha256_test.rb

@@ -1,4 +1,6 @@
-require 'test_helper'
+# frozen_string_literal: true
+
+require "test_helper"
 
 module CryptoProviderTest
   class Sha256Test < ActiveSupport::TestCase

data/test/crypto_provider_test/sha512_test.rb

@@ -1,4 +1,6 @@
-require 'test_helper'
+# frozen_string_literal: true
+
+require "test_helper"
 
 module CryptoProviderTest
   class Sha512Test < ActiveSupport::TestCase

data/test/crypto_provider_test/wordpress_test.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+::ActiveSupport::Deprecation.silence do
+  require "authlogic/crypto_providers/wordpress"
+end
+
+module CryptoProviderTest
+  class WordpressTest < ActiveSupport::TestCase
+    def test_matches
+      plain = "banana"
+      salt = "aaa"
+      crypted = "xxx0nope"
+      # I couldn't figure out how to even execute this method without it
+      # crashing. Maybe, when Jeffry wrote it in 2009, `Digest::MD5.digest`
+      # worked differently. He was probably using ruby 1.9 back then.
+      # Given that I can't even figure out how to run it, and for all the other
+      # reasons I've given in `wordpress.rb`, I'm just going to deprecate
+      # the whole file. -Jared 2018-04-09
+      assert_raises(NoMethodError) {
+        Authlogic::CryptoProviders::Wordpress.matches?(crypted, plain, salt)
+      }
+    end
+  end
+end

data/test/fixtures/companies.yml

@@ -1,5 +1,5 @@
 binary_logic:
   name: Binary Logic
-  
+
 logic_over_data:
-  name: Logic Over Data
+  name: Logic Over Data

data/test/fixtures/employees.yml

@@ -6,7 +6,7 @@ drew:
   persistence_token: 5273d85ed156e9dbd6a7c1438d319ef8c8d41dd24368db6c222de11346c7b11e53ee08d45ecf619b1c1dc91233d22b372482b751b066d0a6f6f9bac42eacaabf
   first_name: Drew
   last_name: Gainor
-  
+
 jennifer:
   company: logic_over_data
   email: jjohnson@logicoverdata.com

data/test/i18n_test.rb

@@ -1,4 +1,6 @@
-require 'test_helper'
+# frozen_string_literal: true
+
+require "test_helper"
 
 class I18nTest < ActiveSupport::TestCase
   def test_uses_authlogic_as_scope_by_default
@@ -6,8 +8,8 @@ class I18nTest < ActiveSupport::TestCase
   end
 
   def test_can_set_scope
-    assert_nothing_raised { Authlogic::I18n.scope = [:a, :b] }
-    assert_equal [:a, :b], Authlogic::I18n.scope
+    assert_nothing_raised { Authlogic::I18n.scope = %i[a b] }
+    assert_equal %i[a b], Authlogic::I18n.scope
     Authlogic::I18n.scope = :authlogic
   end
 
@@ -20,7 +22,7 @@ class I18nTest < ActiveSupport::TestCase
 
     assert_nothing_raised do
       Authlogic::I18n.translator = Class.new do
-        def translate(key, options = {})
+        def translate(key, _options = {})
           "Translated: #{key}"
         end
       end.new

data/test/libs/affiliate.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Affiliate < ActiveRecord::Base
   acts_as_authentic do |c|
     c.crypted_password_field = :pw_hash

data/test/libs/company.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 class Company < ActiveRecord::Base
   authenticates_many :employee_sessions
   authenticates_many :user_sessions, scope_cookies: true
-  has_many :employees, :dependent => :destroy
-  has_many :users, :dependent => :destroy
+  has_many :employees, dependent: :destroy
+  has_many :users, dependent: :destroy
 end

data/test/libs/employee.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Employee < ActiveRecord::Base
   acts_as_authentic do |c|
     c.crypto_provider Authlogic::CryptoProviders::AES256

data/test/libs/employee_session.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class EmployeeSession < Authlogic::Session::Base
 end

data/test/libs/ldaper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Ldaper < ActiveRecord::Base
   acts_as_authentic
 end

data/test/libs/project.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Project < ActiveRecord::Base
   has_and_belongs_to_many :users
 end

data/test/libs/user.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class User < ActiveRecord::Base
   acts_as_authentic do |c|
     c.transition_from_crypto_providers Authlogic::CryptoProviders::Sha512

data/test/libs/user_session.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class UserSession < Authlogic::Session::Base
 end
 
@@ -15,11 +17,11 @@ class WackyUserSession < Authlogic::Session::Base
 
   def persist_by_false
     self.counter += 1
-    return false
+    false
   end
 
   def persist_by_true
     self.counter += 1
-    return true
+    true
   end
 end

data/test/random_test.rb

@@ -1,43 +1,15 @@
-require 'test_helper'
+# frozen_string_literal: true
+
+require "test_helper"
 
 class RandomTest < ActiveSupport::TestCase
-  def test_random_tokens_are_indeed_random
-    # this might fail if you are *really* unlucky :)
-    with_any_random do
-      assert_not_equal Authlogic::Random.hex_token,       Authlogic::Random.hex_token
-      assert_not_equal Authlogic::Random.friendly_token,  Authlogic::Random.friendly_token
-    end
+  def test_that_hex_tokens_are_unique
+    tokens = Array.new(100) { Authlogic::Random.hex_token }
+    assert_equal tokens.size, tokens.uniq.size
   end
 
-  private
-
-    def with_any_random(&block)
-      [true, false].each { |val| with_secure_random_enabled(val, &block) }
-    end
-
-    def with_secure_random_enabled(enabled = true)
-      # can't really test SecureRandom if we don't have an implementation
-      return if enabled && !Authlogic::Random::SecureRandom
-
-      current_sec_rand = Authlogic::Random::SecureRandom
-      reload_authlogic_with_sec_random!(current_sec_rand, enabled)
-
-      yield
-    ensure
-      reload_authlogic_with_sec_random!(current_sec_rand)
-    end
-
-    def reload_authlogic_with_sec_random!(secure_random, enabled = true)
-      silence_warnings do
-        secure_random.parent.const_set(secure_random.name.sub("#{secure_random.parent}::", ''), enabled ? secure_random : nil)
-        load(File.dirname(__FILE__) + '/../lib/authlogic/random.rb')
-      end
-    end
-
-    def silence_warnings
-      old_verbose, $VERBOSE = $VERBOSE, nil
-      yield
-    ensure
-      $VERBOSE = old_verbose
-    end
+  def test_that_friendly_tokens_are_unique
+    tokens = Array.new(100) { Authlogic::Random.friendly_token }
+    assert_equal tokens.size, tokens.uniq.size
+  end
 end

data/test/session_test/activation_test.rb

@@ -1,4 +1,6 @@
-require 'test_helper'
+# frozen_string_literal: true
+
+require "test_helper"
 
 module SessionTest
   module ActivationTest

data/test/session_test/active_record_trickery_test.rb

@@ -1,9 +1,12 @@
-require 'test_helper'
+# frozen_string_literal: true
+
+require "test_helper"
 
 module SessionTest
   module ActiveRecordTrickeryTest
     class ClassMethodsTest < ActiveSupport::TestCase
-      i_suck_and_my_tests_are_order_dependent! # If test_human_name is executed after test_i18n_of_human_name the test will fail.
+      # If test_human_name is executed after test_i18n_of_human_name the test will fail.
+      i_suck_and_my_tests_are_order_dependent!
 
       def test_human_attribute_name
         assert_equal "Some attribute", UserSession.human_attribute_name("some_attribute")
@@ -15,12 +18,12 @@ module SessionTest
       end
 
       def test_i18n_of_human_name
-        I18n.backend.store_translations 'en', :authlogic => { :models => { :user_session => "MySession" } }
+        I18n.backend.store_translations "en", authlogic: { models: { user_session: "MySession" } }
         assert_equal "MySession", UserSession.human_name
       end
 
       def test_i18n_of_model_name_human
-        I18n.backend.store_translations 'en', :authlogic => { :models => { :user_session => "MySession" } }
+        I18n.backend.store_translations "en", authlogic: { models: { user_session: "MySession" } }
         assert_equal "MySession", UserSession.model_name.human
       end
 

data/test/session_test/brute_force_protection_test.rb

@@ -1,4 +1,6 @@
-require 'test_helper'
+# frozen_string_literal: true
+
+require "test_helper"
 
 module SessionTest
   module BruteForceProtectionTest
@@ -25,7 +27,7 @@ module SessionTest
         ben = users(:ben)
         ben.failed_login_count = UserSession.consecutive_failed_logins_limit - 1
         assert ben.save
-        session = UserSession.create(:login => ben.login, :password => "benrocks")
+        session = UserSession.create(login: ben.login, password: "benrocks")
         refute session.new_session?
       end
 
@@ -33,7 +35,7 @@ module SessionTest
         ben = users(:ben)
         ben.failed_login_count = UserSession.consecutive_failed_logins_limit
         assert ben.save
-        session = UserSession.create(:login => ben.login, :password => "benrocks")
+        session = UserSession.create(login: ben.login, password: "benrocks")
         assert session.new_session?
         assert UserSession.create(ben).new_session?
         ben.reload
@@ -46,13 +48,13 @@ module SessionTest
         ben = users(:ben)
 
         2.times do |i|
-          session = UserSession.new(:login => ben.login, :password => "badpassword1")
+          session = UserSession.new(login: ben.login, password: "badpassword1")
           refute session.save
           refute session.errors[:password].empty?
           assert_equal i + 1, ben.reload.failed_login_count
         end
 
-        session = UserSession.new(:login => ben.login, :password => "badpassword2")
+        session = UserSession.new(login: ben.login, password: "badpassword2")
         refute session.save
         assert session.errors[:password].empty?
         assert_equal 3, ben.reload.failed_login_count
@@ -66,7 +68,7 @@ module SessionTest
         ben = users(:ben)
 
         2.times do |i|
-          session = UserSession.new(:login => ben.login, :password => "badpassword1")
+          session = UserSession.new(login: ben.login, password: "badpassword1")
           refute session.save
           assert session.invalid_password?
           assert_equal i + 1, ben.reload.failed_login_count
@@ -75,7 +77,7 @@ module SessionTest
         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")
+        session = UserSession.new(login: ben.login, password: "benrocks")
         assert session.save
         assert_equal 0, ben.reload.failed_login_count
 
@@ -88,7 +90,7 @@ module SessionTest
         ben = users(:ben)
 
         2.times do |i|
-          session = UserSession.new(:login => ben.login, :password => "badpassword1")
+          session = UserSession.new(login: ben.login, password: "badpassword1")
           refute session.save
           refute session.errors[:password].empty?
           assert_equal i + 1, ben.reload.failed_login_count
@@ -97,7 +99,7 @@ module SessionTest
         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")
+        session = UserSession.new(login: ben.login, password: "badpassword1")
         refute session.save
         assert_equal 1, ben.reload.failed_login_count
 

data/test/session_test/callbacks_test.rb

@@ -1,9 +1,11 @@
-require 'test_helper'
+# frozen_string_literal: true
+
+require "test_helper"
 
 module SessionTest
   class CallbacksTest < ActiveSupport::TestCase
     def setup
-     WackyUserSession.reset_callbacks(:persist)
+      WackyUserSession.reset_callbacks(:persist)
     end
 
     def test_no_callbacks
@@ -15,7 +17,10 @@ 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)
+      assert_equal(
+        %i[persist_by_true persist_by_false],
+        WackyUserSession._persist_callbacks.map(&:filter)
+      )
 
       session = WackyUserSession.new
       session.send(:persist)
@@ -24,7 +29,10 @@ module SessionTest
 
     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)
+      assert_equal(
+        %i[persist_by_false persist_by_true],
+        WackyUserSession._persist_callbacks.map(&:filter)
+      )
 
       session = WackyUserSession.new
       session.send(:persist)