jro_apps/redmine Commit - r13882:51f7060aa846

Add the ability to expire passwords after a configurable number of days (#19458)....

Jean-Philippe Lang -

r13882:51f7060aa846

parent child

Context file:

r13882:51f7060aa846

Collapse all files

app/controllers/application_controller.rb +1 0

               def check_password_change
                 if session[:pwd]
                   if User.current.must_change_password?
+                    flash[:error] = l(:error_password_expired)
                     redirect_to my_password_path
                   else
                     session.delete(:pwd)

app/models/user.rb +12 -1

@@ -323,8 +323,19 class User < Principal
323	return auth_source.allow_password_changes?	323	return auth_source.allow_password_changes?
324	end	324	end
325		325
		326	def password_expired?
		327	changed_on = self.passwd_changed_on \|\| Time.at(0)
		328	period = Setting.password_max_age.to_i
		329
		330	if period.zero?
		331	false
		332	else
		333	changed_on < period.days.ago
		334	end
		335	end
		336
326	def must_change_password?	337	def must_change_password?
327	must_change_passwd? && change_password_allowed?	338	(must_change_passwd? \|\| password_expired?) && change_password_allowed?
328	end	339	end
329		340
330	def generate_password?	341	def generate_password?

app/views/my/password.html.erb +1 -1

             <%= submit_tag l(:button_apply) %>
             <% end %>
-            <% unless @user.must_change_passwd? %>
+            <% unless @user.must_change_passwd? || @user.password_expired? %>
             <% content_for :sidebar do %>
             <%= render :partial => 'sidebar' %>
             <% end %>

app/views/settings/_authentication.html.erb +4 0

             <p><%= setting_text_field :password_min_length, :size => 6 %></p>
+            <p>
+              <%= setting_select :password_max_age, [[l(:label_disabled), 0]] + [7, 30, 60, 90, 180, 365].collect{|days| [l('datetime.distance_in_words.x_days', :count => days), days.to_s]} %>
+            </p>
             <p><%= setting_check_box :lost_password, :label => :label_password_lost %></p>
             <p><%= setting_text_field :max_additional_emails, :size => 6 %></p>

config/locales/de.yml +1 0

               setting_non_working_week_days: Arbeitsfreie Tage
               setting_openid: Erlaube OpenID-Anmeldung und -Registrierung
               setting_password_min_length: Mindestlänge des Kennworts
+              setting_password_max_age: Erzwinge Passwortwechsel nach
               setting_per_page_options: Objekte pro Seite
               setting_plain_text_mail: Nur reinen Text (kein HTML) senden
               setting_protocol: Protokoll

config/locales/en.yml +2 0

               error_attachment_too_big: "This file cannot be uploaded because it exceeds the maximum allowed file size (%{max_size})"
               error_session_expired: "Your session has expired. Please login again."
               warning_attachments_not_saved: "%{count} file(s) could not be saved."
+              error_password_expired: "Your password has expired or the administrator requires you to change it."
               mail_subject_lost_password: "Your %{value} password"
               mail_body_lost_password: 'To change your password, click on the following link:'
               setting_file_max_size_displayed: Maximum size of text files displayed inline
               setting_repository_log_display_limit: Maximum number of revisions displayed on file log
               setting_openid: Allow OpenID login and registration
+              setting_password_max_age: Require password change after
               setting_password_min_length: Minimum password length
               setting_new_project_user_role_id: Role given to a non-admin user who creates a project
               setting_default_projects_modules: Default enabled modules for new projects

config/locales/fr.yml +2 0

               error_attachment_too_big: Ce fichier ne peut pas être attaché car il excède la taille maximale autorisée (%{max_size})
               error_session_expired: "Votre session a expiré. Veuillez vous reconnecter."
               warning_attachments_not_saved: "%{count} fichier(s) n'ont pas pu être sauvegardés."
+              error_password_expired: "Votre mot de passe a expiré ou nécessite d'être changé."
               mail_subject_lost_password: "Votre mot de passe %{value}"
               mail_body_lost_password: 'Pour changer votre mot de passe, cliquez sur le lien suivant :'
               setting_file_max_size_displayed: Taille maximum des fichiers texte affichés en ligne
               setting_repository_log_display_limit: "Nombre maximum de révisions affichées sur l'historique d'un fichier"
               setting_openid: "Autoriser l'authentification et l'enregistrement OpenID"
+              setting_password_max_age: Expiration des mots de passe après
               setting_password_min_length: Longueur minimum des mots de passe
               setting_new_project_user_role_id: Rôle donné à un utilisateur non-administrateur qui crée un projet
               setting_default_projects_modules: Modules activés par défaut pour les nouveaux projets

config/settings.yml +4 0

             password_min_length:
               format: int
               default: 8
+            # Maximum password age in days
+            password_max_age:
+              format: int
+              default: 0
             # Maximum number of additional email addresses per user
             max_additional_emails:
               format: int

test/integration/account_test.rb +34 0

@@ -150,6 +150,40 class AccountTest < Redmine::IntegrationTest
150	assert_equal false, User.find_by_login('jsmith').must_change_passwd?	150	assert_equal false, User.find_by_login('jsmith').must_change_passwd?
151	end	151	end
152		152
		153	def test_user_with_expired_password_should_be_forced_to_change_its_password
		154	User.find_by_login('jsmith').update_attribute :passwd_changed_on, 14.days.ago
		155
		156	with_settings :password_max_age => 7 do
		157	post '/login', :username => 'jsmith', :password => 'jsmith'
		158	assert_redirected_to '/my/page'
		159	follow_redirect!
		160	assert_redirected_to '/my/password'
		161
		162	get '/issues'
		163	assert_redirected_to '/my/password'
		164	end
		165	end
		166
		167	def test_user_with_expired_password_should_be_able_to_change_its_password
		168	User.find_by_login('jsmith').update_attribute :passwd_changed_on, 14.days.ago
		169
		170	with_settings :password_max_age => 7 do
		171	post '/login', :username => 'jsmith', :password => 'jsmith'
		172	assert_redirected_to '/my/page'
		173	follow_redirect!
		174	assert_redirected_to '/my/password'
		175	follow_redirect!
		176	assert_response :success
		177	post '/my/password', :password => 'jsmith', :new_password => 'newpassword', :new_password_confirmation => 'newpassword'
		178	assert_redirected_to '/my/account'
		179	follow_redirect!
		180	assert_response :success
		181
		182	assert_equal false, User.find_by_login('jsmith').must_change_passwd?
		183	end
		184
		185	end
		186
153	def test_register_with_automatic_activation	187	def test_register_with_automatic_activation
154	Setting.self_registration = '3'	188	Setting.self_registration = '3'
155		189

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages