foreman_openscap 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab3aabb6896d03f783813b7f15ce07398832a62f
-  data.tar.gz: acbe97d223373e5c632dd829cc291ff60b927387
+  metadata.gz: 4da93ad56f1a41635d2c5dbefbfb60d0dccb09ef
+  data.tar.gz: 61b13cee3f7671c56dc006ec365ff63c5a64eef3
 SHA512:
-  metadata.gz: 74e750b1270d55d37c399adcdc2d01299d071ae87fd100115ee1f6aec2f30bd050f1fee08ae380ad6cf949f48209419627128405a367530c45a1bace3c25720a
-  data.tar.gz: 20b34c1021f6390319c5a39b3b005ad77ab283881597f7f0e286e1d669f2ba9e10eeb457b2f8f9e7c55206cec848b5f2b72f6bcbb6079d819377c7c1ceccc192
+  metadata.gz: 71f5244439f5aca602a9440c6c4a9b1a95afcb946ba1a279fcd2386c0834ae08e85fc9a94bc74c6c6fb08b4e056ff2d099db0c32621a94d8805f51f63fc5ce00
+  data.tar.gz: 9264fedc8b169a4678e750456ef019374a8df3ec4d7639cd16217a3bcad510e5fd2a31549c38e6af76c7f989837302fadc94f4b4e3cb3467f272b27dce41a6da

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 => :edit_compliance).includes(:openscap_proxy, :policy, :host)
+          @arf_reports = resource_scope_for_index(:permission => :view_arf_reports).includes(:openscap_proxy, :policy, :host)
         end
 
         api :GET, '/compliance/arf_reports/:id', N_('Show an ARF report')

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 => :edit_compliance)
+        @policies = resource_scope_for_index(:permission => :view_policies)
       end
 
       api :GET, '/compliance/policies/:id', N_('Show a Policy')

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 => :edit_compliance)
+        @scap_contents = resource_scope_for_index(:permission => :view_scap_contents)
       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
+                  :filename => @scap_content.original_filename || "#{@scap_content.title}.xml"
       end
 
       api :GET, '/compliance/scap_contents/:id', N_('Show an SCAP content')

data/app/models/foreman_openscap/arf_report.rb

@@ -12,8 +12,8 @@ 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, :dependent => :destroy
-    has_one :policy, :through => :policy_arf_report
+    has_one :policy_arf_report
+    has_one :policy, :through => :policy_arf_report, :dependent => :destroy
     has_one :asset, :through => :host, :class_name => 'ForemanOpenscap::Asset', :as => :assetable
     after_save :assign_locations_organizations
     has_one :log, :foreign_key => :report_id

data/app/models/foreman_openscap/policy_arf_report.rb

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

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 ellipsis">
+<table class="table table-bordered table-striped">
   <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/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 the reports?") % policy.name)
+                                             :confirm => _("Delete compliance policy %s with all of its 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.find_by(id: policy_id).nil?
+      execute("DELETE FROM foreman_openscap_asset_policies WHERE policy_id = '#{policy_id}';") if ForemanOpenscap::Policy.unscoped.find_by(id: policy_id).nil?
     end
   end
 

data/db/migrate/20171011134112_remove_arf_reports_without_policy.rb

@@ -0,0 +1,8 @@
+class RemoveArfReportsWithoutPolicy < ActiveRecord::Migration
+  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!)
+    end
+  end
+end

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "0.8.2".freeze
+  VERSION = "0.8.3".freeze
 end

data/test/unit/policy_test.rb

@@ -206,4 +206,14 @@ class PolicyTest < ActiveSupport::TestCase
     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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-27 00:00:00.000000000 Z
+date: 2017-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -217,6 +217,7 @@ files:
 - 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