Download as
Browse Code »

Commit f8c24bf813deead94b3bac788def6db4d9d9a1ae

Authored by Rodrigo Souto
1 parent 401a2773
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

Add support for salted_md5 passwords

Showing 2 changed files with 10 additions and 0 deletions   Show diff stats
app/models/user.rb
  Diff comments   View file @f8c24bf
@@ -201,6 +201,10 @@ class User < ActiveRecord::Base @@ -201,6 +201,10 @@ class User < ActiveRecord::Base
201 Digest::MD5.hexdigest(password) 201 Digest::MD5.hexdigest(password)
202 end 202 end
203 203
  204 + add_encryption_method :salted_md5 do |password, salt|
  205 + Digest::MD5.hexdigest(password+salt)
  206 + end
  207 +
204 add_encryption_method :clear do |password, salt| 208 add_encryption_method :clear do |password, salt|
205 password 209 password
206 end 210 end
test/unit/user_test.rb
  Diff comments   View file @f8c24bf
@@ -190,6 +190,12 @@ class UserTest < ActiveSupport::TestCase @@ -190,6 +190,12 @@ class UserTest < ActiveSupport::TestCase
190 assert_equal '098f6bcd4621d373cade4e832627b4f6', user.crypted_password 190 assert_equal '098f6bcd4621d373cade4e832627b4f6', user.crypted_password
191 end 191 end
192 192
  193 +
  194 + def test_should_support_salted_md5_passwords
  195 + user = new_user(:login => 'lalala', :email => 'lalala@example.com', :password => 'test', :password_confirmation => 'test', :password_type => 'salted_md5', :salt => 'test')
  196 + assert_equal '05a671c66aefea124cc08b76ea6d30bb', user.crypted_password
  197 + end
  198 +
193 def test_should_support_crypt_passwords 199 def test_should_support_crypt_passwords
194 user = new_user(:login => 'lalala', :email => 'lalala@example.com', :password => 'test', :password_confirmation => 'test', :password_type => 'crypt', :salt => 'test') 200 user = new_user(:login => 'lalala', :email => 'lalala@example.com', :password => 'test', :password_confirmation => 'test', :password_type => 'crypt', :salt => 'test')
195 assert_equal 'teH0wLIpW0gyQ', user.crypted_password 201 assert_equal 'teH0wLIpW0gyQ', user.crypted_password