jro_apps/redmine Commit - r2415:d643d9a94c65

Fixed: User#identity_url raises an error when invalid url is supplied (#2742)....

Jean-Philippe Lang -

r2415:d643d9a94c65

parent child

Context file:

r2415:d643d9a94c65

app/models/user.rb +6 -2

                end
                def identity_url=(url)
+                 if url.blank?
+                   write_attribute(:identity_url, '')
+                 else
                  begin
-                   self.write_attribute(:identity_url, OpenIdAuthentication.normalize_identifier(url))
-                 rescue InvalidOpenId
+                     write_attribute(:identity_url, OpenIdAuthentication.normalize_identifier(url))
+                   rescue OpenIdAuthentication::InvalidOpenId
                    # Invlaid url, don't save
                  end
+                 end
                  self.read_attribute(:identity_url)
                end

test/unit/user_test.rb +11 0

                  assert_equal normalized_open_id_url, u.identity_url
                end
+               def test_setting_blank_identity_url
+                 u = User.new( :identity_url => 'example.com' )
+                 u.identity_url = ''
+                 assert u.identity_url.blank?
+               end
+               def test_setting_invalid_identity_url
+                 u = User.new( :identity_url => 'this is not an openid url' )
+                 assert u.identity_url.blank?
+               end
                else
                  puts "Skipping openid tests."
                end

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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