jro_apps/redmine Commit - r13954:e12322dac3ba

config/configuration.yml.example +7 0

               # same secret token on each machine.
               #secret_token: 'change it to a long random string'
+              # Requires users to re-enter their password for sensitive actions (editing
+              # of account data, project memberships, application settings, user, group,
+              # role, auth source management and project deletion).
+              # Disabled by default.
+              #
+              #sudo_mode: true
               # Absolute path (e.g. /usr/bin/convert, c:/im/convert.exe) to
               # the ImageMagick's `convert` binary. Used to generate attachment thumbnails.
               #imagemagick_convert_command:

lib/redmine/sudo_mode.rb +3 -4

                 end
                 def self.possible?
-                  !disabled? && User.current.logged?
+                  enabled? && User.current.logged?
                 end
                 # Turn off sudo mode (never require password entry).
                   RequestStore.store[:sudo_mode_disabled] = nil
                 end
-                def self.disabled?
+                def self.enabled?
-                  !!RequestStore.store[:sudo_mode_disabled]
+                  Redmine::Configuration['sudo_mode'] && !RequestStore.store[:sudo_mode_disabled]
                 end
               end
             end

test/functional/auth_sources_controller_test.rb 0 -1

               def setup
                 @request.session[:user_id] = 1
-                Redmine::SudoMode.disable!
               end
               def test_index

test/functional/email_addresses_controller_test.rb 0 -1

               def setup
                 User.current = nil
-                Redmine::SudoMode.disable!
               end
               def test_index_with_no_additional_emails

test/functional/groups_controller_test.rb 0 -1

               def setup
                 @request.session[:user_id] = 1
-                Redmine::SudoMode.disable!
               end
               def test_index

test/functional/members_controller_test.rb 0 -1

               def setup
                 User.current = nil
                 @request.session[:user_id] = 2
-                Redmine::SudoMode.disable!
               end
               def test_new

test/functional/my_controller_test.rb 0 -1

               def setup
                 @request.session[:user_id] = 2
-                Redmine::SudoMode.disable!
               end
               def test_index

test/functional/projects_controller_test.rb 0 -1

               def setup
                 @request.session[:user_id] = nil
                 Setting.default_language = 'en'
-                Redmine::SudoMode.disable!
               end
               def test_index_by_anonymous_should_not_show_private_projects

test/functional/roles_controller_test.rb 0 -1

               def setup
                 User.current = nil
                 @request.session[:user_id] = 1 # admin
-                Redmine::SudoMode.disable!
               end
               def test_index

test/functional/settings_controller_test.rb 0 -1

               def setup
                 User.current = nil
                 @request.session[:user_id] = 1 # admin
-                Redmine::SudoMode.disable!
               end
               def test_index

test/functional/users_controller_test.rb 0 -1

               def setup
                 User.current = nil
                 @request.session[:user_id] = 1 # admin
-                Redmine::SudoMode.disable!
               end
               def test_index

test/integration/admin_test.rb 0 -17

@@ -26,14 +26,6 class AdminTest < Redmine::IntegrationTest
26	:members,	26	:members,
27	:enabled_modules	27	:enabled_modules
28		28
29	def setup
30	Redmine::SudoMode.enable!
31	end
32
33	def teardown
34	Redmine::SudoMode.disable!
35	end
36
37	def test_add_user	29	def test_add_user
38	log_user("admin", "admin")	30	log_user("admin", "admin")
39	get "/users/new"	31	get "/users/new"
@@ -44,15 +36,6 class AdminTest < Redmine::IntegrationTest
44	:lastname => "Smith", :mail => "psmith@somenet.foo",	36	:lastname => "Smith", :mail => "psmith@somenet.foo",
45	:language => "en", :password => "psmith09",	37	:language => "en", :password => "psmith09",
46	:password_confirmation => "psmith09" }	38	:password_confirmation => "psmith09" }
47	assert_response :success
48	assert_nil User.find_by_login("psmith")
49
50	post "/users",
51	:user => { :login => "psmith", :firstname => "Paul",
52	:lastname => "Smith", :mail => "psmith@somenet.foo",
53	:language => "en", :password => "psmith09",
54	:password_confirmation => "psmith09" },
55	:sudo_password => 'admin'
56		39
57	user = User.find_by_login("psmith")	40	user = User.find_by_login("psmith")
58	assert_kind_of User, user	41	assert_kind_of User, user

test/integration/sudo_test.rb +23 -3

@@ -4,11 +4,31 class SudoTest < Redmine::IntegrationTest
4	fixtures :projects, :members, :member_roles, :roles, :users	4	fixtures :projects, :members, :member_roles, :roles, :users
5		5
6	def setup	6	def setup
7	Redmine::SudoMode.enable!	7	Redmine::SudoMode.stubs(:enabled?).returns(true)
8	end	8	end
9		9
10	def tear~~down~~	10	def test_add_user
11	Redmine::SudoMode.disable!	11	log_user("admin", "admin")
		12	get "/users/new"
		13	assert_response :success
		14	post "/users",
		15	:user => { :login => "psmith", :firstname => "Paul",
		16	:lastname => "Smith", :mail => "psmith@somenet.foo",
		17	:language => "en", :password => "psmith09",
		18	:password_confirmation => "psmith09" }
		19	assert_response :success
		20	assert_nil User.find_by_login("psmith")
		21
		22	post "/users",
		23	:user => { :login => "psmith", :firstname => "Paul",
		24	:lastname => "Smith", :mail => "psmith@somenet.foo",
		25	:language => "en", :password => "psmith09",
		26	:password_confirmation => "psmith09" },
		27	:sudo_password => 'admin'
		28	assert_response 302
		29
		30	user = User.find_by_login("psmith")
		31	assert_kind_of User, user
12	end	32	end
13		33
14	def test_create_member_xhr	34	def test_create_member_xhr

test/test_helper.rb +2 0

             require 'net/ldap'
             require 'mocha/setup'
+            Redmine::SudoMode.disable!
             class ActionView::TestCase
               helper :application
               include ApplicationHelper

	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