kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prevent registration via OpenID if self registration is off. #699 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2448 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Eric Davis 2009-02-11 19:07:41 +00:00
parent 720f928cd2
commit 85ad791d81
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/account_controller.rb
View File

@ -183,6 +183,9 @@ private
if result.successful? if result.successful?
user = User.find_or_initialize_by_identity_url(identity_url) user = User.find_or_initialize_by_identity_url(identity_url)
if user.new_record? if user.new_record?
# Self-registration off
redirect_to(home_url) && return unless Setting.self_registration?
# Create on the fly # Create on the fly
user.login = registration['nickname'] unless registration['nickname'].nil? user.login = registration['nickname'] unless registration['nickname'].nil?
user.mail = registration['email'] unless registration['email'].nil? user.mail = registration['email'] unless registration['email'].nil?

10
test/functional/account_controller_test.rb
View File

@ -86,7 +86,15 @@ class AccountControllerTest < Test::Unit::TestCase
assert_equal 'Cool', user.firstname assert_equal 'Cool', user.firstname
assert_equal 'User', user.lastname assert_equal 'User', user.lastname
end end
def test_login_with_openid_with_new_user_and_self_registration_off
Setting.self_registration = '0'
post :login, :openid_url => 'http://openid.example.com/good_user'
assert_redirected_to home_url
user = User.find_by_login('cool_user')
assert ! user
end
def test_login_with_openid_with_new_user_created_with_email_activation_should_have_a_token def test_login_with_openid_with_new_user_created_with_email_activation_should_have_a_token
Setting.self_registration = '1' Setting.self_registration = '1'
post :login, :openid_url => 'http://openid.example.com/good_user' post :login, :openid_url => 'http://openid.example.com/good_user'