foreman_openscap 0.5.4 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  metadata.gz: 96a6e2184a76a03fd739e6c59c6e84f6cb5085fa
-  data.tar.gz: 3d60a8e2769d5f1f965776ae1dc574905c2fb06a
-SHA512: 
-  metadata.gz: a182595dc0be182b440010db2c6ae0ddbc6bf2ade6224cdaf7d9df6f7a1cc04fa4dca4f1d93f99ffdecd39ea7a0bf68eb872af7cbf61c626f2479806c54bd748
-  data.tar.gz: b893e5bddaa8888d8fa602520dec17b3c8e1d97f5b060dfb3a85efce17d32733d4f6929c8a6782c3e5d92d25cf36bd4af93f92705291de3f2228f9902eb2925e
+---
+SHA1:
+  metadata.gz: 851cba0254a778b37d861c8801c59e5922dfa240
+  data.tar.gz: 5c197e57e737aa99d9eee649016a777da56be9b3
+SHA512:
+  metadata.gz: 0060d5c3f69d2750ee68847295ca415fc3815ca881ba3a2c695213d1d944fc75743adced9ac8a761bd160e27f445aba5101d9b3611fb89a6ddd2df570b45244e
+  data.tar.gz: 461c91f862ce0076d6287b7b962c9ce2597b6d59ff59ffcebc8bbcd323ab8ee8a2d5bb7c4a6a52f98426e29b5e2016da7c038f6de48ea16ac4f812187d745233

data/README.md

@@ -141,6 +141,20 @@ Make sure that
   # service foreman restart
   ```
 
+## Releasing
+
+follow these steps:
+
+1. Bump the version.rb to desired number
+2. git commit -a -m "Version $number"
+3. rake release
+
+the commit gets tagged with what it find in version.rb
+
+if you have commit permissions, the commit and the tag gets pushed to origin remote
+
+if you're the gem owner, gem is built and uploaded to rubygems.org
+
 ## Copyright
 
 Copyright (c) 2014--2015 Red Hat, Inc.

data/app/assets/javascripts/foreman_openscap/policy_edit.js

@@ -1,7 +1,7 @@
 function scap_content_selected(element){
   var attrs = attribute_hash(['scap_content_id']);
   var url = $(element).attr('data-url');
-  foreman.tools.showSpinner();
+  tfm.tools.showSpinner();
   $.ajax({
     data: attrs,
     type: 'post',

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

@@ -2,6 +2,7 @@ module Api::V2
   module Compliance
     class PoliciesController < ::Api::V2::BaseController
       include Foreman::Controller::SmartProxyAuth
+      include Foreman::Controller::Parameters::PolicyApi
 
       add_smart_proxy_filters :content, :features => 'Openscap'
 
@@ -21,14 +22,14 @@ module Api::V2
         api_compliance_policy_url(@policy)
       end
 
-      api :GET, '/compliance/policies', N_('List SCAP contents')
+      api :GET, '/compliance/policies', N_('List Policies')
       param_group :search_and_pagination, ::Api::V2::BaseController
 
       def index
         @policies = resource_scope_for_index(:permission => :edit_compliance)
       end
 
-      api :GET, '/compliance/policies/:id', N_('Show an SCAP content')
+      api :GET, '/compliance/policies/:id', N_('Show a Policy')
       param :id, :identifier, :required => true
 
       def show
@@ -40,30 +41,32 @@ module Api::V2
           param :description, String, :desc => N_('Policy description')
           param :scap_content_id, Integer, :required => true, :desc => N_('Policy SCAP content ID')
           param :scap_content_profile_id, Integer, :required => true, :desc => N_('Policy SCAP content profile ID')
-          param :period, String, :required => true, :desc => N_('Policy schedule period')
-          param :weekday, String, :required => true, :desc => N_('Policy schedule weekday')
+          param :period, String, :desc => N_('Policy schedule period (weekly, monthly, custom)')
+          param :weekday, String, :desc => N_('Policy schedule weekday (only if period == "weekly")')
+          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_group :taxonomies, ::Api::V2::BaseController
         end
       end
 
-      api :POST, '/compliance/policies', N_('Create a policy')
+      api :POST, '/compliance/policies', N_('Create a Policy')
       param_group :policy, :as => :create
 
       def create
-        @policy = ForemanOpenscap::Policy.new(params[:policy])
+        @policy = ForemanOpenscap::Policy.new(policy_params)
         process_response @policy.save
       end
 
-      api :PUT, '/compliance/policies/:id', N_('Update a policy')
+      api :PUT, '/compliance/policies/:id', N_('Update a Policy')
       param :id, :identifier, :required => true
       param_group :policy
 
       def update
-        process_response @policy.update_attributes(params[:policy])
+        process_response @policy.update_attributes(policy_params)
       end
 
-      api :DELETE, '/compliance/policies/:id', N_('Deletes a policy')
+      api :DELETE, '/compliance/policies/:id', N_('Delete a Policy')
       param :id, :identifier, :required => true
 
       def destroy

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

@@ -1,6 +1,7 @@
 module Api::V2
   module Compliance
     class ScapContentsController < ::Api::V2::BaseController
+      include Foreman::Controller::Parameters::ScapContent
       before_filter :find_resource, :except => %w(index create)
 
       def resource_name
@@ -36,6 +37,7 @@ module Api::V2
         param :scap_content, Hash, :required => true, :action_aware => true do
           param :title, String, :required => true, :desc => N_('SCAP content name')
           param :scap_file, String, :required => true, :desc => N_('XML containing SCAP content')
+          param :original_filename, String, :desc => N_('Original file name of the XML file')
           param_group :taxonomies, ::Api::V2::BaseController
         end
       end
@@ -44,7 +46,7 @@ module Api::V2
       param_group :scap_content, :as => :create
 
       def create
-        @scap_content = ForemanOpenscap::ScapContent.new(params[:scap_content])
+        @scap_content = ForemanOpenscap::ScapContent.new(scap_content_params)
         process_response @scap_content.save
       end
 
@@ -53,7 +55,7 @@ module Api::V2
       param_group :scap_content
 
       def update
-        process_response @scap_content.update_attributes(params[:scap_content])
+        process_response @scap_content.update_attributes(scap_content_params)
       end
 
       api :DELETE, '/compliance/scap_contents/:id', N_('Deletes an SCAP content')

data/app/controllers/concerns/foreman/controller/parameters/policy.rb

@@ -0,0 +1,12 @@
+module Foreman::Controller::Parameters::Policy
+  extend ActiveSupport::Concern
+  include PolicyApi
+
+  class_methods do
+    def policy_params_filter
+      Foreman::ParameterFilter.new(::ForemanOpenscap::Policy).tap do |filter|
+        filter.permit([:current_step, :wizard_initiated] + filter_params_list)
+      end
+    end
+  end
+end

data/app/controllers/concerns/foreman/controller/parameters/policy_api.rb

@@ -0,0 +1,21 @@
+module Foreman::Controller::Parameters::PolicyApi
+  extend ActiveSupport::Concern
+
+  class_methods do
+    def filter_params_list
+      [:description, :name, :period, :scap_content_id, :scap_content_profile_id,
+       :weekday, :day_of_month, :cron_line, :location_ids => [], :organization_ids => [],
+       :hostgroup_ids => []]
+    end
+
+    def policy_params_filter
+      Foreman::ParameterFilter.new(::ForemanOpenscap::Policy).tap do |filter|
+        filter.permit filter_params_list
+      end
+    end
+  end
+
+  def policy_params
+    self.class.policy_params_filter.filter_params(params, parameter_filter_context)
+  end
+end

data/app/controllers/concerns/foreman/controller/parameters/scap_content.rb

@@ -0,0 +1,15 @@
+module Foreman::Controller::Parameters::ScapContent
+  extend ActiveSupport::Concern
+
+  class_methods do
+    def scap_content_params_filter
+      Foreman::ParameterFilter.new(::ForemanOpenscap::ScapContent).tap do |filter|
+        filter.permit :original_filename, :scap_file, :title, :location_ids => [], :organization_ids => []
+      end
+    end
+  end
+
+  def scap_content_params
+    self.class.scap_content_params_filter.filter_params(params, parameter_filter_context)
+  end
+end

data/app/controllers/policies_controller.rb

@@ -1,5 +1,7 @@
 class PoliciesController < ApplicationController
   include Foreman::Controller::AutoCompleteSearch
+  include Foreman::Controller::Parameters::Policy
+
   before_filter :find_by_id, :only => [:show, :edit, :update, :parse, :destroy]
   before_filter :find_multiple, :only => [:select_multiple_hosts, :update_multiple_hosts, :disassociate_multiple_hosts, :remove_policy_from_multiple_hosts]
 
@@ -18,7 +20,7 @@ class PoliciesController < ApplicationController
   end
 
   def new
-    @policy = ::ForemanOpenscap::Policy.new
+    @policy = ::ForemanOpenscap::Policy.new(:wizard_initiated => true)
   end
 
   def show
@@ -29,7 +31,9 @@ class PoliciesController < ApplicationController
   end
 
   def create
-    @policy = ::ForemanOpenscap::Policy.new(params[:policy])
+    # we must call unscoped, otherwise taxonomix default scope gets mixed into taxable_taxonomies object
+    # setting taxable_id, making them invalid
+    @policy = ::ForemanOpenscap::Policy.unscoped.new(policy_params)
     if @policy.wizard_completed? && @policy.save
       process_success :success_redirect => policies_path
     else
@@ -46,7 +50,7 @@ class PoliciesController < ApplicationController
   end
 
   def update
-    if @policy.update_attributes(params[:policy])
+    if @policy.update_attributes(policy_params)
       process_success :success_redirect => policies_path
     else
       process_error :object => @policy

data/app/controllers/scap_contents_controller.rb

@@ -1,5 +1,7 @@
 class ScapContentsController < ApplicationController
   include Foreman::Controller::AutoCompleteSearch
+  include Foreman::Controller::Parameters::ScapContent
+
   before_filter :handle_file_upload, :only => [:create, :update]
   before_filter :find_by_id, :only => [:show, :edit, :update, :destroy]
 
@@ -22,7 +24,7 @@ class ScapContentsController < ApplicationController
   end
 
   def create
-    @scap_content = ForemanOpenscap::ScapContent.new(params[:scap_content])
+    @scap_content = ForemanOpenscap::ScapContent.new(scap_content_params)
     if @scap_content.save
       process_success
     else
@@ -31,7 +33,7 @@ class ScapContentsController < ApplicationController
   end
 
   def update
-    if @scap_content.update_attributes(params[:scap_content])
+    if @scap_content.update_attributes(scap_content_params)
       process_success
     else
       process_error

data/app/helpers/{dashboard_helper.rb → compliance_dashboard_helper.rb}

@@ -8,9 +8,9 @@
 # along with this software; if not, see http://www.gnu.org/licenses/gpl.txt
 #
 
-module DashboardHelper
+module ComplianceDashboardHelper
 
-  def latest_headers
+  def latest_compliance_headers
     string =  "<th>#{_("Host")}</th>"
     string += "<th>#{_("Policy")}</th>"
     # TRANSLATORS: initial character of Passed

data/app/helpers/policy_dashboard_helper.rb

@@ -16,10 +16,6 @@ module PolicyDashboardHelper
     :report_missing => '#92A8CD',
   }
 
-  def policy_widget_list
-    ForemanOpenscap::PolicyDashboard::Manager.widgets
-  end
-
   def host_breakdown_chart(report, options = {})
     data = []
     [[:compliant_hosts, _('Compliant hosts')],
@@ -40,4 +36,13 @@ module PolicyDashboardHelper
       content_tag(:h4, @report[label])
     end
   end
+
+  def compliance_widget(opts)
+    name = opts.delete(:name)
+    template = opts.delete(:template)
+    widget = Widget.new(opts)
+    widget.name = name
+    widget.template = template
+    widget
+  end
 end

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

@@ -46,13 +46,11 @@ module ForemanOpenscap
                                AND foreman_openscap_asset_policies.policy_id = '#{policy.id}')")
       }
 
-      alias_method_chain :set_hostgroup_defaults, :openscap
+      alias_method_chain :inherited_attributes, :openscap
     end
 
-    def set_hostgroup_defaults_with_openscap
-      set_hostgroup_defaults_without_openscap
-      return unless hostgroup
-      assign_hostgroup_attributes %w(openscap_proxy_id)
+    def inherited_attributes_with_openscap
+      inherited_attributes_without_openscap.concat(%w(openscap_proxy_id))
     end
 
     def policies=(policies)

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

@@ -3,7 +3,7 @@ module ForemanOpenscap
     extend ActiveSupport::Concern
 
     included do
-      has_one :asset, :as => :assetable, :class_name => "::ForemanOpenscap::Asset"
+      has_one :asset, :as => :assetable, :class_name => "::ForemanOpenscap::Asset", dependent: :destroy
       has_many :asset_policies, :through => :asset, :class_name => "::ForemanOpenscap::AssetPolicy"
       has_many :policies, :through => :asset_policies, :class_name => "::ForemanOpenscap::Policy"
     end

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

@@ -2,7 +2,6 @@ module ForemanOpenscap
   module LogExtensions
     extend ActiveSupport::Concern
     included do
-      attr_accessible :result
       SCAP_RESULT = %w(pass fail error unknown notapplicable notchecked notselected informational fixed)
       validate :scap_result
     end

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

@@ -9,7 +9,7 @@ module ForemanOpenscap
     end
 
     def update_scap_client
-      update_scap_client_params if openscap_proxy_id_changed?
+      update_scap_client_params if changed.include?('openscap_proxy_id')
     end
 
     def update_scap_client_params

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

@@ -4,13 +4,12 @@ module ForemanOpenscap
 
     included do
       belongs_to :openscap_proxy, :class_name => "SmartProxy"
-      attr_accessible :openscap_proxy_id, :openscap_proxy
     end
 
     def openscap_proxy_api
       return @openscap_api if @openscap_api
       proxy_url = openscap_proxy.url if openscap_proxy
-      fail(_("No OpenSCAP proxy found for %s") % 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

@@ -164,11 +164,13 @@ module ForemanOpenscap
     end
 
     def destroy
-      if openscap_proxy_api.destroy_report(self, ForemanOpenscap::Helper::find_name_or_uuid_by_host(host))
-        super
-      else
-        false
+      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
+      super
     end
 
     def self.newline_to_space(string)

data/app/models/foreman_openscap/compliance_status.rb

@@ -36,7 +36,9 @@ module ForemanOpenscap
       end
     end
 
-    def relevant?
+    def relevant?(options = {})
+      # May fail host status during migration
+      return false unless ForemanOpenscap::Asset.table_exists?
       host.policies.present?
     end
 

data/app/models/foreman_openscap/policy.rb

@@ -2,17 +2,14 @@ module ForemanOpenscap
   class Policy < ActiveRecord::Base
     include Authorizable
     include Taxonomix
-    attr_accessible :description, :name, :period, :scap_content_id, :scap_content_profile_id,
-                    :weekday, :day_of_month, :cron_line, :location_ids, :organization_ids,
-                    :current_step, :hostgroup_ids
-    attr_writer :current_step
+    attr_writer :current_step, :wizard_initiated
 
     belongs_to :scap_content
     belongs_to :scap_content_profile
     has_many :policy_arf_reports
     has_many :arf_reports, :through => :policy_arf_reports, :dependent => :destroy
     has_many :asset_policies
-    has_many :assets, :through => :asset_policies
+    has_many :assets, :through => :asset_policies, :as => :assetable, :dependent => :destroy
 
     scoped_search :on => :name, :complete_value => true
 
@@ -21,17 +18,15 @@ module ForemanOpenscap
     SERVER_CLASS_PARAMETER   = 'server'
     PORT_CLASS_PARAMETER     = 'port'
 
-    validates :name, :presence => true, :uniqueness => true, :format => { :without => /\s/ }
+    before_validation :update_period_attrs
+
+    validates :name, :presence => true, :uniqueness => true
     validate :ensure_needed_puppetclasses
-    validates :period, :inclusion => {:in => %w(weekly monthly custom)},
-              :if                 => Proc.new { |policy| policy.new_record? ? policy.step_index > 3 : !policy.id.blank? }
-    validates :weekday, :inclusion => {:in => Date::DAYNAMES.map(&:downcase)},
-              :if                  => Proc.new { |policy| policy.period == 'weekly' && (policy.new_record? ? policy.step_index > 3 : !policy.id.blank?) }
-    validates :day_of_month, :numericality => {:greater_than => 0, :less_than => 32},
-              :if                          => Proc.new { |policy| policy.period == 'monthly'&& (policy.new_record? ? policy.step_index > 3 : !policy.id.blank?) }
-    validate :valid_cron_line
-    validate :ensure_period_specification_present
+    validates :period, :inclusion => {:in => %w(weekly monthly custom), :message => _('is not a valid value')},
+              :if => Proc.new { |policy| policy.should_validate?('Schedule') }
+
 
+    validate :valid_cron_line, :valid_weekday, :valid_day_of_month
 
     after_save :assign_policy_to_hostgroups
     # before_destroy - ensure that the policy has no hostgroups, or classes
@@ -67,10 +62,11 @@ module ForemanOpenscap
 
     def hostgroup_ids=(ids)
       hostgroup_assets = []
-      ids.reject(&:empty?).map do |id|
-        hostgroup_assets << assets.where(:assetable_type => 'Hostgroup', :assetable_id => id).first_or_create!
+      ids.reject { |id| id.respond_to?(:empty?) && id.empty? }.map do |id|
+        hostgroup_assets << assets.where(:assetable_type => 'Hostgroup', :assetable_id => id).first_or_initialize
       end
-      self.assets = hostgroup_assets
+      existing_host_assets = self.assets.where(:assetable_type => 'Host::Base')
+      self.assets = existing_host_assets + hostgroup_assets
     end
 
     def hostgroups
@@ -93,6 +89,10 @@ module ForemanOpenscap
       host_ids = hosts.map(&:id).map(&:to_s)
     end
 
+    def step_to_i(step_name)
+      steps.index(step_name) + 1
+    end
+
     def steps
       base_steps = ['Create policy', 'SCAP Content', 'Schedule']
       base_steps << 'Locations' if SETTINGS[:locations_enabled]
@@ -170,8 +170,37 @@ module ForemanOpenscap
       }.merge(period_enc)
     end
 
+    def should_validate?(step_name)
+      if new_record? && wizard_initiated?
+        step_index > step_to_i(step_name)
+      elsif new_record? && !wizard_initiated?
+        true
+      else
+        persisted?
+      end
+    end
+
+    def wizard_initiated?
+      @wizard_initiated
+    end
+
+    def update_period_attrs
+      case period
+      when 'monthly'
+        erase_period_attrs(['cron_line', 'weekday'])
+      when 'weekly'
+        erase_period_attrs(['cron_line', 'day_of_month'])
+      when 'custom'
+        erase_period_attrs(['weekday', 'day_of_month'])
+      end
+    end
+
     private
 
+    def erase_period_attrs(attrs)
+       attrs.each { |attr| self.public_send("#{attr}=", nil) }
+    end
+
     def period_enc
       # get crontab expression as an array (minute hour day_of_month month day_of_week)
       cron_parts = case period
@@ -221,34 +250,30 @@ module ForemanOpenscap
     end
 
     def cron_line_split
-      cron_line.split(' ')
+      cron_line.to_s.split(' ')
     end
 
     def valid_cron_line
-      return true if period != 'custom' || step_index != 4
-
-      unless cron_line_split.size == 5
-        errors[:base] << _("Cron line does not consist of 5 parts separated by space")
-        return false
+      if period == 'custom' && should_validate?('Schedule')
+        errors.add(:cron_line, _("does not consist of 5 parts separated by space")) unless cron_line_split.size == 5
       end
     end
 
-    def ensure_period_specification_present
-      return true if period.blank? || step_index != 4
+    def valid_weekday
+      if(period == 'weekly' && should_validate?('Schedule'))
+        errors.add(:weekday, _("is not a valid value")) unless Date::DAYNAMES.map(&:downcase).include? weekday
+      end
+    end
 
-      error = nil
-      error = _("You must fill weekday") if weekday.blank? && period == 'weekday'
-      error = _("You must fill day of month") if day_of_month.blank? && period == 'monthly'
-      error = _("You must fill cron line") if cron_line.blank? && period == 'custom'
-      if error
-        errors[:base] << error
-        return false
+    def valid_day_of_month
+      if(period == 'monthly' && should_validate?('Schedule'))
+        errors.add(:day_of_month, _("must be between 1 and 31")) if !day_of_month || (day_of_month < 1 || day_of_month > 31)
       end
     end
 
     def assign_policy_to_hostgroups
       if hostgroups.any?
-        puppetclass = Puppetclass.find_by_name(SCAP_PUPPET_CLASS)
+        puppetclass = find_scap_puppetclass
         hostgroups.each do |hostgroup|
           hostgroup.puppetclasses << puppetclass unless hostgroup.puppetclasses.include? puppetclass
           populate_overrides(puppetclass, hostgroup)
@@ -256,6 +281,10 @@ module ForemanOpenscap
       end
     end
 
+    def find_scap_puppetclass
+      Puppetclass.find_by_name(SCAP_PUPPET_CLASS)
+    end
+
     def populate_overrides(puppetclass, hostgroup)
       puppetclass.class_params.where(:override => true).find_each do |override|
         next unless hostgroup.puppet_proxy && (url = hostgroup.puppet_proxy.url).present?

data/app/models/foreman_openscap/scap_content.rb

@@ -39,15 +39,13 @@ module ForemanOpenscap
     include Authorizable
     include Taxonomix
 
-    attr_accessible :original_filename, :scap_file, :title, :location_ids, :organization_ids
-
     has_many :scap_content_profiles, :dependent => :destroy
     has_many :policies
 
     before_destroy EnsureNotUsedBy.new(:policies)
 
     validates_with DataStreamValidator
-    validates :title, :presence => true
+    validates :title, :presence => true, :length => { :maximum => 255 }
     validates :digest, :presence => true
     validates :scap_file, :presence => true
 

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

@@ -4,7 +4,7 @@
   <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_at, :as => _("Reported At") %></th>
+    <th><%= sort :reported, :as => _("Reported At") %></th>
     <th><%= sort :compliance_passed, :as => _("Passed") %></th>
     <th><%= sort :compliance_failed, :as => _("Failed") %></th>
     <th><%= sort :compliance_othered, :as => _("Other") %></th>

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

@@ -8,9 +8,9 @@
 <%= render 'output', :logs => @arf_report.logs%>
 <%= render 'metrics', :status => @arf_report.status, :metrics => @arf_report.metrics  if @arf_report.logs.any? %>
 
-<%= title_actions link_to(_('Back'), :back),
+<%= title_actions link_to(_('Back'), :back, :class => "btn btn-default"),
   display_delete_if_authorized(hash_for_arf_report_path(:id => @arf_report), :class=> "btn btn-danger"),
-  link_to(_("Host details"), @arf_report.host),
-  link_to(_("View full report"), show_html_arf_report_path(:id => @arf_report.id)),
-  link_to(_("Download XML in bzip"), parse_bzip_arf_report_path(:id => @arf_report.id))
+  link_to(_("Host details"), @arf_report.host, :class => "btn btn-default"),
+  link_to(_("View full report"), show_html_arf_report_path(:id => @arf_report.id), :class => "btn btn-default"),
+  link_to(_("Download XML in bzip"), parse_bzip_arf_report_path(:id => @arf_report.id), :class => "btn btn-default")
 %>

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

@@ -1,6 +1,6 @@
 <%= javascript 'dashboard', 'foreman_openscap/scap_hosts_show' %>
 
-<% title n_("%s compliance report by policy", "%s compliance reports by policy"m , host.combined_policies.length) % @host.to_label %>
+<% title n_("%s compliance report by policy", "%s compliance reports by policy" , @host.combined_policies.length) % @host.to_label %>
 <% @host.combined_policies.each do |policy| %>
   <h2 class="center-block"><%= _('Policy %s') % policy %></h2>
   <div class="row">

data/app/views/dashboard/_compliance_host_reports_widget.html.erb

@@ -1,19 +1,19 @@
 <h4 class="ca"><%= _('Latest compliance reports') %></h4>
-<% latest_reports = ForemanOpenscap::ArfReport.latest %>
+<% latest_reports = ForemanOpenscap::ArfReport.latest.limit(9) %>
 <% if latest_reports.empty? %>
   <p class="ca"><%= _("No reports available") %></p>
 <% else %>
   <table class="table table-striped ellipsis">
     <tr>
-      <%= latest_headers() %>
+      <%= latest_compliance_headers %>
     </tr>
     <% latest_reports.each do |report| %>
       <tr>
         <td><%= link_to h(report.host.nil? ? _('Host does not exist anymore') : report.host.name), arf_report_path(report) %></td>
-        <td><%= link_to h(report.policy.name), policy_dashboard_policy_path(report.policy) %></td>
-        <td><%= report_event_column(report.passed, "label-success")  %></td>
-        <td><%= report_event_column(report.failed, "label-danger")  %></td>
-        <td><%= report_event_column(report.othered, "label-info")  %></td>
+        <td><%= report.policy.nil? ? _('Policy is missing') :  link_to(h(report.policy.name), policy_dashboard_policy_path(report.policy)) %></td>
+        <td class="ca"><%= report_event_column(report.passed, "label-success")  %></td>
+        <td class="ca"><%= report_event_column(report.failed, "label-danger")  %></td>
+        <td class="ca"><%= report_event_column(report.othered, "label-info")  %></td>
       </tr>
     <% end %>
   </table>

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

@@ -2,8 +2,8 @@
 <% title _("Compliance Policies") %>
 
 <% title_actions(
-  display_link_if_authorized(_("New Compliance Policy"), hash_for_new_policy_path),
-  link_to(_("Help"), :action => "welcome")
+  display_link_if_authorized(_("New Compliance Policy"), hash_for_new_policy_path, :class => "btn btn-default"),
+  link_to(_("Help"), { :action => "welcome" }, { :class => "btn btn-info" })
   ) %>
 
 <%= render :partial => 'list' %>