foreman_openscap 1.0.10 → 3.0.1

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

@@ -3,9 +3,6 @@ require 'tmpdir'
 
 class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
   setup do
-    # required for mysql where database cleaner does not cleanup things properly
-    # because of arf_create does explicit transaction commit
-    Message.delete_all
     # override validation of policy (puppetclass, lookup_key overrides)
     ForemanOpenscap::Policy.any_instance.stubs(:valid?).returns(true)
     @host = FactoryBot.create(:compliance_host)

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

@@ -0,0 +1,15 @@
+require 'test_plugin_helper'
+
+class Api::V2::Compliance::ScapContentProfilesControllerTest < ActionController::TestCase
+  test "should get index" do
+    2.times do
+      FactoryBot.create(:scap_content_profile)
+    end
+    FactoryBot.create(:scap_content, :scap_content_profiles => [ForemanOpenscap::ScapContentProfile.first])
+    FactoryBot.create(:tailoring_file, :scap_content_profiles => [ForemanOpenscap::ScapContentProfile.last])
+    get :index, :session => set_session_user
+    response = ActiveSupport::JSON.decode(@response.body)
+    assert response['results'].any?
+    assert_response :success
+  end
+end

data/test/test_plugin_helper.rb

@@ -55,8 +55,8 @@ module ScapTestCommon
   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
     metrics = {
-      'passed' => rule_results.select { |result| result == 'pass' }.count,
-      'failed' => rule_results.select { |result| result == 'fail' }.count,
+      'passed' => rule_results.count { |result| result == 'pass' },
+      'failed' => rule_results.count { |result| result == 'fail' },
       'othered' => rule_results.reject { |result| result == 'fail' || result == 'pass' }.count
     }
     report = FactoryBot.create(:arf_report, :host_id => host.id, :metrics => metrics, :status => metrics)

data/test/unit/concerns/host_extensions_test.rb

@@ -164,6 +164,13 @@ class HostExtensionsTest < ActiveSupport::TestCase
     assert_equal host.errors.full_messages.first, "Openscap proxy with id #{proxy.id} doesn't exist or is not assigned to proper organization and/or location"
   end
 
+  test 'should delete asset together with host' do
+    host = FactoryBot.create(:compliance_host)
+    FactoryBot.create(:asset_policy, :asset => host.asset, :policy => @policy)
+    assert host.destroy
+    assert_empty ForemanOpenscap::Asset.where(:assetable_id => host.id, :assetable_type => 'Host::Base')
+  end
+
   private
 
   def setup_hosts_with_policy

data/test/unit/policy_test.rb

@@ -279,4 +279,23 @@ class PolicyTest < ActiveSupport::TestCase
     refute policy.hostgroups.empty?
     refute policy.hosts.empty?
   end
+
+  test "should change deploy type" do
+    policy = FactoryBot.create(:policy, :scap_content => @scap_content, :scap_content_profile => @scap_profile)
+    setup_puppet_class
+    policy.change_deploy_type({ :deploy_by => 'puppet' })
+    refute policy.errors.any?
+    policy.reload
+    assert 'puppet', policy.deploy_by
+  end
+
+  test 'should not change any attributes when cannot change deploy_by' do
+    name = 'my-policy'
+    policy = FactoryBot.create(:policy, :name => name, :scap_content => @scap_content, :scap_content_profile => @scap_profile)
+    policy.change_deploy_type({ :name => 'salty policy', :deploy_by => 'salt' })
+    assert policy.errors.any?
+    policy.reload
+    assert_equal policy.deploy_by, 'manual'
+    assert_equal policy.name, name
+  end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 3.0.1
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-13 00:00:00.000000000 Z
+date: 2020-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: deface
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 description: Foreman plug-in for managing security compliance reports
 email:
 - slukasik@redhat.com
@@ -46,6 +46,7 @@ files:
 - app/assets/stylesheets/foreman_openscap/scap_breakdown_chart.css
 - app/controllers/api/v2/compliance/arf_reports_controller.rb
 - app/controllers/api/v2/compliance/policies_controller.rb
+- app/controllers/api/v2/compliance/scap_content_profiles_controller.rb
 - app/controllers/api/v2/compliance/scap_contents_controller.rb
 - app/controllers/api/v2/compliance/tailoring_files_controller.rb
 - app/controllers/arf_reports_controller.rb
@@ -56,6 +57,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/api/v2/hosts_controller_extensions.rb
+- app/controllers/concerns/foreman_openscap/api/v2/scap_api_controller_extensions.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_and_hostgroups_controller_extensions.rb
@@ -96,7 +98,6 @@ files:
 - app/models/foreman_openscap/scap_content.rb
 - app/models/foreman_openscap/scap_content_profile.rb
 - app/models/foreman_openscap/tailoring_file.rb
-- app/overrides/hosts/overview/host_compliance_status.rb
 - app/services/foreman_openscap/arf_report_status_calculator.rb
 - app/services/foreman_openscap/client_config/ansible.rb
 - app/services/foreman_openscap/client_config/base.rb
@@ -125,6 +126,9 @@ files:
 - app/views/api/v2/compliance/policies/index.json.rabl
 - app/views/api/v2/compliance/policies/main.json.rabl
 - app/views/api/v2/compliance/policies/show.json.rabl
+- app/views/api/v2/compliance/scap_content_profiles/base.json.rabl
+- app/views/api/v2/compliance/scap_content_profiles/index.json.rabl
+- app/views/api/v2/compliance/scap_content_profiles/main.json.rabl
 - app/views/api/v2/compliance/scap_contents/base.json.rabl
 - app/views/api/v2/compliance/scap_contents/create.json.rabl
 - app/views/api/v2/compliance/scap_contents/index.json.rabl
@@ -146,7 +150,6 @@ files:
 - app/views/arf_reports/show.html.erb
 - app/views/arf_reports/show_html.html.erb
 - app/views/arf_reports/welcome.html.erb
-- app/views/compliance_hosts/_compliance_status.erb
 - app/views/compliance_hosts/show.html.erb
 - app/views/dashboard/_compliance_host_reports_widget.html.erb
 - app/views/dashboard/_compliance_reports_breakdown_widget.html.erb
@@ -240,6 +243,7 @@ files:
 - db/migrate/20171011134112_remove_arf_reports_without_policy.rb
 - db/migrate/20171016125613_add_content_title_unique_constraint.foreman_openscap.rb
 - db/migrate/20190103093409_add_deployment_option_to_policy.foreman_openscap.rb
+- db/migrate/20200117135424_migrate_port_overrides_to_int.rb
 - db/seeds.d/75-job_templates.rb
 - db/seeds.d/openscap_feature.rb
 - db/seeds.d/openscap_policy_notification.rb
@@ -254,45 +258,32 @@ files:
 - 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/en_GB/LC_MESSAGES/foreman_openscap.mo
-- locale/en_GB/foreman_openscap.edit.po
 - locale/en_GB/foreman_openscap.po
 - locale/es/LC_MESSAGES/foreman_openscap.mo
-- locale/es/foreman_openscap.edit.po
 - locale/es/foreman_openscap.po
 - locale/foreman_openscap.pot
 - locale/fr/LC_MESSAGES/foreman_openscap.mo
-- locale/fr/foreman_openscap.edit.po
 - locale/fr/foreman_openscap.po
 - locale/gl/LC_MESSAGES/foreman_openscap.mo
-- locale/gl/foreman_openscap.edit.po
 - locale/gl/foreman_openscap.po
 - locale/it/LC_MESSAGES/foreman_openscap.mo
-- locale/it/foreman_openscap.edit.po
 - locale/it/foreman_openscap.po
 - locale/ja/LC_MESSAGES/foreman_openscap.mo
-- locale/ja/foreman_openscap.edit.po
 - locale/ja/foreman_openscap.po
 - locale/ko/LC_MESSAGES/foreman_openscap.mo
-- locale/ko/foreman_openscap.edit.po
 - locale/ko/foreman_openscap.po
 - locale/pt_BR/LC_MESSAGES/foreman_openscap.mo
-- locale/pt_BR/foreman_openscap.edit.po
 - locale/pt_BR/foreman_openscap.po
 - locale/ru/LC_MESSAGES/foreman_openscap.mo
-- locale/ru/foreman_openscap.edit.po
 - locale/ru/foreman_openscap.po
 - locale/sv_SE/LC_MESSAGES/foreman_openscap.mo
-- locale/sv_SE/foreman_openscap.edit.po
 - locale/sv_SE/foreman_openscap.po
 - 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_TW/LC_MESSAGES/foreman_openscap.mo
-- locale/zh_TW/foreman_openscap.edit.po
 - locale/zh_TW/foreman_openscap.po
 - test/factories/arf_report_factory.rb
 - test/factories/asset_factory.rb
@@ -311,6 +302,7 @@ files:
 - test/files/tailoring_files/ssg-firefox-ds-tailoring.xml
 - test/functional/api/v2/compliance/arf_reports_controller_test.rb
 - test/functional/api/v2/compliance/policies_controller_test.rb
+- test/functional/api/v2/compliance/scap_content_profiles_controller_test.rb
 - test/functional/api/v2/compliance/scap_contents_controller_test.rb
 - test/functional/api/v2/compliance/tailoring_files_controller_test.rb
 - test/functional/api/v2/hosts_controller_test.rb
@@ -356,19 +348,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Foreman plug-in for displaying OpenSCAP audit reports
 test_files:
 - test/factories/arf_report_factory.rb
 - test/factories/asset_factory.rb
+- test/factories/compliance_host_factory.rb
 - test/factories/compliance_log_factory.rb
 - test/factories/policy_arf_report_factory.rb
 - test/factories/policy_factory.rb
 - test/factories/scap_content_related.rb
-- test/factories/compliance_host_factory.rb
 - test/files/arf_report/arf_report.bz2
 - test/files/arf_report/arf_report.html
 - test/files/arf_report/arf_report.json
@@ -379,19 +370,23 @@ test_files:
 - test/files/tailoring_files/ssg-firefox-ds-tailoring.xml
 - test/functional/api/v2/compliance/arf_reports_controller_test.rb
 - test/functional/api/v2/compliance/policies_controller_test.rb
+- test/functional/api/v2/compliance/scap_content_profiles_controller_test.rb
 - test/functional/api/v2/compliance/scap_contents_controller_test.rb
 - test/functional/api/v2/compliance/tailoring_files_controller_test.rb
 - test/functional/api/v2/hosts_controller_test.rb
 - test/functional/arf_reports_controller_test.rb
 - test/functional/openscap_proxies_controller_test.rb
 - test/functional/tailoring_files_controller_test.rb
+- test/helpers/arf_report_dashboard_helper_test.rb
+- test/helpers/policy_dashboard_helper_test.rb
 - test/lib/foreman_openscap/bulk_upload_test.rb
-- test/test_plugin_helper.rb
 - test/unit/arf_report_status_calculator_test.rb
+- test/unit/arf_report_test.rb
 - test/unit/compliance_status_test.rb
-- test/unit/concerns/openscap_proxy_extenstions_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/scap_content_test.rb
 - test/unit/services/config_name_service_test.rb
@@ -400,8 +395,5 @@ test_files:
 - test/unit/services/report_dashboard/data_test.rb
 - test/unit/services/tailoring_files_proxy_check_test.rb
 - test/unit/tailoring_file_test.rb
-- test/unit/arf_report_test.rb
-- test/unit/openscap_host_test.rb
 - test/unit/policy_test.rb
-- test/helpers/arf_report_dashboard_helper_test.rb
-- test/helpers/policy_dashboard_helper_test.rb
+- test/test_plugin_helper.rb

data/app/overrides/hosts/overview/host_compliance_status.rb

@@ -1,4 +0,0 @@
-Deface::Override.new(:virtual_path => "hosts/show",
-                     :name => "add_compliance_link_to_host",
-                     :insert_bottom => 'td:last',
-                     :partial => 'compliance_hosts/compliance_status')

data/app/views/compliance_hosts/_compliance_status.erb

@@ -1,6 +0,0 @@
-<%= link_to(
-        _('Compliance'),
-        compliance_host_path(@host.id),
-        :title => _("Host compliance details"),
-        :class => 'btn btn-default') if @host.arf_reports.any?
-%>