devise-security 0.16.0 → 0.17.0

data/test/test_password_expirable.rb

@@ -14,59 +14,59 @@ class TestPasswordArchivable < ActiveSupport::TestCase
   test 'does nothing if disabled' do
     Devise.expire_password_after = false
     user = User.create email: 'bob@microsoft.com', password: 'Password1', password_confirmation: 'Password1'
-    refute user.need_change_password?
-    refute user.password_expired?
+    assert_not user.need_change_password?
+    assert_not user.password_expired?
     user.need_change_password!
-    refute user.need_change_password?
-    refute user.password_expired?
+    assert_not user.need_change_password?
+    assert_not user.password_expired?
   end
 
   test 'password change can be requested' do
     Devise.expire_password_after = true
     user = User.create email: 'bob@microsoft.com', password: 'Password1', password_confirmation: 'Password1'
-    refute user.need_change_password?
-    refute user.password_expired?
-    refute user.password_change_requested?
+    assert_not user.need_change_password?
+    assert_not user.password_expired?
+    assert_not user.password_change_requested?
     user.need_change_password!
     assert user.need_change_password?
-    refute user.password_expired? # it's not too old because it's not set at all
+    assert_not user.password_expired? # it's not too old because it's not set at all
     assert user.password_change_requested?
   end
 
   test 'password expires' do
     user = User.create email: 'bob@microsoft.com', password: 'Password1', password_confirmation: 'Password1'
-    refute user.need_change_password?
-    refute user.password_expired?
-    refute user.password_too_old?
-    user.update(password_changed_at: Time.now.ago(3.months))
+    assert_not user.need_change_password?
+    assert_not user.password_expired?
+    assert_not user.password_too_old?
+    user.update(password_changed_at: Time.zone.now.ago(3.months))
     assert user.password_too_old?
     assert user.need_change_password?
     assert user.password_expired?
-    refute user.password_change_requested?
+    assert_not user.password_change_requested?
   end
 
   test 'saving a record records the time the password was changed' do
     user = User.new email: 'bob@microsoft.com', password: 'Password1', password_confirmation: 'Password1'
     assert user.password_changed_at.nil?
-    refute user.password_change_requested?
-    refute user.password_expired?
+    assert_not user.password_change_requested?
+    assert_not user.password_expired?
     user.save
     assert user.password_changed_at.present?
-    refute user.password_change_requested?
-    refute user.password_expired?
+    assert_not user.password_change_requested?
+    assert_not user.password_expired?
   end
 
   test 'updating a record updates the time the password was changed if the password is changed' do
     user = User.create email: 'bob@microsoft.com', password: 'Password1', password_confirmation: 'Password1'
-    user.update(password_changed_at: Time.now.ago(3.months))
+    user.update(password_changed_at: Time.zone.now.ago(3.months))
     original_password_changed_at = user.password_changed_at
     user.expire_password!
     assert user.password_change_requested?
-    user.password = "NewPassword1"
-    user.password_confirmation = "NewPassword1"
+    user.password = 'NewPassword1'
+    user.password_confirmation = 'NewPassword1'
     user.save
     assert user.password_changed_at > original_password_changed_at
-    refute user.password_change_requested?
+    assert_not user.password_change_requested?
   end
 
   test 'updating a record does not updates the time the password was changed if the password was not changed' do
@@ -74,7 +74,7 @@ class TestPasswordArchivable < ActiveSupport::TestCase
     user.expire_password!
     assert user.password_change_requested?
     user.save
-    refute user.previous_changes.key?(:password_changed_at)
+    assert_not user.previous_changes.key?(:password_changed_at)
     assert user.password_change_requested?
   end
 
@@ -85,10 +85,10 @@ class TestPasswordArchivable < ActiveSupport::TestCase
         4.months
       end
     end
-    user.password_changed_at = Time.now.ago(3.months)
-    refute user.need_change_password?
-    refute user.password_expired?
-    user.password_changed_at = Time.now.ago(5.months)
+    user.password_changed_at = Time.zone.now.ago(3.months)
+    assert_not user.need_change_password?
+    assert_not user.password_expired?
+    user.password_changed_at = Time.zone.now.ago(5.months)
     assert user.need_change_password?
     assert user.password_expired?
   end

data/test/test_secure_validatable.rb

@@ -1,161 +1,327 @@
 # frozen_string_literal: true
 
 require 'test_helper'
-require 'rails_email_validator'
 
 class TestSecureValidatable < ActiveSupport::TestCase
   class User < ApplicationRecord
-    devise :database_authenticatable, :password_archivable,
-           :paranoid_verification, :password_expirable, :secure_validatable
+    devise :database_authenticatable, :secure_validatable
     include ::Mongoid::Mappings if DEVISE_ORM == :mongoid
   end
 
-  test 'email cannot be blank' do
-    msg = "Email can't be blank"
-    user = User.create password: 'passWord1', password_confirmation: 'passWord1'
+  class EmailNotRequiredUser < User
+    protected
 
-    assert_equal(false, user.valid?)
-    assert_equal([msg], user.errors.full_messages)
-    assert_raises(ORMInvalidRecordException) do
-      user.save!
+    def email_required?
+      false
     end
   end
 
+  test 'email cannot be blank upon creation' do
+    user = User.new(
+      password: 'Password1!', password_confirmation: 'Password1!'
+    )
+
+    assert user.invalid?
+    assert_equal(["Email can't be blank"], user.errors.full_messages)
+  end
+
+  test 'email can be blank upon creation if email not required' do
+    user = EmailNotRequiredUser.new(
+      password: 'Password1!', password_confirmation: 'Password1!'
+    )
+
+    assert user.valid?
+  end
+
+  test 'email cannot be updated to be blank' do
+    user = User.new(
+      email: 'bob@microsoft.com',
+      password: 'Password1!',
+      password_confirmation: 'Password1!'
+    )
+
+    assert user.valid?
+
+    user.email = nil
+
+    assert user.invalid?
+    assert_equal(["Email can't be blank"], user.errors.full_messages)
+  end
+
+  test 'email can be updated to be blank if email not required' do
+    user = EmailNotRequiredUser.new(
+      email: 'bob@microsoft.com',
+      password: 'Password1!',
+      password_confirmation: 'Password1!'
+    )
+
+    assert user.valid?
+
+    user.email = nil
+
+    assert user.valid?
+  end
+
   test 'email must be valid' do
-    msg = 'Email is invalid'
-    user = User.create email: 'bob', password: 'passWord1', password_confirmation: 'passWord1'
-    assert_equal(false, user.valid?)
-    assert_equal([msg], user.errors.full_messages)
-    assert_raises(ORMInvalidRecordException) do
-      user.save!
-    end
+    user = User.new(
+      email: 'bob', password: 'Password1!', password_confirmation: 'Password1!'
+    )
+
+    assert user.invalid?
+    assert_equal(['Email is invalid'], user.errors.full_messages)
   end
 
   test 'validate both email and password' do
-    msgs = ['Email is invalid', 'Password must contain at least one upper-case letter']
-    user = User.create email: 'bob@@foo.tv', password: 'password1', password_confirmation: 'password1'
-    assert_equal(false, user.valid?)
+    user = User.new(
+      email: 'bob',
+      password: 'password1!',
+      password_confirmation: 'password1!'
+    )
+
+    assert user.invalid?
+    assert_equal(
+      [
+        'Email is invalid',
+        'Password must contain at least one upper-case letter'
+      ],
+      user.errors.full_messages
+    )
+  end
+
+  test 'password cannot be blank upon creation' do
+    user = User.new(email: 'bob@microsoft.com')
+
+    msgs = ["Password can't be blank"]
+
+    msgs << "Encrypted password can't be blank" if DEVISE_ORM == :mongoid
+
+    assert user.invalid?
     assert_equal(msgs, user.errors.full_messages)
-    assert_raises(ORMInvalidRecordException) { user.save! }
+  end
+
+  test 'password cannot be updated to be blank' do
+    user = User.new(
+      email: 'bob@microsoft.com',
+      password: 'Password1!',
+      password_confirmation: 'Password1!'
+    )
+
+    assert user.valid?
+
+    user.password = nil
+    user.password_confirmation = nil
+
+    assert user.invalid?
+    assert_equal(["Password can't be blank"],user.errors.full_messages)
+  end
+
+  test 'password_confirmation must match password' do
+    user = User.new(
+      email: 'bob@microsoft.com',
+      password: 'Password1!',
+      password_confirmation: 'not the same password'
+    )
+
+    assert user.invalid?
+    assert_equal(
+      ["Password confirmation doesn't match Password"],
+      user.errors.full_messages
+    )
+  end
+
+  test 'password_confirmation cannot be blank' do
+    user = User.new(
+      email: 'bob@microsoft.com',
+      password: 'Password1!',
+      password_confirmation: ''
+    )
+
+    assert user.invalid?
+    assert_equal(
+      ["Password confirmation doesn't match Password"],
+      user.errors.full_messages
+    )
+  end
+
+  test 'password_confirmation can be skipped' do
+    user = User.new(
+      email: 'bob@microsoft.com',
+      password: 'Password1!',
+      password_confirmation: nil
+    )
+
+    assert user.valid?
   end
 
   test 'password must have capital letter' do
-    msgs = ['Password must contain at least one upper-case letter']
-    user = User.create email: 'bob@microsoft.com', password: 'password1', password_confirmation: 'password1'
-    assert_equal(false, user.valid?)
-    assert_equal(msgs, user.errors.full_messages)
-    assert_raises(ORMInvalidRecordException) { user.save! }
+    user = User.new(
+      email: 'bob@microsoft.com',
+      password: 'password1',
+      password_confirmation: 'password1'
+    )
+
+    assert user.invalid?
+    assert_equal(
+      ['Password must contain at least one upper-case letter'],
+      user.errors.full_messages
+    )
   end
 
   test 'password must have lowercase letter' do
-    msg = 'Password must contain at least one lower-case letter'
-    user = User.create email: 'bob@microsoft.com', password: 'PASSWORD1', password_confirmation: 'PASSWORD1'
-    assert_equal(false, user.valid?)
-    assert_equal([msg], user.errors.full_messages)
-    assert_raises(ORMInvalidRecordException) { user.save! }
+    user = User.new(
+      email: 'bob@microsoft.com',
+      password: 'PASSWORD1',
+      password_confirmation: 'PASSWORD1'
+    )
+
+    assert user.invalid?
+    assert_equal(
+      ['Password must contain at least one lower-case letter'],
+      user.errors.full_messages
+    )
   end
 
   test 'password must have number' do
-    msg = 'Password must contain at least one digit'
-    user = User.create email: 'bob@microsoft.com', password: 'PASSword', password_confirmation: 'PASSword'
-    assert_equal(false, user.valid?)
-    assert_equal([msg], user.errors.full_messages)
-    assert_raises(ORMInvalidRecordException) { user.save! }
+    user = User.new(
+      email: 'bob@microsoft.com',
+      password: 'PASSword',
+      password_confirmation: 'PASSword'
+    )
+
+    assert user.invalid?
+    assert_equal(
+      ['Password must contain at least one digit'],
+      user.errors.full_messages
+    )
   end
 
-  test 'password must have minimum length' do
-    msg = 'Password is too short (minimum is 7 characters)'
-    user = User.create email: 'bob@microsoft.com', password: 'Pa3zZ', password_confirmation: 'Pa3zZ'
-    assert_equal(false, user.valid?)
-    assert_equal([msg], user.errors.full_messages)
-    assert_raises(ORMInvalidRecordException) { user.save! }
+  test 'password must meet minimum length' do
+    user = User.new(
+      email: 'bob@microsoft.com',
+      password: 'Pa3zZ',
+      password_confirmation: 'Pa3zZ'
+    )
+
+    assert user.invalid?
+    assert_equal(
+      ['Password is too short (minimum is 7 characters)'],
+      user.errors.full_messages
+    )
   end
 
-  test 'duplicate email validation message is added only once' do
+  test "new user can't use existing user's email" do
     options = {
-      email: 'test@example.org',
-      password: 'Test12345',
-      password_confirmation: 'Test12345',
+      email: 'bob@microsoft.com',
+      password: 'Password1!',
+      password_confirmation: 'Password1!',
     }
-    SecureUser.create!(options)
-    user = SecureUser.new(options)
-    refute user.valid?
-    assert_equal DEVISE_ORM == :active_record ? ['Email has already been taken'] : ['Email is already taken'], user.errors.full_messages
-  end
+    User.create!(options)
+    user = User.new(options)
 
-  test 'password can not equal email for new user' do
-    msg = 'Password must be different than the email.'
-    user = User.create email: 'bob@microsoft.com', password: 'bob@microsoft.com', password_confirmation: 'bob@microsoft.com'
-    refute user.valid?
-    assert_includes(user.errors.full_messages, msg)
-    assert_raises(ORMInvalidRecordException) { user.save! }
+    assert user.invalid?
+    if DEVISE_ORM == :active_record
+      assert_equal(['Email has already been taken'], user.errors.full_messages)
+    else
+      assert_equal(['Email is already taken'], user.errors.full_messages)
+    end
   end
 
-  test 'password can not equal case sensitive version of email for new user' do
-    msg = 'Password must be different than the email.'
-    user = User.create email: 'bob@microsoft.com', password: 'BoB@microsoft.com', password_confirmation: 'BoB@microsoft.com'
-    refute user.valid?
-    assert_includes(user.errors.full_messages, msg)
-    assert_raises(ORMInvalidRecordException) { user.save! }
+  test "new user can't use existing user's email with different casing" do
+    options = {
+      email: 'bob@microsoft.com',
+      password: 'Password1!',
+      password_confirmation: 'Password1!',
+    }
+    User.create!(options)
+    options[:email] = 'BOB@MICROSOFT.COM'
+    user = User.new(options)
+
+    assert user.invalid?
+    if DEVISE_ORM == :active_record
+      assert_equal(['Email has already been taken'], user.errors.full_messages)
+    else
+      assert_equal(['Email is already taken'], user.errors.full_messages)
+    end
   end
 
-  test 'password can not equal email with spaces for new user' do
-    msg = 'Password must be different than the email.'
-    user = User.create email: 'bob@microsoft.com', password: 'bob@microsoft.com    ', password_confirmation: 'bob@microsoft.com    '
-    refute user.valid?
-    assert_includes(user.errors.full_messages, msg)
-    assert_raises(ORMInvalidRecordException) { user.save! }
+  test 'password cannot equal email for new user' do
+    user = User.new(
+      email: 'Bob1@microsoft.com',
+      password: 'Bob1@microsoft.com',
+      password_confirmation: 'Bob1@microsoft.com'
+    )
+
+    assert user.invalid?
+    assert_equal(
+      ['Password must be different than the email.'],
+      user.errors.full_messages
+    )
   end
 
-  test 'password can not equal case sensitive version of email with spaces for new user' do
-    msg = 'Password must be different than the email.'
-    user = User.create email: 'bob@microsoft.com', password: '  BoB@microsoft.com   ', password_confirmation: '  BoB@microsoft.com   '
-    refute user.valid?
-    assert_includes(user.errors.full_messages, msg)
-    assert_raises(ORMInvalidRecordException) { user.save! }
+  test 'password cannot equal case sensitive version of email for new user' do
+    user = User.new(
+      email: 'bob1@microsoft.com',
+      password: 'BoB1@microsoft.com',
+      password_confirmation: 'BoB1@microsoft.com'
+    )
+
+    assert user.invalid?
+    assert_equal(
+      ['Password must be different than the email.'],
+      user.errors.full_messages
+    )
   end
 
-  test 'password can not equal email for existing user' do
-    user = User.create email: 'bob@microsoft.com', password: 'pAs5W0rd!Is5e6Ure', password_confirmation: 'pAs5W0rd!Is5e6Ure'
+  test 'password cannot equal email with spaces for new user' do
+    user = User.new(
+      email: 'Bob1@microsoft.com',
+      password: 'Bob1@microsoft.com    ',
+      password_confirmation: 'Bob1@microsoft.com    '
+    )
 
-    msg = 'Password must be different than the email.'
-    user.password = 'bob@microsoft.com'
-    user.password_confirmation = 'bob@microsoft.com'
-    refute user.valid?
-    assert_includes(user.errors.full_messages, msg)
-    assert_raises(ORMInvalidRecordException) { user.save! }
+    assert user.invalid?
+    assert_equal(
+      ['Password must be different than the email.'],
+      user.errors.full_messages
+    )
   end
 
-  test 'password can not equal case sensitive version of email for existing user' do
-    user = User.create email: 'bob@microsoft.com', password: 'pAs5W0rd!Is5e6Ure', password_confirmation: 'pAs5W0rd!Is5e6Ure'
+  test 'password cannot equal case sensitive version of email with spaces '\
+       'for new user' do
+    user = User.new(
+      email: 'Bob1@microsoft.com',
+      password: '  boB1@microsoft.com   ',
+      password_confirmation: '  boB1@microsoft.com   '
+    )
 
-    msg = 'Password must be different than the email.'
-    user.password = 'BoB@microsoft.com'
-    user.password_confirmation = 'BoB@microsoft.com'
-    refute user.valid?
-    assert_includes(user.errors.full_messages, msg)
-    assert_raises(ORMInvalidRecordException) { user.save! }
+    assert user.invalid?
+    assert_equal(
+      ['Password must be different than the email.'],
+      user.errors.full_messages
+    )
   end
 
-  test 'password can not equal email with spaces for existing user' do
-    user = User.create email: 'bob@microsoft.com', password: 'pAs5W0rd!Is5e6Ure', password_confirmation: 'pAs5W0rd!Is5e6Ure'
+  test 'new password cannot equal current password' do
+    user = User.create(
+      email: 'bob@microsoft.com',
+      password: 'Password1!',
+      password_confirmation: 'Password1!'
+    )
+
+    user.password = 'Password1!'
 
-    msg = 'Password must be different than the email.'
-    user.password = 'bob@microsoft.com     '
-    user.password_confirmation = 'bob@microsoft.com     '
-    refute user.valid?
-    assert_includes(user.errors.full_messages, msg)
-    assert_raises(ORMInvalidRecordException) { user.save! }
+    assert user.invalid?
+    assert_equal(
+      ['Password must be different than the current password.'],
+      user.errors.full_messages
+    )
   end
 
-  test 'password can not equal case sensitive version of email with spaces for existing user' do
-    user = User.create email: 'bob@microsoft.com', password: 'pAs5W0rd!Is5e6Ure', password_confirmation: 'pAs5W0rd!Is5e6Ure'
+  test 'should not be included in objects with invalid API' do
+    error = assert_raise RuntimeError do
+      class ::Dog; include Devise::Models::SecureValidatable; end
+    end
 
-    msg = 'Password must be different than the email.'
-    user.password = ' BoB@microsoft.com      '
-    user.password_confirmation = ' BoB@microsoft.com      '
-    refute user.valid?
-    assert_includes(user.errors.full_messages, msg)
-    assert_raises(ORMInvalidRecordException) { user.save! }
+    assert_equal('Could not use SecureValidatable on Dog', error.message)
   end
 end