protected 1.0.0 → 1.0.1

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2012 YOURNAME
+Copyright 2012 Mark Daggett
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/models/protected/user.rb

@@ -69,9 +69,7 @@ module Protected
   require  File.dirname(__FILE__) + '/../../../lib/protected/password_utils'
 
   class User < ActiveRecord::Base
-    # devise :database_authenticatable, :recoverable, :trackable, :validatable, :lockable, :timeoutable, :password_archivable,
-    #  :maximum_attempts => 4, :unlock_strategy => :none
-    devise :database_authenticatable, :recoverable, :trackable, :validatable, :lockable, :timeoutable,
+    devise :database_authenticatable, :recoverable, :trackable, :validatable, :lockable, :timeoutable, :password_archivable,
     :maximum_attempts => 4, :unlock_strategy => :none
 
     has_many :old_passwords, :as => :password_archivable, :dependent => :destroy

data/config/initializers/devise.rb

@@ -156,8 +156,8 @@ Devise.setup do |config|
   # and :restful_authentication_sha1 (then you should set stretches to 10, and copy
   # REST_AUTH_SITE_KEY to pepper)
   config.encryptor = :bcrypt
-  # config.password_archiving_count = 5
-  # config.deny_old_passwords = true
+  config.password_archiving_count = 5
+  config.deny_old_passwords = true
 
   # ==> Configuration for :token_authenticatable
   # Defines name of the authentication token params key

data/config/locales/devise.en.yml

@@ -3,6 +3,7 @@
 en:
   errors:
     messages:
+      taken_in_past: "was already taken in the past!"
       expired: "has expired, please request a new one"
       not_found: "not found"
       already_confirmed: "was already confirmed, please try signing in"

data/lib/generators/protected/templates/devise.rb

@@ -174,8 +174,8 @@ Devise.setup do |config|
   # REST_AUTH_SITE_KEY to pepper)
   # config.encryptor = :sha512
   config.encryptor = :bcrypt
-  # config.password_archiving_count = 5
-  # config.deny_old_passwords = true
+  config.password_archiving_count = 5
+  config.deny_old_passwords = true
 
   # ==> Configuration for :token_authenticatable
   # Defines name of the authentication token params key

data/lib/protected.rb

@@ -1,4 +1,14 @@
 require "protected/engine"
+require 'devise'
+module Devise
+  # How often save old passwords in archive
+  mattr_accessor :password_archiving_count
+  @@password_archiving_count = 5
 
+  # Deny old password (true, false, count)
+  mattr_accessor :deny_old_passwords
+  @@deny_old_passwords = true
+end
 module Protected
 end
+Devise.add_module :password_archivable, :model => "#{File.dirname(__FILE__)}/protected/password_archiveable"

data/lib/protected/password_archiveable.rb

@@ -0,0 +1,64 @@
+module Devise
+  module Models
+
+    # PasswordArchivable
+    module PasswordArchivable
+      extend  ActiveSupport::Concern
+
+      included do
+        has_many :old_passwords, :as => :password_archivable, :dependent => :destroy, :order => 'id DESC'
+        before_update :archive_password
+        validate :validate_password_archive
+      end
+
+      def validate_password_archive
+        self.errors.add(:password, :taken_in_past) if encrypted_password_changed? and password_archive_included?
+      end
+
+      # validate is the password used in the past
+      def password_archive_included?
+        unless self.class.deny_old_passwords.is_a? Fixnum
+          if self.class.deny_old_passwords.is_a? TrueClass and self.class.password_archiving_count > 0
+            self.class.deny_old_passwords = self.class.password_archiving_count
+          else
+            self.class.deny_old_passwords = 0
+          end
+        end
+
+        if self.class.deny_old_passwords > 0 and not self.password.nil?
+          self.old_passwords.order('created_at DESC').limit(self.class.deny_old_passwords).each do |old_password|
+            dummy                    = self.class.new
+            dummy.encrypted_password = old_password.encrypted_password
+            dummy.password_salt      = old_password.password_salt if dummy.respond_to?(:password_salt)
+            return true if dummy.valid_password?(self.password)
+          end
+        end
+
+        false
+      end
+
+      private
+
+      # archive the last password before save and delete all to old passwords from archive
+      def archive_password
+        if self.encrypted_password_changed?
+          if self.class.password_archiving_count.to_i > 0
+            if self.respond_to?(:password_salt_change) and not self.password_salt_change.nil?
+              self.old_passwords.create! :encrypted_password => self.encrypted_password_change.first, :password_salt => self.password_salt_change.first
+            else
+              self.old_passwords.create! :encrypted_password => self.encrypted_password_change.first
+            end
+            self.old_passwords.order('created_at DESC').offset(self.class.password_archiving_count).destroy_all
+          else
+            self.old_passwords.destroy_all
+          end
+        end
+      end
+
+      module ClassMethods
+        ::Devise::Models.config(self, :password_archiving_count, :deny_old_passwords)
+      end
+    end
+  end
+
+end

data/lib/protected/version.rb

@@ -1,3 +1,3 @@
 module Protected
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protected
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-22 00:00:00.000000000 Z
+date: 2012-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -373,6 +373,7 @@ files:
 - lib/generators/protected/views/views_generator.rb
 - lib/protected/devise_recoverable_extensions.rb
 - lib/protected/engine.rb
+- lib/protected/password_archiveable.rb
 - lib/protected/password_utils.rb
 - lib/protected/version.rb
 - lib/protected.rb
@@ -394,7 +395,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2923849300726707462
+      hash: -1272936797958317662
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -403,7 +404,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2923849300726707462
+      hash: -1272936797958317662
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.21