jro_apps/redmine Commit - r11851:b764e398475c

db/migrate/20130729070143_add_users_must_change_passwd.rb created 644 +9 0

@@ -0,0 +1,9
	1	class AddUsersMustChangePasswd < ActiveRecord::Migration
	2	def up
	3	add_column :users, :must_change_passwd, :boolean, :default => false, :null => false
	4	end
	5
	6	def down
	7	remove_column :users, :must_change_passwd
	8	end
	9	end

app/controllers/account_controller.rb +1 -1

               include CustomFieldsHelper
               # prevents login action to be filtered by check_if_login_required application scope filter
-              skip_before_filter :check_if_login_required
+              skip_before_filter :check_if_login_required, :check_password_change
               # Login request and validation
               def login

app/controllers/application_controller.rb +18 -1

                 cookies.delete(autologin_cookie_name)
               end
-              before_filter :session_expiration, :user_setup, :check_if_login_required, :set_localization
+              before_filter :session_expiration, :user_setup, :check_if_login_required, :check_password_change, :set_localization
               rescue_from ActionController::InvalidAuthenticityToken, :with => :invalid_authenticity_token
               rescue_from ::Unauthorized, :with => :deny_access
                 session[:user_id] = user.id
                 session[:ctime] = Time.now.utc.to_i
                 session[:atime] = Time.now.utc.to_i
+                if user.must_change_password?
+                  session[:pwd] = '1'
+                end
               end
               def user_setup
                     authenticate_with_http_basic do |username, password|
                       user = User.try_to_login(username, password) || User.find_by_api_key(username)
                     end
+                    if user && user.must_change_password?
+                      render_error :message => 'You must change your password', :status => 403
+                      return
+                    end
                   end
                   # Switch user if requested by an admin user
                   if user && user.admin? && (username = api_switch_user_from_request)
                 require_login if Setting.login_required?
               end
+              def check_password_change
+                if session[:pwd]
+                  if User.current.must_change_password?
+                    redirect_to my_password_path
+                  else
+                    session.delete(:pwd)
+                  end
+                end
+              end
               def set_localization
                 lang = nil
                 if User.current.logged?

app/controllers/my_controller.rb +8 -3

             class MyController < ApplicationController
               before_filter :require_login
+              # let user change his password when he has to
+              skip_before_filter :check_password_change, :only => :password
               helper :issues
               helper :users
                   return
                 end
                 if request.post?
-                  if @user.check_password?(params[:password])
+                  if !@user.check_password?(params[:password])
+                    flash.now[:error] = l(:notice_account_wrong_password)
+                  elsif params[:password] == params[:new_password]
+                    flash.now[:error] = 'Your new password must be different from your current password'
+                  else
                     @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
+                    @user.must_change_passwd = false
                     if @user.save
                       flash[:notice] = l(:notice_account_password_updated)
                       redirect_to my_account_path
                     end
-                  else
-                    flash[:error] = l(:notice_account_wrong_password)
                   end
                 end
               end

app/models/user.rb +5 0

                 return auth_source.allow_password_changes?
               end
+              def must_change_password?
+                must_change_passwd? && change_password_allowed?
+              end
               def generate_password?
                 generate_password == '1' || generate_password == true
               end
               safe_attributes 'status',
                 'auth_source_id',
                 'generate_password',
+                'must_change_passwd',
                 :if => lambda {|user, current_user| current_user.admin?}
               safe_attributes 'group_ids',

app/views/my/password.html.erb +4 0

             <%= submit_tag l(:button_apply) %>
             <% end %>
+            <% unless @user.must_change_passwd? %>
             <% content_for :sidebar do %>
             <%= render :partial => 'sidebar' %>
             <% end %>
+            <% end %>
+            <%= javascript_tag "$('#password').focus();" %>

app/views/users/_form.html.erb +2 -1

               <p><%= f.select :auth_source_id, ([[l(:label_internal), ""]] + @auth_sources.collect { |a| [a.name, a.id] }), {}, :onchange => "if (this.value=='') {$('#password_fields').show();} else {$('#password_fields').hide();}" %></p>
               <% end %>
               <div id="password_fields" style="<%= 'display:none;' if @user.auth_source %>">
-              <p><%= f.check_box :generate_password %></p>
               <p><%= f.password_field :password, :required => true, :size => 25  %>
               <em class="info"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
               <p><%= f.password_field :password_confirmation, :required => true, :size => 25  %></p>
+              <p><%= f.check_box :generate_password %></p>
+              <p><%= f.check_box :must_change_passwd %></p>
               </div>
             </fieldset>
             </div>

config/locales/en.yml +1 0

               field_private_notes: Private notes
               field_inherit_members: Inherit members
               field_generate_password: Generate password
+              field_must_change_passwd: Must change password at next logon
               setting_app_title: Application title
               setting_app_subtitle: Application subtitle

config/locales/fr.yml +1 0

               field_private_notes: Notes privées
               field_inherit_members: Hériter les membres
               field_generate_password: Générer un mot de passe
+              field_must_change_passwd: Doit changer de mot de passe à la prochaine connexion
               setting_app_title: Titre de l'application
               setting_app_subtitle: Sous-titre de l'application

test/integration/account_test.rb +29 0

@@ -128,6 +128,35 class AccountTest < ActionController::IntegrationTest
128	assert_equal 0, Token.count	128	assert_equal 0, Token.count
129	end	129	end
130		130
		131	def test_user_with_must_change_passwd_should_be_forced_to_change_its_password
		132	User.find_by_login('jsmith').update_attribute :must_change_passwd, true
		133
		134	post '/login', :username => 'jsmith', :password => 'jsmith'
		135	assert_redirected_to '/my/page'
		136	follow_redirect!
		137	assert_redirected_to '/my/password'
		138
		139	get '/issues'
		140	assert_redirected_to '/my/password'
		141	end
		142
		143	def test_user_with_must_change_passwd_should_be_able_to_change_its_password
		144	User.find_by_login('jsmith').update_attribute :must_change_passwd, true
		145
		146	post '/login', :username => 'jsmith', :password => 'jsmith'
		147	assert_redirected_to '/my/page'
		148	follow_redirect!
		149	assert_redirected_to '/my/password'
		150	follow_redirect!
		151	assert_response :success
		152	post '/my/password', :password => 'jsmith', :new_password => 'newpassword', :new_password_confirmation => 'newpassword'
		153	assert_redirected_to '/my/account'
		154	follow_redirect!
		155	assert_response :success
		156
		157	assert_equal false, User.find_by_login('jsmith').must_change_passwd?
		158	end
		159
131	def test_register_with_automatic_activation	160	def test_register_with_automatic_activation
132	Setting.self_registration = '3'	161	Setting.self_registration = '3'
133		162

	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