authlogic 5.0.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b789e5e05da9b783cccf285591510d9b7d5a30b9
-  data.tar.gz: 89d480a0525664adbda2943d8b60e3953802835d
+SHA256:
+  metadata.gz: d7ee80bf9b23608f9c88971bd8353f1cd1680f25a9d1bc34543a60adc8a6ff0e
+  data.tar.gz: 836f688d32e87f503357c530a0a380c3e7ea85c566fcca2d08f1990ee9ed3461
 SHA512:
-  metadata.gz: c8f5241263fda34fc5d0043f30673d6fd77e4614d1fb7fef685cb057347ab111e2368f3f71942ae4d9f833d4ad2a5a7376d66ed6399e0ca3f51f8bcf53dba4ea
-  data.tar.gz: 402631583ab0c18687e9d284bd96c8b539a30f9b331060eaef68a0bb072d0e71499eb62217ea0a6b68708c33a1a9f0078d6bdee7e235ee7789e14df41a766cb2
+  metadata.gz: 14ec354abdd25ef960983f64e4d3fc58b764a365f3c419ffc03bc32d43d2824be585e3557162ff4afd70a0eb94cd86b6a08186302f8478f8369fc2dfded46cee
+  data.tar.gz: f1bdaba676fdef7a280e3f7063d92551464f4e3eed5c6299ba4f34c9245d39f831c765d43ecfcca4420e31d2acb4079af3abbd180f2babf23281578ff4e4f2b4

data/lib/authlogic.rb

@@ -18,6 +18,7 @@ path = File.dirname(__FILE__) + "/authlogic/"
   "config",
 
   "controller_adapters/abstract_adapter",
+  "cookie_credentials",
 
   "crypto_providers",
 

data/lib/authlogic/acts_as_authentic/queries/find_with_case.rb

@@ -34,17 +34,28 @@ module Authlogic
 
         # @api private
         def insensitive_comparison
-          @model_class.connection.case_insensitive_comparison(
-            @model_class.arel_table,
-            @field,
-            @model_class.columns_hash[@field],
-            @value
-          )
+          if AR_GEM_VERSION > Gem::Version.new("5.3")
+            @model_class.connection.case_insensitive_comparison(
+              @model_class.arel_table[@field], @value
+            )
+          else
+            @model_class.connection.case_insensitive_comparison(
+              @model_class.arel_table,
+              @field,
+              @model_class.columns_hash[@field],
+              @value
+            )
+          end
         end
 
         # @api private
+        # rubocop:disable Metrics/AbcSize
         def sensitive_comparison
-          if AR_GEM_VERSION >= Gem::Version.new("5.0")
+          if AR_GEM_VERSION > Gem::Version.new("5.3")
+            @model_class.connection.case_sensitive_comparison(
+              @model_class.arel_table[@field], @value
+            )
+          elsif AR_GEM_VERSION >= Gem::Version.new("5.0")
             @model_class.connection.case_sensitive_comparison(
               @model_class.arel_table,
               @field,
@@ -56,6 +67,7 @@ module Authlogic
             @model_class.arel_table[@field].eq(value)
           end
         end
+        # rubocop:enable Metrics/AbcSize
       end
     end
   end

data/lib/authlogic/cookie_credentials.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module Authlogic
+  # Represents the credentials *in* the cookie. The value of the cookie.
+  # This is primarily a data object. It doesn't interact with controllers.
+  # It doesn't know about eg. cookie expiration.
+  #
+  # @api private
+  class CookieCredentials
+    # @api private
+    class ParseError < RuntimeError
+    end
+
+    DELIMITER = "::"
+
+    attr_reader :persistence_token, :record_id, :remember_me_until
+
+    # @api private
+    # @param persistence_token [String]
+    # @param record_id [String, Numeric]
+    # @param remember_me_until [ActiveSupport::TimeWithZone]
+    def initialize(persistence_token, record_id, remember_me_until)
+      @persistence_token = persistence_token
+      @record_id = record_id
+      @remember_me_until = remember_me_until
+    end
+
+    class << self
+      # @api private
+      def parse(string)
+        parts = string.split(DELIMITER)
+        unless (1..3).cover?(parts.length)
+          raise ParseError, format("Expected 1..3 parts, got %d", parts.length)
+        end
+        new(parts[0], parts[1], parse_time(parts[2]))
+      end
+
+      private
+
+      # @api private
+      def parse_time(string)
+        return if string.nil?
+        ::Time.parse(string)
+      rescue ::ArgumentError => e
+        raise ParseError, format("Found cookie, cannot parse remember_me_until: #{e}")
+      end
+    end
+
+    # @api private
+    def remember_me?
+      !@remember_me_until.nil?
+    end
+
+    # @api private
+    def to_s
+      [
+        @persistence_token,
+        @record_id.to_s,
+        @remember_me_until&.iso8601
+      ].compact.join(DELIMITER)
+    end
+  end
+end

data/lib/authlogic/session/base.rb

@@ -1322,7 +1322,7 @@ module Authlogic
       def persisting?
         return true unless record.nil?
         self.attempted_record = nil
-        self.remember_me = cookie_credentials_remember_me?
+        self.remember_me = cookie_credentials&.remember_me?
         run_callbacks :before_persisting
         run_callbacks :persist
         ensure_authentication_attempted
@@ -1380,7 +1380,7 @@ module Authlogic
       # Has the cookie expired due to current time being greater than remember_me_until.
       def remember_me_expired?
         return unless remember_me?
-        (Time.parse(cookie_credentials[2]) < Time.now)
+        cookie_credentials.remember_me_until < ::Time.now
       end
 
       # How long to remember the user if remember_me is true. This is based on the class
@@ -1610,18 +1610,16 @@ module Authlogic
         build_key(self.class.cookie_key)
       end
 
-      # Returns an array of cookie elements. See cookie format in
-      # `generate_cookie_for_saving`. If no cookie is found, returns nil.
+      # Look in the `cookie_jar`, find the cookie that contains authlogic
+      # credentials (`cookie_key`).
+      #
+      # @api private
+      # @return ::Authlogic::CookieCredentials or if no cookie is found, nil
       def cookie_credentials
-        cookie = cookie_jar[cookie_key]
-        cookie&.split("::")
-      end
-
-      # The third element of the cookie indicates whether the user wanted
-      # to be remembered (Actually, it's a timestamp, `remember_me_until`)
-      # See cookie format in `generate_cookie_for_saving`.
-      def cookie_credentials_remember_me?
-        !cookie_credentials.nil? && !cookie_credentials[2].nil?
+        cookie_value = cookie_jar[cookie_key]
+        unless cookie_value.nil?
+          ::Authlogic::CookieCredentials.parse(cookie_value)
+        end
       end
 
       def cookie_jar
@@ -1705,15 +1703,15 @@ module Authlogic
         self.class.generalize_credentials_error_messages
       end
 
+      # @api private
       def generate_cookie_for_saving
-        value = format(
-          "%s::%s%s",
+        creds = ::Authlogic::CookieCredentials.new(
           record.persistence_token,
           record.send(record.class.primary_key),
-          remember_me? ? "::#{remember_me_until.iso8601}" : ""
+          remember_me? ? remember_me_until : nil
         )
         {
-          value: value,
+          value: creds.to_s,
           expires: remember_me_until,
           secure: secure,
           httponly: httponly,
@@ -1809,10 +1807,10 @@ module Authlogic
 
       # Tries to validate the session from information in the cookie
       def persist_by_cookie
-        persistence_token, record_id = cookie_credentials
-        if persistence_token.present?
-          record = search_for_record("find_by_#{klass.primary_key}", record_id)
-          if record && record.persistence_token == persistence_token
+        creds = cookie_credentials
+        if creds&.persistence_token.present?
+          record = search_for_record("find_by_#{klass.primary_key}", creds.record_id)
+          if record && record.persistence_token == creds.persistence_token
             self.unauthorized_record = record
           end
           valid?

data/lib/authlogic/version.rb

@@ -17,6 +17,6 @@ module Authlogic
   #
   # @api public
   def self.gem_version
-    ::Gem::Version.new("5.0.0")
+    ::Gem::Version.new("5.0.1")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authlogic
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - Ben Johnson
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-04 00:00:00.000000000 Z
+date: 2019-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -162,6 +162,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.62.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.13
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.13
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -203,6 +217,7 @@ files:
 - lib/authlogic/controller_adapters/rack_adapter.rb
 - lib/authlogic/controller_adapters/rails_adapter.rb
 - lib/authlogic/controller_adapters/sinatra_adapter.rb
+- lib/authlogic/cookie_credentials.rb
 - lib/authlogic/crypto_providers.rb
 - lib/authlogic/crypto_providers/bcrypt.rb
 - lib/authlogic/crypto_providers/md5.rb
@@ -242,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: An unobtrusive ruby authentication library based on ActiveRecord.