foreman_openscap 0.7.8 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc5705b1687451fbe2a8f0f416b6503b0e105dc3
-  data.tar.gz: 3b5ac00445799f5d62850385c64abd04d1e869c5
+  metadata.gz: 04b41cc23453fdb1d7229c5ba811774c1f9cd118
+  data.tar.gz: f96cdf0e6f73aa48b85ea9589325d6457a4e909a
 SHA512:
-  metadata.gz: c8a8613e4bf342ff2431c9769cca767b58ae513bef5684f352109141bf12ea9f3d744ddd13eacba3d3a50848a7739e5e2004d630bad382820a07ce0c17ba885e
-  data.tar.gz: 654e5e07d79ae90cb273652a608cc431e2382a39d102ba7ebf1dc99da4f0d07a8e090d19f959ccd0a21518ae3aac4ffc28bc27e713c90db2a8d45631b977d51d
+  metadata.gz: 70f7c7df9e55fd79e5781dbfc2326b932c7214d37b42ece3bc7b8584710b9518a78da9f7e55fea13b20ec580e03c02966f47a99d6f308d2a4e61a8fff4a21e13
+  data.tar.gz: 7fdd61dbbee9fe35a30bb31ed09a745ae24c8f15c84c0386dfc44d5f03a113f80a1c20513d05e42ceefb4e6be287b8db50e62f16855fb6266efb3e3e232f5ec5

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')

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/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.7.8".freeze
+  VERSION = "0.7.9".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.7.8
+  version: 0.7.9
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-27 00:00:00.000000000 Z
+date: 2017-10-12 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
@@ -314,45 +315,45 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Foreman plug-in for displaying OpenSCAP audit reports
 test_files:
-- test/lib/foreman_openscap/bulk_upload_test.rb
-- test/unit/message_cleaner_test.rb
-- test/unit/scap_content_test.rb
-- test/unit/concerns/openscap_proxy_extenstions_test.rb
-- test/unit/concerns/host_extensions_test.rb
-- test/unit/openscap_host_test.rb
-- test/unit/tailoring_file_test.rb
-- test/unit/policy_test.rb
-- test/unit/compliance_status_test.rb
-- test/unit/arf_report_status_calculator_test.rb
-- test/unit/policy_mailer_test.rb
-- test/unit/services/tailoring_files_proxy_check_test.rb
-- test/unit/services/report_dashboard/data_test.rb
-- test/unit/arf_report_test.rb
-- test/test_plugin_helper.rb
-- test/functional/arf_reports_controller_test.rb
-- test/functional/api/v2/compliance/arf_reports_controller_test.rb
-- test/functional/api/v2/compliance/scap_contents_controller_test.rb
-- test/functional/api/v2/compliance/policies_controller_test.rb
+- test/functional/tailoring_files_controller_test.rb
 - test/functional/api/v2/compliance/tailoring_files_controller_test.rb
+- test/functional/api/v2/compliance/policies_controller_test.rb
+- test/functional/api/v2/compliance/scap_contents_controller_test.rb
+- test/functional/api/v2/compliance/arf_reports_controller_test.rb
 - test/functional/openscap_proxies_controller_test.rb
-- test/functional/tailoring_files_controller_test.rb
+- test/functional/arf_reports_controller_test.rb
 - test/factories/asset_factory.rb
+- test/factories/compliance_host_factory.rb
+- test/factories/scap_content_related.rb
 - test/factories/compliance_log_factory.rb
 - test/factories/arf_report_factory.rb
-- test/factories/scap_content_related.rb
-- test/factories/compliance_host_factory.rb
 - test/factories/policy_arf_report_factory.rb
 - test/factories/policy_factory.rb
-- test/files/scap_contents/ssg-fedora-ds.xml
-- test/files/tailoring_files/ssg-firefox-ds-tailoring-2.xml
-- test/files/tailoring_files/ssg-firefox-ds-tailoring.xml
-- test/files/arf_report/arf_report_msg_value_changed.json
 - test/files/arf_report/arf_report.bz2
-- test/files/arf_report/arf_report_msg_desc_changed.json
 - test/files/arf_report/arf_report.json
+- test/files/arf_report/arf_report_msg_value_changed.json
+- test/files/arf_report/arf_report_msg_desc_changed.json
 - test/files/arf_report/arf_report.html
+- test/files/scap_contents/ssg-fedora-ds.xml
+- test/files/tailoring_files/ssg-firefox-ds-tailoring-2.xml
+- test/files/tailoring_files/ssg-firefox-ds-tailoring.xml
+- test/lib/foreman_openscap/bulk_upload_test.rb
+- test/test_plugin_helper.rb
+- test/unit/arf_report_status_calculator_test.rb
+- test/unit/compliance_status_test.rb
+- test/unit/arf_report_test.rb
+- test/unit/policy_mailer_test.rb
+- test/unit/tailoring_file_test.rb
+- test/unit/message_cleaner_test.rb
+- test/unit/openscap_host_test.rb
+- test/unit/scap_content_test.rb
+- test/unit/concerns/openscap_proxy_extenstions_test.rb
+- test/unit/concerns/host_extensions_test.rb
+- test/unit/services/report_dashboard/data_test.rb
+- test/unit/services/tailoring_files_proxy_check_test.rb
+- test/unit/policy_test.rb