web47core 1.0.5 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a04d24fd691cb32029738a49005457f80c38043f6ffc8718ce6be6f369fdbc7
-  data.tar.gz: 113ee737740d6c85fec57c8c799d01804ea8dd689ea5837933469c2abc2236fc
+  metadata.gz: 47a4d6b158639c596b5ed01bc73a7f163d19e8ccd9bb7d51089b640368ce9e5b
+  data.tar.gz: 9203632b762294331dc976f61cc99eab95979d1ec58a95405286ba98ae6c58a1
 SHA512:
-  metadata.gz: e69873bd07d0b85fab0ddea56caf9198ccedd97d09365d683be0ddb5dd98f371b7c2466e71356bfaf8a654254a33fba847d66c5060860b1726b08458cdd160f9
-  data.tar.gz: e4885a8a85209f77f13d0f103fd9e8f1d61742e3cb7fbf0b3101d6c671afda4eaf0ca5f7ae358e3c7573fd65753015a1fb9744767d8ee5ceff9ecb9449cd7ee7
+  metadata.gz: 41b150960174a0f848103fcbec5be7847b4115abce5ba1ee00351bb028fe1bd16bd9f84b5a58b463b0b7eb71002c6e5917028208ca09cfeedf4631adcea09ae3
+  data.tar.gz: e67b0d44151b9e0a8aea5e55e7427ca0b527ea9f9c05e70abb65ef011ada7db91e58b11ae3fa4ba9bc88ba5bd9632d7cc5a667bb0d7771d7a5b785b5742e72bb

data/lib/app/controllers/concerns/core_delayed_jobs_controller.rb

@@ -10,7 +10,7 @@ module CoreDelayedJobsController
   #
   def index
     authorize! :read, Delayed::Backend::Mongoid::Job
-    @delayed_jobs = Delayed::Backend::Mongoid::Job.asc(%i[priority run_at]).limit(100)
+    @delayed_jobs = Delayed::Backend::Mongoid::Job.asc(%i[locked_by priority run_at]).limit(100)
   end
 
   def show

data/lib/app/jobs/cron/server.rb

@@ -185,7 +185,7 @@ module Cron
     # Returns the AutoScalingGroup associated with the account
     #
     def auto_scaling_group
-      filter = { auto_scaling_group_names: [sys_config.auto_scaling_group_name] }
+      filter = { auto_scaling_group_names: [sys_config.aws_auto_scaling_group_name] }
       @auto_scaling_group ||= client.describe_auto_scaling_groups(filter).auto_scaling_groups.first
     end
 

data/lib/app/jobs/cron/trim_collection.rb

@@ -31,12 +31,19 @@ module Cron
     # Test if this should be archived
     #
     def archive?(item)
-      item.updated_at < allowed_time_for_item(item)
+      item.send(comparison_field) < allowed_time_for_item(item)
     rescue StandardError => error
       App47Logger.log_warn "Unable to archive item #{item.inspect}", error
       false
     end
 
+    #
+    # Return which field to use for comparison when trimming objects
+    #
+    def comparison_field
+      :updated_at
+    end
+
     #
     # Try to get a TTL from System configuration, otherwise return the default
     #

data/lib/app/models/concerns/cipher_able.rb

@@ -0,0 +1,51 @@
+#
+# A mixin to help with encrypting data in a secure way
+#
+module CipherAble
+  extend ActiveSupport::Concern
+  # Add to the model
+  def self.included(base)
+    base.class_eval do
+      #
+      # Fields
+      #
+      field :secret_key, type: BSON::Binary
+    end
+  end
+
+  #
+  # Encrypt the given text
+  #
+  def encrypt(text)
+    cipher.encrypt_and_sign(text)
+  rescue StandardError => error
+    App47Logger.log_error("Unable to encrypt text for #{inspect}", error)
+    nil
+  end
+
+  #
+  # Decrypt the given text
+  #
+  def decrypt(text)
+    cipher.decrypt_and_verify(text)
+  rescue StandardError => error
+    App47Logger.log_warn("Unable to decrypt text for #{inspect}", error)
+    nil
+  end
+
+  #
+  # Get the cipher directly
+  #
+  def cipher
+    generate_key if secret_key.blank?
+    ActiveSupport::MessageEncryptor.new(secret_key.data)
+  end
+
+  private
+
+  def generate_key
+    len = ActiveSupport::MessageEncryptor.key_len
+    salt = SecureRandom.random_bytes(len)
+    set secret_key: BSON::Binary.new(ActiveSupport::KeyGenerator.new(id.to_s).generate_key(salt, len))
+  end
+end

data/lib/app/models/concerns/encrypted_password.rb

@@ -0,0 +1,41 @@
+#
+# Hold onto a secure password supporting both storage (setting) and retrieval ()getting) the password.
+#
+# The security will lie in the key that is offered by the object. By default it will be the ID of the object
+# however it should really use be combined with some other known value like account.id or something
+#
+module EncryptedPassword
+  extend ActiveSupport::Concern
+  #
+  # Base class extension
+  #
+  def self.included(base)
+    base.class_eval do
+      include CipherAble
+      #
+      # Fields
+      #
+      field :encrypted_password, type: String
+    end
+  end
+
+  #
+  # Retrieve the password
+  #
+  def password
+    encrypted_password.present? ? cipher.decrypt_and_verify(encrypted_password) : ''
+  rescue StandardError => error
+    App47Logger.log_warn("Unable to retrieve password for #{inspect}", error)
+    nil
+  end
+
+  #
+  # Set the password
+  #
+  def password=(pass)
+    set encrypted_password: cipher.encrypt_and_sign(pass)
+  rescue StandardError => error
+    App47Logger.log_error("Unable to store password for #{inspect}", error)
+    nil
+  end
+end

data/lib/web47core.rb

@@ -1,5 +1,6 @@
 require 'web47core/config'
 require 'app/models/concerns/app47_logger'
+require 'app/models/concerns/cipher_able'
 require 'app/models/concerns/cdn_url'
 require 'app/models/concerns/email_able'
 require 'app/models/concerns/search_able'
@@ -10,6 +11,7 @@ require 'app/models/concerns/switchboard_able'
 require 'app/models/concerns/core_system_configuration'
 require 'app/models/concerns/core_account'
 require 'app/models/concerns/secure_fields'
+require 'app/models/concerns/encrypted_password'
 require 'app/models/delayed_job'
 require 'app/models/redis_configuration'
 require 'app/models/notification'

data/lib/web47core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Web47core
-  VERSION = '1.0.5'
+  VERSION = '1.0.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.11
 platform: ruby
 authors:
 - Chris Schroeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-20 00:00:00.000000000 Z
+date: 2020-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -633,9 +633,11 @@ files:
 - lib/app/models/audit_log.rb
 - lib/app/models/concerns/app47_logger.rb
 - lib/app/models/concerns/cdn_url.rb
+- lib/app/models/concerns/cipher_able.rb
 - lib/app/models/concerns/core_account.rb
 - lib/app/models/concerns/core_system_configuration.rb
 - lib/app/models/concerns/email_able.rb
+- lib/app/models/concerns/encrypted_password.rb
 - lib/app/models/concerns/role_able.rb
 - lib/app/models/concerns/search_able.rb
 - lib/app/models/concerns/secure_fields.rb