devise 2.1.0.rc → 2.1.0.rc2

data/test/rails_app/app/mongoid/admin.rb

@@ -22,9 +22,6 @@ class Admin
   field :confirmation_sent_at, :type => Time
   field :unconfirmed_email,    :type => String # Only if using reconfirmable
 
-  ## Encryptable
-  field :password_salt, :type => String
-
   ## Lockable
   field :locked_at, :type => Time
 end

data/test/rails_app/app/mongoid/user.rb

@@ -26,9 +26,6 @@ class User
   field :current_sign_in_ip, :type => String
   field :last_sign_in_ip,    :type => String
 
-  ## Encryptable
-  # field :password_salt, :type => String
-
   ## Confirmable
   field :confirmation_token,   :type => String
   field :confirmed_at,         :type => Time

data/test/rails_app/config/initializers/devise.rb

@@ -12,9 +12,6 @@ Devise.setup do |config|
   # Configure the class responsible to send e-mails.
   # config.mailer = "Devise::Mailer"
 
-  # Disable apply schema
-  config.apply_schema = false
-
   # ==> ORM configuration
   # Load and configure the ORM. Supports :active_record (default) and
   # :mongoid (bson_ext recommended) by default. Other ORMs may be
@@ -87,10 +84,6 @@ Devise.setup do |config|
   # If true, extends the user's remember period when remembered via cookie.
   # config.extend_remember_period = false
 
-  # If true, uses the password salt as remember token. This should be turned
-  # to false if you are not using database authenticatable.
-  config.use_salt_as_remember_token = true
-
   # ==> Configuration for :validatable
   # Range for password length. Default is 6..128.
   # config.password_length = 6..128
@@ -136,14 +129,6 @@ Devise.setup do |config|
   # change their passwords.
   config.reset_password_within = 2.hours
 
-  # ==> Configuration for :encryptable
-  # Allow you to use another encryption algorithm besides bcrypt (default). You can use
-  # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1,
-  # :authlogic_sha512 (then you should set stretches above to 20 for default behavior)
-  # and :restful_authentication_sha1 (then you should set stretches to 10, and copy
-  # REST_AUTH_SITE_KEY to pepper)
-  config.encryptor = :sha512
-
   # Setup a pepper to generate the encrypted password.
   config.pepper = "d142367154e5beacca404b1a6a4f8bc52c6fdcfa3ccc3cf8eb49f3458a688ee6ac3b9fae488432a3bfca863b8a90008368a9f3a3dfbe5a962e64b6ab8f3a3a1a"
 

data/test/rails_app/config/routes.rb

@@ -84,6 +84,7 @@ Rails.application.routes.draw do
 
   match "/set", :to => "home#set"
   match "/unauthenticated", :to => "home#unauthenticated"
+  match "/custom_strategy/new"
 
   root :to => "home#index"
 end

data/test/rails_app/db/migrate/20100401102949_create_tables.rb

@@ -22,9 +22,6 @@ class CreateTables < ActiveRecord::Migration
       t.string   :current_sign_in_ip
       t.string   :last_sign_in_ip
 
-      ## Encryptable
-      # t.string :password_salt
-
       ## Confirmable
       t.string   :confirmation_token
       t.datetime :confirmed_at
@@ -60,9 +57,6 @@ class CreateTables < ActiveRecord::Migration
       t.datetime :confirmation_sent_at
       t.string   :unconfirmed_email # Only if using reconfirmable
 
-      ## Encryptable
-      t.string :password_salt
-
       ## Lockable
       t.datetime :locked_at
 

data/test/rails_app/lib/shared_admin.rb

@@ -2,7 +2,7 @@ module SharedAdmin
   extend ActiveSupport::Concern
 
   included do
-    devise :database_authenticatable, :encryptable, :registerable,
+    devise :database_authenticatable, :registerable,
            :timeoutable, :recoverable, :lockable, :confirmable,
            :unlock_strategy => :time, :lock_strategy => :none,
            :allow_unconfirmed_access_for => 2.weeks, :reconfirmable => true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc
+  version: 2.1.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-15 00:00:00.000000000 Z
+date: 2012-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: warden
-  requirement: &70142542329300 !ruby/object:Gem::Requirement
+  requirement: &70149203225360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,21 +22,21 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70142542329300
+  version_requirements: *70149203225360
 - !ruby/object:Gem::Dependency
   name: orm_adapter
-  requirement: &70142542328140 !ruby/object:Gem::Requirement
+  requirement: &70149203221880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70142542328140
+  version_requirements: *70149203221880
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &70142542327080 !ruby/object:Gem::Requirement
+  requirement: &70149203220960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70142542327080
+  version_requirements: *70149203220960
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70142542326160 !ruby/object:Gem::Requirement
+  requirement: &70149203220380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +55,7 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70142542326160
+  version_requirements: *70149203220380
 description: Flexible authentication solution for Rails with Warden
 email: contact@plataformatec.com.br
 executables: []
@@ -101,16 +101,10 @@ files:
 - lib/devise/controllers/scoped_views.rb
 - lib/devise/controllers/url_helpers.rb
 - lib/devise/delegator.rb
-- lib/devise/encryptors/authlogic_sha512.rb
-- lib/devise/encryptors/base.rb
-- lib/devise/encryptors/bcrypt.rb
-- lib/devise/encryptors/clearance_sha1.rb
-- lib/devise/encryptors/restful_authentication_sha1.rb
-- lib/devise/encryptors/sha1.rb
-- lib/devise/encryptors/sha512.rb
 - lib/devise/failure_app.rb
 - lib/devise/hooks/activatable.rb
 - lib/devise/hooks/forgetable.rb
+- lib/devise/hooks/lockable.rb
 - lib/devise/hooks/rememberable.rb
 - lib/devise/hooks/timeoutable.rb
 - lib/devise/hooks/trackable.rb
@@ -120,7 +114,6 @@ files:
 - lib/devise/models/authenticatable.rb
 - lib/devise/models/confirmable.rb
 - lib/devise/models/database_authenticatable.rb
-- lib/devise/models/encryptable.rb
 - lib/devise/models/lockable.rb
 - lib/devise/models/omniauthable.rb
 - lib/devise/models/recoverable.rb
@@ -140,7 +133,6 @@ files:
 - lib/devise/rails.rb
 - lib/devise/rails/routes.rb
 - lib/devise/rails/warden_compat.rb
-- lib/devise/schema.rb
 - lib/devise/strategies/authenticatable.rb
 - lib/devise/strategies/base.rb
 - lib/devise/strategies/database_authenticatable.rb
@@ -168,13 +160,13 @@ files:
 - lib/generators/templates/simple_form_for/registrations/new.html.erb
 - lib/generators/templates/simple_form_for/sessions/new.html.erb
 - lib/generators/templates/simple_form_for/unlocks/new.html.erb
+- test/controllers/custom_strategy_test.rb
 - test/controllers/helpers_test.rb
 - test/controllers/internal_helpers_test.rb
 - test/controllers/sessions_controller_test.rb
 - test/controllers/url_helpers_test.rb
 - test/delegator_test.rb
 - test/devise_test.rb
-- test/encryptors_test.rb
 - test/failure_app_test.rb
 - test/generators/active_record_generator_test.rb
 - test/generators/devise_generator_test.rb
@@ -202,7 +194,6 @@ files:
 - test/models/authenticatable_test.rb
 - test/models/confirmable_test.rb
 - test/models/database_authenticatable_test.rb
-- test/models/encryptable_test.rb
 - test/models/lockable_test.rb
 - test/models/omniauthable_test.rb
 - test/models/recoverable_test.rb
@@ -288,6 +279,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2428675562235820602
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -301,13 +295,13 @@ signing_key:
 specification_version: 3
 summary: Flexible authentication solution for Rails with Warden
 test_files:
+- test/controllers/custom_strategy_test.rb
 - test/controllers/helpers_test.rb
 - test/controllers/internal_helpers_test.rb
 - test/controllers/sessions_controller_test.rb
 - test/controllers/url_helpers_test.rb
 - test/delegator_test.rb
 - test/devise_test.rb
-- test/encryptors_test.rb
 - test/failure_app_test.rb
 - test/generators/active_record_generator_test.rb
 - test/generators/devise_generator_test.rb
@@ -335,7 +329,6 @@ test_files:
 - test/models/authenticatable_test.rb
 - test/models/confirmable_test.rb
 - test/models/database_authenticatable_test.rb
-- test/models/encryptable_test.rb
 - test/models/lockable_test.rb
 - test/models/omniauthable_test.rb
 - test/models/recoverable_test.rb

data/lib/devise/encryptors/authlogic_sha512.rb

@@ -1,19 +0,0 @@
-require "digest/sha2"
-
-module Devise
-  module Encryptors
-    # = AuthlogicSha512
-    # Simulates Authlogic's default encryption mechanism.
-    # Warning: it uses Devise's stretches configuration to port Authlogic's one. Should be set to 20 in the initializer to simulate
-    #  the default behavior.
-    class AuthlogicSha512 < Base
-      # Generates a default password digest based on salt, pepper and the
-      # incoming password.
-      def self.digest(password, stretches, salt, pepper)
-        digest = [password, salt].flatten.join('')
-        stretches.times { digest = Digest::SHA512.hexdigest(digest) }
-        digest
-      end
-    end
-  end
-end

data/lib/devise/encryptors/base.rb

@@ -1,24 +0,0 @@
-module Devise
-  # Implements a way of adding different encryptions.
-  # The class should implement a self.digest method that taks the following params:
-  #   - password
-  #   - stretches: the number of times the encryption will be applied
-  #   - salt: the password salt as defined by devise
-  #   - pepper: Devise config option
-  #
-  module Encryptors
-    class Base
-      def self.digest
-        raise NotImplemented
-      end
-
-      def self.salt(stretches)
-        Devise.friendly_token[0,20]
-      end
-
-      def self.compare(encrypted_password, password, stretches, salt, pepper)
-        Devise.secure_compare(encrypted_password, digest(password, stretches, salt, pepper))
-      end
-    end
-  end
-end

data/lib/devise/encryptors/bcrypt.rb

@@ -1,14 +0,0 @@
-module Devise
-  module Encryptors
-    class BCrypt < Base
-      def self.digest(password, stretches, salt, pepper)
-        ::BCrypt::Engine.hash_secret("#{password}#{pepper}",salt, stretches)
-      end
-
-      def self.compare(encrypted_password, password, stretches, salt, pepper)
-        salt = ::BCrypt::Password.new(encrypted_password).salt
-        Devise.secure_compare(encrypted_password, digest(password, stretches, salt, pepper))
-      end
-    end
-  end
-end

data/lib/devise/encryptors/clearance_sha1.rb

@@ -1,17 +0,0 @@
-require "digest/sha1"
-
-module Devise
-  module Encryptors
-    # = ClearanceSha1
-    # Simulates Clearance's default encryption mechanism.
-    # Warning: it uses Devise's pepper to port the concept of REST_AUTH_SITE_KEY
-    # Warning: it uses Devise's stretches configuration to port the concept of REST_AUTH_DIGEST_STRETCHES
-    class ClearanceSha1 < Base
-      # Generates a default password digest based on salt, pepper and the
-      # incoming password.
-      def self.digest(password, stretches, salt, pepper)
-        Digest::SHA1.hexdigest("--#{salt}--#{password}--")
-      end
-    end
-  end
-end

data/lib/devise/encryptors/restful_authentication_sha1.rb

@@ -1,22 +0,0 @@
-require "digest/sha1"
-
-module Devise
-  module Encryptors
-    # = RestfulAuthenticationSha1
-    # Simulates Restful Authentication's default encryption mechanism.
-    # Warning: it uses Devise's pepper to port the concept of REST_AUTH_SITE_KEY
-    # Warning: it uses Devise's stretches configuration to port the concept of REST_AUTH_DIGEST_STRETCHES. Should be set to 10 in
-    # the initializer to simulate the default behavior.
-    class RestfulAuthenticationSha1 < Base
-
-      # Generates a default password digest based on salt, pepper and the
-      # incoming password.
-      def self.digest(password, stretches, salt, pepper)
-        digest = pepper
-        stretches.times { digest = Digest::SHA1.hexdigest([digest, salt, password, pepper].flatten.join('--')) }
-        digest
-      end
-
-    end
-  end
-end

data/lib/devise/encryptors/sha1.rb

@@ -1,25 +0,0 @@
-require "digest/sha1"
-
-module Devise
-  module Encryptors
-    # = Sha1
-    # Uses the Sha1 hash algorithm to encrypt passwords.
-    class Sha1 < Base
-      # Generates a default password digest based on stretches, salt, pepper and the
-      # incoming password.
-      def self.digest(password, stretches, salt, pepper)
-        digest = pepper
-        stretches.times { digest = self.secure_digest(salt, digest, password, pepper) }
-        digest
-      end
-
-    private
-
-      # Generate a SHA1 digest joining args. Generated token is something like
-      #   --arg1--arg2--arg3--argN--
-      def self.secure_digest(*tokens)
-        ::Digest::SHA1.hexdigest('--' << tokens.flatten.join('--') << '--')
-      end
-    end
-  end
-end

data/lib/devise/encryptors/sha512.rb

@@ -1,25 +0,0 @@
-require "digest/sha2"
-
-module Devise
-  module Encryptors
-    # = Sha512
-    # Uses the Sha512 hash algorithm to encrypt passwords.
-    class Sha512 < Base
-      # Generates a default password digest based on salt, pepper and the
-      # incoming password.
-      def self.digest(password, stretches, salt, pepper)
-        digest = pepper
-        stretches.times { digest = self.secure_digest(salt, digest, password, pepper) }
-        digest
-      end
-
-    private
-
-      # Generate a Sha512 digest joining args. Generated token is something like
-      #   --arg1--arg2--arg3--argN--
-      def self.secure_digest(*tokens)
-        ::Digest::SHA512.hexdigest('--' << tokens.flatten.join('--') << '--')
-      end
-    end
-  end
-end

data/lib/devise/models/encryptable.rb

@@ -1,80 +0,0 @@
-require 'devise/strategies/database_authenticatable'
-
-module Devise
-  module Models
-    # Encryptable module adds support to several encryptors wrapping
-    # them in a salt and pepper mechanism to increase security.
-    #
-    # == Options
-    #
-    # Encryptable adds the following options to devise_for:
-    #
-    #   * +pepper+: a random string used to provide a more secure hash.
-    #
-    #   * +encryptor+: the encryptor going to be used. By default is nil.
-    #
-    # == Examples
-    #
-    #    User.find(1).valid_password?('password123') # returns true/false
-    #
-    module Encryptable
-      extend ActiveSupport::Concern
-
-      included do
-        attr_reader :password, :current_password
-        attr_accessor :password_confirmation
-      end
-
-      def self.required_fields(klass)
-        [:password_salt]
-      end
-
-      # Generates password salt when setting the password.
-      def password=(new_password)
-        self.password_salt = self.class.password_salt if new_password.present?
-        super
-      end
-
-      # Overrides authenticatable salt to use the new password_salt
-      # column. authenticatable_salt is used by `valid_password?`
-      # and by other modules whenever there is a need for a random
-      # token based on the user password.
-      def authenticatable_salt
-        self.password_salt
-      end
-
-    protected
-
-      # Digests the password using the configured encryptor.
-      def password_digest(password)
-        if password_salt.present?
-          encryptor_class.digest(password, self.class.stretches, authenticatable_salt, self.class.pepper)
-        end
-      end
-
-      def encryptor_class
-        self.class.encryptor_class
-      end
-
-      module ClassMethods
-        Devise::Models.config(self, :encryptor)
-
-        # Returns the class for the configured encryptor.
-        def encryptor_class
-          @encryptor_class ||= case encryptor
-            when :bcrypt
-              raise "In order to use bcrypt as encryptor, simply remove :encryptable from your devise model"
-            when nil
-              raise "You need to give an :encryptor as option in order to use :encryptable"
-            else
-              ::Devise::Encryptors.const_get(encryptor.to_s.classify)
-          end
-        end
-
-        def password_salt
-          self.encryptor_class.salt(self.stretches)
-        end
-      end
-    end
-  end
-end