Merged r3933 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3983 e93f8b46-1217-0410-a6f0-8f06a7374b81

Merged r3933 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3983 e93f8b46-1217-0410-a6f0-8f06a7374b81
7ca197b3 · Eric Davis · 72ce3e18 · 7ca197b3 · 7ca197b3
Commit 7ca197b3 authored Aug 19, 2010 by Eric Davis
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

account_controller_test.rb test/functional/account_controller_test.rb +7 -0

open_id_authentication.rb ...gins/open_id_authentication/lib/open_id_authentication.rb +1 -1

No files found.
--- a/test/functional/account_controller_test.rb
+++ b/test/functional/account_controller_test.rb
@@ -67,6 +67,13 @@ class AccountControllerTest < ActionController::TestCase
    assert_redirected_to 'my/page'
  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
    Setting.self_registration = '2'
    Setting.openid = '1'

--- a/vendor/plugins/open_id_authentication/lib/open_id_authentication.rb
+++ b/vendor/plugins/open_id_authentication/lib/open_id_authentication.rb
@@ -89,7 +89,7 @@ module OpenIdAuthentication

      begin
        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
      rescue URI::InvalidURIError
        raise InvalidOpenId.new("#{identifier} is not an OpenID identifier")