foreman_openscap 0.7.1 → 0.7.2

data/test/unit/arf_report_test.rb

@@ -22,7 +22,7 @@ module ForemanOpenscap
       report_1 = FactoryGirl.create(:arf_report, :policy => @policy, :host_id => @host.id, :logs => [@log_1, @log_2])
       report_2 = FactoryGirl.create(:arf_report, :policy => @policy, :host_id => @host.id, :logs => [@log_3, log_4])
 
-      assert(report_1.equal? report_2)
+      assert(report_1.equal?(report_2))
     end
 
     test 'equal? should return false when there is change in report results' do
@@ -31,14 +31,14 @@ module ForemanOpenscap
       report_1 = FactoryGirl.create(:arf_report, :policy => @policy, :host_id => @host.id, :logs => [@log_1, @log_2])
       report_2 = FactoryGirl.create(:arf_report, :policy => @policy, :host_id => @host.id, :logs => [@log_3, log_4])
 
-      refute(report_1.equal? report_2)
+      refute(report_1.equal?(report_2))
     end
 
     test 'equal? should return false when reports have different sets of rules' do
       report_1 = FactoryGirl.create(:arf_report, :policy => @policy, :host_id => @host.id, :logs => [@log_1, @log_2])
       report_2 = FactoryGirl.create(:arf_report, :policy => @policy, :host_id => @host.id, :logs => [@log_3])
 
-      refute(report_1.equal? report_2)
+      refute(report_1.equal?(report_2))
     end
 
     test 'equal? should return false when reports have different hosts' do
@@ -47,7 +47,7 @@ module ForemanOpenscap
       report_1 = FactoryGirl.create(:arf_report, :policy => @policy, :host_id => @host.id, :logs => [@log_1, @log_2])
       report_2 = FactoryGirl.create(:arf_report, :policy => @policy, :host_id => host.id, :logs => [@log_3, log_4])
 
-      refute(report_1.equal? report_2)
+      refute(report_1.equal?(report_2))
     end
 
     test 'equal? should return false when reports have different policies' do
@@ -56,7 +56,7 @@ module ForemanOpenscap
       report_1 = FactoryGirl.create(:arf_report, :policy => @policy, :host_id => @host.id, :logs => [@log_1, @log_2])
       report_2 = FactoryGirl.create(:arf_report, :policy => policy, :host_id => @host.id, :logs => [@log_3, log_4])
 
-      refute(report_1.equal? report_2)
+      refute(report_1.equal?(report_2))
     end
 
     test 'should recognize report that failed' do

data/test/unit/concerns/host_extensions_test.rb

@@ -10,16 +10,76 @@ class HostExtensionsTest < ActiveSupport::TestCase
   end
 
   test "should have download_path in enc without digest" do
-    ForemanOpenscap::OpenscapProxyAssignedVersionCheck.any_instance.stubs(:openscap_proxy_versions).
-      returns('test-proxy' => '0.5.4')
+    ForemanOpenscap::OpenscapProxyAssignedVersionCheck.any_instance.stubs(:openscap_proxy_versions)
+                                                      .returns('test-proxy' => '0.5.4')
     enc_out = JSON.parse @host.policies_enc
     assert_equal 5, enc_out.first['download_path'].split('/').length
   end
 
   test "should have download_path in enc with digest" do
-    ForemanOpenscap::OpenscapProxyAssignedVersionCheck.any_instance.stubs(:openscap_proxy_versions).
-      returns({})
+    ForemanOpenscap::OpenscapProxyAssignedVersionCheck.any_instance.stubs(:openscap_proxy_versions)
+                                                      .returns({})
     enc_out = JSON.parse @host.policies_enc
     assert_equal 6, enc_out.first['download_path'].split('/').length
   end
+
+  test "should find hosts with direct policy assignment that were never audited" do
+    policy, host, host_2 = setup_hosts_with_policy.values_at(:policy, :host, :host_2)
+    report = FactoryGirl.create(:arf_report, :host_id => host_2.id)
+    FactoryGirl.create(:policy_arf_report, :policy_id => policy.id, :arf_report_id => report.id)
+
+    res = Host.policy_reports_missing policy
+    assert_equal res.count, 1
+    assert_include res, host
+  end
+
+  test "should find hosts with inherited policy that were never audited" do
+    policy, host, host_2 = setup_hosts_with_inherited_policy.values_at(:policy, :host, :host_2)
+    report = FactoryGirl.create(:arf_report, :host_id => host_2.id)
+    FactoryGirl.create(:policy_arf_report, :policy_id => policy.id, :arf_report_id => report.id)
+
+    res = Host.policy_reports_missing policy
+    assert_equal res.count, 1
+    assert_include res, host
+  end
+
+  test "should find hosts that are assigned to policy directly" do
+    policy, host, host_2 = setup_hosts_with_policy.values_at(:policy, :host, :host_2)
+    res = Host.assigned_to_policy(policy)
+    assert_equal 2, res.count
+    assert_include res, host
+    assert_include res, host_2
+  end
+
+  test "should find hosts with policy inherited from hostgroup" do
+    policy, host, host_2 = setup_hosts_with_inherited_policy.values_at(:policy, :host, :host_2)
+    res = Host.assigned_to_policy(policy)
+    assert_equal 2, res.count
+    assert_include res, host
+    assert_include res, host_2
+  end
+
+  private
+
+  def setup_hosts_with_policy
+    policy = FactoryGirl.create(:policy)
+    host = FactoryGirl.create(:compliance_host)
+    host_2 = FactoryGirl.create(:compliance_host)
+    asset = FactoryGirl.create(:asset, :assetable_id => host.id, :assetable_type => 'Host::Base')
+    asset_2 = FactoryGirl.create(:asset, :assetable_id => host_2.id, :assetable_type => 'Host::Base')
+    FactoryGirl.create(:asset_policy, :asset_id => asset.id, :policy_id => policy.id)
+    FactoryGirl.create(:asset_policy, :asset_id => asset_2.id, :policy_id => policy.id)
+    { :host => host, :policy => policy, :host_2 => host_2 }
+  end
+
+  def setup_hosts_with_inherited_policy
+    policy = FactoryGirl.create(:policy)
+    parent = FactoryGirl.create(:hostgroup)
+    child = FactoryGirl.create(:hostgroup, :ancestry => parent.id.to_s)
+    asset = FactoryGirl.create(:asset, :assetable_id => parent.id, :assetable_type => 'Hostgroup')
+    FactoryGirl.create(:asset_policy, :asset_id => asset.id, :policy_id => policy.id)
+    host = FactoryGirl.create(:compliance_host, :hostgroup_id => child.id)
+    host_2 = FactoryGirl.create(:compliance_host, :hostgroup_id => child.id)
+    { :policy => policy, :host => host, :host_2 => host_2 }
+  end
 end

data/test/unit/message_cleaner_test.rb

@@ -0,0 +1,31 @@
+require 'test_plugin_helper'
+
+class MessageCleanerTest < ActiveSupport::TestCase
+  setup do
+    ForemanOpenscap::Policy.any_instance.stubs(:ensure_needed_puppetclasses).returns(true)
+  end
+
+  test "should clean up messages" do
+    host = FactoryGirl.create(:compliance_host)
+    policy = FactoryGirl.create(:policy)
+    reports = []
+    source = FactoryGirl.create(:source, :value => "xccdf_org.ssgproject.content_rule_firefox_preferences-lock_settings_obscure")
+    2.times do
+      report = FactoryGirl.create(:arf_report, :host_id => host.id)
+      message = FactoryGirl.create(:compliance_message, :value => "Disable Firefox Configuration File ROT-13 Encoding")
+      FactoryGirl.create(:policy_arf_report, :policy_id => policy.id, :arf_report_id => report.id)
+      FactoryGirl.create(:compliance_log, :source_id => source.id, :message_id => message.id, :report_id => report.id)
+      report.reload
+      reports << report
+    end
+
+    assert_equal 2, reports.flat_map(&:logs).map(&:message).uniq.count
+
+    ForemanOpenscap::MessageCleaner.new.clean
+    reports.map(&:reload)
+
+    assert_equal 1, reports.flat_map(&:logs).map(&:message).uniq.count
+    log_a, log_b = reports.flat_map(&:logs)
+    assert_equal log_a.message, log_b.message
+  end
+end

data/test/unit/policy_mailer_test.rb

@@ -9,8 +9,7 @@ class PolicyMailerTest < ActiveSupport::TestCase
                        :description => N_('A summary of reports for OpenScap policies'),
                        :mailer => 'ForemanOpenscap::PolicyMailer',
                        :method => 'policy_summary',
-                       :subscription_type => 'report',
-                      )
+                       :subscription_type => 'report',)
     #just to have some content to send
     ForemanOpenscap::Policy.any_instance.stubs(:ensure_needed_puppetclasses).returns(true)
     host = FactoryGirl.create(:compliance_host)

data/test/unit/scap_content_test.rb

@@ -20,16 +20,14 @@ class ScapContentTest < ActiveSupport::TestCase
       ProxyAPI::AvailableProxy.any_instance.stubs(:available?).returns(false)
       scap_content = ForemanOpenscap::ScapContent.new(:title => 'Fedora', :scap_file => @scap_file)
       refute(scap_content.save)
-      assert_includes(scap_content.errors.messages[:base], 'No proxy with OpenSCAP features')
+      assert_includes(scap_content.errors.messages[:base], 'No proxy with OpenSCAP feature was found.')
     end
 
     test 'proxy_url should return the first available proxy it finds' do
       available_proxy = SmartProxy.with_features('Openscap').first
       unavailable_proxy = FactoryGirl.create(:smart_proxy, :url => 'http://proxy.example.com:8443', :features => [FactoryGirl.create(:feature, :name => 'Openscap')])
-      proxy1_url = ProxyAPI::AvailableProxy.new(:url => available_proxy.url)
-      proxy2_url = ProxyAPI::AvailableProxy.new(:url => unavailable_proxy.url)
-      proxy1_url.stubs(:available?).returns(available_proxy.url)
-      proxy2_url.stubs(:available?).returns(false)
+      available_proxy.stubs(:proxy_url).returns(available_proxy.url)
+      unavailable_proxy.stubs(:proxy_url).returns(nil)
       scap_content = ForemanOpenscap::ScapContent.new(:title => 'Fedora', :scap_file => @scap_file)
       assert_equal(available_proxy.url, scap_content.proxy_url)
     end

data/test/unit/services/report_dashboard/data_test.rb

@@ -17,7 +17,7 @@ class DataTest < ActiveSupport::TestCase
   end
 
   test 'should fetch data' do
-    report_data = ForemanOpenscap::ReportDashboard::Data.new().report
+    report_data = ForemanOpenscap::ReportDashboard::Data.new.report
     assert_equal 3, report_data[:failed]
     assert_equal 2, report_data[:passed]
     assert_equal 1, report_data[:othered]

data/test/unit/services/tailoring_files_proxy_check_test.rb

@@ -2,16 +2,16 @@ require 'test_plugin_helper'
 
 class TailoringFilesProxyCheckTest < ActiveSupport::TestCase
   test 'should find proxies with old versions' do
-    ForemanOpenscap::OpenscapProxyVersionCheck.any_instance.stubs(:openscap_proxy_versions).
-      returns('old-proxy.test.com' => "0.5.4", "outdate-proxy.test.com" => "0.6.0")
+    ForemanOpenscap::OpenscapProxyVersionCheck.any_instance.stubs(:openscap_proxy_versions)
+                                              .returns('old-proxy.test.com' => "0.5.4", "outdate-proxy.test.com" => "0.6.0")
     check = ForemanOpenscap::OpenscapProxyVersionCheck.new.run
     refute check.pass?
     refute check.message.empty?
   end
 
   test 'should not find any outdated proxies' do
-    ForemanOpenscap::OpenscapProxyVersionCheck.any_instance.stubs(:openscap_proxy_versions).
-      returns({})
+    ForemanOpenscap::OpenscapProxyVersionCheck.any_instance.stubs(:openscap_proxy_versions)
+                                              .returns({})
     check = ForemanOpenscap::OpenscapProxyVersionCheck.new.run
     assert check.pass?
     assert check.message.empty?

metadata

@@ -1,17 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
-- "Šimon Lukašík"
-- Shlomi Zadok
-- Marek Hulan
-- Ondrej Prazak
+- slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-05 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -228,6 +225,7 @@ files:
 - lib/foreman_openscap/data_migration.rb
 - lib/foreman_openscap/engine.rb
 - lib/foreman_openscap/helper.rb
+- lib/foreman_openscap/message_cleaner.rb
 - lib/foreman_openscap/version.rb
 - lib/tasks/foreman_openscap_tasks.rake
 - locale/Makefile
@@ -268,6 +266,9 @@ files:
 - test/factories/scap_content_related.rb
 - test/files/arf_report/arf_report.bz2
 - test/files/arf_report/arf_report.html
+- test/files/arf_report/arf_report.json
+- test/files/arf_report/arf_report_msg_desc_changed.json
+- test/files/arf_report/arf_report_msg_value_changed.json
 - 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
@@ -285,6 +286,7 @@ files:
 - test/unit/compliance_status_test.rb
 - test/unit/concerns/host_extensions_test.rb
 - test/unit/concerns/openscap_proxy_extenstions_test.rb
+- test/unit/message_cleaner_test.rb
 - test/unit/openscap_host_test.rb
 - test/unit/policy_mailer_test.rb
 - test/unit/policy_test.rb
@@ -318,6 +320,7 @@ 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
@@ -348,5 +351,8 @@ test_files:
 - 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.html