salted_login_generator 1.0.3 → 1.0.4

data/templates/app-config-test.yml

@@ -3,4 +3,4 @@ admin_email:
 server_env: test
 app_url:
 app_base_uri: 
-app_name:
+app_name:

data/templates/controller.rb

@@ -26,7 +26,7 @@ class <%= class_name %>Controller < ApplicationController
     when :post
       @user = User.new(@params['user'])
       begin
-        @user.transaction do
+        User.transaction(@user) do
           if @user.save
             Notify.deliver_signup(@user, @params['user']['password'])
             flash['notice'] = "Signup successful! Please check your registered email account to verify your account registration and continue with the login."
@@ -51,11 +51,11 @@ class <%= class_name %>Controller < ApplicationController
     case @request.method
     when :post
       @user = @session['user']
-      @user.attributes = @params['user']
       begin
-        @user.transaction do
+        User.transaction(@user) do
+          @user.attributes = @params['user']
+          @user.change_password(@params['user']['password'])
           if @user.save
-            @user.change_password(@params['user']['password'])
             Notify.deliver_change_password(@user, @params['user']['password'])
             flash['notice'] = "Your updated password has been emailed to #{@user.email}"
             @user = nil
@@ -80,13 +80,11 @@ class <%= class_name %>Controller < ApplicationController
         if @user.nil?
           flash['message'] = "We could not find a user with the email address #{@params['user']['email']}"
         else
-          @user.password_confirmation = @user.password
-          pass = @user.makepass
           begin
-            @user.transaction do
-#              raise "1: #{@user.password_confirmation} 2: #{@user.password}" # = nil
+            User.transaction(@user) do
+              pass = @user.makepass
+              @user.change_password(pass)
               if @user.save
-                @user.change_password(pass)
                 Notify.deliver_forgot_password(@user, pass)
                 flash['notice'] = "Your new password has been emailed to #{@params['user']['email']}"
                 @user = nil
@@ -95,8 +93,7 @@ class <%= class_name %>Controller < ApplicationController
               end
             end
           rescue
-            flash['notice'] = "Your password could not be emailed to #{@params['user']['email']}"
-#            raise
+            flash['message'] = "Your password could not be emailed to #{@params['user']['email']}"
           end
         end
       end

data/templates/controller_test.rb

@@ -25,74 +25,115 @@ class AccountControllerTest < Test::Unit::TestCase
     assert_redirect_url "/bogus/location"
   end
   
-  def test_signup
+  def do_test_signup(bad_password, bad_email)
     ActionMailer::Base.deliveries = []
+    CONFIG['inject_mailer_error'] = false
+
     @request.session['return-to'] = "/bogus/location"
 
-    post :signup, "user" => { "login" => "newbob", "password" => "newpassword", "password_confirmation" => "newpassword", "email" => "newbob@test.com" }
-    assert_session_has_no "user"
+    if not bad_password and not bad_email
+      post :signup, "user" => { "login" => "newbob", "password" => "newpassword", "password_confirmation" => "newpassword", "email" => "newbob@test.com" }
+      assert_session_has_no "user"
     
-    assert_redirect_url(@controller.url_for(:action => "login"))
-    assert_equal 1, ActionMailer::Base.deliveries.size
-    mail = ActionMailer::Base.deliveries[0]
-    assert_equal "newbob@test.com", mail.to_addrs[0].to_s
-    assert_match /login:\s+\w+\n/, mail.encoded
-    assert_match /password:\s+\w+\n/, mail.encoded
-
-    user = User.find_by_email("newbob@test.com")
-    assert_not_nil user
-    assert_equal 0, user.verified
-    post :verify, "id" => user.uuid.to_s
-    user = User.find_by_email("newbob@test.com")
-    assert_equal 1, user.verified
-    assert_redirect_url(@controller.url_for(:action => "login"))
+      assert_redirect_url(@controller.url_for(:action => "login"))
+      assert_equal 1, ActionMailer::Base.deliveries.size
+      mail = ActionMailer::Base.deliveries[0]
+      assert_equal "newbob@test.com", mail.to_addrs[0].to_s
+      assert_match /login:\s+\w+\n/, mail.encoded
+      assert_match /password:\s+\w+\n/, mail.encoded
+
+      user = User.find_by_email("newbob@test.com")
+      assert_not_nil user
+      assert_equal 0, user.verified
+      post :verify, "id" => user.uuid.to_s
+      user = User.find_by_email("newbob@test.com")
+      assert_equal 1, user.verified
+      assert_redirect_url(@controller.url_for(:action => "login"))
+      post :login, "user" => { "login" => "newbob", "password" => "newpassword" }
+      assert_session_has "user"
+      get :logout
+    elsif bad_password
+      post :signup, "user" => { "login" => "newbob", "password" => "bad", "password_confirmation" => "bad", "email" => "newbob@test.com" }
+      assert_session_has_no "user"
+      assert_invalid_column_on_record "user", "password"
+      assert_success
+      assert_equal 0, ActionMailer::Base.deliveries.size
+    elsif bad_email
+      CONFIG['inject_mailer_error'] = true
+      post :signup, "user" => { "login" => "newbob", "password" => "newpassword", "password_confirmation" => "newpassword", "email" => "newbob@test.com" }
+      CONFIG['inject_mailer_error'] = false
+      assert_session_has_no "user"
+      assert_equal 0, ActionMailer::Base.deliveries.size
+      assert_flash_has "message"
+    else
+      # Invalid test case
+      assert false
+    end
   end
 
-  def do_change_password(bad)
+  def test_signup
+    do_test_signup(true, false)
+    do_test_signup(false, true)
+    do_test_signup(false, false)
+  end
+
+  def do_change_password(bad_password, bad_email)
     ActionMailer::Base.deliveries = []
+    CONFIG['inject_mailer_error'] = false
 
     post :login, "user" => { "login" => "bob", "password" => "atest" }
     assert_session_has "user"
 
     @request.session['return-to'] = "/bogus/location"
-    if not bad
+    if not bad_password and not bad_email
       post :change_password, "user" => { "password" => "changed_password", "password_confirmation" => "changed_password" }
       assert_equal 1, ActionMailer::Base.deliveries.size
       mail = ActionMailer::Base.deliveries[0]
       assert_equal "bob@test.com", mail.to_addrs[0].to_s
       assert_match /login:\s+\w+\n/, mail.encoded
       assert_match /password:\s+\w+\n/, mail.encoded
-
       assert_redirect_url "/bogus/location"
-    else
+    elsif bad_password
       post :change_password, "user" => { "password" => "bad", "password_confirmation" => "bad" }
       assert_invalid_column_on_record "user", "password"
       assert_success
       assert_equal 0, ActionMailer::Base.deliveries.size
+    elsif bad_email
+      CONFIG['inject_mailer_error'] = true
+      post :change_password, "user" => { "password" => "changed_password", "password_confirmation" => "changed_password" }
+      CONFIG['inject_mailer_error'] = false
+      assert_equal 0, ActionMailer::Base.deliveries.size
+      assert_flash_has "message"
+    else
+      # Invalid test case
+      assert false
     end
 
     get :logout
     assert_session_has_no "user"
 
-    if not bad
+    if not bad_password and not bad_email
       post :login, "user" => { "login" => "bob", "password" => "changed_password" }
       assert_session_has "user"
       post :change_password, "user" => { "password" => "atest", "password_confirmation" => "atest" }
-    else
-      post :login, "user" => { "login" => "bob", "password" => "atest" }
-      assert_session_has "user"
+      get :logout
     end
 
+    post :login, "user" => { "login" => "bob", "password" => "atest" }
+    assert_session_has "user"
+
     get :logout
   end
 
   def test_change_password
-    do_change_password(false)
-    do_change_password(true)
+    do_change_password(false, false)
+    do_change_password(true, false)
+    do_change_password(false, true)
   end
 
-  def do_forgot_password(bad, logged_in)
+  def do_forgot_password(bad_address, bad_email, logged_in)
     ActionMailer::Base.deliveries = []
+    CONFIG['inject_mailer_error'] = false
 
     if logged_in
       post :login, "user" => { "login" => "bob", "password" => "atest" }
@@ -100,11 +141,7 @@ class AccountControllerTest < Test::Unit::TestCase
     end
 
     @request.session['return-to'] = "/bogus/location"
-    if bad
-      post :forgot_password, "user" => { "email" => "bademail@test.com" }
-      assert_equal 0, ActionMailer::Base.deliveries.size
-      assert_flash_has "message"
-    else
+    if not bad_address and not bad_email
       post :forgot_password, "user" => { "email" => "bob@test.com" }
       assert_equal 1, ActionMailer::Base.deliveries.size
       mail = ActionMailer::Base.deliveries[0]
@@ -113,27 +150,52 @@ class AccountControllerTest < Test::Unit::TestCase
       assert_match /password:\s+\w{8}\n/, mail.encoded
       mail.encoded =~ /password:\s+(\w{8})\n/
       password = $1
+    elsif bad_address
+      post :forgot_password, "user" => { "email" => "bademail@test.com" }
+      assert_equal 0, ActionMailer::Base.deliveries.size
+      assert_flash_has "message"
+    elsif bad_email
+      CONFIG['inject_mailer_error'] = true
+      post :forgot_password, "user" => { "email" => "bob@test.com" }
+      CONFIG['inject_mailer_error'] = false
+      assert_equal 0, ActionMailer::Base.deliveries.size
+      assert_flash_has "message"
+    else
+      # Invalid test case
+      assert false
     end
 
-    if logged_in
-      assert_redirect_url "/bogus/location"
-    else
-      if not bad
+    if not bad_address and not bad_email
+      if logged_in
+        assert_redirect_url "/bogus/location"
+        get :logout
+      else
         assert_redirect_url(@controller.url_for(:action => "login"))
-        post :login, "user" => { "login" => "bob", "password" => "#{password}" }
       end
+      post :login, "user" => { "login" => "bob", "password" => "#{password}" }
+    else
+      # Okay, make sure the database did not get changed
+      if logged_in
+        get :logout
+      end
+      post :login, "user" => { "login" => "bob", "password" => "atest" }
     end
 
-    if not bad
+    assert_session_has "user"
+
+    # Put the old settings back
+    if not bad_address and not bad_email
       post :change_password, "user" => { "password" => "atest", "password_confirmation" => "atest" }
-      get :logout
     end
+    
+    get :logout
   end
 
   def test_forgot_password
-    do_forgot_password(false, false)
-    do_forgot_password(false, true)
-    do_forgot_password(true, false)
+    do_forgot_password(false, false, false)
+    do_forgot_password(false, false, true)
+    do_forgot_password(true, false, false)
+    do_forgot_password(false, true, false)
   end
 
   def test_bad_signup

data/templates/notify.rb

@@ -12,6 +12,10 @@ class Notify < ActionMailer::Base
     @body["password"] = password
     @body["url"] = url || CONFIG['app_url'].to_s
     @body["uuid"] = user.uuid
+
+    if CONFIG['inject_mailer_error']
+      raise "Signup mail failed"
+    end
   end
 
   def forgot_password(user, password, url=nil, sent_on=Time.now)
@@ -26,6 +30,10 @@ class Notify < ActionMailer::Base
     @body["login"] = user.login
     @body["password"] = password
     @body["url"] = url || CONFIG['app_url'].to_s
+
+    if CONFIG['inject_mailer_error']
+      raise "Forgot password mail failed"
+    end
   end
 
   def change_password(user, password, url=nil, sent_on=Time.now)
@@ -40,5 +48,9 @@ class Notify < ActionMailer::Base
     @body["login"] = user.login
     @body["password"] = password
     @body["url"] = url || CONFIG['app_url'].to_s
+
+    if CONFIG['inject_mailer_error']
+      raise "Change password mail failed"
+    end
   end
 end

data/templates/user.rb

@@ -12,8 +12,7 @@ class User < ActiveRecord::Base
   end
 
   def change_password(pass)
-    update_attribute("salt", self.class.hashed("salt-#{Time.now}"))
-    update_attribute("password", self.class.salted_password(salt, self.class.hashed(pass)))
+    self.password_confirmation = self.password = pass
   end
     
   def makepass
@@ -23,7 +22,8 @@ class User < ActiveRecord::Base
   end
 
   def verify
-    update_attribute("verified", 1)
+    toggle("verified")
+    update_without_callbacks
   end
 
   protected
@@ -32,7 +32,8 @@ class User < ActiveRecord::Base
     return Digest::SHA1.hexdigest("change-me--#{str}--")[0..39]
   end
 
-  before_create :generate_uuid, :crypt_password
+  before_create :generate_uuid
+  before_save :crypt_password
   
   def crypt_password
     write_attribute("salt", self.class.hashed("salt-#{Time.now}"))

data/templates/user_model.sql

@@ -12,4 +12,4 @@ CREATE TABLE users (
   updated_at DATETIME default NULL,
   logged_in_at DATETIME default NULL,
   PRIMARY KEY (id)
-);
+) TYPE=InnoDB;

data/templates/user_test.rb

@@ -15,9 +15,11 @@ class UserTest < Test::Unit::TestCase
   def test_passwordchange
         
     @longbob.change_password("nonbobpasswd")
+    @longbob.save
     assert_equal @longbob, User.authenticate("longbob", "nonbobpasswd")
     assert_nil   User.authenticate("longbob", "alongtest")
     @longbob.change_password("alongtest")
+    @longbob.save
     assert_equal @longbob, User.authenticate("longbob", "alongtest")
     assert_nil   User.authenticate("longbob", "nonbobpasswd")
         

data/templates/users.yml

@@ -3,23 +3,23 @@
 bob:
   id: 1000001
   login: bob
-  password: 1e340b1f9adc4d6341feeb35d2a0f496ba8ed36c # atest
-  salt: 83adfb824223d02e163f903707dec5589e431c61
+  password: ef94c16f6c124a4e84cc215c164767bfa25f6e92 # atest
+  salt: 7f8b036f9b647d46d22abdbfc8113f44a88f9889
   email: bob@test.com
   verified: 1
   
 existingbob:
   id: 1000002
   login: existingbob
-  password: 313d038a07f750cbcbe09066ee5f46ac08ce5ceb # atest
-  salt: 90ba172042b62f36d47c87e8dac0d07ac788cef4
+  password: 99d6b680d4bfa81cbd383ffa0390bb03323a0b9a # atest
+  salt: fc76daa7bc4e4b7833375cf9deca38beee4c5581
   email: existingbob@test.com
   verified: 1  
 
 longbob:
   id: 1000003
   login: longbob
-  password: a255d0285bd2a5a5df497af3c28c1a8a11739dcb # alongtest
-  salt: 4780fb458484e17611a9c20a72a21f7c564811cb
+  password: c841391e1d29100a4920de7a8fbb4b0fd180c6c0 # alongtest
+  salt: c068e3671780f16898c0a8295ae8d82cc59713e2
   email: longbob@test.com
   verified: 1

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.8
 specification_version: 1
 name: salted_login_generator
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 date: 2005-04-16
 summary: "[Rails] Login generator with salted passwords."
 require_paths: