0
@@ -22,4 +22,5 @@ A list of these people in order of appearance:
0
   * Dag Odenhall <dag.odenhall@gmail.com>
0
   * Will Fisher <will@gina.alaska.edu>
0
   * Jonas Fonseca <fonseca@diku.dk>
0
+  * Patrick Aljord <patcito@gmail.com>
0
   
0
\ No newline at end of file

0
@@ -26,9 +26,10 @@ class User < ActiveRecord::Base
0
 
0
   before_save :encrypt_password
0
   before_create :make_activation_code
0
+  before_validation :lint_identity_url
0
 
0
   def self.find_by_login!(name)
0
-    find_by_login(name) || raise(ActiveRecord::RecordNotFound )
0
+    find_by_login(name) || raise(ActiveRecord::RecordNotFound)
0
   end
0
 
0
   # Authenticates a user by their login name and unencrypted password.  Returns the user or nil.
0
@@ -49,6 +50,16 @@ class User < ActiveRecord::Base
0
     end.join
0
   end
0
   
0
+  def validate
0
+    if !not_openid?
0
+      begin
0
+        OpenIdAuthentication.normalize_url(self.identity_url)
0
+      rescue OpenIdAuthentication::InvalidOpenId => e
0
+        errors.add(:identity_url, "Invalid url")
0
+      end
0
+    end
0
+  end
0
+  
0
   # Activates the user in the database.
0
   def activate
0
     @activated = true
0
@@ -139,4 +150,11 @@ class User < ActiveRecord::Base
0
     def make_activation_code
0
       self.activation_code = Digest::SHA1.hexdigest( Time.now.to_s.split(//).sort_by {rand}.join )
0
     end
0
+    
0
+    def lint_identity_url
0
+      return if not_openid?
0
+      self.identity_url = OpenIdAuthentication.normalize_url(self.identity_url)
0
+    rescue OpenIdAuthentication::InvalidOpenId
0
+      # validate will catch it instead
0
+    end
0
 end

0
@@ -154,6 +154,23 @@ describe User do
0
     User.authenticate(u.email, password).should_not be_nil
0
   end
0
   
0
+  it "normalizes identity urls" do
0
+    u = users(:johan)
0
+    u.identity_url = "http://johan.someprovider.com"
0
+    u.valid?.should be_true
0
+    u.identity_url.should == "http://johan.someprovider.com/"
0
+    
0
+    u.identity_url = "http://johan.someprovider.com/me"
0
+    u.valid?.should be_true
0
+    u.identity_url.should == "http://johan.someprovider.com/me"
0
+  end
0
+  
0
+  it "catches invalid identity_url" do
0
+    u = users(:johan)
0
+    u.identity_url = "€&/()"
0
+    u.should have(1).errors_on(:identity_url)
0
+  end
0
+  
0
   protected
0
     def create_user(options = {})
0
       u = User.new({