web47core 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0df839ec2a6e7d78c8ef4e250179643a359e0b5723b35992ab4dfda76ccd1886
-  data.tar.gz: 31b961889cc2bf8748da8b2ea26d050a20fed870adfdcc68a5e8bce1f0e67409
+  metadata.gz: e4fa89fdcd38c923f6fde1827baa6d3237f43120e9e82c25f9c13cc7817e580a
+  data.tar.gz: d25bd53993294c31e1a6f89ce6cffe76c38bd0058411c97c2f4027418a37be43
 SHA512:
-  metadata.gz: 3fe114893789eee1c74a7f0c8870c4669feb38d8d67010b9425634b20910c7bce0bbd5825c3f0fe3e65eb4f58fabf8c49b390b868fa6f0c8bb8ee3821fcf7c4d
-  data.tar.gz: ba5626fdb74f667f55c992d84253026e8a50679552d7c4447d3832cfcbe05bbe26e84c4900ed23159a7cdc873149b6769e6d27aee559312f1aeedcfb0dcfc26f
+  metadata.gz: 1b9b6f4ed7fef7b154e7622f664c2c93bfbd6e26524523befd9b764d3d1f72525b06243b91e8c3fac057230dfff5f659017db4893b123665353e994c3cee2dad
+  data.tar.gz: ca8ecfac41f5bd5df4d766d48ad6823550d7fbbb62413c3820011edb151e59d5557edd18f4e967507a539fcd2731bd8198e5b352f3f6c546d95d376d034316e9

data/app/controllers/status_controller.rb

@@ -4,62 +4,36 @@
 # Return the status of the server
 #
 class StatusController < ActionController::Base
-  protect_from_forgery with: :exception
   #
   # Main (and only) page
   #
   def index
-    components = { mongo: mongo_status,
-                   redis: redis_status,
-                   jobs: delayed_jobs_status,
-                   cron_job_servers: cron_job_servers_status,
-                   workers: workers_status }
+    components = { mongo: mongo_status, redis: redis_status, job_count: job_count_status, cron_job: cron_job_status }
 
     respond_to do |format|
-      format.html { render :index, locals: { components: ui_decorators(components) }, layout: false }
+      format.html { render :index, locals: { components: components }, layout: false }
       format.json { render json: components.to_json }
-      format.text { render plain: components.flatten, status: text_status(components) }
+      format.text do
+        overall = components.collect { |_key, item| item[:success] }.all?
+        render plain: components.flatten, status: overall ? 200 : 500
+      end
     end
   end
 
   private
 
-  #
-  # Return the status of the key components, mongo, redis
-  #
-  def text_status(components)
-    components[:mongo][:success] && components[:redis][:success] ? 200 : 500
-  rescue StandardError
-    500
-  end
-
-  #
-  # Add UI decorators for HTML formatting
-  #
-  def ui_decorators(components)
-    components.each do |key, values|
-      if values[:success]
-        components[key][:icon_name] = 'check_circle'
-        components[key][:icon_color] = 'green-text'
-      else
-        components[key][:icon_name] = 'error'
-        components[key][:icon_color] = 'red-text'
-      end
-    end
-  end
-
   #
   # Report an error for the check
   #
-  def report_error(error, metrics = {})
-    metrics.merge(success: false, message: error.message)
+  def report_error(error)
+    { success: false, icon_name: 'error', icon_color: 'red-text', message: error.message }
   end
 
   #
   # Report a success for the check
   #
-  def report_success(message, metrics = {})
-    metrics.merge(success: true, message: message)
+  def report_success(message)
+    { success: true, icon_name: 'check_circle', icon_color: 'green-text', message: message }
   end
 
   #
@@ -68,9 +42,9 @@ class StatusController < ActionController::Base
   def mongo_status
     raise 'Mongo not available' if SystemConfiguration.count.zero?
 
-    report_success "#{SystemConfiguration.count} Configs", count: SystemConfiguration.count
+    report_success "#{SystemConfiguration.count} Configs"
   rescue StandardError => error
-    report_error error, count: 0
+    report_error(error)
   end
 
   #
@@ -81,53 +55,32 @@ class StatusController < ActionController::Base
     Rails.cache.write 'redis-status-check', value
     raise 'Redis not available' unless value.eql?(Rails.cache.fetch('redis-status-check'))
 
-    report_success 'Redis Available', count: 1
+    report_success 'Redis Available'
   rescue StandardError => error
-    report_error(error, count: 0)
+    report_error(error)
   end
 
   #
   # Job Count
   #
-  def delayed_jobs_status
-    count = Delayed::Backend::Mongoid::Job.count
-    report_success "#{count} Jobs", count: count
+  def job_count_status
+    report_success "#{Delayed::Backend::Mongoid::Job.count} Jobs"
   rescue StandardError => error
     report_error(error)
   end
 
   #
-  # Cron job primary status
+  # Cron job status
   #
-  def cron_job_servers_status
-    server = cron_job_server
+  def cron_job_status
+    server = Cron::Server.primary_server
     raise 'No primary server' if server.blank?
 
     server_info = "#{server.host_name}(#{server.pid}), last check in #{server.last_check_in_at}"
     raise "Primary Server is DEAD: #{server_info}" if server.dead?
 
-    report_success "Primary Server is alive: #{server_info}",
-                   primary_count: 1,
-                   total_count: Cron::Server.count
+    report_success "Primary Server is alive: #{server_info}"
   rescue StandardError => error
-    report_error(error, primary_count: 0, total_count: Cron::Server.count)
-  end
-
-  #
-  # Desired and current worker status for servers
-  #
-  def workers_status
-    server = cron_job_server
-    raise 'No primary server' if server.blank? || server.dead?
-
-    report_success "Workers #{server.desired_server_count}/ #{server.current_server_count}",
-                   desired_count: server.desired_server_count,
-                   current_count: server.current_server_count
-  rescue StandardError => error
-    report_error(error, desired_count: 0, current_count: 0)
-  end
-
-  def cron_job_server
-    @cron_job_server ||= Cron::Server.primary_server
+    report_error(error)
   end
 end

data/app/helpers/core_helper.rb

@@ -91,4 +91,8 @@ module CoreHelper
   def edit_model_path(model)
     model_action_path(model, :edit)
   end
+
+  def current_user
+    User.new
+  end
 end

data/app/views/status/index.html.haml

@@ -7,7 +7,7 @@
     %meta{ name: 'apple-mobile-web-app-status-bar-style', content: 'black'}
     = stylesheet_link_tag 'https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.min.css'
     = stylesheet_link_tag 'https://fonts.googleapis.com/icon?family=Material+Icons'
-    %title="#{Rails.env} Status"
+    %title "#{Rails.env} Status"
   %body{ style: 'background-color: #006064;'}
     %header
     %main

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

@@ -6,7 +6,7 @@
 module RestfulController
   #
   # Render a JSON response with the results and status passed in. The payload will include
-  # an MD5 hash along with the response for validation.
+  # an SHA1 hash along with the response for validation.
   #
   def render_json_response(success = true, results = {}, status_code = :ok)
     results[:success] = success
@@ -29,6 +29,10 @@ module RestfulController
   # Create a hash of the string contents
   #
   def hash(str)
-    Digest::MD5.hexdigest(str)
+    if SystemConfiguration.fips_mode?
+      Digest::SHA2.hexdigest(str)
+    else
+      Digest::MD5.hexdigest(str)
+    end
   end
 end

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

@@ -20,6 +20,7 @@ module CoreSystemConfiguration
       # Fields
       #
       field :environment, type: String, default: 'test'
+      field :fips_mode, type: String, default: false
       # SMTP configuration
       field :default_email, type: String, default: 'support@app47.com'
       field :support_email, type: String, default: 'support@app47.com'

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

@@ -76,7 +76,12 @@ module EmailAble
   # Return the gravatar URL based on email address
   #
   def gravatar_url(size = '32', default = 'mm')
-    "https://www.gravatar.com/avatar/#{Digest::MD5.hexdigest(email)}?s=#{size}&d=#{default}"
+    self.email ||= 'noone@abc.com'
+    if SystemConfiguration.fips_mode?
+      "https://www.gravatar.com/avatar/#{Digest::SHA2.hexdigest(email)}?s=#{size}&d=#{default}"
+    else
+      "https://www.gravatar.com/avatar/#{Digest::MD5.hexdigest(email)}?s=#{size}&d=#{default}"
+    end
   end
 
   private

data/lib/web47core/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Chris Schroeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-14 00:00:00.000000000 Z
+date: 2020-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport