rodauth 2.47.0 → 2.49.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 680f1b9dda9f8dd15399a7a7d1a990ea65299b6d9fb1d42646f9d8661a14b927
-  data.tar.gz: e7dd526eb3f3d0cfb1d7b470bd2e9d604e6fe7784657fe6449e1d2b9b128c9f3
+  metadata.gz: 24077da1fc384a74f6e692220eeac283243ce13c0d219befdbd43c4a3498ab63
+  data.tar.gz: b05d593e3e12ebcf503c8de530613dea813cfa90984c058d1910bab7cb010674
 SHA512:
-  metadata.gz: 79f9aa12624e42d2520e01b3a760d1b7bbda370aa7e11fa8987cd3f67a62d15a160ceda4c997afbb636caabc8282f5dfb36689d538e86dc8aea3a178902fb0b3
-  data.tar.gz: d183b0f9f350b2321c1ee2cb33ad36d789541d77c2a6ba27082f205dd61fabc0566e881a359d9490bfcccfae853d3e2b3acb30eee02884885e3ebe2838fef358
+  metadata.gz: 8e6d8819e37fd3d417641dc1745360c9ff52df0ee90399ad844ad7d3c23990d1c74f9db31d698e17861881e8776f5fb3fb4aae07ab4d9e2762e257ffd334d51f
+  data.tar.gz: 902ece75d3590486435729195e741834c4613d379f47ca29b93ba68281810273b36ae94374c9c9b317ca49464e60c1be15d344b88c94bada8fd1f8ea5668dde1

data/lib/rodauth/features/argon2.rb

@@ -2,11 +2,11 @@
 
 require 'argon2'
 
-# :nocov:
+# simplecov:disable
 if !defined?(Argon2::VERSION) || Argon2::VERSION < '2'
   raise LoadError, "argon2 version 1.x not supported as it does not support argon2id hashes"
 end
-# :nocov:
+# simplecov:enable
 
 module Rodauth
   Feature.define(:argon2, :Argon2) do
@@ -36,12 +36,12 @@ module Rodauth
       def argon2_salt_option
         :salt_do_not_supply
       end
-    # :nocov:
+    # simplecov:disable
     else
       def argon2_salt_option
         :salt_for_testing_purposes_only
       end
-    # :nocov:
+    # simplecov:enable
     end
 
     def password_hash_cost
@@ -78,7 +78,7 @@ module Rodauth
         def argon2_hash_cost
           { t_cost: 1, m_cost: 5, p_cost: 1 }
         end
-      # :nocov:
+      # simplecov:disable
       else
         def argon2_hash_cost
           { t_cost: 2, m_cost: 16, p_cost: 1 }
@@ -102,7 +102,7 @@ module Rodauth
         end
       end
     end
-    # :nocov:
+    # simplecov:enable
 
     def argon2_hash_algorithm?(hash)
       hash.start_with?('$argon2id$')

data/lib/rodauth/features/audit_logging.rb

@@ -83,9 +83,9 @@ module Rodauth
 
     def audit_log_ds
       ds = db[audit_logging_table]
-      # :nocov:
+      # simplecov:disable
       if db.database_type == :postgres
-      # :nocov:
+      # simplecov:enable
         # For PostgreSQL, use RETURNING NULL. This allows the feature
         # to be used with INSERT but not SELECT permissions on the
         # table, useful for audit logging where the database user

data/lib/rodauth/features/base.rb

@@ -2,7 +2,7 @@
 
 begin
   require "rack/version"
-# :nocov:
+# simplecov:disable
 rescue LoadError
   require "rack"
 else
@@ -13,7 +13,7 @@ else
     require "rack"
   end
 end
-# :nocov:
+# simplecov:enable
 
 module Rodauth
   Feature.define(:base, :Base) do
@@ -443,9 +443,9 @@ module Rodauth
       if use_request_specific_csrf_tokens?
         scope.csrf_tag(path)
       else
-        # :nocov:
+        # simplecov:disable
         scope.csrf_tag
-        # :nocov:
+        # simplecov:enable
       end
     end
 
@@ -472,7 +472,7 @@ module Rodauth
     end
 
     def only_json?
-      scope.class.opts[:rodauth_json] == :only
+      scope.class.rodauth_json == :only
     end
 
     def post_configure
@@ -623,7 +623,7 @@ module Rodauth
       def convert_response_header_key(key)
         key
       end
-    # :nocov:
+    # simplecov:disable
     else
       def set_response_header(key, value)
         response.headers[convert_response_header_key(key)] = value
@@ -650,13 +650,13 @@ module Rodauth
         mixed_case_headers.fetch(key, key)
       end
     end
-    # :nocov:
+    # simplecov:enable
 
     if RUBY_VERSION >= '2.1'
       def button_fixed_locals
         '(value:, opts:)'
       end
-    # :nocov:
+    # simplecov:disable
     else
       # Work on Ruby 2.0 when using Tilt 2.6+, as Ruby 2.0 does
       # not support required keyword arguments.
@@ -664,7 +664,7 @@ module Rodauth
         '(value: nil, opts: nil)'
       end
     end
-    # :nocov:
+    # simplecov:enable
 
     def missing_recommended_configuration(msg)
       # RODAUTH3: switch to raise ConfigurationError
@@ -674,7 +674,6 @@ module Rodauth
     def account_reload(current_retrieval_type, new_retrieval_type)
       return unless @current_route
 
-
       if current_retrieval_type == new_retrieval_type
         warn "account retrieved multiple times during rodauth route with retrieval type #{current_retrieval_type}"
       else
@@ -770,7 +769,7 @@ module Rodauth
     end
 
     def require_account_session
-      unless account_from_session
+      unless (@account_retrieval_type == :session ? account : account_from_session)
         clear_session
         login_required
       end
@@ -828,25 +827,25 @@ module Rodauth
       when :postgres, :mysql, :mssql
         true
       else
-        # :nocov:
+        # simplecov:disable
         false
-        # :nocov:
+        # simplecov:enable
       end
     end
 
     def use_request_specific_csrf_tokens?
-      scope.opts[:rodauth_route_csrf] && scope.use_request_specific_csrf_tokens?
+      scope.class.rodauth_route_csrf? && scope.use_request_specific_csrf_tokens?
     end
 
     def check_csrf?
-      scope.opts[:rodauth_route_csrf]
+      scope.class.rodauth_route_csrf?
     end
 
     def function_name(name)
       if db.database_type == :mssql
-        # :nocov:
+        # simplecov:disable
         "dbo.#{name}"
-        # :nocov:
+        # simplecov:enable
       else
         name
       end
@@ -864,9 +863,9 @@ module Rodauth
       elsif use_database_authentication_functions?
         db.get(Sequel.function(function_name(:rodauth_get_salt), account_id_or_session_value))
       else
-        # :nocov:
+        # simplecov:disable
         password_hash_ds.get(password_hash_column)
-        # :nocov:
+        # simplecov:enable
       end
     end
 
@@ -977,9 +976,9 @@ module Rodauth
     # UniqueConstraintViolation.
     def unique_constraint_violation_class
       if db.adapter_scheme == :jdbc && db.database_type == :sqlite
-        # :nocov:
+        # simplecov:disable
         Sequel::ConstraintViolation
-        # :nocov:
+        # simplecov:enable
       else
         Sequel::UniqueConstraintViolation
       end
@@ -995,9 +994,9 @@ module Rodauth
     # CURRENT_TIMESTAMP.
     def set_deadline_value(hash, column, interval)
       if set_deadline_values?
-        # :nocov:
+        # simplecov:disable
         hash[column] = Sequel.date_add(Sequel::CURRENT_TIMESTAMP, interval)
-        # :nocov:
+        # simplecov:enable
       end
     end
 
@@ -1023,9 +1022,9 @@ module Rodauth
       end
     end
 
-    # :nocov:
+    # simplecov:disable
     if RUBY_VERSION >= '4.0'
-    # :nocov:
+    # simplecov:enable
       def instance_variables_to_inspect
         instance_variables.reject{|v| instance_variable_get(v).nil?}
       end

data/lib/rodauth/features/disallow_password_reuse.rb

@@ -59,11 +59,11 @@ module Rodauth
           database_function_password_match?(:rodauth_previous_password_hash_match, hash_id, password, salt)
         end
       else
-        # :nocov:
+        # simplecov:disable
         previous_password_ds.select_map(previous_password_hash_column).any? do |hash|
           password_hash_match?(hash, password)
         end
-        # :nocov:
+        # simplecov:enable
       end
 
       return true unless match

data/lib/rodauth/features/http_basic_auth.rb

@@ -4,13 +4,14 @@ module Rodauth
   Feature.define(:http_basic_auth, :HttpBasicAuth) do
     auth_value_method :http_basic_auth_realm, "protected"
     auth_value_method :require_http_basic_auth?, false
+    auth_value_method :logged_in_fallback_to_http_basic_auth?, true # RODAUTH3: false
 
     uses_instance_variables(:@checked_http_basic_auth)
 
     def logged_in?
       ret = super
 
-      if !ret && @checked_http_basic_auth.nil?
+      if !ret && logged_in_fallback_to_http_basic_auth? && @checked_http_basic_auth.nil?
         http_basic_auth
         ret = super
       end
@@ -33,6 +34,10 @@ module Rodauth
       end
     end
 
+    def account_from_session
+      @checked_http_basic_auth ? @account : super
+    end
+
     def http_basic_auth
       unless @checked_http_basic_auth.nil?
         return (@checked_http_basic_auth ? true : nil)

data/lib/rodauth/features/jwt.rb

@@ -113,12 +113,12 @@ module Rodauth
         secrets.compact!
         secrets
       end
-    # :nocov:
+    # simplecov:disable
     else
       def _jwt_decode_secrets
         jwt_secret
       end
-    # :nocov:
+    # simplecov:enable
     end
 
     def jwt_payload

data/lib/rodauth/features/lockout.rb

@@ -187,11 +187,11 @@ module Rodauth
           with_sql(:update_sql, account_login_failures_number_column=>Sequel.expr(account_login_failures_number_column)+1).
           single_value
       else
-        # :nocov:
+        # simplecov:disable
         if ds.update(account_login_failures_number_column=>Sequel.expr(account_login_failures_number_column)+1) > 0
           ds.get(account_login_failures_number_column)
         end
-        # :nocov:
+        # simplecov:enable
       end
 
       unless number

data/lib/rodauth/features/login_password_requirements_base.rb

@@ -81,10 +81,10 @@ module Rodauth
         if @existing_password_hash_or_salt
           existing_expression = if use_database_authentication_functions?
             Sequel.function(function_name(:rodauth_get_salt), :id)
-          # :nocov:
+          # simplecov:disable
           else
             password_hash_column
-          # :nocov:
+          # simplecov:enable
           end
           ds = ds.where(existing_expression => @existing_password_hash_or_salt)
         end
@@ -159,12 +159,12 @@ module Rodauth
       def login_confirmation_matches?(login, login_confirmation)
         login.casecmp?(login_confirmation)
       end
-    # :nocov:
+    # simplecov:disable
     else
       def login_confirmation_matches?(login, login_confirmation)
         login.casecmp(login_confirmation) == 0
       end
-    # :nocov:
+    # simplecov:enable
     end
 
     def login_meets_length_requirements?(login)
@@ -223,11 +223,11 @@ module Rodauth
         BCrypt::Engine::MIN_COST
       end
     else
-      # :nocov:
+      # simplecov:disable
       def password_hash_cost
         BCrypt::Engine::DEFAULT_COST
       end
-      # :nocov:
+      # simplecov:enable
     end
 
     def extract_password_hash_cost(hash)

data/lib/rodauth/features/otp.rb

@@ -270,17 +270,17 @@ module Rodauth
       return false unless otp_exists?
       ot_pass = ot_pass.gsub(/\s+/, '')
       if drift = otp_drift
-        # :nocov:
+        # simplecov:disable
         if otp.respond_to?(:verify_with_drift)
           otp.verify_with_drift(ot_pass, drift)
-        # :nocov:
+        # simplecov:enable
         else
           otp.verify(ot_pass, :drift_behind=>drift, :drift_ahead=>drift, :after=>otp_last_use)
         end
-      # :nocov:
+      # simplecov:disable
       elsif otp.respond_to?(:verify_with_drift)
         otp.verify(ot_pass)
-      # :nocov:
+      # simplecov:enable
       else
         otp.verify(ot_pass, :after=>otp_last_use)
       end
@@ -413,11 +413,11 @@ module Rodauth
         ROTP::Base32.random_base32.downcase
       end
     else
-      # :nocov:
+      # simplecov:disable
       def otp_new_secret
         ROTP::Base32.random.downcase
       end
-      # :nocov:
+      # simplecov:enable
     end
 
     def base32_encode(data, length)

data/lib/rodauth/features/otp_unlock.rb

@@ -181,9 +181,9 @@ module Rodauth
       end
 
       @otp_unlock_data = nil
-      # :nocov:
+      # simplecov:disable
       if otp_unlock_data
-      # :nocov:
+      # simplecov:enable
         if otp_unlock_num_successes >= otp_unlock_auths_required
           # At least the requisite number of consecutive successful unlock
           # authentications. Unlock OTP authentication.

data/lib/rodauth/features/password_complexity.rb

@@ -33,9 +33,9 @@ module Rodauth
         # nothing
       when nil
         default_dictionary_file = '/usr/share/dict/words'
-        # :nocov:
+        # simplecov:disable
         if File.file?(default_dictionary_file)
-        # :nocov:
+        # simplecov:enable
           words = File.read(default_dictionary_file)
         end
       else

data/lib/rodauth/features/password_grace_period.rb

@@ -34,8 +34,9 @@ module Rodauth
     private
 
     def new_password_matches_current_password?(_)
+      last_password_entry = session[last_password_entry_session_key]
       if v = super
-        session.delete(last_password_entry_session_key)
+        set_session_value(last_password_entry_session_key, last_password_entry)
       end
       v
     end

data/lib/rodauth/features/remember.rb

@@ -70,9 +70,9 @@ module Rodauth
         if [remember_remember_param_value, remember_forget_param_value, remember_disable_param_value].include?(remember)
           transaction do
             before_remember
-            # :nocov:
+            # simplecov:disable
             case remember
-            # :nocov:
+            # simplecov:enable
             when remember_remember_param_value
               remember_login
             when remember_forget_param_value

data/lib/rodauth/features/update_password_hash.rb

@@ -13,6 +13,8 @@ module Rodauth
           set_password(password)
         rescue Rodauth::SetPasswordFailure
           return false
+        else
+          @existing_password_hash_or_salt = nil
         end
       end
 

data/lib/rodauth/features/verify_account.rb

@@ -265,7 +265,7 @@ module Rodauth
 
     def _login_form_footer_links
       links = super
-      if !param_or_nil(login_param) || ((account || account_from_login(login_param_value)) && allow_resending_verify_account_email?)
+      if !param_or_nil(login_param) || ((account || (@account_retrieval_type != :login && account_from_login(login_param_value))) && allow_resending_verify_account_email?)
         links << [30, verify_account_resend_path, verify_account_resend_link_text]
       end
       links

data/lib/rodauth/features/webauthn.rb

@@ -290,9 +290,9 @@ module Rodauth
           # it is safe for the second one to use the webauthn user id inserted by the other request.
           # If there is still no webauthn user id at this point, then we'll just reraise the
           # exception.
-          # :nocov:
+          # simplecov:disable
           raise e unless webauthn_id = webauthn_user_ids_ds.get(webauthn_user_ids_webauthn_id_column)
-          # :nocov:
+          # simplecov:enable
         end
       end
 
@@ -419,7 +419,7 @@ module Rodauth
             name: webauthn_rp_name,
           )
         end
-      # :nocov:
+      # simplecov:disable
       else
         def webauthn_relying_party
           WebAuthn::RelyingParty.new(
@@ -428,7 +428,7 @@ module Rodauth
             name: webauthn_rp_name,
           )
         end
-      # :nocov:
+      # simplecov:enable
       end
 
       def webauthn_create_relying_party_opts
@@ -443,7 +443,7 @@ module Rodauth
       def _override_webauthn_credential_response_verify(webauthn_credential)
         # no need to override
       end
-    # :nocov:
+    # simplecov:disable
     else
       def webauthn_create_relying_party_opts
         {:rp => {:name=>webauthn_rp_name, :id=>webauthn_rp_id}}
@@ -466,7 +466,7 @@ module Rodauth
           super(expected_challenge, expected_origin || origin, **kw)
         end
       end
-    # :nocov:
+    # simplecov:enable
     end
 
     def webauthn_modification_authenticated?

data/lib/rodauth/version.rb

@@ -6,7 +6,7 @@ module Rodauth
   MAJOR = 2
 
   # The minor version of Rodauth, updated for new feature releases of Rodauth.
-  MINOR = 47
+  MINOR = 49
 
   # The patch version of Rodauth, updated only for bug fixes from the last
   # feature release.

data/lib/rodauth.rb

@@ -1,6 +1,7 @@
 # frozen-string-literal: true
 
 require 'securerandom'
+require 'roda'
 
 module Rodauth
   OPTS = {}.freeze
@@ -22,7 +23,7 @@ module Rodauth
   end
 
   def self.load_dependencies(app, opts=OPTS, &_)
-    json_opt = opts.fetch(:json, app.opts[:rodauth_json])
+    json_opt = opts.fetch(:json){app.opts[:rodauth_json]}
     if json_opt
       app.plugin :json
       app.plugin :json_parser
@@ -34,13 +35,13 @@ module Rodauth
         app.plugin :render
       end
 
-      case opts.fetch(:csrf, app.opts[:rodauth_csrf])
+      case opts.fetch(:csrf){app.opts[:rodauth_csrf]}
       when false
         # nothing
       when :rack_csrf
-        # :nocov:
+        # simplecov:disable
         app.plugin :csrf
-        # :nocov:
+        # simplecov:enable
       else
         app.plugin :route_csrf
       end
@@ -51,22 +52,23 @@ module Rodauth
   end
 
   def self.configure(app, opts=OPTS, &block)
-    json_opt = app.opts[:rodauth_json] = opts.fetch(:json, app.opts[:rodauth_json])
-    csrf = app.opts[:rodauth_csrf] = opts.fetch(:csrf, app.opts[:rodauth_csrf])
+    json_opt = app.opts[:rodauth_json] = opts.fetch(:json){app.rodauth_json}
+    csrf = app.opts[:rodauth_csrf] = opts.fetch(:csrf){app.opts[:rodauth_csrf]}
     app.opts[:rodauth_route_csrf] = case csrf
     when false, :rack_csrf
       false
     else
       json_opt != :only
     end
-    auth_class = (app.opts[:rodauths] ||= {})[opts[:name]] ||= opts[:auth_class] || Class.new(Auth)
+    name = opts[:name]
+    auth_class = (app.opts[:rodauths] ||= {})[name] ||= opts[:auth_class] || Class.new(Auth)
     if !auth_class.roda_class
       auth_class.roda_class = app
     elsif auth_class.roda_class != app
-      auth_class = app.opts[:rodauths][opts[:name]] = Class.new(auth_class)
+      auth_class = app.rodauths[name] = Class.new(auth_class)
       auth_class.roda_class = app
     end
-    auth_class.class_eval{@configuration_name = opts[:name] unless defined?(@configuration_name)}
+    auth_class.class_eval{@configuration_name = name unless defined?(@configuration_name)}
     auth_class.configure(&block) if block
     auth_class.send(:make_shape_friendly)
     auth_class.allocate.post_configure if auth_class.method_defined?(:post_configure)
@@ -186,9 +188,9 @@ module Rodauth
       feature.module_eval(&block)
       configuration.def_configuration_methods(feature)
 
-      # :nocov:
+      # simplecov:disable
       if constant
-      # :nocov:
+      # simplecov:enable
         Rodauth.const_set(constant, feature)
         Rodauth::FeatureConfiguration.const_set(constant, configuration)
       end
@@ -211,9 +213,9 @@ module Rodauth
     if RUBY_VERSION >= '2.5'
       DEPRECATED_ARGS = [{:uplevel=>1}]
     else
-      # :nocov:
+      # simplecov:disable
       DEPRECATED_ARGS = []
-      # :nocov:
+      # simplecov:enable
     end
     def def_deprecated_alias(new, old)
       configuration_module_eval do
@@ -348,7 +350,7 @@ module Rodauth
       auth_private_methods(meth)
     end
 
-    # :nocov:
+    # simplecov:disable
     def auth_cached_method(meth, iv=:"@#{meth}") # :nodoc:
       # Non-shape friendly historical method.
       # RODAUTH3: Remove
@@ -363,7 +365,7 @@ module Rodauth
       alias_method(meth, meth)
       auth_private_methods(meth)
     end
-    # :nocov:
+    # simplecov:enable
 
     [:notice_flash, :error_flash, :button].each do |meth|
       define_method(meth) do |v, name=feature_name|
@@ -377,11 +379,11 @@ module Rodauth
 
     def initialize(auth, &block)
       @auth = auth
-      # :nocov:
+      # simplecov:disable
       # Only for backwards compatibility
       # RODAUTH3: Remove
       apply(&block) if block
-      # :nocov:
+      # simplecov:enable
     end
 
     def apply(&block)
@@ -471,12 +473,12 @@ module Rodauth
 
           ivs
         end
-      # :nocov:
+      # simplecov:disable
       else
         def make_shape_friendly # :nodoc:
         end
       end
-      # :nocov:
+      # simplecov:enable
     end
 
     def self.inherited(subclass)
@@ -519,8 +521,28 @@ module Rodauth
   end
 
   module ClassMethods
+    if Roda::RodaPlugins.respond_to?(:opt_attr_reader)
+      Roda::RodaPlugins.opt_attr_reader(self, :rodauths)
+      Roda::RodaPlugins.opt_attr_reader(self, :rodauth_json)
+      Roda::RodaPlugins.opt_attr_reader(self, :rodauth_route_csrf, name: :rodauth_route_csrf?)
+    # simplecov:disable
+    else
+      def rodauths
+        opts[:rodauths]
+      end
+
+      def rodauth_json
+        opts[:rodauth_json]
+      end
+
+      def rodauth_route_csrf?
+        opts[:rodauth_route_csrf]
+      end
+    # simplecov:enable
+    end
+
     def rodauth(name=nil)
-      opts[:rodauths][name]
+      rodauths[name]
     end
 
     def precompile_rodauth_templates
@@ -540,8 +562,8 @@ module Rodauth
     end
 
     def freeze
-      opts[:rodauths].each_value(&:freeze)
-      opts[:rodauths].freeze
+      rodauths.each_value(&:freeze)
+      rodauths.freeze
       super
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rodauth
 version: !ruby/object:Gem::Version
-  version: 2.47.0
+  version: 2.49.0
 platform: ruby
 authors:
 - Jeremy Evans
@@ -407,7 +407,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Authentication and Account Management Framework for Rack Applications
 test_files: []