devise-security 0.15.0 → 0.16.0

data/test/integration/test_password_expirable_workflow.rb

@@ -17,8 +17,6 @@ class TestPasswordExpirableWorkflow < ActionDispatch::IntegrationTest
   end
 
   test 'sign in and change expired password' do
-    skip("Does not work in Rails < 5.0") if Rails.gem_version < Gem::Version.new('5.0')
-
     sign_in(@user)
     assert_redirected_to(root_path)
     follow_redirect!
@@ -37,8 +35,6 @@ class TestPasswordExpirableWorkflow < ActionDispatch::IntegrationTest
   end
 
   test 'sign in and password is updated before redirect completes' do
-    skip("Does not work in Rails < 5.0") if Rails.gem_version < Gem::Version.new('5.0')
-
     sign_in(@user)
     assert_redirected_to(root_path)
 

data/test/orm/mongoid.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'mongoid/version'
+require 'database_cleaner-mongoid'
 
 Mongoid.configure do |config|
   config.load!('test/support/mongoid.yml', Rails.env)
@@ -8,5 +9,5 @@ Mongoid.configure do |config|
   config.include_root_in_json = true
 end
 
-DatabaseCleaner[:mongoid].strategy = :truncation
+DatabaseCleaner[:mongoid].strategy = :deletion
 ORMInvalidRecordException = Mongoid::Errors::Validations

data/test/support/integration_helpers.rb

@@ -1,47 +1,29 @@
+# frozen_string_literal: true
+
 module IntegrationHelpers
   # login the user.  This will exercise all the Warden Hooks
   # @param user [User]
   # @param session [ActionDispatch::Integration::Session]
   # @return [void]
-  # @note accounts for differences in the integration test API between rails versions
   def sign_in(user, session = integration_session)
-    if Rails.gem_version > Gem::Version.new('5.0')
-      session.post new_user_session_path, params: {
-        user: {
-          email: user.email,
-          password: user.password
-        }
-      }
-    else
-      session.post new_user_session_path, {
-        user: {
-          email: user.email,
-          password: user.password
-        }
-      }
-    end
+    session.post new_user_session_path, params: {
+      user: {
+        email: user.email,
+        password: user.password,
+      },
+    }
   end
 
   # attempt to login the user with a bad password. This will exercise all the Warden Hooks
   # @param user [User]
   # @param session [ActionDispatch::Integration::Session]
   # @return [void]
-  # @note accounts for differences in the integration test API between rails versions
   def failed_sign_in(user, session)
-    if Rails.gem_version > Gem::Version.new('5.0')
-      session.post new_user_session_path, params: {
-        user: {
-          email: user.email,
-          password: 'bad-password'
-        }
-      }
-    else
-      session.post new_user_session_path, {
-        user: {
-          email: user.email,
-          password: 'bad-password'
-        }
-      }
-    end
+    session.post new_user_session_path, params: {
+      user: {
+        email: user.email,
+        password: 'bad-password',
+      },
+    }
   end
 end

data/test/support/mongoid.yml

@@ -1,5 +1,5 @@
 test:
-  <%= Mongoid::VERSION.to_i > 4 ? 'clients' : 'sessions' %>:
+  clients:
     default:
       database: devise-test-suite
       hosts:

data/test/test_helper.rb

@@ -34,10 +34,10 @@ require 'devise-security'
 require 'database_cleaner'
 require "orm/#{DEVISE_ORM}"
 
-if Rails.gem_version >= Gem::Version.new('5.0.0')
-  require 'rails-controller-testing'
-  Rails::Controller::Testing.install
-end
+# Controller testing is the way that Devise itself tests the functionality of
+# controller, even though it has been deprecated in favor of request tests.
+require 'rails-controller-testing'
+Rails::Controller::Testing.install
 require 'support/integration_helpers'
 
 class Minitest::Test

data/test/test_install_generator.rb

@@ -11,7 +11,7 @@ class TestInstallGenerator < Rails::Generators::TestCase
 
   test 'Assert all files are properly created' do
     run_generator
-    assert_file 'config/initializers/devise-security.rb'
+    assert_file 'config/initializers/devise_security.rb'
     assert_file 'config/locales/devise.security_extension.by.yml'
     assert_file 'config/locales/devise.security_extension.cs.yml'
     assert_file 'config/locales/devise.security_extension.de.yml'

data/test/test_secure_validatable.rb

@@ -82,4 +82,80 @@ class TestSecureValidatable < ActiveSupport::TestCase
     refute user.valid?
     assert_equal DEVISE_ORM == :active_record ? ['Email has already been taken'] : ['Email is already taken'], user.errors.full_messages
   end
+
+  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! }
+  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! }
+  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! }
+  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! }
+  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'
+
+    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! }
+  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'
+
+    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! }
+  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'
+
+    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! }
+  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'
+
+    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! }
+  end
 end

data/test/tmp/config/initializers/devise-security.rb

@@ -41,4 +41,7 @@ Devise.setup do |config|
 
   # Time period for account expiry from last_activity_at
   # config.expire_after = 90.days
+
+  # Allow password to equal the email
+  # config.allow_passwords_equal_to_email = false
 end

data/test/tmp/config/locales/devise.security_extension.by.yml

@@ -0,0 +1,49 @@
+by:
+  errors:
+    messages:
+      taken_in_past: 'ужо раней выкарыстоўваўся.'
+      equal_to_current_password: 'павінен адрознівацца ад сучаснага пароля.'
+      equal_to_email: 'павінна адрознівацца ад электроннай пошты.'
+      password_complexity:
+        digit:
+          one: 'павінен утрымліваць хоць адну лічбу'
+          few: 'павінен утрымліваць хоць %{count} лічбы'
+          many: 'павінен утрымліваць хоць %{count} лічбы'
+          other: 'павінен утрымліваць хоць %{count} лічбы'
+        lower:
+          one: 'павінен утрымліваць хоць адну маленькую літару'
+          few: 'павінен утрымліваць хоць %{count} малыx літары'
+          many: 'павінен утрымліваць хоць %{count} малыx літары'
+          other: 'павінен утрымліваць хоць %{count} малыx літары'
+        symbol:
+          one: 'павінен утрымліваць хоць адзін знак пунктуацыі або сімвал'
+          few: 'павінен утрымліваць хоць %{count} знака пунктуацыі або сімвала'
+          many: 'павінен утрымліваць хоць %{count} знака пунктуацыі або сімвала'
+          other: 'павінен утрымліваць хоць %{count} знака пунктуацыі або сімвала'
+        upper:
+          one: 'павінен утрымліваць хоць адну вялікую літару'
+          few: 'павінен утрымліваць хоць %{count} вялікіx літары'
+          many: 'павінен утрымліваць хоць %{count} вялікіx літары'
+          other: 'павінен утрымліваць хоць %{count} вялікіx літары'
+  devise:
+    invalid_captcha: 'Уведзены няправільны код капчы.'
+    invalid_security_question: 'Адказ на сакрэтнае пытанне быў няправільны.'
+    paranoid_verify:
+      code_required: 'Калі ласка, увядзіце код, атрыманы ад нашай каманды падтрымкі'
+    paranoid_verification_code:
+      show:
+        submit_verification_code: 'Увод кода пацверджання'
+        verification_code: 'Код пацверджання'
+        submit: 'Адправіць'
+    password_expired:
+      updated: 'Ваш новы пароль захаваны.'
+      change_required: 'Ваш пароль састарэў. Калі ласка, усталюйце новы.'
+      show:
+        renew_your_password: 'Змена пароля'
+        current_password: 'Сучасны пароль'
+        new_password: 'Новы пароль'
+        new_password_confirmation: 'Пацвердзіце новы пароль'
+        change_my_password: 'Змяніць пароль'
+    failure:
+      session_limited: 'Вашы параметры ўваходу выкарыстоўваюцца ў іншым браўзэры. Калі ласка, аўтарызуйцеся зноў, каб працягнуць у гэтым браўзэры.'
+      expired: 'Ваш уліковы запіс састарэў з-за неактыўнасці. Калі ласка, звяжыцеся з адміністратарам.'

data/test/tmp/config/locales/devise.security_extension.cs.yml

@@ -0,0 +1,41 @@
+cs:
+  errors:
+    messages:
+      taken_in_past: bylo již použito v minulosti.
+      equal_to_current_password: se musí lišit od aktuálního hesla.
+      equal_to_email: musí být jiný než e-mail.
+      password_complexity:
+        digit:
+          one: musí obsahovat alespoň jednu číslici
+          other: musí obsahovat alespoň %{count} číslice
+        lower:
+          one: musí obsahovat alespoň jedno malé písmeno
+          other: musí obsahovat alespoň %{count} malé písmena
+        symbol:
+          one: musí obsahovat alespoň jedno interpunkční znaménko nebo symbol
+          other: musí obsahovat alespoň %{count} interpunkční znaménka nebo symboly
+        upper:
+          one: musí obsahovat alespoň jedno velké písmeno
+          other: musí obsahovat alespoň %{count} velké písmena
+  devise:
+    invalid_captcha: Chybná captcha.
+    invalid_security_question: Chybná odpověď na bezpečnostní otázku.
+    paranoid_verify:
+      code_required: Zadejte kód, který poskytla naše podpora
+    paranoid_verification_code:
+      show:
+        submit_verification_code: Odeslat ověřovací kód
+        verification_code: Ověřovací kód
+        submit: Odeslat
+    password_expired:
+      updated: Vaše nové heslo bylo uloženo.
+      change_required: Platnost Vašeho hesla vypršela. Prosím, obnovte si jej.
+      show:
+        renew_your_password: Obnovit heslo
+        current_password: Současné heslo
+        new_password: Nové heslo
+        new_password_confirmation: Potvrďte nové heslo
+        change_my_password: Změnit moje heslo
+    failure:
+      session_limited: Vaše přihlašovací údaje byly použity v jiném prohlížeči. Chcete-li pokračovat v tomto prohlížeči, znovu se přihlaste.
+      expired: Platnost Vašeho účtu vypršela z důvodu nečinnosti. Obraťte se na správce webu.

data/test/tmp/config/locales/devise.security_extension.de.yml

@@ -3,6 +3,7 @@ de:
     messages:
       taken_in_past: 'wurde bereits in der Vergangenheit verwendet.'
       equal_to_current_password: 'darf nicht dem aktuellen Passwort entsprechen.'
+      equal_to_email: 'darf nicht dem E-mail entsprechen.'
       password_complexity:
         digit:
           one: muss mindestens eine Ziffer enthalten

data/test/tmp/config/locales/devise.security_extension.en.yml

@@ -3,6 +3,7 @@ en:
     messages:
       taken_in_past: 'was used previously.'
       equal_to_current_password: 'must be different than the current password.'
+      equal_to_email: 'must be different than the email.'
       password_complexity:
         digit:
           one: must contain at least one digit

data/test/tmp/config/locales/devise.security_extension.es.yml

@@ -1,29 +1,30 @@
 es:
   errors:
     messages:
-      taken_in_past: 'la contraseña fue usada previamente, favor elegir otra.'
+      taken_in_past: 'la contraseña fue usada previamente, por favor elige otra.'
       equal_to_current_password: 'tiene que ser diferente a la contraseña actual.'
+      equal_to_email: 'tiene que ser diferente al email'
       password_complexity:
         digit:
-          one: tiene que contener al menos un digito
-          other: tiene que contener al menos %{count} digitos
+          one: tiene que contener al menos un dígito
+          other: tiene que contener al menos %{count} dígitos
         lower:
-          one: tiene que contener al menos un minúscula
+          one: tiene que contener al menos una minúscula
           other: tiene que contener al menos %{count} minúsculas
         symbol:
           one: tiene que contener al menos un signo de puntuación
           other: tiene que contener al menos %{count} signos de puntuación
         upper:
-          one: tiene que contener al menos un mayúscula
+          one: tiene que contener al menos una mayúscula
           other: tiene que contener al menos %{count} mayúsculas
   devise:
     invalid_captcha: 'El captcha ingresado es inválido.'
-    invalid_security_question: 'La respuesta a la pregunta de suguridad fue incorrecta.'
+    invalid_security_question: 'La respuesta a la pregunta de seguridad fue incorrecta.'
     paranoid_verify:
       code_required: 'Por favor ingrese el código provisto por nuestro equipo de soporte'
     password_expired:
-      updated: 'Su nueva contraña ha sido guardada.'
-      change_required: 'Su contraña ha expirado. Por favor renueve su contraseña.'
+      updated: 'Su nueva contraseña ha sido guardada.'
+      change_required: 'Su contraseña ha expirado. Por favor renueve su contraseña.'
     failure:
-      session_limited: 'Sus credenciales de inicio de sesión fueron usadas en otro navegador. Por favor inicie sesión nuevamente para continuar en éste navegador.'
+      session_limited: 'Sus credenciales de inicio de sesión fueron usadas en otro navegador. Por favor inicie sesión nuevamente para continuar en este navegador.'
       expired: 'Su cuenta ha expirado debido a inactividad. Por favor contacte al administrador de la aplicación.'

data/test/tmp/config/locales/devise.security_extension.fa.yml

@@ -3,6 +3,7 @@ fa:
     messages:
       taken_in_past: 'قبلا استفاده شده است'
       equal_to_current_password: 'باید متفاوت با رمز عبور فعلی باشد'
+      equal_to_email: 'باید متفاوت از ایمیل باشد'
       password_complexity:
         digit:
           one: باید حداقل یک رقم داشته باشد

data/test/tmp/config/locales/devise.security_extension.fr.yml

@@ -3,6 +3,7 @@ fr:
     messages:
       taken_in_past: a été utilisé trop récemment. Veuillez en choisir un autre
       equal_to_current_password: doit être différent de l'actuel
+      equal_to_email: doit être différent de l'e-mail
       password_complexity:
         digit:
           one: doit contenir au moins un chiffre

data/test/tmp/config/locales/devise.security_extension.hi.yml

@@ -0,0 +1,42 @@
+
+hi:
+  errors:
+    messages:
+      taken_in_past: यह पासवर्ड, आपके द्वारा पूर्व मे प्रयोग किया जा चुका है  
+      equal_to_current_password: नया पासवर्ड, वर्तमान पासवर्ड से भिन्न होना चाहिए 
+      equal_to_email: ईमेल से अलग होना चाहिए
+      password_complexity:
+        digit:
+          one: एक अंक होना चाहिए 
+          other: कम से कम %{count} अंक होने चाहिए  
+        lower:
+          one: एक लोअर-केस अक्षर होना चाहिए 
+          other: कम से कम %{count} अक्षर होने चाहिए  
+        symbol:
+          one: एक चिन्ह होना चाहिए 
+          other: कम से कम %{count} चिन्ह होने चाहिए  
+        upper:
+          one: एक अपर-केस अक्षर होना चाहिए 
+          other: कम से कम %{count} अपर-केस अक्षर होने चाहिए  
+  devise:
+    invalid_captcha: अमान्य कॅप्टचा
+    invalid_security_question: अमान्य सुरक्षा उत्तर
+    paranoid_verify:
+      code_required: सपोर्ट टीम द्वारा दिया गया कोड डाले 
+    paranoid_verification_code:
+      show:
+        submit_verification_code: वेरिफिकेशन कोड डाले 
+        verification_code: वेरिफिकेशन कोड 
+        submit: सबमिट 
+    password_expired:
+      updated: पासवर्ड अद्यतन किया गया
+      change_required: पासवर्ड अमान्य हो चुका, पासवर्ड बदले 
+      show:
+        renew_your_password: पासवर्ड बदले 
+        current_password: वर्तमान पासवर्ड
+        new_password: नया पासवर्ड 
+        new_password_confirmation: नए पासवर्ड की पुष्टि करें 
+        change_my_password: पासवर्ड बदले 
+    failure:
+      session_limited: जानकारी, दूसरे ब्राउज़र में उपयोग की गयी थी जारी रखने फिर से साइन-इन करे 
+      expired: कोई गतिविधि न होने के कारण खाता बंद हो गया, सिस्टम व्यवस्थापक से संपर्क करें

data/test/tmp/config/locales/devise.security_extension.it.yml

@@ -3,6 +3,7 @@ it:
     messages:
       taken_in_past: "è stata gia' utilizzata in passato!"
       equal_to_current_password: " deve essere differente dalla password corrente!"
+      equal_to_email: "deve essere differente dall'email"
       password_complexity:
         digit:
           one: deve contenere almeno una cifra

data/test/tmp/config/locales/devise.security_extension.ja.yml

@@ -3,6 +3,7 @@ ja:
     messages:
       taken_in_past: 'は既に使われています。'
       equal_to_current_password: 'は現在のパスワードと異なるものである必要があります。'
+      equal_to_email: 'メールとは異なる必要があります'
       password_complexity:
         digit:
           one: は最低1つの数字を含む必要があります。