login-control 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6836209796584aad1dbcf76ec600cd30e1612929c827a50fce7e314f0855076b
-  data.tar.gz: 989f4356315dc1ad769f3ed4ea3a3b14afd89af6538df5a243e1ac2856bcf310
+  metadata.gz: 65870b8b7ac15bff2ace601e0acbe5ae5038a00bdebc73f9d4aa6ed1c0650a15
+  data.tar.gz: 2696d809010c5296e8dcf2151632bbbc58eb2815d10afa756a02d561bb8342c3
 SHA512:
-  metadata.gz: b7055e036d046c5568cdbe7adce1f90fad68a948656454aa5fe6b7a649f728c630cf28b70df01f4c209b6cc31616b9fa68a61e666804b15941a718ec6fb2520e
-  data.tar.gz: bc180a24f2b6673a28a35e11ceeb795f5a347f1d6186fe7f8c0a8935d53effae209e18ca0370dafe7be154be71144316b246af19f92219780f2fa3810fa38727
+  metadata.gz: b92e08058e2e2280449e55e47bab6cc8178203d7833ec475f54e47e25e2fb69a5162226ea70d9d7e9881620a90914daed60c7a0c1a591799af269942426badf9
+  data.tar.gz: 64aa7205d51924951e6fe98f5d2c084648e88b7bfa5519c34c4344f12d472b388696e65c7bed49678df19cd2522e434f204c54a912ef47b63cad588a6b0020e3

data/lib/login_control_module.rb

@@ -3,6 +3,7 @@ module LoginControlModule
   # check if captcha is to validate (does not store a cookie)
   def captcha_validation?(scope: :global, login_name: nil)
     rec = rc_record(scope, login_name)
+    logger.info "LOGIN-CONTROL => get captcha #{captcha_requested ? '' : 'NOT '}requested from record LoginControl.#{rec.id}" if debug_request_control
     rec ? rec.validate_captcha : true
   end
 
@@ -11,6 +12,7 @@ module LoginControlModule
   def notice_successful_request(scope: :global, login_name: nil)
     rec = find_or_build_rc_record(scope, login_name)
     rec.sign_in_success = rec.sign_in_success.to_i + 1
+    rec.last_attempt = DateTime.now
     rec.attempts = 1
     rec.save!
     logger.info "LOGIN-CONTROL => #{rec.sign_in_success}. successful request noticed" if debug_request_control
@@ -21,6 +23,7 @@ module LoginControlModule
   def notice_request_attempt(scope: :global, login_name: nil)
     rec = find_or_build_rc_record(scope, login_name)
     rec.attempts = rec.attempts.to_i + 1
+    rec.last_attempt = DateTime.now
     rec.save!
     logger.info "LOGIN-CONTROL => #{rec.attempts}. failed request noticed" if debug_request_control
   end

data/lib/login_control_view_helper.rb

@@ -6,12 +6,13 @@ module LoginControlViewHelper
   def captcha_tag?(scope: :global, login_name: nil)
     debug = (Rails.configuration.x.login_control.debug || !Rails.env.production?)
     rc_id = cookies.encrypted.permanent[:login_control]
+    captcha_requested = true
     if request.host == 'localhost'
       logger.info 'LOGIN-CONTROL => no captcha because of localhost' if debug
-      false
+      captcha_requested = false
     elsif !rc_id.present?
       logger.info 'LOGIN-CONTROL => captcha because no cookie stored yet' if debug
-      true
+      captcha_requested = true
     else
       logger.info 'LOGIN-CONTROL => cookie found ...' if debug
       rec = LoginControl.find_by(session_id: rc_id, scope: scope, login_name: login_name)
@@ -20,21 +21,21 @@ module LoginControlViewHelper
         true
       else
         logger.info 'LOGIN-CONTROL => record found ...' if debug
-        captcha_requested = true
 
         attempts_allowed = (Rails.configuration.x.login_control.attempts_allowed || 10)
         retry_after_seconds = (Rails.configuration.x.login_control.retry_after_seconds || 30)
         logger.info "LOGIN-CONTROL => #{rec.attempts.to_i}. attempt (config.x.attempts_allowed: #{attempts_allowed})" if debug
 
         if rec.attempts.to_i <= attempts_allowed
-          secs = Time.now - rec.updated_at
+          secs = Time.now - rec.last_attempt
           captcha_requested = retry_after_seconds.to_f >= secs
           logger.info "LOGIN-CONTROL => captcha #{captcha_requested ? '' : 'NOT '}requested: config.x.retry_after_seconds(#{retry_after_seconds}) >= secs(#{secs})" if debug
         end
 
-        rec.update!(validate_captcha: captcha_requested)
-        captcha_requested
       end
+      rec.update!(validate_captcha: captcha_requested)
+      logger.info "LOGIN-CONTROL => set captcha #{captcha_requested ? '' : 'NOT '}requested to record LoginControl.#{rec.id}" if debug
+      captcha_requested
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: login-control
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Christian Sedlmair
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-07 00:00:00.000000000 Z
+date: 2023-01-09 00:00:00.000000000 Z
 dependencies: []
 description: Based on Login Attempts check if captcha is necessary. It stores a permanent
   cookie and uses a table for tracking login requests.