foreman_openscap 0.12.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce7f1231ac98c8b2e24699151fda71aba37f3561
-  data.tar.gz: e8631cb1cc2a02dcaa84f14d974ad4d45dad804d
+  metadata.gz: 9bfb00d33c3c3830de03a63d7f0d49d58546964f
+  data.tar.gz: 30f6ae8f460f01bcd5b1c67bf44057e3e7eb61cf
 SHA512:
-  metadata.gz: 178205d8a72c403f737e468b5bfef78327de3838545e28d7c776c8e6e8fa509854ff86dbea99ba710df84292e66a93b2ac9c280ba72c4e7d878bcc4d18db67e6
-  data.tar.gz: 5062f40577ecd10899465ffd45c4d384dd3c5c8e939e0fdc23957c718d3284a0798d2e8db8c5d7db72c55a0c4677d8f76f65985cd4926af2ccff17ef9c6e5aff
+  metadata.gz: 02b7fdac41c2ebae43b5dafd36018f20ebf279a5cd662a6a861412757a96b03cdb0c6376826a4e032d8010fb7f5b4288dd169caede2e515e7577d2f5fddb800f
+  data.tar.gz: 55afbffc1f5d4f68b51b6d5d6eb2498f591aaa15d47bb6328e9977a1a8d8dad46def864c758b77a60d50dfed1f2ef5f224349884b9a7fb0966e13a69d7162381

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

@@ -0,0 +1,5 @@
+$(document).on('ContentLoad', () => {
+  if (/^\/compliance\/policies\/\d+\/dashboard$/.test(window.location.pathname)) {
+    tfm.dashboard.startGridster();
+  }
+});

data/app/assets/stylesheets/foreman_openscap/policy_dashboard.css

@@ -0,0 +1,3 @@
+#latest-arf-reports-table  .content-view-pf-pagination.table-view-pf-pagination {
+  margin-bottom: 30px;
+}

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

@@ -0,0 +1,26 @@
+module ForemanOpenscap
+  module Api::V2::HostsControllerExtensions
+    extend ActiveSupport::Concern
+
+    module Overrides
+      def action_permission
+        case params[:action]
+        when 'policies_enc'
+          'view'
+        else
+          super
+        end
+      end
+    end
+
+    included do
+      prepend Overrides
+
+      api :GET, "/hosts/:id/policies_enc", N_("Show config information for foreman_scap_client")
+      param :id, :identifier_dottable, :required => true, :desc => N_("The identifier of the host")
+      def policies_enc
+        @encs = @host.policies_enc_raw.map { |hash| OpenStruct.new(hash) }
+      end
+    end
+  end
+end

data/app/controllers/policies_controller.rb

@@ -11,9 +11,8 @@ class PoliciesController < ApplicationController
   end
 
   def index
-    @policies = resource_base.search_for(params[:search], :order => params[:order])
-                             .paginate(:page => params[:page], :per_page => params[:per_page])
-                             .includes(:scap_content, :scap_content_profile, :tailoring_file)
+    @policies = resource_base_search_and_page.search_for(params[:search])
+                                             .includes(:scap_content, :scap_content_profile, :tailoring_file, :tailoring_file_profile)
     if @policies.empty? && ForemanOpenscap::ScapContent.unconfigured?
       redirect_to scap_contents_path
     end

data/app/controllers/policy_dashboard_controller.rb

@@ -8,5 +8,10 @@ class PolicyDashboardController < ApplicationController
     @policy = ::ForemanOpenscap::Policy.find(params[:id])
     dashboard = ForemanOpenscap::PolicyDashboard::Data.new(@policy, params[:search])
     @report = dashboard.report
+    @latest_reports = ForemanOpenscap::ArfReport
+                      .includes(:host)
+                      .of_policy(@policy.id)
+                      .latest
+                      .paginate(:page => params[:page], :per_page => params[:per_page])
   end
 end

data/app/controllers/scap_contents_controller.rb

@@ -10,7 +10,7 @@ class ScapContentsController < ApplicationController
   end
 
   def index
-    @contents = resource_base.search_for(params[:search])
+    @contents = resource_base_search_and_page.search_for(params[:search])
   end
 
   def show

data/app/controllers/tailoring_files_controller.rb

@@ -10,8 +10,7 @@ class TailoringFilesController < ApplicationController
   end
 
   def index
-    @tailoring_files = resource_base.search_for(params[:search], :order => params[:order])
-                                    .paginate(:page => params[:page], :per_page => params[:per_page])
+    @tailoring_files = resource_base_search_and_page.search_for(params[:search])
   end
 
   def new

data/app/helpers/policy_dashboard_helper.rb

@@ -34,4 +34,27 @@ module PolicyDashboardHelper
     widget.template = template
     widget
   end
+
+  def assigned_icon(policy, arf_report)
+    if arf_report.host.combined_policies.include? policy
+      icon = 'check'
+      tooltip_text = _('Host is assigned to policy')
+    else
+      icon = 'close'
+      tooltip_text = _('Host is not assigned to policy but reports were found. You may want to delete the reports or assign the policy again.')
+    end
+    trunc_with_tooltip icon_text(icon, '', :kind => 'fa'), 32, tooltip_text, false
+  end
+
+  def unassigned_hosts_link
+    trunc_with_tooltip(
+      link_to(
+        _("Hosts no longer assigned: %s") % @report[:unassigned_hosts],
+        hosts_path(:search => "removed_from_policy = \"#{@policy.name}\"")
+      ),
+      32,
+      _("Total hosts with reports where policy is no longer assigned."),
+      false
+    )
+  end
 end

data/app/mailers/foreman_openscap/policy_mailer.rb

@@ -7,7 +7,7 @@ module ForemanOpenscap
 
       @policies = ::ForemanOpenscap::Policy.all.reject { |policy| policy.assets.map(&:host).compact.empty? }
       @compliant_hosts = @policies.map { |policy| Host.comply_with policy }.flatten
-      @incompliant_hosts = @policies.map { |policy| Host.incomply_with policy }.flatten
+      @incompliant_hosts = @policies.map { |policy| Host.not_comply_with policy }.flatten
       changed_hosts_of_policies(@policies)
 
       if user.nil? || user.mail.nil?

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

@@ -36,6 +36,18 @@ module ForemanOpenscap
       base.scoped_search :on => :id, :rename => :others_xccdf_rule,
               :only_explicit => true, :operators => ['= '], :ext_method => :search_by_rule_othered
 
+      base.scoped_search :on => :id, :rename => :comply_with,
+                         :only_explicit => true, :operators => ['= '], :ext_method => :search_by_comply_with
+
+      base.scoped_search :on => :id, :rename => :not_comply_with,
+                         :only_explicit => true, :operators => ['= '], :ext_method => :search_by_not_comply_with
+
+      base.scoped_search :on => :id, :rename => :inconclusive_with,
+                         :only_explicit => true, :operators => ['= '], :ext_method => :search_by_inconclusive_with
+
+      base.scoped_search :on => :id, :rename => :removed_from_policy,
+                         :only_explicit => true, :operators => ['= '], :ext_method => :search_by_removed_from_policy
+
       base.after_update :puppetrun!, :if => ->(host) do
         Setting[:puppetrun] &&
         host.changed.include?('openscap_proxy_id') &&
@@ -46,7 +58,7 @@ module ForemanOpenscap
         joins(:arf_reports).merge(ArfReport.latest_of_policy(policy)).merge(ArfReport.passed)
       }
 
-      base.scope :incomply_with, lambda { |policy|
+      base.scope :not_comply_with, lambda { |policy|
         joins(:arf_reports).merge(ArfReport.latest_of_policy(policy)).merge(ArfReport.failed)
       }
 
@@ -62,6 +74,10 @@ module ForemanOpenscap
         search_for("compliance_policy = \"#{policy.name}\"")
       }
 
+      base.scope :removed_from_policy, lambda { |policy|
+        joins(:arf_reports).merge(ArfReport.latest_of_policy(policy)).where.not(:id => assigned_to_policy(policy).pluck(:id))
+      }
+
       base.send :extend, ClassMethods
     end
 
@@ -79,13 +95,18 @@ module ForemanOpenscap
     end
 
     def policies_enc
+      policies_enc_raw.to_json
+    end
+
+    def policies_enc_raw
       check = ForemanOpenscap::OpenscapProxyAssignedVersionCheck.new(self).run
       method = check.pass? ? :to_enc : :to_enc_legacy
-      combined_policies.map(&method).to_json
+      combined_policies.map(&method)
     end
 
     def combined_policies
-      combined = self.hostgroup ? self.policies + self.hostgroup.policies + self.hostgroup.inherited_policies : self.policies
+      inc = %i[scap_content scap_content_profile tailoring_file tailoring_file_profile]
+      combined = self.hostgroup ? self.policies.includes(inc) + self.hostgroup.policies.includes(inc) + self.hostgroup.inherited_policies : self.policies.includes(inc)
       combined.uniq
     end
 
@@ -118,6 +139,30 @@ module ForemanOpenscap
     end
 
     module ClassMethods
+      def search_by_removed_from_policy(key, operator, policy_name)
+        policy = ForemanOpenscap::Policy.find_by :name => policy_name
+        host_ids = policy ? removed_from_policy(policy).pluck(:id) : []
+        { :conditions => Host::Managed.arel_table[:id].in(host_ids).to_sql }
+      end
+
+      def search_by_compliance(key, operator, policy_name, method)
+        policy = ForemanOpenscap::Policy.find_by :name => policy_name
+        host_ids = policy ? public_send(method, policy).pluck(:id) : []
+        { :conditions => Host::Managed.arel_table[:id].in(host_ids).to_sql }
+      end
+
+      def search_by_comply_with(key, operator, policy_name)
+        search_by_compliance key, operator, policy_name, :comply_with
+      end
+
+      def search_by_not_comply_with(key, operator, policy_name)
+        search_by_compliance key, operator, policy_name, :not_comply_with
+      end
+
+      def search_by_inconclusive_with(key, operator, policy_name)
+        search_by_compliance key, operator, policy_name, :inconclusive_with
+      end
+
       def search_by_rule_passed(key, operator, rule_name)
         search_by_rule rule_name, 'pass'
       end

data/app/models/foreman_openscap/policy.rb

@@ -16,6 +16,10 @@ module ForemanOpenscap
     has_many :assets, :through => :asset_policies, :as => :assetable, :dependent => :destroy
 
     scoped_search :on => :name, :complete_value => true
+    scoped_search :in => :scap_content, :on => :title, :rename => 'content', :complete_value => true
+    scoped_search :in => :scap_content_profile, :on => :title, :rename => 'profile', :complete_value => true
+    scoped_search :in => :tailoring_file, :on => :name, :rename => 'tailoring_file', :complete_value => true
+    scoped_search :in => :tailoring_file_profile, :on => :title, :rename => 'tailoring_file_profile', :complete_value => true
     before_validation :update_period_attrs
 
     def self.deploy_by_variants

data/app/models/foreman_openscap/scap_content.rb

@@ -13,6 +13,7 @@ module ForemanOpenscap
 
     scoped_search :on => :title,             :complete_value => true
     scoped_search :on => :original_filename, :complete_value => true, :rename => :filename
+    scoped_search :on => :created_at
 
     default_scope do
       with_taxonomy_scope do

data/app/models/foreman_openscap/tailoring_file.rb

@@ -11,6 +11,7 @@ module ForemanOpenscap
 
     scoped_search :on => :name,              :complete_value => true
     scoped_search :on => :original_filename, :complete_value => true, :rename => :filename
+    scoped_search :on => :created_at
 
     def fetch_profiles
       api = ProxyAPI::Openscap.new(:url => proxy_url)

data/app/services/foreman_openscap/policy_dashboard/data.rb

@@ -18,14 +18,13 @@ module ForemanOpenscap::PolicyDashboard
     end
 
     def fetch_data
-      assigned_count = Host::Managed.assigned_to_policy(@policy).count
       report.update(
         { :compliant_hosts => Host::Managed.comply_with(@policy).count,
-          :incompliant_hosts => Host::Managed.incomply_with(@policy).count,
+          :incompliant_hosts => Host::Managed.not_comply_with(@policy).count,
           :inconclusive_hosts => Host::Managed.inconclusive_with(@policy).count,
           :report_missing => Host::Managed.policy_reports_missing(@policy).count,
-          :assigned_hosts => assigned_count,
-          :unassigned_hosts => hosts.count - assigned_count }
+          :assigned_hosts => Host::Managed.assigned_to_policy(@policy).count,
+          :unassigned_hosts => Host::Managed.removed_from_policy(@policy).count }
       )
     end
   end

data/app/views/api/v2/hosts/policies_enc.json.rabl

@@ -0,0 +1,2 @@
+collection @encs
+extends "api/v2/hosts/policy_enc"

data/app/views/api/v2/hosts/policy_enc.json.rabl

@@ -0,0 +1,3 @@
+object @enc
+
+attributes :id, :profile_id, :content_path, :tailoring_path, :download_path, :tailoring_download_path, :minute, :hour, :monthday, :month, :week

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

@@ -1,22 +1,22 @@
 <table id='report_log' class="<%= table_css_classes %>">
   <thead>
     <tr>
-      <th><%= _("Severity") %></th>
+      <th><%= _("Result") %></th>
       <th><%= _("Message") %></th>
       <th class="col-md-4"><%= _("Resource") %></th>
-      <th class="col-md-1"><%= _("Result") %></th>
+      <th class="col-md-1"><%= _("Severity") %></th>
       <th class="col-md-1"><%= _("Actions") %></th>
     </tr>
   </thead>
   <tbody>
     <% logs.each do |log| %>
       <tr>
-        <td><span <%= severity_tag log.message.severity %>><%= h log.message.severity %></span></td>
+        <td><span <%= result_tag log.result %>><%= h log.result %></span></td>
         <td>
           <%= render :partial => 'detailed_message', :locals => { :message => log.message } %>
         </td>
         <td><%= log.source %></td>
-        <td><span <%= result_tag log.result %>><%= h log.result %></span></td>
+        <td><span <%= severity_tag log.message.severity %>><%= h log.message.severity %></span></td>
         <td><%= host_search_by_rule_result_buttons(log.source) %></td>
       </tr>
     <% end %>

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

@@ -13,9 +13,9 @@
 <%= render 'metrics', :status => @arf_report.status, :metrics => @arf_report.metrics  if @arf_report.logs.any? %>
 
 <%= 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"),
+  display_delete_if_authorized(hash_for_arf_report_path(:id => @arf_report), :class=> "btn btn-default"),
   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(_("View full report"), show_html_arf_report_path(:id => @arf_report.id), :class => "btn btn-primary"),
   link_to(_("Download XML in bzip"), parse_bzip_arf_report_path(:id => @arf_report.id), :class => "btn btn-default", :data => { :no_turbolink => true }),
   link_to(_("Download HTML"), download_html_arf_report_path(:id => @arf_report.id), :class => "btn btn-default", :data => { :no_turbolink => true })
 %>

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

@@ -1,16 +1,16 @@
 <table class="<%= table_css_classes('table-fixed') %>">
   <tr>
-    <th><%= _('Name') %></th>
-    <th><%= _('Content') %></th>
-    <th><%= _('Profile') %></th>
-    <th><%= _('Tailoring File') %></th>
-    <th><%= _('Effective Profile') %></th>
+    <th><%= sort :name %></th>
+    <th><%= sort :content %></th>
+    <th><%= sort :profile %></th>
+    <th><%= sort :tailoring_file, :as => _('Tailoring File') %></th>
+    <th><%= sort :tailoring_file_profile, :as => _('Effective Profile') %></th>
     <th><%= _('Actions') %></th>
   </tr>
   <% for policy in @policies %>
     <tr>
       <td class="ellipsis">
-        <%= link_to_if_authorized(policy.name.to_s, hash_for_policy_dashboard_policy_path(:id => policy.id)) %>
+        <%= link_to_if_authorized(policy.name.to_s, hash_for_edit_policy_path(:id => policy.id)) %>
       </td>
       <td>
         <% if !policy.scap_content.nil? %>
@@ -33,8 +33,8 @@
       </td>
       <td>
         <%= action_buttons(
+                display_link_if_authorized(_("Dashboard"), hash_for_policy_dashboard_policy_path(:id => policy.id)),
                 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)
             ) %>
@@ -42,3 +42,5 @@
     </tr>
   <% end %>
 </table>
+
+<%= will_paginate_with_info @policies %>

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, :class => "btn btn-default"),
-  link_to(_("Help"), { :action => "welcome" }, { :class => "btn btn-info" })
+  display_link_if_authorized(_("New Compliance Policy"), hash_for_new_policy_path, :class => "btn btn-primary"),
+    documentation_button('#4.2Creatingpolicywizard', :root_url => scap_doc_url)
   ) %>
 
 <%= render :partial => 'list' %>

data/app/views/policy_dashboard/_policy_reports.html.erb

@@ -1,24 +1,31 @@
-<table class="<%= table_css_classes('ellipsis') %>">
-  <tr>
-    <th><%= _('Host') %></th>
-    <th><%= _("Date") %></th>
-    <th><%= _("Passed") %></th>
-    <th><%= _("Failed") %></th>
-    <th><%= _("Other") %></th>
-    <th><%= _('Actions') %></th>
-  </tr>
-  <% for arf_report in @policy.arf_reports.latest %>
+<% stylesheet 'foreman_openscap/policy_dashboard'%>
+
+<div id="latest-arf-reports-table">
+  <table class="<%= table_css_classes('ellipsis') %>">
     <tr>
-      <td><%= name_column(arf_report.host) %></td>
-      <td><%= date_time_relative_value(arf_report.reported_at) %></td>
-      <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>
-      <td>
-        <%= action_buttons(
-                link_to(_("View Report"), hash_for_arf_report_path(:id => arf_report.id))
-            ) %>
-      </td>
+      <th><%= _('Host') %></th>
+      <th><%= _('Policy assigned') %></th>
+      <th><%= _("Date") %></th>
+      <th><%= _("Passed") %></th>
+      <th><%= _("Failed") %></th>
+      <th><%= _("Other") %></th>
+      <th><%= _('Actions') %></th>
     </tr>
-  <% end %>
-</table>
+    <% @policy.arf_reports.latest.each do |arf_report| %>
+      <tr>
+        <td><%= name_column(arf_report.host) %></td>
+        <td><%= assigned_icon(@policy, arf_report) %></td>
+        <td><%= date_time_relative_value(arf_report.reported_at) %></td>
+        <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>
+        <td>
+          <%= action_buttons(
+                  link_to(_("View Report"), hash_for_arf_report_path(:id => arf_report.id))
+              ) %>
+        </td>
+      </tr>
+    <% end %>
+  </table>
+  <%= will_paginate_with_info @latest_reports %>
+</div>

data/app/views/policy_dashboard/_policy_status_widget.html.erb

@@ -1,12 +1,15 @@
 <div id='status-table'>
   <h4 class="header"><%= _('Hosts Breakdown') %></h4>
   <ul>
-    <%= status_link _('Compliant with the policy'), :compliant_hosts, arf_reports_path(:search => "comply_with = \"#{@policy.name}\"") %>
-    <%= status_link _('Not compliant with the policy'), :incompliant_hosts, arf_reports_path(:search => "not_comply_with = \"#{@policy.name}\"") %>
-    <%= status_link _('Inconclusive results'), :inconclusive_hosts, arf_reports_path(:search => " inconclusive_with = \"#{@policy.name}\"") %>
+    <%= status_link _('Compliant with the policy'), :compliant_hosts, hosts_path(:search => "comply_with = \"#{@policy.name}\"") %>
+    <%= status_link _('Not compliant with the policy'), :incompliant_hosts, hosts_path(:search => "not_comply_with = \"#{@policy.name}\"") %>
+    <%= status_link _('Inconclusive results'), :inconclusive_hosts, hosts_path(:search => " inconclusive_with = \"#{@policy.name}\"") %>
     <%= status_link _('Never audited'), :report_missing, hosts_path(:search => "compliance_report_missing_for = \"#{@policy.name}\"") %>
     <h4 class="total">
-      <%= link_to(_("Total hosts: %s") % @report[:assigned_hosts], hosts_path(:search => "compliance_policy = \"#{@policy.name}\"")) %>
+      <%= link_to(_("Total hosts with policy: %s") % @report[:assigned_hosts], hosts_path(:search => "compliance_policy = \"#{@policy.name}\"")) %>
+    </h4>
+    <h4>
+      <%= unassigned_hosts_link %>
     </h4>
   </ul>
 </div>

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

@@ -1,4 +1,4 @@
-<% javascript 'charts', 'dashboard' %>
+<% javascript 'charts', 'foreman_openscap/policy_dashboard' %>
 
 <% title _("Compliance policy: %s") % @policy.name %>
 

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

@@ -1,25 +1,26 @@
 <table class="<%= table_css_classes('table-two-pane table-fixed') %>">
   <tr>
-    <th class="col-md-4">Title</th>
-    <th class="col-md-4">Filename</th>
-    <th class="col-md-3">Created</th>
+    <th class="col-md-4"><%= sort :title %></th>
+    <th class="col-md-5"><%= sort :filename %></th>
+    <th class="col-md-2"><%= sort :created_at %></th>
     <th class="col-md-1"><%= _('Actions') %></th>
   </tr>
   <% for content in @contents %>
     <tr>
-      <td class="ellipsis"><%= content.title %></td>
+      <td class="ellipsis"><%= link_to_if_authorized content.title, hash_for_edit_scap_content_path(:id => content.id) %></td>
       <td class="ellipsis"><%= content.original_filename %></td>
       <td>
         <%= date_time_relative_value(content.created_at.getlocal) %>
       </td>
       <td>
         <%= action_buttons(
-                display_link_if_authorized(_("Edit"), hash_for_edit_scap_content_path(:id => content.id)),
 		display_link_if_authorized(_("Download"), hash_for_scap_content_path(:id => content.id), :data => { :no_turbolink => true }),
                 display_delete_if_authorized(hash_for_scap_content_path(:id => content.id),
-                                             :confirm => _("Delete compliance policy %s with all the reports?") % content.title)
+                                             :confirm => _("Delete scap content %s?") % content.title)
             ) %>
       </td>
     </tr>
   <% end %>
 </table>
+
+<%= will_paginate_with_info @contents %>

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

@@ -1,6 +1,6 @@
 <% title _("SCAP Contents") %>
 
-<% title_actions(display_link_if_authorized(_("Upload New SCAP Content"), hash_for_new_scap_content_path, :class => 'btn btn-default'),
-                 link_to(_("Help"), { :action => "welcome" }, { :class => 'btn btn-info' })) %>
+<% title_actions(display_link_if_authorized(_("Upload New SCAP Content"), hash_for_new_scap_content_path, :class => 'btn btn-primary'),
+                 documentation_button('#4.1CreatingSCAPcontent', :root_url => scap_doc_url)) %>
 
 <%= render :partial => 'list' %>

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

@@ -1,14 +1,14 @@
 <table class="<%= table_css_classes('table-fixed') %>">
   <tr>
-    <th class="col-md-4"><%= _('Name')%></th>
-    <th class="col-md-4"><%= _('Filename') %></th>
-    <th class="col-md-3"><%= _('Created') %></th>
+    <th class="col-md-4"><%= sort :name %></th>
+    <th class="col-md-5"><%= sort :filename %></th>
+    <th class="col-md-2"><%= sort :created_at %></th>
     <th class="col-md-1"><%= _('Actions') %></th>
   </tr>
   <% @tailoring_files.each do |file| %>
     <tr>
       <td class="ellipsis">
-        <%= file.name %>
+        <%= link_to_if_authorized file.name, hash_for_edit_tailoring_file_path(:id => file.id) %>
       </td>
       <td>
         <%= file.original_filename %>
@@ -18,7 +18,6 @@
       </td>
       <td>
         <%= action_buttons(
-                display_link_if_authorized(_("Edit"), hash_for_edit_tailoring_file_path(:id => file.id)),
                 display_delete_if_authorized(hash_for_tailoring_file_path(:id => file.id),
                                              :confirm => _("Delete tailoring file %s?") % file.name),
                 display_link_if_authorized(_("Download"), hash_for_xml_tailoring_file_path(:id => file.id), :data => { :no_turbolink => true })
@@ -27,3 +26,5 @@
     </tr>
   <% end %>
 </table>
+
+<%= will_paginate_with_info @tailoring_files %>

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

@@ -1,3 +1,4 @@
 <% title _("Tailoring Files") %>
-<% title_actions(display_link_if_authorized(_("Upload New Tailoring file"), hash_for_new_tailoring_file_path, :class => 'btn btn-default')) %>
+<% title_actions(display_link_if_authorized(_("Upload New Tailoring file"), hash_for_new_tailoring_file_path, :class => 'btn btn-primary'),
+                documentation_button('#4.5Tailoringfiles(foreman_openscap>=0.6.5)', :root_url => scap_doc_url)) %>
 <%= render :partial => 'list' %>

data/config/routes.rb

@@ -103,4 +103,19 @@ Foreman::Application.routes.draw do
       post 'openscap_proxy_changed'
     end
   end
+
+  namespace :api do
+    scope "(:api_version)", :module => :v2,
+                            :defaults => { :api_version => 'v2' },
+                            :api_version => /v2/,
+                            :constraints => ApiConstraints.new(:version => 2, :default => true) do
+      constraints(:id => %r{[^\/]+}) do
+        resources :hosts, :only => [] do
+          member do
+            get :policies_enc
+          end
+        end
+      end
+    end
+  end
 end

data/db/migrate/20190103093409_add_deployment_option_to_policy.foreman_openscap.rb

@@ -3,7 +3,7 @@ class AddDeploymentOptionToPolicy < ActiveRecord::Migration[5.2]
     add_column :foreman_openscap_policies, :deploy_by, :string
     ForemanOpenscap::Policy.unscoped.in_batches do |batch|
       batch.map do |policy|
-        policy.update_attribute(:deploy_by, 'puppet')
+        policy.update_column(:deploy_by, 'puppet')
       end
     end
     change_column :foreman_openscap_policies, :deploy_by, :string, :null => false

data/lib/foreman_openscap/engine.rb

@@ -50,7 +50,7 @@ module ForemanOpenscap
 
     initializer 'foreman_openscap.register_plugin', :before => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_openscap do
-        requires_foreman '>= 1.21'
+        requires_foreman '>= 1.22'
 
         apipie_documented_controllers ["#{ForemanOpenscap::Engine.root}/app/controllers/api/v2/compliance/*.rb"]
 
@@ -104,6 +104,7 @@ module ForemanOpenscap
                                                  select_multiple_openscap_proxy
                                                  update_multiple_openscap_proxy] },
                      :resource_type => "Host"
+          permission :view_hosts, { 'api/v2/hosts' => [:policies_enc] }, :resource_type => 'Host'
           permission :edit_hostgroups, { :hostgroups => [:openscap_proxy_changed] }, :resource_type => "Hostgroup"
           permission :create_tailoring_files, { :tailoring_files => %i[create new],
                                                 'api/v2/compliance/tailoring_files' => [:create] },
@@ -210,6 +211,7 @@ module ForemanOpenscap
 
     # Include concerns in this config.to_prepare block
     config.to_prepare do
+      ::Api::V2::HostsController.send(:include, ForemanOpenscap::Api::V2::HostsControllerExtensions)
       Host::Managed.send(:include, ForemanOpenscap::OpenscapProxyExtensions)
       Host::Managed.send(:include, ForemanOpenscap::OpenscapProxyCoreExtensions)
       Host::Managed.send(:prepend, ForemanOpenscap::HostExtensions)

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "0.12.3".freeze
+  VERSION = "1.0.0".freeze
 end