foreman_openscap 0.7.13 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8df18dc74e5bedec4c537aebb669668d5c30d56
-  data.tar.gz: 5a3cc516ba8be0e717a71c16ec756194feacddcc
+  metadata.gz: 9486399cc59110965957e2a3f91d1fe521653e92
+  data.tar.gz: dc00dfd095d17a5eb6edd5bddc1d8e5a315a9a77
 SHA512:
-  metadata.gz: 37774693e9f4c13cb758f1d27e813a93c3d8c176e4c82d853eea8bbb2c035d25f47ae80f8bacd0bdb110b81c4ce63e52eac0148d823b4293b423deb0c97e1302
-  data.tar.gz: 50383b9cad954065a7851fcce0d751e287681ce5461ce287ce40d502e8aa5ed769e275486824a44969638ff4ebb99875e816d9ccd129237e690e30a56f830b40
+  metadata.gz: 04e9191662e177076cc0d740aeda0d51a418412a06e178af8922e0794010919b62ccabcef433462aab564bfe5180d4376f7e5e1dbaeadecbee43d7469f5e196c
+  data.tar.gz: 0c2e5932fba6d3c5be4b8c44b3891c21c4dad1d44cbc15dd5e6e814c6f4884cb18410f4ac4d3093de80a8920c20b46ce3cd79ef05d18284ffee7b1c429dab5c2

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

@@ -26,7 +26,7 @@ module Api
         param_group :search_and_pagination, ::Api::V2::BaseController
 
         def index
-          @arf_reports = resource_scope_for_index(:permission => :view_arf_reports).includes(:openscap_proxy, :policy, :host)
+          @arf_reports = resource_scope_for_index(:permission => :edit_compliance).includes(:asset)
         end
 
         api :GET, '/compliance/arf_reports/:id', N_('Show an ARF report')
@@ -49,13 +49,9 @@ 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)
-            asset.host.refresh_statuses
-            render :json => { :result => :OK, :id => arf_report.id.to_s }
-          else
-            no_proxy_for_host asset
-          end
+          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 }
         end
 
         api :GET, "/compliance/arf_reports/:id/download/", N_("Download bzipped ARF report")
@@ -89,12 +85,6 @@ 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

@@ -26,7 +26,7 @@ module Api::V2
       param_group :search_and_pagination, ::Api::V2::BaseController
 
       def index
-        @policies = resource_scope_for_index(:permission => :view_policies)
+        @policies = resource_scope_for_index(:permission => :edit_compliance)
       end
 
       api :GET, '/compliance/policies/:id', N_('Show a Policy')
@@ -90,13 +90,9 @@ module Api::V2
 
       def tailoring
         @tailoring_file = @policy.tailoring_file
-        if @tailoring_file
-          send_data @tailoring_file.scap_file,
-                    :type => 'application/xml',
-                    :filename => @tailoring_file.original_filename
-        else
-          render(:json => { :error => { :message => _("No Tailoring file assigned for policy with id %s") % @policy.id } }, :status => 404)
-        end
+        send_data @tailoring_file.scap_file,
+                  :type => 'application/xml',
+                  :filename => @tailoring_file.original_filename
       end
 
       private

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

@@ -16,7 +16,7 @@ module Api::V2
       param_group :search_and_pagination, ::Api::V2::BaseController
 
       def index
-        @scap_contents = resource_scope_for_index(:permission => :view_scap_contents)
+        @scap_contents = resource_scope_for_index(:permission => :edit_compliance)
       end
 
       api :GET, '/compliance/scap_contents/:id/xml', N_('Show an SCAP content as XML')
@@ -25,7 +25,7 @@ module Api::V2
       def xml
         send_data @scap_content.scap_file,
                   :type     => 'application/xml',
-                  :filename => @scap_content.original_filename || "#{@scap_content.title}.xml"
+                  :filename => @scap_content.original_filename
       end
 
       api :GET, '/compliance/scap_contents/:id', N_('Show an SCAP content')

data/app/controllers/arf_reports_controller.rb

@@ -10,7 +10,7 @@ class ArfReportsController < ApplicationController
   end
 
   def index
-    @arf_reports = resource_base.includes(:policy, :openscap_proxy, :host => %i[policies last_report_object host_statuses])
+    @arf_reports = resource_base.includes(:host => %i[policies last_report_object host_statuses])
                                 .search_for(params[:search], :order => params[:order])
                                 .paginate(:page => params[:page], :per_page => params[:per_page])
   end

data/app/helpers/arf_reports_helper.rb

@@ -52,17 +52,4 @@ module ArfReportsHelper
          :'data-dialog-title' => _("%s - The following compliance reports are about to be changed") % action[0])
       end.flatten)
   end
-
-  def openscap_proxy_link(arf_report)
-    return _("No proxy found!") unless arf_report.openscap_proxy
-    display_link_if_authorized(arf_report.openscap_proxy.name, hash_for_smart_proxy_path(:id => arf_report.openscap_proxy_id))
-  end
-
-  def reported_info(arf_report)
-    msg = _("Reported at %s") % 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)
-    msg.html_safe
-  end
 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/data_stream_content.rb

@@ -28,23 +28,16 @@ module ForemanOpenscap
       self[:digest] ||= Digest::SHA256.hexdigest(scap_file.to_s)
     end
 
-    def create_profiles
-      fetch_profiles.each do |key, title|
-        create_or_update_profile key, title
-      end
-    end
-
-    def create_or_update_profile(profile_id, title)
-      profile = ScapContentProfile.find_by(:profile_id => profile_id, "#{self.class.to_s.demodulize.underscore}_id".to_sym => id)
-      return ScapContentProfile.create(:profile_id => profile_id, :title => title, "#{self.class.to_s.demodulize.underscore}_id".to_sym => id) unless profile
-      profile.update(:title => title) unless profile.title == title
-      profile
-    end
-
     private
 
     def redigest
       self[:digest] = Digest::SHA256.hexdigest(scap_file.to_s)
     end
+
+    def create_profiles
+      fetch_profiles.each do |key, title|
+        ScapContentProfile.where(:profile_id => key, :title => title, "#{self.class.to_s.demodulize.underscore}_id".to_sym => id).first_or_create
+      end
+    end
   end
 end

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

@@ -2,10 +2,14 @@ module ForemanOpenscap
   module OpenscapProxyExtensions
     extend ActiveSupport::Concern
 
+    included do
+      belongs_to :openscap_proxy, :class_name => "SmartProxy"
+    end
+
     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 %{id}"), { :class => self.class, :id => id }) unless proxy_url
+      raise ::Foreman::Exception.new(N_("No OpenSCAP proxy found for %{class} with %{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

@@ -12,14 +12,11 @@ module ForemanOpenscap
 
     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 :policy_arf_report, :dependent => :destroy
+    has_one :policy, :through => :policy_arf_report
     has_one :asset, :through => :host, :class_name => 'ForemanOpenscap::Asset', :as => :assetable
-    has_one :log, :foreign_key => :report_id
-    belongs_to :openscap_proxy, :class_name => "SmartProxy"
-
     after_save :assign_locations_organizations
-    before_destroy :destroy_from_proxy
+    has_one :log, :foreign_key => :report_id
 
     delegate :asset=, :to => :host
 
@@ -176,21 +173,18 @@ module ForemanOpenscap
         policy.id == other.policy.id
     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"
+    def destroy
+      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
+      super
     end
 
     def self.newline_to_space(string)

data/app/models/foreman_openscap/asset.rb

@@ -1,5 +1,5 @@
 module ForemanOpenscap
-  class Asset < ActiveRecord::Base
+  class Asset < ApplicationRecord
     has_many :asset_policies
     has_many :policies, :through => :asset_policies
     belongs_to :assetable, :polymorphic => true

data/app/models/foreman_openscap/asset_policy.rb

@@ -1,5 +1,5 @@
 module ForemanOpenscap
-  class AssetPolicy < ActiveRecord::Base
+  class AssetPolicy < ApplicationRecord
     belongs_to :policy
     belongs_to :asset
   end

data/app/models/foreman_openscap/policy.rb

@@ -1,10 +1,8 @@
-require 'rack/utils'
 module ForemanOpenscap
-  class Policy < ActiveRecord::Base
+  class Policy < ApplicationRecord
     include Authorizable
     include Taxonomix
     attr_writer :current_step, :wizard_initiated
-    audited
 
     belongs_to :scap_content
     belongs_to :scap_content_profile
@@ -30,9 +28,10 @@ module ForemanOpenscap
               :if => Proc.new { |policy| policy.should_validate?('Schedule') }
 
     validates :scap_content_id, presence: true, if: Proc.new { |policy| policy.should_validate?('SCAP Content') }
-    validate :matching_content_profile, if: Proc.new { |policy| policy.should_validate?('SCAP Content') }
+    validates :scap_content_profile_id, presence: true, if: Proc.new { |policy| policy.should_validate?('SCAP Content') }
 
     validate :valid_cron_line, :valid_weekday, :valid_day_of_month, :valid_tailoring, :valid_tailoring_profile
+
     after_save :assign_policy_to_hostgroups
     # before_destroy - ensure that the policy has no hostgroups, or classes
 
@@ -47,17 +46,18 @@ module ForemanOpenscap
     end
 
     def to_html
-      if scap_content.nil?
-        return html_error_message(_('Cannot generate HTML guide, scap content is missing.'))
+      if scap_content.nil? || scap_content_profile.nil?
+        return ("<h2>%s</h2>" % (_('Cannot generate HTML guide for %{scap_content}/%{profile}') %
+          { :scap_content => h(self.scap_content), :profile => h(self.scap_content_profile) })).html_safe
       end
 
       if (proxy = scap_content.proxy_url)
         api = ProxyAPI::Openscap.new(:url => proxy)
       else
-        return html_error_message(_('Cannot generate HTML guide, no valid OpenSCAP proxy server found.'))
+        return ("<h2>%s</h2>" % _('No valid OpenSCAP proxy server found.')).html_safe
       end
 
-      api.policy_html_guide(scap_content.scap_file, scap_content_profile.try(:profile_id))
+      api.policy_html_guide(scap_content.scap_file, scap_content_profile.profile_id)
     end
 
     def hostgroup_ids
@@ -209,13 +209,6 @@ module ForemanOpenscap
 
     private
 
-    def html_error_message(message)
-      error_message = '<div class="alert alert-danger"><span class="pficon pficon-error-circle-o"></span><strong>' <<
-        message <<
-        '</strong></div>'
-      error_message.html_safe
-    end
-
     def erase_period_attrs(attrs)
       attrs.each { |attr| self.public_send("#{attr}=", nil) }
     end
@@ -301,12 +294,6 @@ module ForemanOpenscap
       end
     end
 
-    def matching_content_profile
-      if scap_content_id && scap_content_profile_id && !ScapContent.find(scap_content_id).scap_content_profile_ids.include?(scap_content_profile_id)
-        errors.add(:scap_content_id, _("does not have the selected SCAP content profile"))
-      end
-    end
-
     def assign_policy_to_hostgroups
       if hostgroups.any?
         puppetclass = find_scap_puppetclass

data/app/models/foreman_openscap/policy_arf_report.rb

@@ -1,6 +1,6 @@
 module ForemanOpenscap
   class PolicyArfReport < ::ActiveRecord::Base
-    belongs_to :arf_report, :dependent => :destroy
+    belongs_to :arf_report
     belongs_to :policy
 
     scope :of_policy, lambda { |policy_id| joins(:policy).where(:policy_id => policy_id) }

data/app/models/foreman_openscap/policy_revision.rb

@@ -1,5 +1,5 @@
 module ForemanOpenscap
-  class PolicyRevision < ActiveRecord::Base
+  class PolicyRevision < ApplicationRecord
     belongs_to :policy
     belongs_to :scap_content
   end

data/app/models/foreman_openscap/scap_content.rb

@@ -1,15 +1,13 @@
 module ForemanOpenscap
-  class ScapContent < ActiveRecord::Base
+  class ScapContent < ApplicationRecord
     include Authorizable
     include Taxonomix
     include DataStreamContent
-    audited :except => [ :scap_file ]
 
     has_many :scap_content_profiles, :dependent => :destroy
     has_many :policies
 
     validates :title, :presence => true, :length => { :maximum => 255 }
-    validates :original_filename, :length => { :maximum => 255 }
 
     scoped_search :on => :title,             :complete_value => true
     scoped_search :on => :original_filename, :complete_value => true, :rename => :filename

data/app/models/foreman_openscap/scap_content_profile.rb

@@ -1,5 +1,5 @@
 module ForemanOpenscap
-  class ScapContentProfile < ActiveRecord::Base
+  class ScapContentProfile < ApplicationRecord
     belongs_to :scap_content
     has_many :policies
     belongs_to :tailoring_file

data/app/models/foreman_openscap/tailoring_file.rb

@@ -1,9 +1,8 @@
 module ForemanOpenscap
-  class TailoringFile < ActiveRecord::Base
+  class TailoringFile < ApplicationRecord
     include Authorizable
     include Taxonomix
     include DataStreamContent
-    audited :except => [ :scap_file ]
 
     has_many :policies
     has_many :scap_content_profiles, :dependent => :destroy

data/app/overrides/hostgroups/form/select_openscap_proxy.rb

@@ -0,0 +1,4 @@
+Deface::Override.new(:virtual_path => "hostgroups/_form",
+                     :name => "choose_openscap_proxy",
+                     :insert_bottom => "#primary",
+                     :partial => "compliance_hosts/openscap_proxy")

data/app/overrides/hosts/form/select_openscap_proxy.rb

@@ -0,0 +1,4 @@
+Deface::Override.new(:virtual_path => "hosts/_form",
+                     :name => "openscap_proxy",
+                     :insert_bottom => "#primary",
+                     :partial => "compliance_hosts/openscap_proxy")

data/app/views/api/v2/compliance/arf_reports/main.json.rabl

@@ -2,16 +2,8 @@ object @arf_report
 
 extends "api/v2/compliance/arf_reports/base"
 
-attributes :created_at, :updated_at, :reported_at
+attributes :created_at, :updated_at, :host_id, :openscap_proxy_id, :reported_at
 
-child :openscap_proxy => :openscap_proxy do
-  attributes :id, :name
-end
-
-child :host do
-  attributes :id, :name
-end
-
-child :policy do
-  attributes :id, :name
+node :openscap_proxy_name do |arf|
+  arf.openscap_proxy.name
 end

data/app/views/api/v2/compliance/common/_loc.json.rabl

@@ -1,3 +1,3 @@
 child :locations => :locations do |loc|
-  attributes :id, :name, :title
+  attributes :id, :name
 end

data/app/views/api/v2/compliance/common/_org.json.rabl

@@ -1,3 +1,3 @@
 child :organizations => :organizations do |org|
-  attributes :id, :name, :title
+  attributes :id, :name
 end

data/app/views/api/v2/compliance/policies/show.json.rabl

@@ -1,7 +1,3 @@
 object @policy
 
-child :hostgroups => :hostgroups do |hostgroup|
-  attributes :id, :name, :title
-end
-
 extends "api/v2/compliance/policies/main"

data/app/views/arf_reports/_list.html.erb

@@ -1,12 +1,10 @@
 <%= javascript "host_checkbox", "foreman_openscap/arf_reports" %>
 
-<table class="table table-bordered table-striped">
+<table class="table table-bordered table-striped ellipsis">
   <tr>
   <th class="ca" width="40px"><%= check_box_tag "check_all", "", false, { :onclick => "toggleCheck()", :'check-title' => _("Select all items in this page"), :'uncheck-title'=> _("items selected. Uncheck to Clear") } %></th>
     <th><%= sort :host %></th>
     <th><%= sort :reported, :as => _("Reported At") %></th>
-    <th><%= sort :policy, :as => _("Policy") %></th>
-    <th><%= sort :openscap_proxy, :as => _("Openscap Proxy") %></th>
     <th><%= sort :compliance_passed, :as => _("Passed") %></th>
     <th><%= sort :compliance_failed, :as => _("Failed") %></th>
     <th><%= sort :compliance_othered, :as => _("Other") %></th>
@@ -23,10 +21,8 @@
                              :class => 'host_select_boxes',
                              :onclick => 'hostChecked(this)' %>
         </td>
-      <td class="elipsis"><%= name_column(arf_report.host) %></td>
+      <td><%= name_column(arf_report.host) %></td>
       <td><%= display_link_if_authorized(_("%s ago") % time_ago_in_words(arf_report.reported_at), hash_for_arf_report_path(:id => arf_report.id)) %></td>
-      <td class="ellipsis"><%= arf_report.policy.present? ? display_link_if_authorized(arf_report.policy.name, hash_for_edit_policy_path(:id => arf_report.policy.id)) : _('Deleted policy') %></th>
-      <td class="ellipsis"><%= openscap_proxy_link arf_report %></th>
       <td><%= report_arf_column(arf_report.passed, "label-info") %></th>
       <td><%= report_arf_column(arf_report.failed, "label-danger") %></th>
       <td><%= report_arf_column(arf_report.othered, "label-warning") %></th>

data/app/views/arf_reports/delete_multiple.html.erb

@@ -25,5 +25,5 @@
 
 <%= form_tag submit_delete_multiple_arf_reports_path({:arf_report_ids => params[:arf_report_ids]}) do %>
   <span class="label label-danger"><%= _('Delete') %></span>
-  <%= _('these Compliance reports') %>
+  <%= _('these Complianace reports') %>
 <% end %>

data/app/views/arf_reports/show.html.erb

@@ -3,8 +3,7 @@
 <% stylesheet 'foreman_openscap/reports' %>
 
 <% title "#{@arf_report.host}" %>
-
-<p class='ra'><%= reported_info @arf_report %></p>
+<p class='ra'> <%= _("Reported at %s") % @arf_report.reported_at %> </p>
 
 <% content_for(:search_bar) {show_logs} %>
 

data/app/views/compliance_hosts/_openscap_proxy.html.erb

@@ -0,0 +1,3 @@
+<%= select_f f, :openscap_proxy_id, SmartProxy.with_features("Openscap"), :id, :name,
+    { :include_blank => blank_or_inherit_f(f, :openscap_proxy) },
+    { :label => _('Openscap Proxy') } %>

data/app/views/policies/_list.html.erb

@@ -36,7 +36,7 @@
                 display_link_if_authorized(_("Show Guide"), hash_for_policy_path(:id => policy.id)),
                 display_link_if_authorized(_("Edit"), hash_for_edit_policy_path(:id => policy.id)),
                 display_delete_if_authorized(hash_for_policy_path(:id => policy.id),
-                                             :confirm => _("Delete compliance policy %s with all of its reports?") % policy.name)
+                                             :confirm => _("Delete compliance policy %s with all the reports?") % policy.name)
             ) %>
       </td>
     </tr>

data/db/migrate/20160830113437_remove_deleted_policy.rb

@@ -1,7 +1,7 @@
 class RemoveDeletedPolicy < ActiveRecord::Migration
   def up
     ForemanOpenscap::AssetPolicy.all.collect(&:policy_id).uniq.each do |policy_id|
-      execute("DELETE FROM foreman_openscap_asset_policies WHERE policy_id = '#{policy_id}';") if ForemanOpenscap::Policy.unscoped.find_by(id: policy_id).nil?
+      execute("DELETE FROM foreman_openscap_asset_policies WHERE policy_id = '#{policy_id}';") if ForemanOpenscap::Policy.find_by(id: policy_id).nil?
     end
   end
 

data/db/seeds.d/openscap_policy_notification.rb

@@ -1,7 +1,7 @@
-N_('Compliance policy summary')
+N_('Openscap policy summary')
 
 policy_notification = {
-  :name => :compliance_policy_summary,
+  :name => :openscap_policy_summary,
   :description => N_('A summary of reports for OpenSCAP policies'),
   :mailer => 'ForemanOpenscap::PolicyMailer',
   :method => 'policy_summary',

data/lib/foreman_openscap/engine.rb

@@ -42,7 +42,7 @@ module ForemanOpenscap
 
     initializer 'foreman_openscap.register_plugin', :before => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_openscap do
-        requires_foreman '>= 1.15'
+        requires_foreman '>= 1.16'
 
         apipie_documented_controllers ["#{ForemanOpenscap::Engine.root}/app/controllers/api/v2/compliance/*.rb"]
 
@@ -156,18 +156,6 @@ view_openscap_proxies]
         parameter_filter Hostgroup, :openscap_proxy_id, :openscap_proxy
         parameter_filter Log, :result
 
-        smart_proxy_for Hostgroup, :openscap_proxy,
-                        :feature => 'Openscap',
-                        :label => N_('OpenSCAP Proxy'),
-                        :description => N_('OpenSCAP Proxy to use for fetching SCAP content and uploading ARF reports'),
-                        :api_description => N_('ID of OpenSCAP Proxy')
-        smart_proxy_for Host::Managed, :openscap_proxy,
-                        :feature => 'Openscap',
-                        :label => N_('OpenSCAP Proxy'),
-                        :description => N_('OpenSCAP Proxy to use for fetching SCAP content and uploading ARF reports'),
-                        :api_description => N_('ID of OpenSCAP Proxy')
-
-
         if ForemanOpenscap.with_remote_execution?
           options = {
             :description => N_("Run OpenSCAP scan"),

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "0.7.13".freeze
+  VERSION = "0.8.0".freeze
 end

data/lib/tasks/foreman_openscap_tasks.rake

@@ -56,15 +56,6 @@ namespace :foreman_openscap do
     ForemanOpenscap::MessageCleaner.new.clean
     puts 'Done'
   end
-
-  desc "Delete ArfReports without OpenSCAP proxy"
-  task :clean_reports_without_proxy => :environment do
-    User.as_anonymous_admin do
-      report_ids_without_proxy = ForemanOpenscap::ArfReport.unscoped.where(:openscap_proxy => nil).pluck(:id)
-      total = ForemanOpenscap::ArfReport.delete report_ids_without_proxy
-      puts "Done cleaning #{total} reports"
-    end
-  end
 end
 
 # Tests

data/test/factories/policy_factory.rb

@@ -3,8 +3,8 @@ FactoryGirl.define do
     sequence(:name) { |n| "policy#{n}" }
     period 'weekly'
     weekday 'monday'
-    scap_content { FactoryGirl.create(:scap_content) }
-    scap_content_profile { FactoryGirl.create(:scap_content_profile, :scap_content => scap_content) }
+    scap_content
+    scap_content_profile
     tailoring_file nil
     tailoring_file_profile nil
     day_of_month nil

data/test/functional/api/v2/compliance/arf_reports_controller_test.rb

@@ -6,15 +6,17 @@ class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
     # override validation of policy (puppetclass, lookup_key overrides)
     ForemanOpenscap::Policy.any_instance.stubs(:valid?).returns(true)
     @host = FactoryGirl.create(:compliance_host)
+    @report = FactoryGirl.create(:arf_report,
+                                 :host_id => @host.id,
+                                 :openscap_proxy => FactoryGirl.create(:smart_proxy, :url => "http://smart-proxy.org:8000"))
     @policy = FactoryGirl.create(:policy)
-    @asset = FactoryBot.create(:asset, :assetable_id => @host.id)
+    @asset = FactoryGirl.create(:asset)
 
     @from_json = arf_from_json "#{ForemanOpenscap::Engine.root}/test/files/arf_report/arf_report.json"
     @cname = '9521a5c5-8f44-495f-b087-20e86b30bf67'
   end
 
   test "should get index" do
-    create_arf_report
     get :index, {}, set_session_user
     response = ActiveSupport::JSON.decode(@response.body)
     assert_not response['results'].empty?
@@ -22,8 +24,7 @@ class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
   end
 
   test "should get show" do
-    report = create_arf_report
-    get :show, { :id => report.to_param }, set_session_user
+    get :show, { :id => @report.to_param }, set_session_user
     response = ActiveSupport::JSON.decode(@response.body)
     refute response['passed'].blank?
     refute response['failed'].blank?
@@ -32,10 +33,9 @@ class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
   end
 
   test "should download report" do
-    report = create_arf_report
     bzipped_report = File.read "#{ForemanOpenscap::Engine.root}/test/files/arf_report/arf_report.bz2"
     ForemanOpenscap::ArfReport.any_instance.stubs(:to_bzip).returns(bzipped_report)
-    get :download, { :id => report.to_param }, set_session_user
+    get :download, { :id => @report.to_param }, set_session_user
     t = Tempfile.new('tmp_report')
     t.write @response.body
     t.close
@@ -60,20 +60,6 @@ class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
     assert_equal msg_count, src_count
   end
 
-  test "should not create report for host without proxy" do
-    asset = FactoryBot.create(:asset)
-    date = Time.new(1944, 6, 6)
-    ForemanOpenscap::Helper.stubs(:get_asset).returns(asset)
-    post :create,
-         @from_json.merge(:cname => @cname,
-                          :policy_id => @policy.id,
-                          :date => date.to_i),
-         set_session_user
-    assert_response :unprocessable_entity
-    res = JSON.parse(@response.body)
-    assert_equal "Failed to upload Arf Report, no OpenSCAP proxy set for host #{asset.host.name}", res["result"]
-  end
-
   test "should not duplicate messages" do
     dates = [Time.new(1984, 9, 15), Time.new(1932, 3, 27)]
     ForemanOpenscap::Helper.stubs(:get_asset).returns(@asset)
@@ -159,10 +145,4 @@ class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
     file_content = File.read path
     JSON.parse file_content
   end
-
-  def create_arf_report
-    FactoryBot.create(:arf_report,
-                      :host_id => @host.id,
-                      :openscap_proxy => FactoryBot.create(:smart_proxy, :url => "http://smart-proxy.org:8000"))
-  end
 end

data/test/functional/api/v2/compliance/policies_controller_test.rb

@@ -93,12 +93,4 @@ class Api::V2::Compliance::PoliciesControllerTest < ActionController::TestCase
     assert(@response.header['Content-Type'], 'application/xml')
     assert_response :success
   end
-
-  test "should return meaningufull error when no tailioring file assigned" do
-    policy = FactoryGirl.create(:policy)
-    get :tailoring, { :id => policy.id }, set_session_user
-    assert_response :not_found
-    response = ActiveSupport::JSON.decode(@response.body)
-    assert_equal "No Tailoring file assigned for policy with id #{policy.id}", response['error']['message']
-  end
 end

data/test/unit/policy_test.rb

@@ -6,7 +6,7 @@ class PolicyTest < ActiveSupport::TestCase
     ForemanOpenscap::DataStreamValidator.any_instance.stubs(:validate)
     ForemanOpenscap::ScapContent.any_instance.stubs(:fetch_profiles).returns({ 'test_profile_key' => 'test_profile_title' })
     @scap_content = FactoryGirl.create(:scap_content)
-    @scap_profile = FactoryGirl.create(:scap_content_profile, :scap_content => @scap_content)
+    @scap_profile = FactoryGirl.create(:scap_content_profile)
     @tailoring_profile = FactoryGirl.create(:scap_content_profile, :profile_id => 'xccdf_org.test.tailoring_test_profile')
   end
 
@@ -16,7 +16,7 @@ class PolicyTest < ActiveSupport::TestCase
     hg1 = FactoryGirl.create(:hostgroup)
     hg2 = FactoryGirl.create(:hostgroup)
     asset = FactoryGirl.create(:asset, :assetable_id => hg1.id, :assetable_type => 'Hostgroup')
-    policy = FactoryGirl.create(:policy, :assets => [asset], :scap_content => @scap_content, :scap_content_profile => @scap_profile)
+    policy = FactoryGirl.create(:policy, :assets => [asset])
     policy.hostgroup_ids = [hg1, hg2].map(&:id)
     policy.save!
     assert_equal 2, policy.hostgroups.count
@@ -28,7 +28,7 @@ class PolicyTest < ActiveSupport::TestCase
     ForemanOpenscap::Policy.any_instance.stubs(:populate_overrides)
     hg = FactoryGirl.create(:hostgroup)
     asset = FactoryGirl.create(:asset, :assetable_id => hg.id, :assetable_type => 'Hostgroup')
-    policy = FactoryGirl.create(:policy, :assets => [asset], :scap_content => @scap_content, :scap_content_profile => @scap_profile)
+    policy = FactoryGirl.create(:policy, :assets => [asset])
     policy.save!
     hg.hostgroup_classes.destroy_all
     hg.destroy
@@ -135,16 +135,17 @@ class PolicyTest < ActiveSupport::TestCase
     assert p.errors[:scap_content_id].include?("can't be blank")
   end
 
-  test "should create a policy with default SCAP content profile (profile id is nil)" do
+  test "should not create policy without SCAP content profile" do
     p = ForemanOpenscap::Policy.new(:name => "custom_policy",
                                     :scap_content_id => @scap_content.id,
                                     :period => 'monthly',
                                     :day_of_month => '5')
-    assert p.save
+    refute p.save
+    assert p.errors[:scap_content_profile_id].include?("can't be blank")
   end
 
   test "should have correct scap profile in enc" do
-    p = FactoryGirl.create(:policy, :scap_content => @scap_content, :scap_content_profile => @scap_profile)
+    p = FactoryGirl.create(:policy)
     profile_id = p.scap_content_profile.profile_id
     assert_equal profile_id, p.to_enc['profile_id']
     tailoring_profile = FactoryGirl.create(:scap_content_profile, :profile_id => 'xccdf_org.test.tailoring_test_profile')
@@ -189,31 +190,4 @@ class PolicyTest < ActiveSupport::TestCase
     assert_equal 6, p.to_enc['tailoring_download_path'].split('/').length
     assert_equal tailoring_file.digest, p.to_enc['tailoring_download_path'].split('/').last
   end
-
-  test "should have assigned a content profile that belongs to assigned scap content" do
-    scap_content_2 = FactoryGirl.create(:scap_content)
-    p = ForemanOpenscap::Policy.create(:name => "valid_profile_policy",
-                                        :scap_content_id => @scap_content.id,
-                                        :scap_content_profile_id => @scap_profile.id,
-                                        :period => 'monthly',
-                                        :day_of_month => '5')
-    assert p.valid?
-    q = ForemanOpenscap::Policy.create(:name => "invalid_profile_policy",
-                                        :scap_content_id => scap_content_2.id,
-                                        :scap_content_profile_id => @scap_profile.id,
-                                        :period => 'monthly',
-                                        :day_of_month => '5')
-    refute q.valid?
-    assert_equal "does not have the selected SCAP content profile", q.errors.messages[:scap_content_id].first
-  end
-
-  test "should delete arf_report when deleting policy" do
-    policy = FactoryGirl.create(:policy, :scap_content => @scap_content, :scap_content_profile => @scap_profile)
-    host = FactoryGirl.create(:compliance_host)
-    arf_report = FactoryGirl.create(:arf_report, :host_id => host.id)
-    policy_arf_report = FactoryGirl.create(:policy_arf_report, :policy_id => policy.id, :arf_report_id => arf_report.id)
-    policy.destroy
-    assert_empty ForemanOpenscap::PolicyArfReport.where(:id => policy_arf_report.id)
-    assert_empty ForemanOpenscap::ArfReport.where(:id => arf_report.id)
-  end
 end

data/test/unit/scap_content_test.rb

@@ -32,19 +32,4 @@ class ScapContentTest < ActiveSupport::TestCase
       assert_equal(available_proxy.url, scap_content.proxy_url)
     end
   end
-
-  test 'should update profile title when fetching profiles from proxy' do
-    scap_content = FactoryGirl.create(:scap_content)
-    scap_content.stubs(:fetch_profiles).returns({ "xccdf.test.profile" => "Changed title" })
-    scap_profile = FactoryGirl.create(:scap_content_profile, :scap_content => scap_content, :profile_id => 'xccdf.test.profile', :title => "Original title")
-    scap_content.create_profiles
-    assert_equal scap_profile.reload.title, 'Changed title'
-  end
-
-  test 'should create profile when fetching profiles from proxy' do
-    scap_content = FactoryGirl.create(:scap_content)
-    scap_content.stubs(:fetch_profiles).returns({ "xccdf.test.profile" => "My title" })
-    scap_content.create_profiles
-    assert scap_content.reload.scap_content_profiles.where(:title => 'My title').first
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 0.7.13
+  version: 0.8.0
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-13 00:00:00.000000000 Z
+date: 2017-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -91,6 +91,8 @@ files:
 - app/models/foreman_openscap/scap_content.rb
 - app/models/foreman_openscap/scap_content_profile.rb
 - app/models/foreman_openscap/tailoring_file.rb
+- app/overrides/hostgroups/form/select_openscap_proxy.rb
+- app/overrides/hosts/form/select_openscap_proxy.rb
 - app/overrides/hosts/overview/host_compliance_status.rb
 - app/services/foreman_openscap/arf_report_status_calculator.rb
 - app/services/foreman_openscap/host_report_dashboard/data.rb
@@ -111,11 +113,9 @@ files:
 - app/views/api/v2/compliance/policies/main.json.rabl
 - app/views/api/v2/compliance/policies/show.json.rabl
 - app/views/api/v2/compliance/scap_contents/base.json.rabl
-- app/views/api/v2/compliance/scap_contents/create.json.rabl
 - app/views/api/v2/compliance/scap_contents/index.json.rabl
 - app/views/api/v2/compliance/scap_contents/main.json.rabl
 - app/views/api/v2/compliance/scap_contents/show.json.rabl
-- app/views/api/v2/compliance/scap_contents/update.json.rabl
 - app/views/api/v2/compliance/tailoring_files/base.json.rabl
 - app/views/api/v2/compliance/tailoring_files/index.json.rabl
 - app/views/api/v2/compliance/tailoring_files/main.json.rabl
@@ -129,6 +129,7 @@ files:
 - app/views/arf_reports/show.html.erb
 - app/views/arf_reports/show_html.html.erb
 - app/views/compliance_hosts/_compliance_status.erb
+- app/views/compliance_hosts/_openscap_proxy.html.erb
 - app/views/compliance_hosts/show.html.erb
 - app/views/dashboard/_compliance_host_reports_widget.html.erb
 - app/views/dashboard/_compliance_reports_breakdown_widget.html.erb
@@ -215,9 +216,6 @@ files:
 - db/migrate/20160925213031_change_scap_widget_names.rb
 - db/migrate/20161109155255_create_tailoring_files.rb
 - db/migrate/20161223153249_add_permissions_to_arf_report.rb
-- db/migrate/20170821081205_rename_mail_notification.foreman_openscap.rb
-- db/migrate/20170830221751_add_index_to_logs_result.rb
-- db/migrate/20171011134112_remove_arf_reports_without_policy.rb
 - db/seeds.d/75-job_templates.rb
 - db/seeds.d/openscap_feature.rb
 - db/seeds.d/openscap_policy_notification.rb
@@ -315,7 +313,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Foreman plug-in for displaying OpenSCAP audit reports

data/app/views/api/v2/compliance/scap_contents/create.json.rabl

@@ -1,3 +0,0 @@
-object @scap_content
-
-extends "api/v2/compliance/scap_contents/main"

data/app/views/api/v2/compliance/scap_contents/update.json.rabl

@@ -1,3 +0,0 @@
-object @scap_content
-
-extends "api/v2/compliance/scap_contents/main"

data/db/migrate/20170821081205_rename_mail_notification.foreman_openscap.rb

@@ -1,15 +0,0 @@
-class RenameMailNotification < ActiveRecord::Migration
-  def up
-    notification = MailNotification.where(:name => 'openscap_policy_summary').first
-    if notification
-      notification.update_attribute :name, 'compliance_policy_summary'
-    end
-  end
-
-  def down
-    notification = MailNotification.where(:name => 'compliance_policy_summary').first
-    if notification
-      notification.update_attribute :name, 'openscap_policy_summary'
-    end
-  end
-end

data/db/migrate/20170830221751_add_index_to_logs_result.rb

@@ -1,9 +0,0 @@
-class AddIndexToLogsResult < ActiveRecord::Migration
-  def up
-    add_index :logs, :result
-  end
-
-  def down
-    remove_index :logs, :result
-  end
-end

data/db/migrate/20171011134112_remove_arf_reports_without_policy.rb

@@ -1,18 +0,0 @@
-class RemoveArfReportsWithoutPolicy < ActiveRecord::Migration
-  def up
-    if User.unscoped.find_by(:login => User::ANONYMOUS_ADMIN)
-      User.as_anonymous_admin do
-        delete_reports
-      end
-    else
-      delete_reports
-    end
-  end
-
-  def delete_reports
-    ids_to_keep = ForemanOpenscap::ArfReport.unscoped.all.joins(:policy_arf_report).pluck(:id)
-    ForemanOpenscap::ArfReport.unscoped.where.not(:id => ids_to_keep).find_in_batches do |batch|
-      batch.map(&:destroy!)
-    end
-  end
-end