foreman_openscap 0.10.4 → 0.11.0

data/test/factories/compliance_log_factory.rb

@@ -13,4 +13,11 @@ FactoryBot.define do
       msg.digest = Digest::SHA1.hexdigest(msg.value)
     end
   end
+
+  factory :compliance_source, :class => :source do
+    sequence(:value) { |n| "source#{n}" }
+    after(:build) do |source|
+      source.digest = Digest::SHA1.hexdigest(source.value)
+    end
+  end
 end

data/test/functional/api/v2/compliance/arf_reports_controller_test.rb

@@ -313,6 +313,97 @@ class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
     end
   end
 
+  test "should find reports with rule name" do
+    reports_cleanup
+    host = FactoryBot.create(:compliance_host)
+    rule_name = 'xccdf_org.something_installed'
+    rule_names_1 = ['xccdf_org.something_tested', rule_name]
+    rule_names_2 = ['xccdf_org.nothing', 'xccdf_org.whatever']
+    rule_results_1 = ['fail', 'pass']
+    rule_results_2 = ['fail', 'fail']
+    report = create_report_with_rules(host, rule_names_1, rule_results_1)
+    create_report_with_rules(host, rule_names_2, rule_results_2)
+
+    get :index, :params => { :search => "xccdf_rule_name=#{rule_name}" }, :session => set_session_user
+    response = ActiveSupport::JSON.decode(@response.body)
+    assert_response :success
+    assert_equal 1, response['results'].count
+    assert_equal report.id, response['results'].first["id"].to_i
+  end
+
+  test "should find reports by rule with fail" do
+    reports_cleanup
+    host = FactoryBot.create(:compliance_host)
+    rule_name = 'xccdf_org.something_installed'
+    rule_names_1 = [rule_name, 'xccdf_org.nothing', 'xccdf_org.othered']
+    rule_names_2 = [rule_name, 'xccdf_org.whatever', 'xccdf_org.original']
+    rule_results_1 = ['fail', 'pass', 'fixed']
+    rule_results_2 = ['pass', 'pass', 'unknown']
+    report = create_report_with_rules(host, rule_names_1, rule_results_1)
+    create_report_with_rules(host, rule_names_2, rule_results_2)
+
+    get :index, :params => { :search => "xccdf_rule_failed=#{rule_name}" }, :session => set_session_user
+    response = ActiveSupport::JSON.decode(@response.body)
+    assert_response :success
+    assert_equal 1, response['results'].count
+    assert_equal report.id, response['results'].first["id"].to_i
+  end
+
+  test "should find reports by rule with pass" do
+    reports_cleanup
+    host = FactoryBot.create(:compliance_host)
+    rule_name = 'xccdf_org.something_installed'
+    rule_names_1 = [rule_name, 'xccdf_org.nothing', 'xccdf_org.othered']
+    rule_names_2 = [rule_name, 'xccdf_org.whatever', 'xccdf_org.original']
+    rule_results_1 = ['pass', 'fail', 'fixed']
+    rule_results_2 = ['notchecked', 'fail', 'unknown']
+    report = create_report_with_rules(host, rule_names_1, rule_results_1)
+    create_report_with_rules(host, rule_names_2, rule_results_2)
+
+    get :index, :params => { :search => "xccdf_rule_passed=#{rule_name}" }, :session => set_session_user
+    response = ActiveSupport::JSON.decode(@response.body)
+    assert_response :success
+    assert_equal 1, response['results'].count
+    assert_equal report.id, response['results'].first["id"].to_i
+  end
+
+  test "should find reports by rule with othered" do
+    reports_cleanup
+    host = FactoryBot.create(:compliance_host)
+    rule_name = 'xccdf_org.something_installed'
+    rule_names_1 = [rule_name, 'xccdf_org.nothing', 'xccdf_org.othered']
+    rule_names_2 = [rule_name, 'xccdf_org.whatever', 'xccdf_org.original']
+    rule_results_1 = ['notapplicable', 'fail', 'fixed']
+    rule_results_2 = ['pass', 'fail', 'unknown']
+    report = create_report_with_rules(host, rule_names_1, rule_results_1)
+    create_report_with_rules(host, rule_names_2, rule_results_2)
+
+    get :index, :params => { :search => "xccdf_rule_othered=#{rule_name}" }, :session => set_session_user
+    response = ActiveSupport::JSON.decode(@response.body)
+    assert_response :success
+    assert_equal 1, response['results'].count
+    assert_equal report.id, response['results'].first["id"].to_i
+  end
+
+  test "should find reports with rule name" do
+    reports_cleanup
+    host = FactoryBot.create(:compliance_host)
+    rule_name = 'xccdf_org.something_installed'
+    rule_names_1 = ['xccdf_org.something_tested', rule_name]
+    rule_names_2 = ['xccdf_org.nothing', 'xccdf_org.whatever']
+    rule_results_1 = ['fail', 'pass']
+    rule_results_2 = ['fail', 'fail']
+    host = FactoryBot.create(:compliance_host)
+    report = create_report_with_rules(host, rule_names_1, rule_results_1)
+    create_report_with_rules(host, rule_names_2, rule_results_2)
+
+    get :index, :params => { :search => "xccdf_rule_name=#{rule_name}" }, :session => set_session_user
+    response = ActiveSupport::JSON.decode(@response.body)
+    assert_response :success
+    assert_equal 1, response['results'].count
+    assert_equal report.id, response['results'].first["id"].to_i
+  end
+
   private
 
   def reports_cleanup

data/test/functional/openscap_proxies_controller_test.rb

@@ -6,11 +6,11 @@ class OpenscapProxiesControllerTest < ActionController::TestCase
   include ApplicationHelper
 
   test "should render spool error" do
-    spool_error = { "timestamp" => 1_487_144_633.951_368, "level" => "ERROR", "message" => "Failed to parse Arf Report in test" }
-    OpenscapProxiesController.any_instance.stubs(:find_spool_error).returns(spool_error)
+    spool_error = { "errors_count" => 4 }
+    ProxyStatus::OpenscapSpool.any_instance.stubs(:spool_status).returns(spool_error)
     proxy = FactoryBot.create(:openscap_proxy)
     get :openscap_spool, :params => { :id => proxy.id }, :session => set_session_user
     assert_template :partial => 'smart_proxies/_openscap_spool'
-    assert @response.body.match(date_time_relative_value(Time.at(spool_error["timestamp"])))
+    assert @response.body.match('4 spool errors detected, inspect the appropriate file directly on proxy')
   end
 end

data/test/test_plugin_helper.rb

@@ -29,6 +29,20 @@ module ScapTestProxy
   end
 end
 
+module ScapTestCommon
+  private
+
+  def create_report_with_rules(host, rule_names, rule_results)
+    raise "rule_names and rule_results should have the same length!" if rule_names.size != rule_results.size
+    report = FactoryBot.create(:arf_report, :host_id => host.id)
+    rule_names.each_with_index do |item, index|
+      source = FactoryBot.create(:compliance_source, :value => rule_names[index])
+      log = FactoryBot.create(:compliance_log, :source => source, :report => report, :result => rule_results[index])
+    end
+    report
+  end
+end
+
 class ActionMailer::TestCase
   include ScapClientPuppetclass
   setup :skip_scap_callback
@@ -37,6 +51,7 @@ end
 class ActionController::TestCase
   include ScapClientPuppetclass
   include ScapTestProxy
+  include ScapTestCommon
 
   setup :add_smart_proxy, :skip_scap_callback
 end
@@ -44,6 +59,7 @@ end
 class ActiveSupport::TestCase
   include ScapClientPuppetclass
   include ScapTestProxy
+  include ScapTestCommon
 
   setup :add_smart_proxy, :skip_scap_callback
 end

data/test/unit/arf_report_test.rb

@@ -165,6 +165,19 @@ module ForemanOpenscap
       refute ForemanOpenscap::ArfReport.all.include? report
     end
 
+    test 'should get reports by rule result' do
+      rule_name = 'xccdf_org.something_installed'
+      rule_names_1 = ['xccdf_org.something_tested', rule_name]
+      rule_names_2 = ['xccdf_org.nothing', 'xccdf_org.whatever']
+      rule_results_1 = ['fail', 'pass']
+      rule_results_2 = ['fail', 'fail']
+      host = FactoryBot.create(:compliance_host)
+      report_1 = create_report_with_rules(host, rule_names_1, rule_results_1)
+      report_2 = create_report_with_rules(host, rule_names_2, rule_results_2)
+      res = ForemanOpenscap::ArfReport.by_rule_result(rule_name, 'pass').first
+      assert_equal res, report_1
+    end
+
     private
 
     def create_logs_for_report(report, log_params)

data/test/unit/concerns/host_extensions_test.rb

@@ -75,6 +75,48 @@ class HostExtensionsTest < ActiveSupport::TestCase
     assert_include res, host_2
   end
 
+  test "should correctly find hosts based on rule result" do
+    rule_name = 'xccdf_org.something'
+    rule_names = [rule_name, 'xccdf_org.nothing']
+    rule_results_1 = ['pass', 'fail']
+    rule_results_2 = ['fail', 'fail']
+    rule_results_3 = ['notchecked', 'fail']
+    host_1 = setup_host_with_reports_and_rules([rule_names, rule_names], [rule_results_2, rule_results_1], @policy)
+    host_2 = setup_host_with_reports_and_rules([rule_names, rule_names], [rule_results_1, rule_results_2], @policy)
+    host_3 = setup_host_with_reports_and_rules([rule_names, rule_names], [rule_results_1, rule_results_3], @policy)
+
+    res = Host.search_for "passes_xccdf_rule = #{rule_name}"
+    assert_equal res.first, host_1
+
+    res = Host.search_for "fails_xccdf_rule = #{rule_name}"
+    assert_equal res.first, host_2
+
+    res = Host.search_for "others_xccdf_rule = #{rule_name}"
+    assert_equal res.first, host_3
+  end
+
+  context "find_with_any_policy" do
+    setup do
+      @host.destroy
+      policy, host, host_2 = setup_hosts_with_inherited_policy.values_at(:policy, :host, :host_2)
+      policy, host_3, host_4 = setup_hosts_with_policy.values_at(:policy, :host, :host_2)
+      @compliance_hosts = [host, host_2, host_3, host_4]
+      @host_without_policy = FactoryBot.create(:host)
+    end
+
+    test "should find compliance hosts" do
+      res = Host.search_for "is_compliance_host = true"
+      assert_equal 4, res.count
+      assert_empty(@compliance_hosts - res | res - @compliance_hosts)
+    end
+
+    test "should find all but compliance hosts" do
+      res = Host.search_for "is_compliance_host = false"
+      assert_equal 1, res.count
+      assert_equal @host_without_policy, res.first
+    end
+  end
+
   private
 
   def setup_hosts_with_policy
@@ -98,4 +140,14 @@ class HostExtensionsTest < ActiveSupport::TestCase
     host_2 = FactoryBot.create(:compliance_host, :hostgroup_id => child.id)
     { :policy => policy, :host => host, :host_2 => host_2 }
   end
+
+  def setup_host_with_reports_and_rules(rule_names_ary, rule_results_ary, policy)
+    raise "rule_names_ary must have the same length as rule_results_ary" if rule_names_ary.size != rule_results_ary.size
+    host = FactoryBot.create(:host)
+    rule_names_ary.each_with_index do |item, index|
+      report = create_report_with_rules host, rule_names_ary[index], rule_results_ary[index]
+      FactoryBot.create(:policy_arf_report, :policy_id => policy.id, :arf_report_id => report.id)
+    end
+    host
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.11.0
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-11 00:00:00.000000000 Z
+date: 2018-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -35,7 +35,6 @@ files:
 - README.md
 - app/assets/javascripts/foreman_openscap/arf_reports.js
 - app/assets/javascripts/foreman_openscap/load_report.js
-- app/assets/javascripts/foreman_openscap/openscap_proxy.js
 - app/assets/javascripts/foreman_openscap/period_selector.js
 - app/assets/javascripts/foreman_openscap/policy_edit.js
 - app/assets/javascripts/foreman_openscap/reports.js
@@ -54,6 +53,7 @@ files:
 - app/controllers/concerns/foreman/controller/parameters/scap_content.rb
 - app/controllers/concerns/foreman/controller/parameters/tailoring_file.rb
 - app/controllers/concerns/foreman_openscap/arf_reports_controller_common_extensions.rb
+- app/controllers/concerns/foreman_openscap/body_log_extensions.rb
 - app/controllers/concerns/foreman_openscap/hosts_controller_extensions.rb
 - app/controllers/openscap_proxies_controller.rb
 - app/controllers/policies_controller.rb
@@ -65,7 +65,6 @@ files:
 - app/helpers/compliance_dashboard_helper.rb
 - app/helpers/compliance_hosts_helper.rb
 - app/helpers/concerns/foreman_openscap/hosts_helper_extensions.rb
-- app/helpers/concerns/foreman_openscap/lookup_keys_helper_extensions.rb
 - app/helpers/policies_helper.rb
 - app/helpers/policy_dashboard_helper.rb
 - app/helpers/tailoring_files_helper.rb
@@ -98,6 +97,8 @@ files:
 - app/services/foreman_openscap/openscap_proxy_version_check.rb
 - app/services/foreman_openscap/policy_dashboard/data.rb
 - app/services/foreman_openscap/report_dashboard/data.rb
+- app/services/proxy_status/openscap_spool.rb
+- app/validators/concerns/foreman_openscap/bookmark_controller_validator_extensions.rb
 - app/validators/foreman_openscap/data_stream_validator.rb
 - app/views/api/v2/compliance/arf_reports/base.json.rabl
 - app/views/api/v2/compliance/arf_reports/index.json.rabl
@@ -234,34 +235,61 @@ files:
 - lib/foreman_openscap/version.rb
 - lib/tasks/foreman_openscap_tasks.rake
 - locale/Makefile
+- locale/action_names.rb
 - locale/de/LC_MESSAGES/foreman_openscap.mo
+- locale/de/foreman_openscap.edit.po
 - locale/de/foreman_openscap.po
+- locale/de/foreman_openscap.po.time_stamp
 - locale/en_GB/LC_MESSAGES/foreman_openscap.mo
+- locale/en_GB/foreman_openscap.edit.po
 - locale/en_GB/foreman_openscap.po
+- locale/en_GB/foreman_openscap.po.time_stamp
 - locale/es/LC_MESSAGES/foreman_openscap.mo
+- locale/es/foreman_openscap.edit.po
 - locale/es/foreman_openscap.po
+- locale/es/foreman_openscap.po.time_stamp
 - locale/foreman_openscap.pot
 - locale/fr/LC_MESSAGES/foreman_openscap.mo
+- locale/fr/foreman_openscap.edit.po
 - locale/fr/foreman_openscap.po
+- locale/fr/foreman_openscap.po.time_stamp
 - locale/gl/LC_MESSAGES/foreman_openscap.mo
+- locale/gl/foreman_openscap.edit.po
 - locale/gl/foreman_openscap.po
+- locale/gl/foreman_openscap.po.time_stamp
 - locale/it/LC_MESSAGES/foreman_openscap.mo
+- locale/it/foreman_openscap.edit.po
 - locale/it/foreman_openscap.po
+- locale/it/foreman_openscap.po.time_stamp
 - locale/ja/LC_MESSAGES/foreman_openscap.mo
+- locale/ja/foreman_openscap.edit.po
 - locale/ja/foreman_openscap.po
+- locale/ja/foreman_openscap.po.time_stamp
 - locale/ko/LC_MESSAGES/foreman_openscap.mo
+- locale/ko/foreman_openscap.edit.po
 - locale/ko/foreman_openscap.po
+- locale/ko/foreman_openscap.po.time_stamp
 - locale/pt_BR/LC_MESSAGES/foreman_openscap.mo
+- locale/pt_BR/foreman_openscap.edit.po
 - locale/pt_BR/foreman_openscap.po
+- locale/pt_BR/foreman_openscap.po.time_stamp
 - locale/ru/LC_MESSAGES/foreman_openscap.mo
+- locale/ru/foreman_openscap.edit.po
 - locale/ru/foreman_openscap.po
+- locale/ru/foreman_openscap.po.time_stamp
 - locale/sv_SE/LC_MESSAGES/foreman_openscap.mo
+- locale/sv_SE/foreman_openscap.edit.po
 - locale/sv_SE/foreman_openscap.po
+- locale/sv_SE/foreman_openscap.po.time_stamp
 - locale/zanata.xml
 - locale/zh_CN/LC_MESSAGES/foreman_openscap.mo
+- locale/zh_CN/foreman_openscap.edit.po
 - locale/zh_CN/foreman_openscap.po
+- locale/zh_CN/foreman_openscap.po.time_stamp
 - locale/zh_TW/LC_MESSAGES/foreman_openscap.mo
+- locale/zh_TW/foreman_openscap.edit.po
 - locale/zh_TW/foreman_openscap.po
+- locale/zh_TW/foreman_openscap.po.time_stamp
 - test/factories/arf_report_factory.rb
 - test/factories/asset_factory.rb
 - test/factories/compliance_host_factory.rb

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

@@ -1,7 +0,0 @@
-function findSpoolLogs() {
-    var table,
-        string = 'Failed to parse Arf Report';
-    $("div#table-proxy-status-logs_filter input").val(string);
-    table = $('#table-proxy-status-logs').DataTable();
-    table.search(string).draw();
-}

data/app/helpers/concerns/foreman_openscap/lookup_keys_helper_extensions.rb

@@ -1,8 +0,0 @@
-module ForemanOpenscap
-  module LookupKeysHelperExtensions
-    def overridable_lookup_keys(klass, obj)
-      return [] if klass.name == "foreman_scap_client"
-      super klass, obj
-    end
-  end
-end