foreman_openscap 0.8.6 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a2517a24cb92ee7898fa02ab267bc2e32f05565
-  data.tar.gz: 1c4beabb618e2953f03bae31db8bfe988c72076a
+  metadata.gz: 8860c02972d0a7286d2d44f6a23c02a79a540ad1
+  data.tar.gz: a0789f0a6842b9609f688208e9a7e9dc7289ba1f
 SHA512:
-  metadata.gz: 8d9b4179678e3e3d69f59636dafbc5e895a198c032354ac3fc9793d6f0006d7d4c9fe53aa7bae414606fccf2f7f2e9341836c6b76a2713ed7d61c439d9d55dae
-  data.tar.gz: ad099fa637e2fdbe1efa5e9b07e4fd79901e186c9c985bf22dd94a05296df1a1fa07300366fc4fbd981ecf288fff3ac013407b917bbc06842c070283d4d22121
+  metadata.gz: 6f5c7ba56f44c5db6828ffa2d5f6d02fb470e910c8614a11ec68121962f04c96472b5edf6e35e4abd20b29b68b012f3c67c0b192268c98b517f7ee8b63b4286c
+  data.tar.gz: 2b495b6833ec1362dc7dcc386d83e1a3c076c742db55bce19b80301f793b961e8db16535abaf41478d28815086305447dff21ed6c15d5a40626260b4eb7b7f54

data/app/controllers/api/v2/compliance/arf_reports_controller.rb

@@ -10,8 +10,8 @@ module Api
 
         add_smart_proxy_filters :create, :features => 'Openscap'
 
-        before_filter :find_resource, :only => %w[show destroy download download_html]
-        skip_after_filter :log_response_body, :only => %w[download download_html]
+        before_action :find_resource, :only => %w[show destroy download download_html]
+        skip_after_action :log_response_body, :only => %w[download download_html]
 
         def resource_name
           '::ForemanOpenscap::ArfReport'
@@ -49,7 +49,7 @@ module Api
         def create
           asset = ForemanOpenscap::Helper::get_asset(params[:cname], params[:policy_id])
           if asset.host.openscap_proxy
-            arf_report = ForemanOpenscap::ArfReport.create_arf(asset, params)
+            arf_report = ForemanOpenscap::ArfReport.create_arf(asset, params.to_unsafe_h)
             asset.host.refresh_statuses([HostStatus.find_status_by_humanized_name("compliance")])
             render :json => { :result => :OK, :id => arf_report.id.to_s }
           else

data/app/controllers/api/v2/compliance/policies_controller.rb

@@ -6,9 +6,9 @@ module Api::V2
 
       add_smart_proxy_filters %i[content tailoring], :features => 'Openscap'
 
-      before_filter :find_resource, :except => %w[index create]
+      before_action :find_resource, :except => %w[index create]
 
-      skip_after_filter :log_response_body, :only => [:content]
+      skip_after_action :log_response_body, :only => [:content]
 
       def resource_name
         '::ForemanOpenscap::Policy'

data/app/controllers/api/v2/compliance/scap_contents_controller.rb

@@ -2,7 +2,7 @@ module Api::V2
   module Compliance
     class ScapContentsController < ::Api::V2::BaseController
       include Foreman::Controller::Parameters::ScapContent
-      before_filter :find_resource, :except => %w[index create]
+      before_action :find_resource, :except => %w[index create]
 
       def resource_name
         '::ForemanOpenscap::ScapContent'

data/app/controllers/api/v2/compliance/tailoring_files_controller.rb

@@ -2,8 +2,8 @@ module Api::V2
   module Compliance
     class TailoringFilesController < ::Api::V2::BaseController
       include Foreman::Controller::Parameters::TailoringFile
-      before_filter :find_resource, :except => %w[index create]
-      before_filter :openscap_proxy_check, :only => %w[create]
+      before_action :find_resource, :except => %w[index create]
+      before_action :openscap_proxy_check, :only => %w[create]
 
       def resource_name
         '::ForemanOpenscap::TailoringFile'

data/app/controllers/arf_reports_controller.rb

@@ -2,8 +2,8 @@ class ArfReportsController < ApplicationController
   include Foreman::Controller::AutoCompleteSearch
   include ForemanOpenscap::ArfReportsControllerCommonExtensions
 
-  before_filter :find_arf_report, :only => %i[show show_html destroy parse_html parse_bzip download_html]
-  before_filter :find_multiple, :only => %i[delete_multiple submit_delete_multiple]
+  before_action :find_arf_report, :only => %i[show show_html destroy parse_html parse_bzip download_html]
+  before_action :find_multiple, :only => %i[delete_multiple submit_delete_multiple]
 
   def model_of_controller
     ::ForemanOpenscap::ArfReport

data/app/controllers/concerns/foreman_openscap/hosts_controller_extensions.rb

@@ -1,17 +1,14 @@
 module ForemanOpenscap
   module HostsControllerExtensions
-    extend ActiveSupport::Concern
-
-    included do
-      alias_method_chain :process_hostgroup, :openscap
-      self::AJAX_REQUESTS << 'openscap_proxy_changed'
+    def self.prepended(base)
+      base::AJAX_REQUESTS << 'openscap_proxy_changed'
     end
 
-    def process_hostgroup_with_openscap
+    def process_hostgroup
       @hostgroup = Hostgroup.find(params[:host][:hostgroup_id]) if params[:host][:hostgroup_id].to_i > 0
       return head(:not_found) unless @hostgroup
       @openscap_proxy = @hostgroup.openscap_proxy
-      process_hostgroup_without_openscap
+      super
     end
   end
 end

data/app/controllers/policies_controller.rb

@@ -2,9 +2,9 @@ class PoliciesController < ApplicationController
   include Foreman::Controller::AutoCompleteSearch
   include Foreman::Controller::Parameters::Policy
 
-  before_filter :find_by_id, :only => %i[show edit update parse destroy]
-  before_filter :find_multiple, :only => %i[select_multiple_hosts update_multiple_hosts disassociate_multiple_hosts remove_policy_from_multiple_hosts]
-  before_filter :find_tailoring_file, :only => [:tailoring_file_selected]
+  before_action :find_by_id, :only => %i[show edit update parse destroy]
+  before_action :find_multiple, :only => %i[select_multiple_hosts update_multiple_hosts disassociate_multiple_hosts remove_policy_from_multiple_hosts]
+  before_action :find_tailoring_file, :only => [:tailoring_file_selected]
 
   def model_of_controller
     ::ForemanOpenscap::Policy

data/app/controllers/policy_dashboard_controller.rb

@@ -1,5 +1,5 @@
 class PolicyDashboardController < ApplicationController
-  before_filter :prefetch_data, :only => :index
+  before_action :prefetch_data, :only => :index
 
   def index
   end

data/app/controllers/scap_contents_controller.rb

@@ -2,8 +2,8 @@ class ScapContentsController < ApplicationController
   include Foreman::Controller::AutoCompleteSearch
   include Foreman::Controller::Parameters::ScapContent
 
-  before_filter :handle_file_upload, :only => %i[create update]
-  before_filter :find_by_id, :only => %i[show edit update destroy]
+  before_action :handle_file_upload, :only => %i[create update]
+  before_action :find_by_id, :only => %i[show edit update destroy]
 
   def model_of_controller
     ::ForemanOpenscap::ScapContent

data/app/controllers/tailoring_files_controller.rb

@@ -2,8 +2,8 @@ class TailoringFilesController < ApplicationController
   include Foreman::Controller::AutoCompleteSearch
   include Foreman::Controller::Parameters::TailoringFile
 
-  before_filter :find_tailoring_file, :only => %i[destroy update edit xml]
-  before_filter :handle_file_upload, :only => %i[create update]
+  before_action :find_tailoring_file, :only => %i[destroy update edit xml]
+  before_action :handle_file_upload, :only => %i[create update]
 
   def model_of_controller
     ::ForemanOpenscap::TailoringFile

data/app/helpers/arf_reports_helper.rb

@@ -59,7 +59,7 @@ module ArfReportsHelper
   end
 
   def reported_info(arf_report)
-    msg = _("Reported at %s") % arf_report.reported_at
+    msg = _("Reported at %s") % date_time_absolute(arf_report.reported_at)
     msg << _(" for policy %s") % display_link_if_authorized(arf_report.policy.name, hash_for_edit_policy_path(:id => arf_report.policy.id)) if arf_report.policy
     return msg.html_safe unless arf_report.openscap_proxy
     msg += _(" through %s") % openscap_proxy_link(arf_report)

data/app/helpers/concerns/foreman_openscap/hosts_helper_extensions.rb

@@ -1,19 +1,12 @@
 module ForemanOpenscap
   module HostsHelperExtensions
-    extend ActiveSupport::Concern
-
-    included do
-      alias_method_chain :multiple_actions, :scap
-      alias_method_chain :name_column, :scap
-    end
-
-    def multiple_actions_with_scap
-      multiple_actions_without_scap + [[_('Assign Compliance Policy'), select_multiple_hosts_policies_path],
+    def multiple_actions
+      super + [[_('Assign Compliance Policy'), select_multiple_hosts_policies_path],
                                        [_('Unassign Compliance Policy'), disassociate_multiple_hosts_policies_path]]
     end
 
-    def name_column_with_scap(record)
-      record.nil? ? _('Host is deleted') : name_column_without_scap(record)
+    def name_column(record)
+      record.nil? ? _('Host is deleted') : super(record)
     end
   end
 end

data/app/helpers/concerns/foreman_openscap/lookup_keys_helper_extensions.rb

@@ -1,14 +1,8 @@
 module ForemanOpenscap
   module LookupKeysHelperExtensions
-    extend ActiveSupport::Concern
-
-    included do
-      alias_method_chain :overridable_lookup_keys, :scap
-    end
-
-    def overridable_lookup_keys_with_scap(klass, obj)
+    def overridable_lookup_keys(klass, obj)
       return [] if klass.name == "foreman_scap_client"
-      overridable_lookup_keys_without_scap klass, obj
+      super klass, obj
     end
   end
 end

data/app/helpers/policies_helper.rb

@@ -88,7 +88,7 @@ module PoliciesHelper
   end
 
   def previous_link(form)
-    previous = content_tag(:span, :class => 'glyphicon glyphicon-chevron-left') {}
+    previous = content_tag(:span, :class => 'glyphicon glyphicon-chevron-left')
     content_tag(:div, :class => 'pull-left') do
       link_to(previous.html_safe, '#', :class => 'btn btn-default', :onclick => "previous_step('#{@policy.previous_step}')")
     end

data/app/lib/proxy_api/openscap.rb

@@ -51,9 +51,8 @@ module ::ProxyAPI
       begin
         parse(delete("arf/#{report.id}/#{cname}/#{report.reported_at.to_i}/#{report.policy_arf_report.digest}"))
       rescue => e
-        msg = "Failed to destroy arf report with id #{report.id} on Smart Proxy, cause: #{e.message}"
-        logger.error msg
-        report.errors.add(:base, msg)
+        logger.error "Failed to destroy arf report with id #{report.id} on Smart Proxy"
+        logger.debug e.backtrace.join("\n\t")
         false
       end
     end

data/app/models/concerns/foreman_openscap/host_extensions.rb

@@ -1,55 +1,54 @@
 module ForemanOpenscap
   module HostExtensions
-    extend ActiveSupport::Concern
     ::Host::Managed::Jail.allow :policies_enc
 
-    included do
-      has_one :asset, :as => :assetable, :class_name => "::ForemanOpenscap::Asset"
-      has_many :asset_policies, :through => :asset, :class_name => "::ForemanOpenscap::AssetPolicy"
-      has_many :policies, :through => :asset_policies, :class_name => "::ForemanOpenscap::Policy"
-      has_many :arf_reports, :class_name => '::ForemanOpenscap::ArfReport', :foreign_key => :host_id
-      has_one :compliance_status_object, :class_name => '::ForemanOpenscap::ComplianceStatus', :foreign_key => 'host_id'
+    def self.prepended(base)
+      base.has_one :asset, :as => :assetable, :class_name => "::ForemanOpenscap::Asset"
+      base.has_many :asset_policies, :through => :asset, :class_name => "::ForemanOpenscap::AssetPolicy"
+      base.has_many :policies, :through => :asset_policies, :class_name => "::ForemanOpenscap::Policy"
+      base.has_many :arf_reports, :class_name => '::ForemanOpenscap::ArfReport', :foreign_key => :host_id
+      base.has_one :compliance_status_object, :class_name => '::ForemanOpenscap::ComplianceStatus', :foreign_key => 'host_id'
 
-      scoped_search :relation => :policies, :on => :name, :complete_value => true, :rename => :compliance_policy,
+      base.scoped_search :relation => :policies, :on => :name, :complete_value => true, :rename => :compliance_policy,
                     :only_explicit => true, :operators => ['= '], :ext_method => :search_by_policy_name
 
-      scoped_search :relation => :policies, :on => :id, :complete_value => false, :rename => :compliance_policy_id,
+      base.scoped_search :relation => :policies, :on => :id, :complete_value => false, :rename => :compliance_policy_id,
                     :only_explicit => true, :operators => ['= ', '!= '], :ext_method => :search_by_policy_id
 
-      scoped_search :relation => :policies, :on => :name, :complete_value => true, :rename => :compliance_report_missing_for,
+      base.scoped_search :relation => :policies, :on => :name, :complete_value => true, :rename => :compliance_report_missing_for,
                     :only_explicit => true, :operators => ['= ', '!= '], :ext_method => :search_by_missing_arf
 
-      scoped_search :relation => :compliance_status_object, :on => :status, :rename => :compliance_status,
+      base.scoped_search :relation => :compliance_status_object, :on => :status, :rename => :compliance_status,
                     :complete_value => { :compliant => ::ForemanOpenscap::ComplianceStatus::COMPLIANT,
                                          :incompliant => ::ForemanOpenscap::ComplianceStatus::INCOMPLIANT,
                                          :inconclusive => ::ForemanOpenscap::ComplianceStatus::INCONCLUSIVE }
-      after_update :puppetrun!, :if => ->(host) { Setting[:puppetrun] && host.changed.include?('openscap_proxy_id') }
+      base.after_update :puppetrun!, :if => ->(host) { Setting[:puppetrun] && host.changed.include?('openscap_proxy_id') }
 
-      scope :comply_with, lambda { |policy|
+      base.scope :comply_with, lambda { |policy|
         joins(:arf_reports).merge(ArfReport.latest_of_policy(policy)).merge(ArfReport.passed)
       }
 
-      scope :incomply_with, lambda { |policy|
+      base.scope :incomply_with, lambda { |policy|
         joins(:arf_reports).merge(ArfReport.latest_of_policy(policy)).merge(ArfReport.failed)
       }
 
-      scope :inconclusive_with, lambda { |policy|
+      base.scope :inconclusive_with, lambda { |policy|
         joins(:arf_reports).merge(ArfReport.latest_of_policy(policy)).merge(ArfReport.othered)
       }
 
-      scope :policy_reports_missing, lambda { |policy|
+      base.scope :policy_reports_missing, lambda { |policy|
         search_for("compliance_report_missing_for = \"#{policy.name}\"")
       }
 
-      scope :assigned_to_policy, lambda { |policy|
+      base.scope :assigned_to_policy, lambda { |policy|
         search_for("compliance_policy = \"#{policy.name}\"")
       }
 
-      alias_method_chain :inherited_attributes, :openscap
+      base.send :extend, ClassMethods
     end
 
-    def inherited_attributes_with_openscap
-      inherited_attributes_without_openscap.concat(%w[openscap_proxy_id])
+    def inherited_attributes
+      super.concat(%w[openscap_proxy_id])
     end
 
     def policies=(policies)

data/app/models/foreman_openscap/arf_report.rb

@@ -189,22 +189,18 @@ module ForemanOpenscap
     end
 
     def destroy_from_proxy
-      if !host
-        destroy_from_proxy_warning "host"
-      elsif !policy
-        destroy_from_proxy_warning "policy"
-      elsif !openscap_proxy
-        destroy_from_proxy_warning "OpenSCAP proxy"
+      if host
+        begin
+          openscap_proxy_api.destroy_report(self, ForemanOpenscap::Helper::find_name_or_uuid_by_host(host))
+        rescue Foreman::Exception => e
+          logger.error "Failed to delete report with id #{id} from proxy, cause: #{e.message}"
+          logger.debug e.backtrace.join("\n\t")
+        end
       else
-        openscap_proxy_api.destroy_report(self, ForemanOpenscap::Helper::find_name_or_uuid_by_host(host))
+        logger.error "Failed to delete report with id #{id} from proxy, no host associated with report"
       end
     end
 
-    def destroy_from_proxy_warning(associated)
-      logger.warn "Skipping deletion of report with id #{id} from proxy, no #{associated} associated with report"
-      true
-    end
-
     def self.newline_to_space(string)
       string.gsub(/ *\n+/, " ")
     end

data/app/views/scap_contents/_form.html.erb

@@ -17,7 +17,7 @@
   <div class="tab-content">
     <div class="tab-pane active" id="primary">
       <%= text_f(f, :title) %>
-      <%= file_field_f f, :scap_file, :help_block  => _("Upload SCAP DataStream file") %>
+      <%= file_field_f f, :scap_file, :file_name => @scap_content.original_filename , :label_help  => _("SCAP DataStream file") %>
     </div>
     <%= render 'taxonomies/loc_org_tabs', :f => f, :obj => @scap_content %>
     <%= submit_or_cancel f %>

data/app/views/tailoring_files/_form.html.erb

@@ -17,7 +17,7 @@
   <div class="tab-content">
     <div class="tab-pane active" id="primary">
       <%= text_f(f, :name) %>
-      <%= file_field_f f, :scap_file, :help_block  => _("Upload DataStream Tailoring file") %>
+      <%= file_field_f f, :scap_file, :file_name => @tailoring_file.original_filename, :label_help => _("DataStream Tailoring file") %>
     </div>
     <%= render 'taxonomies/loc_org_tabs', :f => f, :obj => @tailoring_file %>
     <%= submit_or_cancel f %>

data/db/migrate/20141013172051_create_scaptimony_policies.rb

@@ -1,4 +1,4 @@
-class CreateScaptimonyPolicies < ActiveRecord::Migration
+class CreateScaptimonyPolicies < ActiveRecord::Migration[4.2]
   def change
     create_table :scaptimony_policies do |t|
       t.string :name, :limit => 80

data/db/migrate/20141014105333_create_scaptimony_assets.rb

@@ -1,4 +1,4 @@
-class CreateScaptimonyAssets < ActiveRecord::Migration
+class CreateScaptimonyAssets < ActiveRecord::Migration[4.2]
   def change
     create_table :scaptimony_assets do |t|
       t.string :name, :limit => 255

data/db/migrate/20141015092642_create_scaptimony_arf_reports.rb

@@ -1,4 +1,4 @@
-class CreateScaptimonyArfReports < ActiveRecord::Migration
+class CreateScaptimonyArfReports < ActiveRecord::Migration[4.2]
   def change
     create_table :scaptimony_arf_reports do |t|
       t.references :asset, :index => true

data/db/migrate/20141015115511_add_arf_report_unique_constraint.rb

@@ -1,4 +1,4 @@
-class AddArfReportUniqueConstraint < ActiveRecord::Migration
+class AddArfReportUniqueConstraint < ActiveRecord::Migration[4.2]
   def change
     add_index :scaptimony_arf_reports, %i[asset_id policy_id date digest],
               :unique => true, :name => :index_scaptimony_arf_reports_unique_set

data/db/migrate/20141104164201_create_scaptimony_scap_contents.rb

@@ -1,4 +1,4 @@
-class CreateScaptimonyScapContents < ActiveRecord::Migration
+class CreateScaptimonyScapContents < ActiveRecord::Migration[4.2]
   def change
     create_table :scaptimony_scap_contents, &:timestamps
   end

data/db/migrate/20141104171545_create_scaptimony_policy_revisions.rb

@@ -1,4 +1,4 @@
-class CreateScaptimonyPolicyRevisions < ActiveRecord::Migration
+class CreateScaptimonyPolicyRevisions < ActiveRecord::Migration[4.2]
   def change
     create_table :scaptimony_policy_revisions do |t|
       t.references :policy, :index => true

data/db/migrate/20141105174625_add_description_to_scaptimony_policy_revisions.rb

@@ -1,4 +1,4 @@
-class AddDescriptionToScaptimonyPolicyRevisions < ActiveRecord::Migration
+class AddDescriptionToScaptimonyPolicyRevisions < ActiveRecord::Migration[4.2]
   def change
     add_column :scaptimony_policy_revisions, :description, :string
   end

data/db/migrate/20141105174834_add_columns_to_scaptimony_policies.rb

@@ -1,4 +1,4 @@
-class AddColumnsToScaptimonyPolicies < ActiveRecord::Migration
+class AddColumnsToScaptimonyPolicies < ActiveRecord::Migration[4.2]
   def change
     add_column :scaptimony_policies, :xccdf_profile, :string
     add_column :scaptimony_policies, :period, :string

data/db/migrate/20141107091756_add_columns_to_scaptimony_scap_contents.rb

@@ -1,4 +1,4 @@
-class AddColumnsToScaptimonyScapContents < ActiveRecord::Migration
+class AddColumnsToScaptimonyScapContents < ActiveRecord::Migration[4.2]
   def change
     add_column :scaptimony_scap_contents, :title, :string
     add_column :scaptimony_scap_contents, :original_filename, :string

data/db/migrate/20141111104519_add_constraint_to_scaptimony_scap_contents.rb

@@ -1,4 +1,4 @@
-class AddConstraintToScaptimonyScapContents < ActiveRecord::Migration
+class AddConstraintToScaptimonyScapContents < ActiveRecord::Migration[4.2]
   def change
     change_column :scaptimony_scap_contents, :title, :string, :null => false
   end

data/db/migrate/20141113221054_create_scaptimony_scap_content_profiles.rb

@@ -1,4 +1,4 @@
-class CreateScaptimonyScapContentProfiles < ActiveRecord::Migration
+class CreateScaptimonyScapContentProfiles < ActiveRecord::Migration[4.2]
   def change
     create_table :scaptimony_scap_content_profiles do |t|
       t.references :scap_content, :index => true

data/db/migrate/20141116170632_remove_xccdf_profile_from_scaptimony_policies.rb

@@ -1,4 +1,4 @@
-class RemoveXccdfProfileFromScaptimonyPolicies < ActiveRecord::Migration
+class RemoveXccdfProfileFromScaptimonyPolicies < ActiveRecord::Migration[4.2]
   def change
     remove_column :scaptimony_policies, :xccdf_profile, :string
   end

data/db/migrate/20141116171305_add_profile_to_scaptimony_policies.rb

@@ -1,4 +1,4 @@
-class AddProfileToScaptimonyPolicies < ActiveRecord::Migration
+class AddProfileToScaptimonyPolicies < ActiveRecord::Migration[4.2]
   def change
     # add_reference :scaptimony_policies, :scap_content_profile, index: true
     add_column :scaptimony_policies, :scap_content_profile_id, :integer, :references => :scap_content_profile