authie 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fc31edba5c9cfea934c40b4ac410c942f5d0fcb75a236a9a0f8bd671556058a
-  data.tar.gz: 6ebbf8156b7092e358c4ed08f2d403a002c4f8930cc7e5b5bfc375cd5bc6e718
+  metadata.gz: 1b35fefc8e1d77c5dc713e70d46d29a2e6de782e3d3c6cb35a89f8a31f416406
+  data.tar.gz: f4bfa5628f66ef549e2cb0e74b87c2a503a0d49916d1a93aba7af299bc0e7d29
 SHA512:
-  metadata.gz: 21b86b8a69c1878736de93952f5b4e88bcb1080470f3b3df9f1e12087a29996f71dc39177020747b2e31fff6a39da88ff560e168b35ce61e602e77eb68c7e45b
-  data.tar.gz: 4cf16e7b8af0f80d68cae494c59f7f0c3722c92475c80b47ad2ea4f7b719099ad8e053deb708ee90fe1996db4065869f1f98c92121987cbf68bcae159001465e
+  metadata.gz: 47793da24b501a3e3a5f26652cde36431c90f6f43b8d0e1fa8477e366b2ba6f6ee524e989dd5d2520f15b61c567320f701c29caa5c62bf1acfafc1ad1d096415
+  data.tar.gz: 98e9993d49250765b479e7bd37703652f381d3dc6fb2cf1d1792498b5c95f81c200bb0ea68ff09be6fe072e7141ed49876b43a0953a94fed012370bbbce5c36f

data/db/migrate/20230627165500_add_countries_to_authie_sessions.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddCountriesToAuthieSessions < ActiveRecord::Migration[6.1]
+  def change
+    add_column :authie_sessions, :login_ip_country, :string
+    add_column :authie_sessions, :two_factored_ip_country, :string
+    add_column :authie_sessions, :last_activity_ip_country, :string
+  end
+end

data/lib/authie/config.rb

@@ -8,6 +8,7 @@ module Authie
     attr_accessor :browser_id_cookie_name
     attr_accessor :session_token_length
     attr_accessor :extend_session_expiry_on_touch
+    attr_accessor :ip_lookup
 
     def initialize
       @session_inactivity_timeout = 12.hours
@@ -16,6 +17,13 @@ module Authie
       @browser_id_cookie_name = :browser_id
       @session_token_length = 64
       @extend_session_expiry_on_touch = false
+      @lookup_ip_country_backend = nil
+    end
+
+    def lookup_ip_country(ip)
+      return nil if @lookup_ip_country_backend.nil?
+
+      @lookup_ip_country_backend.call(ip)
     end
   end
 

data/lib/authie/session.rb

@@ -96,7 +96,11 @@ module Authie
     # @return [Authie::Session]
     def touch
       @session.last_activity_at = Time.now
+      if @controller.request.ip != @session.last_activity_ip
+        @session.last_activity_ip_country = Authie.config.lookup_ip_country(@controller.request.ip)
+      end
       @session.last_activity_ip = @controller.request.ip
+
       @session.last_activity_path = @controller.request.path
       @session.requests += 1
       extend_session_expiry_if_appropriate
@@ -124,6 +128,7 @@ module Authie
     def mark_as_two_factored(skip: nil)
       @session.two_factored_at = Time.now
       @session.two_factored_ip = @controller.request.ip
+      @session.two_factored_ip_country = Authie.config.lookup_ip_country(@controller.request.ip)
       @session.skip_two_factor = skip unless skip.nil?
       @session.save!
       Authie.notify(:mark_as_two_factor, session: self)
@@ -244,6 +249,7 @@ module Authie
         session.browser_id = cookies[:browser_id]
         session.login_at = Time.now
         session.login_ip = controller.request.ip
+        session.login_ip_country = Authie.config.lookup_ip_country(session.login_ip)
         session.host = controller.request.host
         session.user_agent = controller.request.user_agent
         session.expires_at = Time.now + Authie.config.persistent_session_length if persistent
@@ -298,9 +304,11 @@ module Authie
     delegate :invalidate_others!, to: :session
     delegate :last_activity_at, to: :session
     delegate :last_activity_ip, to: :session
+    delegate :last_activity_ip_country, to: :session
     delegate :last_activity_path, to: :session
     delegate :login_at, to: :session
     delegate :login_ip, to: :session
+    delegate :login_ip_country, to: :session
     delegate :password_seen_at, to: :session
     delegate :persisted?, to: :session
     delegate :persistent?, to: :session
@@ -311,6 +319,7 @@ module Authie
     delegate :token_hash, to: :session
     delegate :two_factored_at, to: :session
     delegate :two_factored_ip, to: :session
+    delegate :two_factored_ip_country, to: :session
     delegate :two_factored?, to: :session
     delegate :skip_two_factor?, to: :session
     delegate :update, to: :session

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authie
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-02 00:00:00.000000000 Z
+date: 2023-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -45,6 +45,7 @@ files:
 - db/migrate/20170421174100_add_index_to_token_hashes_on_authie_sessions.rb
 - db/migrate/20180215152200_add_host_to_authie_sessions.rb
 - db/migrate/20220502180100_add_two_factor_required_to_sessions.rb
+- db/migrate/20230627165500_add_countries_to_authie_sessions.rb
 - lib/authie.rb
 - lib/authie/config.rb
 - lib/authie/controller_delegate.rb