foreman_openscap 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4da93ad56f1a41635d2c5dbefbfb60d0dccb09ef
-  data.tar.gz: 61b13cee3f7671c56dc006ec365ff63c5a64eef3
+  metadata.gz: 3c549bddac8d76de26371740d282a226a08300f5
+  data.tar.gz: efb9f59e37b0b2bb7351f2ccd62e3dc3dab41aea
 SHA512:
-  metadata.gz: 71f5244439f5aca602a9440c6c4a9b1a95afcb946ba1a279fcd2386c0834ae08e85fc9a94bc74c6c6fb08b4e056ff2d099db0c32621a94d8805f51f63fc5ce00
-  data.tar.gz: 9264fedc8b169a4678e750456ef019374a8df3ec4d7639cd16217a3bcad510e5fd2a31549c38e6af76c7f989837302fadc94f4b4e3cb3467f272b27dce41a6da
+  metadata.gz: 07c6aa94f281c2a5617e92667fcb4dd85f4b2fce25ca8bd1fe7a1ed87facb618b75f019a8e9f82d2b8be61010ddf08ad69b4230d019ff90407bc745522e81f50
+  data.tar.gz: 4ff5e641877263dcd2792106893610c7183bb6d15d2b65772600722790475cd4b4d1b1480c5ba741f889310c329605eb8032ebc1e1136fb107a88419b0c3d9e2

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

@@ -3,7 +3,6 @@ require 'foreman_openscap/helper'
 module Api
   module V2
     module Compliance
-
       class ArfReportsController < V2::BaseController
         include Api::Version2
         include Foreman::Controller::SmartProxyAuth
@@ -19,7 +18,7 @@ module Api
         end
 
         def get_resource(message = 'no resource loaded')
-          instance_variable_get :"@arf_report" or raise message
+          instance_variable_get(:"@arf_report") || raise(message)
         end
 
         api :GET, '/compliance/arf_reports', N_('List ARF reports')
@@ -49,9 +48,13 @@ module Api
 
         def create
           asset = ForemanOpenscap::Helper::get_asset(params[:cname], params[:policy_id])
-          arf_report = ForemanOpenscap::ArfReport.create_arf(asset, params)
-          asset.host.refresh_statuses if asset.host
-          render :json => { :result => :OK, :id => arf_report.id.to_s }
+          if asset.host.openscap_proxy
+            arf_report = ForemanOpenscap::ArfReport.create_arf(asset, params)
+            asset.host.refresh_statuses([HostStatus.find_status_by_humanized_name("compliance")])
+            render :json => { :result => :OK, :id => arf_report.id.to_s }
+          else
+            no_proxy_for_host asset
+          end
         end
 
         api :GET, "/compliance/arf_reports/:id/download/", N_("Download bzipped ARF report")
@@ -77,7 +80,7 @@ module Api
         private
 
         def find_resource
-          not_found and return if params[:id].blank?
+          not_found && return if params[:id].blank?
           instance_variable_set("@arf_report", resource_scope.find(params[:id]))
         end
 
@@ -85,6 +88,12 @@ module Api
           render_error 'standard_error', :status => :internal_error, :locals => { :exception => error }
         end
 
+        def no_proxy_for_host(asset)
+          msg = _('Failed to upload Arf Report, no OpenSCAP proxy set for host %s') % asset.host.name
+          logger.error msg
+          render :json => { :result => msg }, :status => :unprocessable_entity
+        end
+
         def action_permission
           case params[:action]
           when 'download', 'download_html'

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

@@ -15,7 +15,7 @@ module Api::V2
       end
 
       def get_resource(message = 'no resource loaded')
-        instance_variable_get :"@policy" or raise message
+        instance_variable_get(:"@policy") || raise(message)
       end
 
       def policy_url(policy = nil)
@@ -46,6 +46,7 @@ module Api::V2
           param :day_of_month, Integer, :desc => N_('Policy schedule day of month (only if period == "monthly")')
           param :cron_line, String, :desc => N_('Policy schedule cron line (only if period == "custom")')
           param :hostgroup_ids, Array, :desc => N_('Apply policy to host groups')
+          param :host_ids, Array, :desc => N_('Apply policy to hosts')
           param :tailoring_file_id, Integer, :desc => N_('Tailoring file ID')
           param :tailoring_file_profile_id, Integer, :desc => N_('Tailoring file profile ID')
           param_group :taxonomies, ::Api::V2::BaseController
@@ -100,8 +101,9 @@ module Api::V2
       end
 
       private
+
       def find_resource
-        not_found and return if params[:id].blank?
+        not_found && return if params[:id].blank?
         instance_variable_set("@policy", resource_scope.find(params[:id]))
       end
 

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

@@ -9,7 +9,7 @@ module Api::V2
       end
 
       def get_resource(message = 'no resource loaded')
-        instance_variable_get :"@scap_content" or raise message
+        instance_variable_get(:"@scap_content") || raise(message)
       end
 
       api :GET, '/compliance/scap_contents', N_('List SCAP contents')
@@ -66,8 +66,9 @@ module Api::V2
       end
 
       private
+
       def find_resource
-        not_found and return if params[:id].blank?
+        not_found && return if params[:id].blank?
         instance_variable_set("@scap_content", resource_scope.find(params[:id]))
       end
 

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

@@ -10,7 +10,7 @@ module Api::V2
       end
 
       def get_resource(message = 'no resource loaded')
-        instance_variable_get :"@tailoring_file" or raise message
+        instance_variable_get(:"@tailoring_file") || raise(message)
       end
 
       api :GET, '/compliance/tailoring_files', N_('List Tailoring files')
@@ -67,8 +67,9 @@ module Api::V2
       end
 
       private
+
       def find_resource
-        not_found and return if params[:id].blank?
+        not_found && return if params[:id].blank?
         instance_variable_set("@tailoring_file", resource_scope.find(params[:id]))
       end
 

data/app/controllers/arf_reports_controller.rb

@@ -54,7 +54,7 @@ class ArfReportsController < ApplicationController
     if @arf_report.destroy
       process_success(:success_msg => _("Successfully deleted ARF report."), :success_redirect => arf_reports_path)
     else
-      process_error(:error_msg => _("Failed to delete ARF Report for host %{host_name} reported at %{reported_at}") % {:host_name => @arf_report.host.name, :reported_at => @arf_report.reported_at})
+      process_error(:error_msg => _("Failed to delete ARF Report for host %{host_name} reported at %{reported_at}") % { :host_name => @arf_report.host.name, :reported_at => @arf_report.reported_at })
     end
   end
 
@@ -83,18 +83,18 @@ class ArfReportsController < ApplicationController
       @arf_reports = ::ForemanOpenscap::ArfReport.where(:id => params[:arf_report_ids])
       if @arf_reports.empty?
         error _('No compliance reports were found.')
-        redirect_to(arf_reports_path) and return false
+        redirect_to(arf_reports_path) && (return false)
       end
     else
       error _('No compliance reports selected')
-      redirect_to(arf_reports_path) and return false
+      redirect_to(arf_reports_path) && (return false)
     end
     return @arf_reports
   rescue => e
     error _("Something went wrong while selecting compliance reports - %s") % e
     logger.debug e.message
     logger.debug e.backtrace.join("\n")
-    redirect_to arf_reports_path and return false
+    redirect_to(arf_reports_path) && (return false)
   end
 
   def action_permission

data/app/controllers/policies_controller.rb

@@ -35,7 +35,7 @@ class PoliciesController < ApplicationController
     if @policy.wizard_completed? && @policy.save
       process_success :success_redirect => policies_path
     elsif @policy.valid?
-      render 'new' and return
+      render('new') && return
     else
       @policy.rewind_step
       process_error :object => @policy
@@ -64,7 +64,7 @@ class PoliciesController < ApplicationController
   def scap_content_selected
     if params[:scap_content_id] && (@scap_content = ::ForemanOpenscap::ScapContent.find(params[:scap_content_id]))
       @policy ||= ::ForemanOpenscap::Policy.new
-      render :partial => 'scap_content_results', :locals => {:policy => @policy}
+      render :partial => 'scap_content_results', :locals => { :policy => @policy }
     end
   end
 
@@ -104,6 +104,7 @@ class PoliciesController < ApplicationController
   end
 
   private
+
   def find_by_id
     @policy = resource_base.find(params[:id])
   end
@@ -118,18 +119,18 @@ class PoliciesController < ApplicationController
       @hosts = Host.where("id IN (?)", params[:host_ids])
       if @hosts.empty?
         error _('No hosts were found.')
-        redirect_to(hosts_path) and return false
+        redirect_to(hosts_path) && (return false)
       end
     else
       error _('No hosts selected')
-      redirect_to(hosts_path) and return false
+      redirect_to(hosts_path) && (return false)
     end
     return @hosts
   rescue => e
     error _("Something went wrong while selecting hosts - %s") % e
     logger.debug e.message
     logger.debug e.backtrace.join("\n")
-    redirect_to hosts_path and return false
+    redirect_to(hosts_path) && (return false)
   end
 
   def action_permission

data/app/controllers/scap_contents_controller.rb

@@ -15,8 +15,8 @@ class ScapContentsController < ApplicationController
 
   def show
     send_data @scap_content.scap_file,
-      :type     => 'application/xml',
-      :filename => @scap_content.original_filename
+              :type     => 'application/xml',
+              :filename => @scap_content.original_filename
   end
 
   def new
@@ -49,6 +49,7 @@ class ScapContentsController < ApplicationController
   end
 
   private
+
   def find_by_id
     @scap_content = resource_base.find(params[:id])
   end
@@ -58,5 +59,4 @@ class ScapContentsController < ApplicationController
     params[:scap_content][:original_filename] = scap_raw_file.original_filename
     params[:scap_content][:scap_file] = scap_raw_file.tempfile.read if scap_raw_file.tempfile.respond_to?(:read)
   end
-
 end

data/app/helpers/arf_report_dashboard_helper.rb

@@ -10,7 +10,7 @@ module ArfReportDashboardHelper
     [[:failed, _('Failed')],
      [:passed, _('Passed')],
      [:othered, _('Othered')],].each do |i|
-      data << {:label => i[1], :data => report[i[0]], :color => COLORS[i[0]]}
+      data << { :label => i[1], :data => report[i[0]], :color => COLORS[i[0]] }
     end
     flot_pie_chart 'overview', _('Compliance reports breakdown'), data, options
   end

data/app/helpers/arf_reports_helper.rb

@@ -1,15 +1,15 @@
 module ArfReportsHelper
   def report_arf_column(event, style = "")
     style = "label-default" if event == 0
-    content_tag(:span, event, :class=>'label ' + style)
+    content_tag(:span, event, :class => 'label ' + style)
   end
 
   def show_logs
     return if @arf_report.logs.empty?
     form_tag arf_report_path(@arf_report), :id => 'level_filter', :method => :get, :class => "form form-horizontal" do
       content_tag(:span, _("Show log messages:") + ' ') +
-      select(nil, 'level', [[_('All messages'), 'info'],[_('Failed and Othered'), 'warning'],[_('Failed only'), 'error']],
-             {}, {:class=>"col-md-1 form-control", :onchange =>"filter_by_level(this);"})
+      select(nil, 'level', [[_('All messages'), 'info'], [_('Failed and Othered'), 'warning'], [_('Failed only'), 'error']],
+             {}, { :class => "col-md-1 form-control", :onchange => "filter_by_level(this);" })
     end
   end
 
@@ -46,11 +46,11 @@ module ArfReportsHelper
   end
 
   def multiple_actions_arf_report_select
-    select_action_button(_("Select Action"), {:id => 'submit_multiple'},
-      multiple_actions_arf_report.map do |action|
-        link_to_function(action[0], "buildArfModal(this, '#{action[1]}')",
-         :'data-dialog-title' => _("%s - The following compliance reports are about to be changed") % action[0])
-      end.flatten)
+    select_action_button(_("Select Action"), { :id => 'submit_multiple' },
+                         multiple_actions_arf_report.map do |action|
+                           link_to_function(action[0], "buildArfModal(this, '#{action[1]}')",
+                                            :'data-dialog-title' => _("%s - The following compliance reports are about to be changed") % action[0])
+                         end.flatten)
   end
 
   def openscap_proxy_link(arf_report)

data/app/helpers/compliance_dashboard_helper.rb

@@ -1,5 +1,4 @@
 module ComplianceDashboardHelper
-
   def latest_compliance_headers
     string =  "<th class='col-md-7'>#{_("Host")}</th>"
     string += "<th class='col-md-3'>#{_("Policy")}</th>"
@@ -12,5 +11,4 @@ module ComplianceDashboardHelper
 
     string.html_safe
   end
-
 end

data/app/helpers/compliance_hosts_helper.rb

@@ -1,11 +1,10 @@
 module ComplianceHostsHelper
-
   def host_policy_breakdown_chart(report, options = {})
     data = []
     [[:passed, _('Passed')],
      [:failed, _('Failed')],
      [:othered, _('Other')],].each do |i|
-      data << {:label => i[1], :data => report[i[0]], :color => ArfReportDashboardHelper::COLORS[i[0]]}
+      data << { :label => i[1], :data => report[i[0]], :color => ArfReportDashboardHelper::COLORS[i[0]] }
     end
     flot_pie_chart 'overview', _('Compliance reports breakdown'), data, options
   end
@@ -15,12 +14,12 @@ module ComplianceHostsHelper
     failed = []
     othered = []
     @host.arf_reports.of_policy(policy_id).each do |report|
-      passed  << [report.created_at.to_i*1000, report.passed]
-      failed  << [report.created_at.to_i*1000, report.failed]
-      othered << [report.created_at.to_i*1000, report.othered]
+      passed  << [report.created_at.to_i * 1000, report.passed]
+      failed  << [report.created_at.to_i * 1000, report.failed]
+      othered << [report.created_at.to_i * 1000, report.othered]
     end
-    [{:label => _("Passed"), :data => passed, :color => ArfReportDashboardHelper::COLORS[:passed]},
-     {:label => _("Failed"), :data => failed, :color => ArfReportDashboardHelper::COLORS[:failed]},
-     {:label => _("Othered"), :data => othered, :color => ArfReportDashboardHelper::COLORS[:othered]}]
+    [{ :label => _("Passed"), :data => passed, :color => ArfReportDashboardHelper::COLORS[:passed] },
+     { :label => _("Failed"), :data => failed, :color => ArfReportDashboardHelper::COLORS[:failed] },
+     { :label => _("Othered"), :data => othered, :color => ArfReportDashboardHelper::COLORS[:othered] }]
   end
 end

data/app/helpers/policies_helper.rb

@@ -17,32 +17,32 @@ module PoliciesHelper
     scap_contents = ::ForemanOpenscap::ScapContent.authorized(:view_scap_contents).all
     if scap_contents.length > 1
       select_f form, :scap_content_id, scap_contents, :id, :title,
-               {:include_blank => _("Choose existing SCAP Content")},
-               {:label => _("SCAP Content"),
-                :onchange => 'scap_content_selected(this);',
-                :'data-url' => method_path('scap_content_selected')}
+               { :include_blank => _("Choose existing SCAP Content") },
+               { :label => _("SCAP Content"),
+                 :onchange => 'scap_content_selected(this);',
+                 :'data-url' => method_path('scap_content_selected') }
     else
       select_f form, :scap_content_id, scap_contents, :id, :title,
-               {:label => _("SCAP Content"),
-                :onchange => 'scap_content_selected(this);',
-                :'data-url' => method_path('scap_content_selected')}
+               { :label => _("SCAP Content"),
+                 :onchange => 'scap_content_selected(this);',
+                 :'data-url' => method_path('scap_content_selected') }
     end
   end
 
   def scap_content_profile_selector(form)
     if profiles_selection.length == 1
       select_f form, :scap_content_profile_id, profiles_selection, :id, :title,
-               {:selected => @policy.scap_content_profile_id },
-               {:label => _("XCCDF Profile"),
-                :disabled => profiles_selection.empty? ? true : false,
-                :help_inline => :indicator}
+               { :selected => @policy.scap_content_profile_id },
+               { :label => _("XCCDF Profile"),
+                 :disabled => profiles_selection.empty? ? true : false,
+                 :help_inline => :indicator }
     else
       select_f form, :scap_content_profile_id, profiles_selection, :id, :title,
-               {:selected => @policy.scap_content_profile_id,
-                :include_blank => _("Default XCCDF profile")},
-               {:label => _("XCCDF Profile"),
-                :disabled => profiles_selection.empty? ? true : false,
-                :help_inline => :indicator}
+               { :selected => @policy.scap_content_profile_id,
+                 :include_blank => _("Default XCCDF profile") },
+               { :label => _("XCCDF Profile"),
+                 :disabled => profiles_selection.empty? ? true : false,
+                 :help_inline => :indicator }
     end
   end
 
@@ -66,12 +66,12 @@ module PoliciesHelper
     end
   end
 
-  def submit_or_cancel_policy(form, overwrite = nil, args = { })
+  def submit_or_cancel_policy(form, overwrite = nil, args = {})
     args[:cancel_path] ||= send("#{controller_name}_path")
     content_tag(:div, :class => "clearfix") do
       content_tag(:div, :class => "form-actions") do
         text    = overwrite ? overwrite : _("Submit")
-        options = {:class => "btn btn-primary"}
+        options = { :class => "btn btn-primary" }
         options[:'data-id'] = form_to_submit_id(form) unless options.key?(:'data-id')
         previous = form.object.first_step? ? ' ' : previous_link(form)
         cancel_and_submit = content_tag(:div, :class => "pull-right") do

data/app/helpers/policy_dashboard_helper.rb

@@ -12,16 +12,16 @@ module PolicyDashboardHelper
      [:incompliant_hosts, _('Incompliant hosts')],
      [:inconclusive_hosts, _('Inconclusive')],
      [:report_missing, _('Not audited')],].each do |i|
-      data << {:label => i[1], :data => report[i[0]], :color => COLORS[i[0]]}
+      data << { :label => i[1], :data => report[i[0]], :color => COLORS[i[0]] }
     end
     flot_pie_chart 'overview', _('Compliance Status'), data, options
   end
 
   def status_link(name, label, path)
     content_tag :li do
-      content_tag(:i, raw('&nbsp;'), :class=>'label', :style => 'background-color:' + COLORS[label]) +
+      content_tag(:i, raw('&nbsp;'), :class => 'label', :style => 'background-color:' + COLORS[label]) +
       raw('&nbsp;') +
-      link_to(name, path, :class=>'dashboard-links') +
+      link_to(name, path, :class => 'dashboard-links') +
       content_tag(:h4, @report[label])
     end
   end

data/app/lib/proxy_api/available_proxy.rb

@@ -1,6 +1,5 @@
 module ::ProxyAPI
   class AvailableProxy
-
     HTTP_ERRORS = [
       EOFError,
       Errno::ECONNRESET,
@@ -8,7 +7,8 @@ module ::ProxyAPI
       Net::HTTPBadResponse,
       Net::HTTPHeaderSyntaxError,
       Net::ProtocolError,
-      Timeout::Error
+      Timeout::Error,
+      ProxyAPI::ProxyException
     ].freeze
 
     def initialize(args)

data/app/lib/proxy_api/openscap.rb

@@ -21,7 +21,7 @@ module ::ProxyAPI
       raise ::ProxyAPI::ProxyException.new(url, e, N_("Request timed out. Please try increasing Settings -> proxy_request_timeout"))
     rescue RestClient::ResourceNotFound => e
       raise ::ProxyAPI::ProxyException.new(url, e,
-        N_("Could not validate %s. Please make sure you have appropriate proxy version to use this functionality") % scap_file.class)
+                                           N_("Could not validate %s. Please make sure you have appropriate proxy version to use this functionality") % scap_file.class)
     end
 
     def policy_html_guide(scap_file, policy)

data/app/mailers/foreman_openscap/policy_mailer.rb

@@ -1,6 +1,5 @@
 module ForemanOpenscap
   class PolicyMailer < ::ApplicationMailer
-
     def policy_summary(options = {})
       set_url
       user = ::User.find(options[:user])
@@ -37,6 +36,5 @@ module ForemanOpenscap
       end
       @changed_hosts.uniq
     end
-
   end
 end

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

@@ -14,7 +14,7 @@ module ForemanOpenscap
         { :conditions => ArfReport.arel_table[:id].in(
           PolicyArfReport.select(PolicyArfReport.arel_table[:arf_report_id])
             .of_policy(Policy.find_by(name: cond).id).ast
-        ).to_sql}
+        ).to_sql }
       end
 
       def search_by_comply_with(_key, _operator, policy_name)
@@ -34,7 +34,7 @@ module ForemanOpenscap
         { :conditions => ArfReport.arel_table[:id].in(
           ArfReport.select(ArfReport.arel_table[:id])
               .latest_of_policy(Policy.find_by(name: cond)).instance_eval(&selection).ast
-        ).to_sql}
+        ).to_sql }
       end
 
       def search_by_last_for(key, operator, by)
@@ -68,19 +68,19 @@ module ForemanOpenscap
 
     included do
       scoped_search :relation => :policy, :on => :name, :complete_value => true, :rename => :compliance_policy,
-        :only_explicit => true, :ext_method => :search_by_policy_name
+                    :only_explicit => true, :ext_method => :search_by_policy_name
 
       scoped_search :on => :id, :rename => :last_for, :complete_value => { :host => 0, :policy => 1 },
-        :only_explicit => true, :ext_method => :search_by_last_for
+                    :only_explicit => true, :ext_method => :search_by_last_for
 
       scoped_search :relation => :policy, :on => :name, :complete_value => true, :rename => :comply_with,
-        :only_explicit => true, :operators => ['= '], :ext_method => :search_by_comply_with
+                    :only_explicit => true, :operators => ['= '], :ext_method => :search_by_comply_with
 
       scoped_search :relation => :policy, :on => :name, :complete_value => true, :rename => :not_comply_with,
-        :only_explicit => true, :operators => ['= '], :ext_method => :search_by_not_comply_with
+                    :only_explicit => true, :operators => ['= '], :ext_method => :search_by_not_comply_with
 
       scoped_search :relation => :policy, :on => :name, :complete_value => true, :rename => :inconclusive_with,
-        :only_explicit => true, :operators => ['= '], :ext_method => :search_by_inconclusive_with
+                    :only_explicit => true, :operators => ['= '], :ext_method => :search_by_inconclusive_with
 
       compliance_status_scoped_search 'passed', :on => :status, :rename => :compliance_passed
       compliance_status_scoped_search 'failed', :on => :status, :rename => :compliance_failed

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

@@ -10,7 +10,7 @@ module ForemanOpenscap
 
       validates_with ForemanOpenscap::DataStreamValidator
 
-      after_save :create_profiles
+      after_save :create_profiles, :if => lambda { |ds_content| ds_content.scap_file_changed? }
 
       before_validation :redigest, :if => lambda { |ds_content| ds_content.persisted? && ds_content.scap_file_changed? }
       before_destroy ActiveRecord::Base::EnsureNotUsedBy.new(:policies)

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

@@ -13,13 +13,16 @@ module ForemanOpenscap
       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,
+                    :only_explicit => true, :operators => ['= ', '!= '], :ext_method => :search_by_policy_id
+
       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,
-                    :complete_value => {:compliant => ::ForemanOpenscap::ComplianceStatus::COMPLIANT,
-                                        :incompliant => ::ForemanOpenscap::ComplianceStatus::INCOMPLIANT,
-                                        :inconclusive => ::ForemanOpenscap::ComplianceStatus::INCONCLUSIVE}
+                    :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') }
 
       scope :comply_with, lambda { |policy|
@@ -110,15 +113,22 @@ module ForemanOpenscap
         { :conditions => Host::Managed.arel_table[:id].in(Host::Managed.select(Host::Managed.arel_table[:id]).joins(:policies).where(cond).pluck(:id)).to_sql + host_group_cond }
       end
 
+      def search_by_policy_id(key, operator, policy_id)
+        cond = sanitize_sql_for_conditions(["foreman_openscap_policies.id #{operator} ?", value_to_sql(operator, policy_id)])
+        search_assigned_all cond, []
+      end
+
       def search_by_missing_arf(key, operator, policy_name)
         cond = sanitize_sql_for_conditions(["foreman_openscap_policies.name #{operator} ?", value_to_sql(operator, policy_name)])
 
         host_ids_from_arf_of_policy = ForemanOpenscap::ArfReport.joins(:policy).where(cond).pluck(:host_id).uniq
 
-        direct_result = policy_assigned_directly_host_ids cond, host_ids_from_arf_of_policy
-
-        hg_result = policy_assigned_using_hostgroup_host_ids cond, host_ids_from_arf_of_policy
+        search_assigned_all cond, host_ids_from_arf_of_policy
+      end
 
+      def search_assigned_all(condition, not_in_host_ids)
+        direct_result = policy_assigned_directly_host_ids condition, not_in_host_ids
+        hg_result = policy_assigned_using_hostgroup_host_ids condition, not_in_host_ids
         result = (direct_result + hg_result).uniq
         { :conditions => "hosts.id IN (#{result.empty? ? 'NULL' : result.join(',')})" }
       end

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

@@ -5,7 +5,7 @@ module ForemanOpenscap
     def openscap_proxy_api
       return @openscap_api if @openscap_api
       proxy_url = openscap_proxy.url if openscap_proxy
-      raise ::Foreman::Exception.new(N_("No OpenSCAP proxy found for %{class} with %{id}"), { :class => self.class, :id => id }) unless proxy_url
+      raise ::Foreman::Exception.new(N_("No OpenSCAP proxy found for %{class} with id %{id}"), { :class => self.class, :id => id }) unless proxy_url
       @openscap_api = ::ProxyAPI::Openscap.new(:url => proxy_url)
     end
   end

data/app/models/foreman_openscap/arf_report.rb

@@ -10,15 +10,16 @@ module ForemanOpenscap
     BIT_NUM = 10
     MAX = (1 << BIT_NUM) - 1
 
-    scoped_search :on => :status, :offset => 0, :word_size => 4*BIT_NUM, :complete_value => {:true => true, :false => false}, :rename => :eventful
+    scoped_search :on => :status, :offset => 0, :word_size => 4 * BIT_NUM, :complete_value => { :true => true, :false => false }, :rename => :eventful
 
     has_one :policy_arf_report
     has_one :policy, :through => :policy_arf_report, :dependent => :destroy
     has_one :asset, :through => :host, :class_name => 'ForemanOpenscap::Asset', :as => :assetable
-    after_save :assign_locations_organizations
     has_one :log, :foreign_key => :report_id
     belongs_to :openscap_proxy, :class_name => "SmartProxy"
 
+    after_save :assign_locations_organizations
+    before_destroy :destroy_from_proxy
 
     delegate :asset=, :to => :host
 
@@ -139,7 +140,7 @@ module ForemanOpenscap
               end
               msg.save!
             end
-            #TODO: log level
+            # TODO: log level
             Log.create!(:source_id => src.id,
                         :message_id => msg.id,
                         :level => :info,
@@ -187,7 +188,7 @@ module ForemanOpenscap
         policy.id == other.policy.id
     end
 
-    def destroy
+    def destroy_from_proxy
       if host
         begin
           openscap_proxy_api.destroy_report(self, ForemanOpenscap::Helper::find_name_or_uuid_by_host(host))
@@ -198,7 +199,6 @@ module ForemanOpenscap
       else
         logger.error "Failed to delete report with id #{id} from proxy, no host associated with report"
       end
-      super
     end
 
     def self.newline_to_space(string)