Download as
Browse Code »

Commit b1fd97bfd2e8cebd02c4fc7aa8b60d3d363bb518

Authored by Antonio Terceiro
1 parent e52a9b49
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem305: supporting old cooperation.net passwords

Showing 2 changed files with 11 additions and 2 deletions   Show diff stats
app/models/user.rb
  Diff comments   View file @b1fd97b
... ... @@ -134,6 +134,10 @@ class User < ActiveRecord::Base
134 134 password
135 135 end
136 136  
  137 + add_encryption_method :crypt do |password, salt|
  138 + password.crypt(salt)
  139 + end
  140 +
137 141 def authenticated?(password)
138 142 result = (crypted_password == encrypt(password))
139 143 if (encryption_method != User.system_encryption_method) && result
... ... @@ -209,7 +213,7 @@ class User < ActiveRecord::Base
209 213 # before filter
210 214 def encrypt_password
211 215 return if password.blank?
212   - self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{login}--") if new_record?
  216 + self.salt ||= Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{login}--") if new_record?
213 217 self.password_type ||= User.system_encryption_method.to_s
214 218 self.crypted_password = encrypt(password)
215 219 end
... ...
test/unit/user_test.rb
  Diff comments   View file @b1fd97b
... ... @@ -165,7 +165,7 @@ class UserTest < Test::Unit::TestCase
165 165 def test_should_encrypt_password_with_salted_sha1
166 166 user = User.new(:login => 'lalala', :email => 'lalala@example.com', :password => 'test', :password_confirmation => 'test')
167 167 user.build_person(person_data)
168   - user.expects(:salt).returns('testsalt')
  168 + user.stubs(:salt).returns('testsalt')
169 169 user.save!
170 170  
171 171 # SHA1+salt crypted form for password 'test', and salt 'testsalt',
... ... @@ -182,6 +182,11 @@ class UserTest < Test::Unit::TestCase
182 182 assert_equal '098f6bcd4621d373cade4e832627b4f6', user.crypted_password
183 183 end
184 184  
  185 + def test_should_support_crypt_passwords
  186 + user = new_user(:login => 'lalala', :email => 'lalala@example.com', :password => 'test', :password_confirmation => 'test', :password_type => 'crypt', :salt => 'test')
  187 + assert_equal 'teH0wLIpW0gyQ', user.crypted_password
  188 + end
  189 +
185 190 def test_should_support_clear_passwords
186 191 assert_equal 'test', new_user(:password => 'test', :password_confirmation => 'test', :password_type => 'clear').crypted_password
187 192 end
... ...