web47core 1.0.4 → 1.0.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 19ad57cb88f8e3915846ba74bfb5151c5ebc66be678b731e5b94dfc15e295b91
4
- data.tar.gz: f01456dc0a54891dc091745a4a338e955f35b139d11a891ca553db36696ff897
3
+ metadata.gz: 9622e0a6af565d04a9632845a6b6800bfb5b81d14d7d5a553827dc97b3eac30e
4
+ data.tar.gz: e44feb61e1103d7e3abec6a0498f4d9b2cbf691d38a638a350a1cc5162139811
5
5
  SHA512:
6
- metadata.gz: 5898e05f8e14c6193dd0d67fe4708a73963080b35845a21523619fe91124b154168e768a6fed1fd4075dbc27dbb4a2a27553289d26aba359d3e975dc7cd6dda9
7
- data.tar.gz: 2f3fb0df2af5f3c372b640b0074ed54f510ff4cc54638bb2bb07b440b752c3e1dc1324bbd569126ffb2edc0cdddd54adaabb12d8e12f2356fb22a879422bc073
6
+ metadata.gz: 2f5cabb03ecd3a26f650093aa3724b4adef50c484e9c20fad24cad95b6edbc1d5b6782611dfa3938e221c376a1699bbf4915ddefcfdfb66e1a614e576c65b64e
7
+ data.tar.gz: 7bcd7542a8a4f7042f4077538df3f83b12a59b934e41180befaa40614da9b2872bec565aabd194d443f523ab2242ebf166b1432be7c4eda609f1ec94209c7bf2
@@ -1,4 +1,4 @@
1
- p.clipboard {
1
+ .clipboard {
2
2
  margin: 0 0 0 2px;
3
3
  padding: 0;
4
4
  span {
@@ -17,7 +17,7 @@ module CoreLinkHelper
17
17
  # Setup the text as copy text
18
18
  #
19
19
  def copy_tag(copy_text, options = {})
20
- content_tag(:p, class: 'clipboard') do
20
+ content_tag(:div, class: 'clipboard') do
21
21
  concat(content_tag(:span) { copy_text })
22
22
  concat(copy_text_tag(copy_text, options))
23
23
  concat(download_tag(options[:download_url], options)) if options[:download_url].present?
@@ -10,7 +10,7 @@ module CoreDelayedJobsController
10
10
  #
11
11
  def index
12
12
  authorize! :read, Delayed::Backend::Mongoid::Job
13
- @delayed_jobs = Delayed::Backend::Mongoid::Job.asc(%i[priority run_at]).limit(100)
13
+ @delayed_jobs = Delayed::Backend::Mongoid::Job.asc(%i[locked_by priority run_at]).limit(100)
14
14
  end
15
15
 
16
16
  def show
@@ -185,7 +185,7 @@ module Cron
185
185
  # Returns the AutoScalingGroup associated with the account
186
186
  #
187
187
  def auto_scaling_group
188
- filter = { auto_scaling_group_names: [sys_config.auto_scaling_group_name] }
188
+ filter = { auto_scaling_group_names: [sys_config.aws_auto_scaling_group_name] }
189
189
  @auto_scaling_group ||= client.describe_auto_scaling_groups(filter).auto_scaling_groups.first
190
190
  end
191
191
 
@@ -0,0 +1,51 @@
1
+ #
2
+ # A mixin to help with encrypting data in a secure way
3
+ #
4
+ module CipherAble
5
+ extend ActiveSupport::Concern
6
+ # Add to the model
7
+ def self.included(base)
8
+ base.class_eval do
9
+ #
10
+ # Fields
11
+ #
12
+ field :secret_key, type: BSON::Binary
13
+ end
14
+ end
15
+
16
+ #
17
+ # Encrypt the given text
18
+ #
19
+ def encrypt(text)
20
+ cipher.encrypt_and_sign(text)
21
+ rescue StandardError => error
22
+ App47Logger.log_error("Unable to encrypt text for #{inspect}", error)
23
+ nil
24
+ end
25
+
26
+ #
27
+ # Decrypt the given text
28
+ #
29
+ def decrypt(text)
30
+ cipher.decrypt_and_verify(text)
31
+ rescue StandardError => error
32
+ App47Logger.log_warn("Unable to decrypt text for #{inspect}", error)
33
+ nil
34
+ end
35
+
36
+ #
37
+ # Get the cipher directly
38
+ #
39
+ def cipher
40
+ generate_key if secret_key.blank?
41
+ ActiveSupport::MessageEncryptor.new(secret_key.data)
42
+ end
43
+
44
+ private
45
+
46
+ def generate_key
47
+ len = ActiveSupport::MessageEncryptor.key_len
48
+ salt = SecureRandom.random_bytes(len)
49
+ set secret_key: BSON::Binary.new(ActiveSupport::KeyGenerator.new(id.to_s).generate_key(salt, len))
50
+ end
51
+ end
@@ -0,0 +1,41 @@
1
+ #
2
+ # Hold onto a secure password supporting both storage (setting) and retrieval ()getting) the password.
3
+ #
4
+ # The security will lie in the key that is offered by the object. By default it will be the ID of the object
5
+ # however it should really use be combined with some other known value like account.id or something
6
+ #
7
+ module EncryptedPassword
8
+ extend ActiveSupport::Concern
9
+ #
10
+ # Base class extension
11
+ #
12
+ def self.included(base)
13
+ base.class_eval do
14
+ include CipherAble
15
+ #
16
+ # Fields
17
+ #
18
+ field :encrypted_password, type: String
19
+ end
20
+ end
21
+
22
+ #
23
+ # Retrieve the password
24
+ #
25
+ def password
26
+ encrypted_password.present? ? cipher.decrypt_and_verify(encrypted_password) : ''
27
+ rescue StandardError => error
28
+ App47Logger.log_warn("Unable to retrieve password for #{inspect}", error)
29
+ nil
30
+ end
31
+
32
+ #
33
+ # Set the password
34
+ #
35
+ def password=(pass)
36
+ set encrypted_password: cipher.encrypt_and_sign(pass)
37
+ rescue StandardError => error
38
+ App47Logger.log_error("Unable to store password for #{inspect}", error)
39
+ nil
40
+ end
41
+ end
@@ -1,5 +1,6 @@
1
1
  require 'web47core/config'
2
2
  require 'app/models/concerns/app47_logger'
3
+ require 'app/models/concerns/cipher_able'
3
4
  require 'app/models/concerns/cdn_url'
4
5
  require 'app/models/concerns/email_able'
5
6
  require 'app/models/concerns/search_able'
@@ -10,6 +11,7 @@ require 'app/models/concerns/switchboard_able'
10
11
  require 'app/models/concerns/core_system_configuration'
11
12
  require 'app/models/concerns/core_account'
12
13
  require 'app/models/concerns/secure_fields'
14
+ require 'app/models/concerns/encrypted_password'
13
15
  require 'app/models/delayed_job'
14
16
  require 'app/models/redis_configuration'
15
17
  require 'app/models/notification'
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Web47core
4
- VERSION = '1.0.4'
4
+ VERSION = '1.0.10'
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: web47core
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.4
4
+ version: 1.0.10
5
5
  platform: ruby
6
6
  authors:
7
7
  - Chris Schroeder
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-08-20 00:00:00.000000000 Z
11
+ date: 2020-09-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport
@@ -633,9 +633,11 @@ files:
633
633
  - lib/app/models/audit_log.rb
634
634
  - lib/app/models/concerns/app47_logger.rb
635
635
  - lib/app/models/concerns/cdn_url.rb
636
+ - lib/app/models/concerns/cipher_able.rb
636
637
  - lib/app/models/concerns/core_account.rb
637
638
  - lib/app/models/concerns/core_system_configuration.rb
638
639
  - lib/app/models/concerns/email_able.rb
640
+ - lib/app/models/concerns/encrypted_password.rb
639
641
  - lib/app/models/concerns/role_able.rb
640
642
  - lib/app/models/concerns/search_able.rb
641
643
  - lib/app/models/concerns/secure_fields.rb