rails_base 0.72.0 → 0.73.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d9dbecf707959853a1706981d02b51479be08f34fcc2f55555b7d7d6ce8d8ee
-  data.tar.gz: d41e996e3a1a294e454ce47b26f330c4c0c417ca7b36b2fcc419212a2f1a6047
+  metadata.gz: cb5af463df9662e0a5c266c6b62dbf3c726167f2c4f0470dc191447091cc51fb
+  data.tar.gz: 137972e047ef1382819930cd51f6ad49aa99a5b64bff07a2463ed6ed1c553817
 SHA512:
-  metadata.gz: bafad74e906a22bc5b7af49506c594a4a6556b7f085ca37d59446f522e233fcc68ac34d1394425ad26407f13b56ad31fa0879c611a80d49de88bf0c4edf2f656
-  data.tar.gz: 65e01213e5d5e4160a1d5c7552b02671c5f2e410c620c6c257564811cf8cb9cab259047cb2dae2d6fd35ee99904e347f8433d32b8478d6a626380e9beac9173b
+  metadata.gz: c628e0403ce2cf8a9001c0df794b7cbbcee15efc4f2df8495f84b8c7dca76c1e459073ebaa7b3fce131d600632dcbc1008cece5a7b1c83d6c7fdd8932bc6a9f4
+  data.tar.gz: 7c31a13d4de80a55b5b6110d2080c999cafdf095ff016bb90bf68b9586ec16204a55f970371dd1f8d4f118e3c1c92368b6f059e8ec5e962a42c0f48c4c487368

data/app/helpers/rails_base/user_field_validators.rb

@@ -86,7 +86,7 @@ module RailsBase::UserFieldValidators
 
 		number_count = password.scan(/\d/).join('').length
 		char_count = password.scan(/[a-zA-Z]/).join('').length
-		unacceptable_chars = password.scan(/\W/).join('')
+		non_standard_chars = password.scan(/\W/)
 
 		if char_count < RailsBase::Authentication::Constants::MP_MIN_ALPHA
 			log(level: :warn, msg: "User password does not have enough numbers. Req: #{RailsBase::Authentication::Constants::MP_MIN_ALPHA}. Given: #{char_count}")
@@ -98,9 +98,10 @@ module RailsBase::UserFieldValidators
 			return { status: false, msg: "Password must contain at least #{RailsBase::Authentication::Constants::MP_MIN_NUMS} numbers [0-9]" }
 		end
 
+    unacceptable_chars = non_standard_chars - RailsBase.config.auth.password_allowed_special_chars.split("")
 		if unacceptable_chars.length > 0
-			log(level: :warn, msg: "User password contains unacceptable_chars. Received: #{unacceptable_chars}")
-			return { status: false, msg: "Unaccepted characters received. Characters must be in [0-9a-zA-Z] exclusively. Received #{unacceptable_chars}" }
+			log(level: :warn, msg: "User password contains unacceptable_chars special chars. Received: #{unacceptable_chars}")
+			return { status: false, msg: "Unaccepted characters received. Characters must be in [0-9a-zA-Z] and [#{RailsBase.config.auth.password_allowed_special_chars}] exclusively. Received #{unacceptable_chars}" }
 		end
 
 		{ status: true }

data/app/services/rails_base/authentication/constants.rb

@@ -35,13 +35,10 @@ module RailsBase::Authentication
 		SSOVE_PURPOSE = :verify_email
 
 		# modify password
-		MP_MIN_LENGTH = 7
-		MP_MIN_NUMS = 1
-		MP_MIN_ALPHA = 6
-		var = []
-		var << "contain at least #{MP_MIN_NUMS} numerics [0-9]" if MP_MIN_NUMS > 0
-		var << "contain at least #{MP_MIN_ALPHA} letters [a-z,A-Z]" if MP_MIN_NUMS > 0
-		MP_REQ_MESSAGE = "Password must #{var.join(' and ')}. Minimum length is #{MP_MIN_LENGTH} and contain [1-9a-zA-Z] only"
+		MP_MIN_LENGTH = RailsBase.config.auth.password_min_length
+		MP_MIN_NUMS = RailsBase.config.auth.password_min_numeric
+		MP_MIN_ALPHA = RailsBase.config.auth.password_min_alpha
+		MP_REQ_MESSAGE = RailsBase.config.auth.password_message
 
 		STATIC_WAIT_FLASH = '"Check email inbox for verification email. Follow instructions to gain access"'
 

data/app/services/rails_base/service_base.rb

@@ -59,7 +59,7 @@ class RailsBase::ServiceBase
   ensure
     # Always log how long it took along with a status
     finished_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-    elapsed = ((finished_time - beginning_time) * 10).round
+    elapsed = ((finished_time - beginning_time)).round(1)
     log(level: :info, msg: "Finished with [#{status}]...elapsed #{elapsed}s")
   end
 end

data/app/services/rails_base/service_logging.rb

@@ -1,13 +1,16 @@
 module RailsBase::ServiceLogging
 	def log(level:, msg:)
-	  altered_message = "#{log_prefix}: #{msg}"
-	  logger.public_send(level, altered_message)
+	  logger.public_send(level, aletered_message(msg))
 	rescue StandardError
-		Rails.logger.public_send(level, msg)
+		Rails.logger.public_send(level, aletered_message(msg))
+	end
+
+	def aletered_message(msg)
+		"#{log_prefix}: #{msg}"
 	end
 
 	def logger
-		defined?(context) ? context.loger : nil
+		defined?(context) ? context.logger : Rails.logger
 	end
 
 	def log_prefix

data/app/views/rails_base/shared/_password_confirm_javascript.html.erb

@@ -15,8 +15,21 @@
       return false
     }
 
-    var unknown = value.replace(/[0-9a-zA-Z]/g,'')
-    if(unknown.length > 0) {
+    var special_chars = value.replace(/[0-9a-zA-Z]/g,'')
+
+    if (special_chars.length == 0) {
+      return true
+    }
+    password_allowed_special_chars = <%= raw (RailsBase.config.auth.password_allowed_special_chars || "").split("") %>
+
+    special_chars_array = special_chars.split("")
+    unknown_chars = []
+    for (let i = 0; i < special_chars_array.length; i++) {
+      if(!password_allowed_special_chars.includes(special_chars_array[i])){
+        unknown_chars.push(special_chars_array[i])
+      }
+    }
+    if(unknown_chars.length > 0) {
       return false
     }
     true

data/app/views/rails_base/shared/_reset_password_form.html.erb

@@ -59,8 +59,21 @@
       return false
     }
 
-    var unknown = value.replace(/[0-9a-zA-Z]/g,'')
-    if(unknown.length > 0) {
+    var special_chars = value.replace(/[0-9a-zA-Z]/g,'')
+
+    if (special_chars.length == 0) {
+      return true
+    }
+    password_allowed_special_chars = <%= raw (RailsBase.config.auth.password_allowed_special_chars || "").split("") %>
+
+    special_chars_array = special_chars.split("")
+    unknown_chars = []
+    for (let i = 0; i < special_chars_array.length; i++) {
+      if(!password_allowed_special_chars.includes(special_chars_array[i])){
+        unknown_chars.push(special_chars_array[i])
+      }
+    }
+    if(unknown_chars.length > 0) {
       return false
     }
     true

data/lib/rails_base/config.rb

@@ -1,17 +1,17 @@
 require 'singleton'
+require 'rails_base/configuration/active_job'
 require 'rails_base/configuration/admin'
-require 'rails_base/configuration/mfa'
-require 'rails_base/configuration/authentication'
-require 'rails_base/configuration/redis'
-require 'rails_base/configuration/owner'
-require 'rails_base/configuration/mailer'
-require 'rails_base/configuration/exceptions_app'
 require 'rails_base/configuration/app'
 require 'rails_base/configuration/appearance'
-require 'rails_base/configuration/user'
+require 'rails_base/configuration/authentication'
+require 'rails_base/configuration/exceptions_app'
 require 'rails_base/configuration/login_behavior'
-require 'rails_base/configuration/active_job'
+require 'rails_base/configuration/mailer'
+require 'rails_base/configuration/mfa'
+require 'rails_base/configuration/owner'
+require 'rails_base/configuration/redis'
 require 'rails_base/configuration/templates'
+require 'rails_base/configuration/user'
 
 module RailsBase
   class Config

data/lib/rails_base/configuration/active_job.rb

@@ -1,3 +1,5 @@
+require 'rails_base/configuration/base'
+
 module RailsBase
   module Configuration
     class ActiveJob < Base

data/lib/rails_base/configuration/authentication.rb

@@ -8,6 +8,25 @@ module RailsBase
 
       DEFAULT_MFA_TIME = 7.day
       MIN_MFA_TIME = 1.day
+      PASSWORD_MIN_LENGTH = 8
+      PASSWORD_MIN_NUMERIC = 2
+      PASSWORD_MIN_ALPHANUMERIC = 6
+      PASSWORD_ALLOWED_SPECIAL_CHARS = "(),.\"'{}[]!@\#$%^&*_-+="
+
+      PASSWORD_MESSAGE_ON_ASSIGNMENT = Proc.new do |value, current|
+        if value.nil?
+          special_chars_str =
+            if current.password_allowed_special_chars.nil?
+              "No Special characters are allowed"
+            else
+              "Only the following special characters are allowed #{current.password_allowed_special_chars}"
+            end
+
+          current.password_message = "Password must be at least #{current.password_min_length} characters long. " \
+            "With #{current.password_min_numeric} numbers [0-9] and #{current.password_min_alpha} letters [a-zA-Z]. " \
+            "#{special_chars_str}."
+        end
+      end
 
       DEFAULT_VALUES = {
         session_timeout: {
@@ -29,9 +48,52 @@ module RailsBase
           custom: ->(val) { val.to_i > MIN_MFA_TIME },
           msg: "mfa_time_duration must be a duration. Greater than #{MIN_MFA_TIME}",
           description: 'Max time between when MFA will be required',
+        },
+        password_min_length: {
+          type: :integer,
+          default: PASSWORD_MIN_LENGTH,
+          custom: ->(val) { val >= PASSWORD_MIN_LENGTH },
+          msg: "password_min_length must be a integer greater than #{PASSWORD_MIN_LENGTH}.",
+          description: 'Min length the password can be.',
+        },
+        password_min_numeric: {
+          type: :integer,
+          default: PASSWORD_MIN_NUMERIC,
+          custom: ->(val) { val >= PASSWORD_MIN_NUMERIC },
+          msg: "password_min_numeric must be a integer greater or equal to #{PASSWORD_MIN_NUMERIC}.",
+          description: 'Min count of numerics in password.',
+        },
+        password_min_alpha: {
+          type: :integer,
+          default: PASSWORD_MIN_ALPHANUMERIC,
+          custom: ->(val) { val >= PASSWORD_MIN_ALPHANUMERIC },
+          msg: "password_min_alpha must be a integer greater or equal to #{PASSWORD_MIN_ALPHANUMERIC}.",
+          description: 'Min count of letters in password.',
+        },
+        password_allowed_special_chars: {
+          type: :string_nil,
+          default: PASSWORD_ALLOWED_SPECIAL_CHARS,
+          description: 'Allowed special characters in password.',
+        },
+        password_message: {
+          type: :string_nil,
+          default: nil,
+          description: 'Password message for users.',
+          on_assignment: PASSWORD_MESSAGE_ON_ASSIGNMENT,
         }
       }
       attr_accessor *DEFAULT_VALUES.keys
+
+      private
+
+      def custom_validations
+        enforce_password_config!
+      end
+
+      def enforce_password_config!
+        incorrectness = []
+        incorrectness << "`password_min_numeric` is not less than or equal to `password_min_length`" if password_min_numeric <= password_min_length
+      end
     end
   end
 end

data/lib/rails_base/configuration/base.rb

@@ -16,19 +16,20 @@ module RailsBase
       end
 
       ALLOWED_TYPES = {
+        array: -> (val) { [Array].include?(val.class) },
+        array_nil: -> (val) { [Array, NilClass].include?(val.class) },
         boolean: -> (val) { [TrueClass, FalseClass].include?(val.class) },
-        proc: -> (val) { [Proc].include?(val.class) },
+        duration: -> (val) { [ActiveSupport::Duration].include?(val.class) },
+        hash: -> (val) { [Hash].include?(val.class) },
         integer: -> (val) { [Integer].include?(val.class) },
+        klass: -> (_val) { true },
+        path: -> (val) { [Pathname].include?(val.class) },
+        proc: -> (val) { [Proc].include?(val.class) },
         string: -> (val) { [String].include?(val.class) },
-        symbol: -> (val) { [Symbol].include?(val.class) },
-        symbol_class: -> (val) { [Symbol].include?(val.class) || val.superclass === ActiveJob::QueueAdapters },
-        duration: -> (val) { [ActiveSupport::Duration].include?(val.class) },
         string_nil: -> (val) { [String, NilClass].include?(val.class) },
         string_proc: -> (val) { [String, Proc].include?(val.class) },
-        array: -> (val) { [Array].include?(val.class) },
-        hash: -> (val) { [Hash].include?(val.class) },
-        path: -> (val) { [Pathname].include?(val.class) },
-        klass: -> (_val) { true },
+        symbol: -> (val) { [Symbol].include?(val.class) },
+        symbol_class: -> (val) { [Symbol].include?(val.class) || val.superclass === ActiveJob::QueueAdapters },
         values: -> (_val) { true },
       }
 
@@ -116,8 +117,7 @@ module RailsBase
 
       private
 
-      def custom_validations
-      end
+      def custom_validations; end
 
       def def_convenience_methods
         self.class::DEFAULT_VALUES.each do |key, object|

data/lib/rails_base/configuration/mfa.rb

@@ -69,9 +69,9 @@ module RailsBase
       def enforce_twilio!
         return unless enable == true
 
-      return if twilio_sid.present? &&
-        twilio_auth_token.present? &&
-        twilio_from_number.present?
+        return if twilio_sid.present? &&
+          twilio_auth_token.present? &&
+          twilio_from_number.present?
 
         raise InvalidConfiguration, "twilio_sid twilio_auth_token twilio_from_number need to be present when `mfa.enabled`"
       end

data/lib/rails_base/version.rb

@@ -1,7 +1,7 @@
 module RailsBase
   MAJOR = '0'
-  MINOR = '72'
-  PATCH = '0'
+  MINOR = '73'
+  PATCH = '1'
   VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}"
 
   def self.print_version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_base
 version: !ruby/object:Gem::Version
-  version: 0.72.0
+  version: 0.73.1
 platform: ruby
 authors:
 - Matt Taylor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-18 00:00:00.000000000 Z
+date: 2022-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails