foreman_openscap 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8860c02972d0a7286d2d44f6a23c02a79a540ad1
-  data.tar.gz: a0789f0a6842b9609f688208e9a7e9dc7289ba1f
+  metadata.gz: e8f52d649074a7a24698aa4daa23ec072a154db1
+  data.tar.gz: 5b1bd3961f6757d2d3a0dac0339ea2f24bdf3e88
 SHA512:
-  metadata.gz: 6f5c7ba56f44c5db6828ffa2d5f6d02fb470e910c8614a11ec68121962f04c96472b5edf6e35e4abd20b29b68b012f3c67c0b192268c98b517f7ee8b63b4286c
-  data.tar.gz: 2b495b6833ec1362dc7dcc386d83e1a3c076c742db55bce19b80301f793b961e8db16535abaf41478d28815086305447dff21ed6c15d5a40626260b4eb7b7f54
+  metadata.gz: d444fb32f8c0c3dfbbd2e59bce1c89e3c39f966c21cc6daa26310b0338f555aa4b31480ec1a36428fa08a0e3fbc1dedc89316d23382af84afd097ff5abf42ae0
+  data.tar.gz: 823709a0c3872f547a65beabf94e431394b494936e46c732905da95e342b29c4bf48e1f01734b3db89a2afec88f4dbaab36a26af6730d47317e6d391e64c3dd7

data/README.md

@@ -99,47 +99,29 @@ Make sure that
   3. Go to *Hosts -> Compliance -> Policies* page
   4. Click the policy link to view dashboard and trend
 
-## Installation from RPMS
+## Installation
 
-- Install Foreman from [upstream](http://theforeman.org/)
+- Follow the official guide on [theforeman.org](https://theforeman.org/plugins/foreman_openscap/0.8/index.html#2.Installation)
 
-- Install foreman-proxy_openscap to all your foreman-proxies from [upstream](https://github.com/OpenSCAP/foreman-proxy_openscap)
-
-- Enable [isimluk/OpenSCAP](https://copr.fedoraproject.org/coprs/isimluk/OpenSCAP/) COPR repository
-
-- Install Foreman_OpenSCAP
+## Development setup
 
+- set up Foreman for development, preferably using [forklift](https://github.com/theforeman/forklift)
+- clone this repo
   ```
-  yum install rubygem-foreman_openscap ruby193-rubygem-foreman_openscap
+    git clone https://github.com/theforeman/foreman_openscap.git
   ```
-
-## Installation from upstream git
-
-- Install Foreman from [upstream](http://theforeman.org/)
-- Install SCAPtimony from [upstream](https://github.com/OpenSCAP/scaptimony)
-- Install foreman-proxy_openscap to all your foreman-proxies from [upstream](https://github.com/OpenSCAP/foreman-proxy_openscap)
-- Get foreman_openscap sources
-
+- point foreman to your checkout
   ```
-  $ git clone https://github.com/OpenSCAP/foreman_openscap.git
+  echo "gemspec :path => 'path/to/foreman_openscap'" >> foreman/bundler.d/Gemfile.local.rb
   ```
-
-- Build foreman_openscap RPM (instructions for Red Hat Enterprise Linux 6)
-
-  ```
-  $ cd foreman_openscap
-  $ gem build foreman_openscap.gemspec
-  # yum install yum-utils rpm-build scl-utils scl-utils-build ruby193-rubygems-devel ruby193-build ruby193
-  # yum-builddep extra/rubygem-foreman_openscap.spec
-  $ rpmbuild  --define "_sourcedir `pwd`" --define "scl ruby193" -ba extra/rubygem-foreman_openscap.spec
-  ```
-
-- Install foreman_openscap RPM
-
+- run bundler, migrations and seeds from foreman dir
   ```
-  # yum localinstall ~/rpmbuild/RPMS/noarch/ruby193-rubygem-foreman_openscap-*.noarch.rpm
-  # service foreman restart
+  cd foreman
+  bundle install
+  rake db:migrate
+  rake db:seed
   ```
+- start your Rails server, verify openscap plugin is present
 
 ## Releasing
 

data/app/lib/proxy_api/openscap.rb

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

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

@@ -9,6 +9,11 @@ module ForemanOpenscap
         scoped_search options
       end
 
+      def policy_search(search_alias)
+        scoped_search :relation => :policy, :on => :name, :complete_value => true, :rename => search_alias,
+              :only_explicit => true, :ext_method => :search_by_policy_name
+      end
+
       def search_by_policy_name(_key, _operator, policy_name)
         cond = sanitize_policy_name(policy_name)
         { :conditions => ArfReport.arel_table[:id].in(
@@ -67,8 +72,9 @@ module ForemanOpenscap
     end
 
     included do
-      scoped_search :relation => :policy, :on => :name, :complete_value => true, :rename => :compliance_policy,
-                    :only_explicit => true, :ext_method => :search_by_policy_name
+      policy_search :compliance_policy
+
+      policy_search :policy
 
       scoped_search :on => :id, :rename => :last_for, :complete_value => { :host => 0, :policy => 1 },
                     :only_explicit => true, :ext_method => :search_by_last_for
@@ -82,6 +88,8 @@ module ForemanOpenscap
       scoped_search :relation => :policy, :on => :name, :complete_value => true, :rename => :inconclusive_with,
                     :only_explicit => true, :operators => ['= '], :ext_method => :search_by_inconclusive_with
 
+      scoped_search :relation => :openscap_proxy, :on => :name, :complete_value => true, :only_explicit => true, :rename => :openscap_proxy
+
       compliance_status_scoped_search 'passed', :on => :status, :rename => :compliance_passed
       compliance_status_scoped_search 'failed', :on => :status, :rename => :compliance_failed
       compliance_status_scoped_search 'othered', :on => :status, :rename => :compliance_othered

data/app/models/foreman_openscap/arf_report.rb

@@ -10,6 +10,8 @@ module ForemanOpenscap
     BIT_NUM = 10
     MAX = (1 << BIT_NUM) - 1
 
+    include ComplianceStatusScopedSearch
+
     scoped_search :on => :status, :offset => 0, :word_size => 4 * BIT_NUM, :complete_value => { :true => true, :false => false }, :rename => :eventful
 
     has_one :policy_arf_report
@@ -189,18 +191,22 @@ module ForemanOpenscap
     end
 
     def destroy_from_proxy
-      if host
-        begin
-          openscap_proxy_api.destroy_report(self, ForemanOpenscap::Helper::find_name_or_uuid_by_host(host))
-        rescue Foreman::Exception => e
-          logger.error "Failed to delete report with id #{id} from proxy, cause: #{e.message}"
-          logger.debug e.backtrace.join("\n\t")
-        end
+      if !host
+        destroy_from_proxy_warning "host"
+      elsif !policy
+        destroy_from_proxy_warning "policy"
+      elsif !openscap_proxy
+        destroy_from_proxy_warning "OpenSCAP proxy"
       else
-        logger.error "Failed to delete report with id #{id} from proxy, no host associated with report"
+        openscap_proxy_api.destroy_report(self, ForemanOpenscap::Helper::find_name_or_uuid_by_host(host))
       end
     end
 
+    def destroy_from_proxy_warning(associated)
+      logger.warn "Skipping deletion of report with id #{id} from proxy, no #{associated} associated with report"
+      true
+    end
+
     def self.newline_to_space(string)
       string.gsub(/ *\n+/, " ")
     end

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

@@ -1,6 +1,6 @@
 <%= javascript "host_checkbox", "foreman_openscap/arf_reports" %>
 
-<table class="table table-bordered table-striped">
+<table class="<%= table_css_classes %>">
   <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>

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

@@ -14,7 +14,7 @@
     </div>
   </div>
   <div class="col-md-4">
-    <table class='table table-bordered table-striped'>
+    <table class='<%= table_css_classes %>'>
       <tbody>
         <% metrics.sort.each do |title, value|%>
           <tr>

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

@@ -1,4 +1,4 @@
-<table id='report_log' class="table table-bordered table-striped">
+<table id='report_log' class="<%= table_css_classes %>">
   <thead>
     <tr>
       <th><%= _("Severity") %></th>

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

@@ -1,6 +1,6 @@
 <div class="row">
   <div class="col-md-8">
-    <table class="table table-bordered table-striped">
+    <table class="<%= table_css_classes %>">
       <thead>
         <tr>
           <th>

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

@@ -3,7 +3,7 @@
 <% if latest_reports.empty? %>
   <p class="ca"><%= _("No reports available") %></p>
 <% else %>
-  <table class="table table-striped table-fixed">
+  <table class="<%= table_css_classes('table-fixed') %>">
     <tr>
       <%= latest_compliance_headers %>
     </tr>

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

@@ -1,4 +1,4 @@
-<table class="table table-bordered table-striped table-fixed">
+<table class="<%= table_css_classes('table-fixed') %>">
   <tr>
     <th><%= _('Name') %></th>
     <th><%= _('Content') %></th>

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

@@ -1,4 +1,4 @@
-<table class="table table-bordered table-striped ellipsis">
+<table class="<%= table_css_classes('ellipsis') %>">
   <tr>
     <th><%= _('Host') %></th>
     <th><%= _("Date") %></th>
@@ -21,4 +21,4 @@
       </td>
     </tr>
   <% end %>
-</table>
+</table>

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

@@ -1,4 +1,4 @@
-<table class="table table-bordered table-striped table-two-pane table-fixed">
+<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>

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

@@ -1,4 +1,4 @@
-<table class="table table-bordered table-striped table-fixed">
+<table class="<%= table_css_classes('table-fixed') %>">
   <tr>
     <th class="col-md-4"><%= _('Name')%></th>
     <th class="col-md-4"><%= _('Filename') %></th>

data/db/migrate/20171011134112_remove_arf_reports_without_policy.rb

@@ -1,8 +1,10 @@
 class RemoveArfReportsWithoutPolicy < ActiveRecord::Migration[4.2]
   def up
-    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!)
+    User.as_anonymous_admin do
+      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
 end

data/lib/foreman_openscap/engine.rb

@@ -204,7 +204,6 @@ module ForemanOpenscap
       Hostgroup.send(:include, ForemanOpenscap::OpenscapProxyExtensions)
       Hostgroup.send(:include, ForemanOpenscap::OpenscapProxyCoreExtensions)
       Hostgroup.send(:include, ForemanOpenscap::HostgroupExtensions)
-      ForemanOpenscap::ArfReport.send(:include, ForemanOpenscap::ComplianceStatusScopedSearch)
       SmartProxy.send(:include, ForemanOpenscap::SmartProxyExtensions)
       HostsController.send(:prepend, ForemanOpenscap::HostsControllerExtensions)
       Log.send(:include, ForemanOpenscap::LogExtensions)

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "0.9.0".freeze
+  VERSION = "0.9.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-11 00:00:00.000000000 Z
+date: 2018-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface