web47core 1.0.4 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19ad57cb88f8e3915846ba74bfb5151c5ebc66be678b731e5b94dfc15e295b91
-  data.tar.gz: f01456dc0a54891dc091745a4a338e955f35b139d11a891ca553db36696ff897
+  metadata.gz: 9622e0a6af565d04a9632845a6b6800bfb5b81d14d7d5a553827dc97b3eac30e
+  data.tar.gz: e44feb61e1103d7e3abec6a0498f4d9b2cbf691d38a638a350a1cc5162139811
 SHA512:
-  metadata.gz: 5898e05f8e14c6193dd0d67fe4708a73963080b35845a21523619fe91124b154168e768a6fed1fd4075dbc27dbb4a2a27553289d26aba359d3e975dc7cd6dda9
-  data.tar.gz: 2f3fb0df2af5f3c372b640b0074ed54f510ff4cc54638bb2bb07b440b752c3e1dc1324bbd569126ffb2edc0cdddd54adaabb12d8e12f2356fb22a879422bc073
+  metadata.gz: 2f5cabb03ecd3a26f650093aa3724b4adef50c484e9c20fad24cad95b6edbc1d5b6782611dfa3938e221c376a1699bbf4915ddefcfdfb66e1a614e576c65b64e
+  data.tar.gz: 7bcd7542a8a4f7042f4077538df3f83b12a59b934e41180befaa40614da9b2872bec565aabd194d443f523ab2242ebf166b1432be7c4eda609f1ec94209c7bf2

data/app/assets/stylesheets/clipboard.scss

@@ -1,4 +1,4 @@
-p.clipboard {
+.clipboard {
   margin: 0 0 0 2px;
   padding: 0;
   span {

data/app/helpers/core_link_helper.rb

@@ -17,7 +17,7 @@ module CoreLinkHelper
   # Setup the text as copy text
   #
   def copy_tag(copy_text, options = {})
-    content_tag(:p, class: 'clipboard') do
+    content_tag(:div, class: 'clipboard') do
       concat(content_tag(:span) { copy_text })
       concat(copy_text_tag(copy_text, options))
       concat(download_tag(options[:download_url], options)) if options[:download_url].present?

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/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.4'
+  VERSION = '1.0.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.10
 platform: ruby
 authors:
 - Chris Schroeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-20 00:00:00.000000000 Z
+date: 2020-09-23 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