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

Prevent 500 error on login when there's a typo in OpenID URI scheme, such as http;// or http.// 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3933 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Baptiste Barth 2010-08-10 21:12:32 +00:00
parent 52c624aabd
commit 83e4cf3dd4
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/functional/account_controller_test.rb
View File

@ -67,6 +67,13 @@ class AccountControllerTest < ActionController::TestCase
assert_redirected_to 'my/page' assert_redirected_to 'my/page'
end end
def test_login_with_invalid_openid_provider
Setting.self_registration = '0'
Setting.openid = '1'
post :login, :openid_url => 'http;//openid.example.com/good_user'
assert_redirected_to home_url
end
def test_login_with_openid_for_existing_non_active_user def test_login_with_openid_for_existing_non_active_user
Setting.self_registration = '2' Setting.self_registration = '2'
Setting.openid = '1' Setting.openid = '1'

2
vendor/plugins/open_id_authentication/lib/open_id_authentication.rb vendored
View File

@ -89,7 +89,7 @@ module OpenIdAuthentication
begin begin
uri = URI.parse(identifier) uri = URI.parse(identifier)
uri.scheme = uri.scheme.downcase # URI should do this uri.scheme = uri.scheme.downcase if uri.scheme # URI should do this
identifier = uri.normalize.to_s identifier = uri.normalize.to_s
rescue URI::InvalidURIError rescue URI::InvalidURIError
raise InvalidOpenId.new("#{identifier} is not an OpenID identifier") raise InvalidOpenId.new("#{identifier} is not an OpenID identifier")