foreman_openscap 4.3.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bc31c3bac07804311899dc01dd5dbe0c0500cc8981eefa1ec867316d0465fb8
-  data.tar.gz: 4b00712959d937f44fa2da29de505704e153277043bf319c84fa0d4a44f8d5ac
+  metadata.gz: 534b669988c89b1335565f67c02b63443b0cfd36636749397b50617c4797316b
+  data.tar.gz: 4ee455ef101cc0bb6b034f1b081e2d604848620e7438e3ae887493ee77d13015
 SHA512:
-  metadata.gz: 90f233717d65a7bf4d1793251a27d6f7268e81a93e4dd06b86258e8f6f5b108d0a886fe8ebe455766eccfe10a55076d9b61bd211165620f5d899cd94147d203c
-  data.tar.gz: b77f05c002ef0fb3fdcc4050974bc5b4390d2af5322aac601ef912172391e0bfb3f391e4166ad94b7e701156e9b84f640dcda03d434323d5e2921e50974f6109
+  metadata.gz: b2ddaa5f34a78a9f085f5564f7e12f28071baf8b1679e645c327bb6d229986f0b399ae9a3bf50078e7d4c536014b43df974125851277ff1584130918b93382a2
+  data.tar.gz: 6a115b58c74b88f4c9e4f81ab5c31a0db2195a285d2c2eb4612251aead4131a426b34aab2593b7e8b6e2b656fee92cae0adc1b3d5bd19787466514e35312fd70

data/app/controllers/api/v2/compliance/arf_reports_controller.rb

@@ -140,12 +140,6 @@ module Api
             super
           end
         end
-
-        protected
-
-        def assign_lone_taxonomies
-          # do not assign lone taxonomies to arf report
-        end
       end
     end
   end

data/app/controllers/api/v2/compliance/oval_policies_controller.rb

@@ -75,7 +75,7 @@ module Api::V2
         assign _('hosts'), params["host_ids"], ::Host::Managed
       end
 
-      api :GET, '/compliance/oval_policies/:id/oval_content', N_("Show a policy's SCAP content")
+      api :GET, '/compliance/oval_policies/:id/oval_content', N_("Show a policy's OVAL content")
       param :id, :identifier, :required => true
 
       def oval_content

data/app/helpers/arf_report_dashboard_helper.rb

@@ -6,11 +6,9 @@ module ArfReportDashboardHelper
   }.freeze
 
   def breakdown_chart_data(categories, report, colors = COLORS)
-    data = categories.reduce([]) do |memo, (key, value)|
+    categories.reduce([]) do |memo, (key, value)|
       memo << [value, report[key], colors[key]]
     end
-
-    data.to_json
   end
 
   def donut_breakdown_chart_data(report)
@@ -27,6 +25,6 @@ module ArfReportDashboardHelper
       :data => status.to_a,
       :yAxisLabel => _("Number of Events"),
       :xAxisLabel => _("Rule Results"),
-    }.to_json
+    }
   end
 end

data/app/helpers/compliance_hosts_helper.rb

@@ -16,7 +16,7 @@ module ComplianceHostsHelper
       [_("Othered"), othered, ArfReportDashboardHelper::COLORS[:othered]],
       ['dates', date, nil]
     ]
-    { :data => data, :xAxisDataLabel => 'dates', :config => 'timeseries' }.to_json
+    { :data => data, :xAxisDataLabel => 'dates', :config => 'timeseries' }
   end
 
   def compliance_host_multiple_actions

data/app/helpers/policies_helper.rb

@@ -41,7 +41,7 @@ module PoliciesHelper
   end
 
   def deploy_by_radio_checked(policy, tool)
-    type = policy.deploy_by ? policy.deploy_by.to_sym : :puppet
+    type = policy.deploy_by ? policy.deploy_by.to_sym : :manual
     tool.type == type
   end
 

data/app/services/foreman_openscap/client_config/base.rb

@@ -38,6 +38,7 @@ module ForemanOpenscap
       end
 
       def find_config_item(scope = config_item_class_name.constantize)
+        return unless scope
         return scope.find_by :name => config_item_name if scope.respond_to?(:find_by)
         # all_puppetclasses, all_ansible_roles methods return Array, not ActiveRecord::Relation
         scope.find { |item| item.name == config_item_name }

data/app/services/foreman_openscap/client_config/puppet.rb

@@ -10,7 +10,7 @@ module ForemanOpenscap
       end
 
       def available?
-        defined?(Puppetclass)
+        defined?(ForemanPuppet)
       end
 
       def inline_help
@@ -21,13 +21,17 @@ module ForemanOpenscap
         }
       end
 
+      def collection_method
+        :puppetclasses
+      end
+
       def constants
         OpenStruct.new(
           :server_param => 'server',
           :port_param => 'port',
           :policies_param => 'policies',
           :puppetclass_name => 'foreman_scap_client',
-          :config_item_class_name => 'Puppetclass',
+          :config_item_class_name => 'ForemanPuppet::Puppetclass',
           :override_method_name => 'class_params',
           :msg_name => _('Puppet class'),
           :lookup_key_plural_name => _('Smart Class Parameters'),

data/app/views/api/v2/compliance/oval_contents/destroy.json.rabl

@@ -0,0 +1,3 @@
+object @oval_content
+
+extends "api/v2/compliance/oval_contents/base"

data/app/views/arf_reports/_metrics.html.erb

@@ -4,15 +4,15 @@
   <div class="col-md-5 scap-breakdown-chart-col">
     <div class="stats-well">
       <h4 class="ca" ><%= _('Report Metrics') %></h4>
-      <div id="arf-report-breakdown-chart" class="scap-breakdown-chart"></div>
-      <%= mount_react_component('DonutChart', "#arf-report-breakdown-chart", donut_breakdown_chart_data(metrics)) %>
+      <div class="scap-breakdown-chart">
+        <%= react_component('DonutChart', :data => donut_breakdown_chart_data(metrics)) %>
+      </div>
     </div>
   </div>
   <div class="col-md-5 arf-report-rule-chart-col">
     <div class="stats-well">
       <h4 class="ca" ><%= _('Report Status') %></h4>
-      <div id="arf-report-rule-chart"></div>
-      <%= mount_react_component('BarChart', "#arf-report-rule-chart", arf_report_status_chart_data(status), :flatten_data => true) %>
+      <%= react_component('BarChart', arf_report_status_chart_data(status)) %>
     </div>
   </div>
   <div class="col-md-2">

data/app/views/compliance_hosts/show.html.erb

@@ -17,18 +17,16 @@
                                                         hash_for_arf_report_path(:id => data.latest_report.id)
                                                           .merge(:auth_object => data.latest_report)) %></h4>
         <% report = data.report %>
-        <% id = "host-policy-breakdown-chart-#{policy.id}" %>
-        <div id="<%= id %>" class="scap-breakdown-chart"></div>
-        <%= mount_react_component('DonutChart', "##{id}", donut_breakdown_chart_data(report)) %>
+        <div class="scap-breakdown-chart">
+          <%= react_component('DonutChart', :data => donut_breakdown_chart_data(report)) %>
+        </div>
       </div>
     </div>
 
     <div class="col-md-8">
       <div class="stats-well">
         <h4 class="ca"><%= _("%s reports over time") % policy %></h4>
-        <% reports_graph_id = "arf-reports-over-time-#{policy.id}" %>
-        <div id="<%= reports_graph_id %>"></div>
-        <%= mount_react_component('LineChart', "##{reports_graph_id}", host_arf_reports_chart_data(policy.id), :flatten_data => true) %>
+        <%= react_component('LineChart', host_arf_reports_chart_data(policy.id)) %>
       </div>
     </div>
     <% else %>

data/app/views/dashboard/_compliance_reports_breakdown_widget.html.erb

@@ -1,4 +1,5 @@
 <h4 class="header ca"><%= _('Compliance Reports Breakdown') %></h4>
-<div id="compliance-reports-breakdown" class="host-configuration-chart"/>
-<% report = ForemanOpenscap::ReportDashboard::Data.new().report %>
-<%= mount_react_component('DonutChart', "#compliance-reports-breakdown", donut_breakdown_chart_data(report)) %>
+<div class="host-configuration-chart">
+  <% report = ForemanOpenscap::ReportDashboard::Data.new().report %>
+  <%= react_component('DonutChart', :data => donut_breakdown_chart_data(report)) %>
+</div>

data/app/views/policy_dashboard/_policy_chart_widget.html.erb

@@ -2,6 +2,7 @@
 
 <div id='status-chart'>
   <h4 class="header ca"><%= _('Host Breakdown Chart') %></h4>
-  <div id="policy-breakdown-chart" class="scap-breakdown-chart"></div>
-  <%= mount_react_component('DonutChart', "#policy-breakdown-chart", policy_breakdown_chart_data(@report)) %>
+  <div class="scap-breakdown-chart">
+    <%= react_component('DonutChart', :data => policy_breakdown_chart_data(@report)) %>
+  </div>
 </div>

data/db/migrate/20200117135424_migrate_port_overrides_to_int.rb

@@ -10,7 +10,8 @@ class MigratePortOverridesToInt < ActiveRecord::Migration[5.2]
   private
 
   def transform_lookup_values(method)
-    puppet_class = Puppetclass.find_by :name => 'foreman_scap_client'
+    return unless defined?(ForemanPuppet)
+    puppet_class = ::ForemanPuppet::Puppetclass.find_by :name => 'foreman_scap_client'
     return unless puppet_class
     port_key = puppet_class.class_params.find_by :key => 'port'
     return unless port_key

data/db/migrate/20201202110213_update_puppet_port_param_type.rb

@@ -10,7 +10,8 @@ class UpdatePuppetPortParamType < ActiveRecord::Migration[6.0]
   private
 
   def update_port_type(method)
-    puppet_class = Puppetclass.find_by :name => 'foreman_scap_client'
+    return unless defined?(ForemanPuppet)
+    puppet_class = ::ForemanPuppet::Puppetclass.find_by :name => 'foreman_scap_client'
     return unless puppet_class
     port_key = puppet_class.class_params.find_by :key => 'port'
     return unless port_key

data/lib/foreman_openscap/engine.rb

@@ -223,13 +223,6 @@ module ForemanOpenscap
         register_graphql_query_field :oval_policy, '::Types::OvalPolicy', :record_field
         register_graphql_query_field :cves, '::Types::Cve', :collection_field
 
-        # move to core
-        extend_graphql_type type: ::Types::Hostgroup do
-          field :descendants, Types::Hostgroup.connection_type, null: true, resolve: (proc do |object|
-            RecordLoader.for(model_class).load_many(object.descendant_ids)
-          end)
-        end
-
         register_facet ForemanOpenscap::Host::OvalFacet, :oval_facet do
           configure_host do
             extend_model ForemanOpenscap::OvalFacetHostExtensions

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "4.3.0".freeze
+  VERSION = "5.0.0".freeze
 end

data/package.json

@@ -0,0 +1,48 @@
+{
+  "name": "foreman_openscap",
+  "version": "0.1.0",
+  "description": "Foreman plug-in for managing security compliance reports",
+  "main": "index.js",
+  "scripts": {
+    "lint": "tfm-lint --plugin -d /webpack",
+    "test": "tfm-test --plugin --config jest.config.js",
+    "test:watch": "tfm-test --plugin --watchAll --config jest.config.js",
+    "test:current": "tfm-test --plugin --watch --config jest.config.js",
+    "publish-coverage": "tfm-publish-coverage",
+    "stories": "tfm-stories --plugin",
+    "stories:build": "tfm-build-stories --plugin",
+    "create-react-component": "yo react-domain"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/theforeman/foreman_openscap.git"
+  },
+  "bugs": {
+    "url": "https://projects.theforeman.org/projects/foreman_openscap/issues"
+  },
+  "peerDependencies": {
+    "@theforeman/vendor": ">= 4.13.2"
+  },
+  "devDependencies": {
+    "@apollo/react-testing": "^4.0.0",
+    "@babel/core": "^7.7.0",
+    "@testing-library/dom": "^7.30.4",
+    "@testing-library/jest-dom": "^5.11.9",
+    "@testing-library/react": "^11.2.5",
+    "@testing-library/user-event": "^13.1.2",
+    "@theforeman/builder": "^8.4.1",
+    "@theforeman/eslint-plugin-foreman": "8.4.1",
+    "@theforeman/find-foreman": "^8.4.1",
+    "@theforeman/stories": "^8.4.1",
+    "@theforeman/test": "^8.4.1",
+    "@theforeman/vendor-dev": "^8.4.1",
+    "babel-eslint": "^10.0.3",
+    "eslint": "^6.7.2",
+    "jed": "^1.1.1",
+    "jest-svg-transformer": "^1.0.0",
+    "jest-transform-graphql": "^2.1.0",
+    "prettier": "^1.13.5",
+    "stylelint": "^9.3.0",
+    "stylelint-config-standard": "^18.0.0"
+  }
+}

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

@@ -20,7 +20,7 @@ class Api::V2::Compliance::OvalReportsControllerTest < ActionController::TestCas
 
   test 'should show host errors on CVEs upload' do
     proxy = FactoryBot.create(:smart_proxy)
-    host = FactoryBot.create(:host, :puppet_proxy => proxy, :environment => FactoryBot.create(:environment))
+    host = FactoryBot.create(:host, :puppet_proxy => proxy)
     SmartProxy.any_instance.stubs(:smart_proxy_features).returns([])
     post :create, :params => @params.merge(:cname => host.name), :session => set_session_user
 

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

@@ -40,6 +40,7 @@ class Api::V2::Compliance::PoliciesControllerTest < ActionController::TestCase
   end
 
   test "should get index and show hostgroups" do
+    skip unless puppet_available?
     ForemanOpenscap::Policy.any_instance.stubs(:find_scap_puppetclass).returns(FactoryBot.create(:puppetclass, :name => 'foreman_scap_client'))
     ForemanOpenscap::Policy.any_instance.stubs(:populate_overrides)
     hostgroup = FactoryBot.create(:hostgroup)
@@ -61,6 +62,7 @@ class Api::V2::Compliance::PoliciesControllerTest < ActionController::TestCase
   end
 
   test "should show a policy hosts and hostgroups" do
+    skip unless puppet_available?
     ForemanOpenscap::Policy.any_instance.stubs(:find_scap_puppetclass).returns(FactoryBot.create(:puppetclass, :name => 'foreman_scap_client'))
     ForemanOpenscap::Policy.any_instance.stubs(:populate_overrides)
     hostgroup = FactoryBot.create(:hostgroup)

data/test/helpers/arf_report_dashboard_helper_test.rb

@@ -7,14 +7,13 @@ class ArfReportDashboardHelperTest < ActionView::TestCase
     categories = { :passed => 'passed', :failed => 'failed' }
     report = { :passed => 23, :failed => 24 }
     colors = { :passed => '#FFF', :failed => '#000' }
-    res = JSON.parse(breakdown_chart_data(categories, report, colors))
+    res = breakdown_chart_data(categories, report, colors)
     assert_equal ["passed", 23, "#FFF"], res.first
     assert_equal ["failed", 24, "#000"], res.last
   end
 
   test 'should return breakdown chart data for donut as json' do
-    report = { :passed => 4, :failed => 7, :othered => 5 }
-    res = JSON.parse(donut_breakdown_chart_data(report))
+    res = donut_breakdown_chart_data(:passed => 4, :failed => 7, :othered => 5)
     assert_equal 3, res.size
     assert_include res, ["Passed", 4, ArfReportDashboardHelper::COLORS[:passed]]
     assert_include res, ["Failed", 7, ArfReportDashboardHelper::COLORS[:failed]]
@@ -22,12 +21,12 @@ class ArfReportDashboardHelperTest < ActionView::TestCase
   end
 
   test 'should return data for report status chart' do
-    res = JSON.parse(arf_report_status_chart_data(:passed => 6, :failed => 7, :othered => 8))
-    assert_equal "Number of Events", res['yAxisLabel']
-    assert_equal "Rule Results", res['xAxisLabel']
-    assert_equal 3, res['data'].size
-    assert_include res['data'], ["passed", 6]
-    assert_include res['data'], ["failed", 7]
-    assert_include res['data'], ["othered", 8]
+    res = arf_report_status_chart_data(:passed => 6, :failed => 7, :othered => 8)
+    assert_equal "Number of Events", res[:yAxisLabel]
+    assert_equal "Rule Results", res[:xAxisLabel]
+    assert_equal 3, res[:data].size
+    assert_include res[:data], [:passed, 6]
+    assert_include res[:data], [:failed, 7]
+    assert_include res[:data], [:othered, 8]
   end
 end

data/test/helpers/policy_dashboard_helper_test.rb

@@ -11,7 +11,7 @@ class PolicyDashboardHelperTest < ActionView::TestCase
       :inconclusive_hosts => 7,
       :report_missing => 8
     }
-    res = JSON.parse(policy_breakdown_chart_data(report))
+    res = policy_breakdown_chart_data(report)
     assert_equal 4, res.size
     assert_include res, ['Compliant hosts', 5, PolicyDashboardHelper::COLORS[:compliant_hosts]]
     assert_include res, ['Incompliant hosts', 6, PolicyDashboardHelper::COLORS[:incompliant_hosts]]

data/test/test_plugin_helper.rb

@@ -5,19 +5,24 @@ require 'test_helper'
 FactoryBot.definition_file_paths << File.join(File.dirname(__FILE__), 'factories')
 # Add factories from foreman_ansible
 FactoryBot.definition_file_paths << File.join(ForemanAnsible::Engine.root, '/test/factories')
+FactoryBot.definition_file_paths << File.join(ForemanPuppet::Engine.root, '/test/factories') if defined?(ForemanPuppet)
 FactoryBot.reload
 
 require "#{ForemanOpenscap::Engine.root}/test/fixtures/cve_fixtures"
 
 module ScapClientPuppetclass
+  def puppet_available?
+    defined?(ForemanPuppet)
+  end
+
   def setup_puppet_class
     puppet_config = ::ForemanOpenscap::ClientConfig::Puppet.new
-    Puppetclass.find_by(:name => puppet_config.puppetclass_name)&.destroy
+    ForemanPuppet::Puppetclass.find_by(:name => puppet_config.puppetclass_name)&.destroy
 
     puppet_class = FactoryBot.create(:puppetclass, :name => puppet_config.puppetclass_name)
-    server_param = FactoryBot.create(:puppetclass_lookup_key, :key => puppet_config.server_param, :default_value => nil)
-    port_param = FactoryBot.create(:puppetclass_lookup_key, :key => puppet_config.port_param, :default_value => nil)
-    policies_param = FactoryBot.create(:puppetclass_lookup_key, :key => puppet_config.policies_param, :default_value => nil)
+    server_param = FactoryBot.create(:puppetclass_lookup_key, :key => puppet_config.server_param, :default_value => nil, :override => false)
+    port_param = FactoryBot.create(:puppetclass_lookup_key, :key => puppet_config.port_param, :default_value => nil, :override => false)
+    policies_param = FactoryBot.create(:puppetclass_lookup_key, :key => puppet_config.policies_param, :default_value => nil, :override => false)
 
     env = FactoryBot.create :environment
 

data/test/unit/policy_test.rb

@@ -75,7 +75,6 @@ class PolicyTest < ActiveSupport::TestCase
     asset = FactoryBot.create(:asset, :assetable_id => hg.id, :assetable_type => 'Hostgroup')
     policy = FactoryBot.create(:policy, :assets => [asset], :scap_content => @scap_content, :scap_content_profile => @scap_profile)
     policy.save!
-    hg.hostgroup_classes.destroy_all
     hg.destroy
     assert_equal 0, policy.hostgroups.count
   end
@@ -314,6 +313,7 @@ class PolicyTest < ActiveSupport::TestCase
   end
 
   test "should change deploy type" do
+    skip unless puppet_available?
     policy = FactoryBot.create(:policy, :scap_content => @scap_content, :scap_content_profile => @scap_profile)
     setup_puppet_class
     policy.change_deploy_type({ :deploy_by => 'puppet' })

data/test/unit/services/config_name_service_test.rb

@@ -24,6 +24,7 @@ class ConfigNameServiceTest < ActiveSupport::TestCase
   end
 
   test 'should find all available except Manual' do
+    skip unless puppet_available?
     ForemanOpenscap::ClientConfig::Ansible.any_instance.stubs(:available?).returns(false)
     configs = @name_service.all_available_except(:manual)
     assert_equal 1, configs.size

data/test/unit/services/hostgroup_overrider_test.rb

@@ -9,11 +9,12 @@ class HostgroupOverriderTest < ActiveSupport::TestCase
   end
 
   test 'should populate puppet overrides' do
+    skip unless puppet_available?
     puppet_class, env, port_param, server_param = setup_puppet_class.values_at :puppet_class, :env, :port_param, :server_param
 
     proxy = FactoryBot.create(:openscap_proxy, :url => 'https://override-keys.example.com:8998')
 
-    hostgroup = FactoryBot.create(:hostgroup, :environment_id => env.id, :openscap_proxy_id => proxy.id)
+    hostgroup = FactoryBot.create(:hostgroup, :environment_id => env.id, :openscap_proxy_id => proxy.id, :puppet => FactoryBot.create(:hostgroup_puppet_facet))
     refute hostgroup.puppetclasses.include? puppet_class
     assert LookupValue.where(:match => "hostgroup=#{hostgroup.to_label}",
                              :lookup_key_id => port_param.id,

data/test/unit/services/lookup_key_overrider_test.rb

@@ -8,6 +8,7 @@ class LookupKeyOverriderTest < ActiveSupport::TestCase
   end
 
   test 'should override puppet class parameters' do
+    skip unless puppet_available?
     server_param, port_param, policies_param = setup_puppet_class.values_at :server_param, :port_param, :policies_param
     refute server_param.override
     refute port_param.override
@@ -21,7 +22,8 @@ class LookupKeyOverriderTest < ActiveSupport::TestCase
   end
 
   test 'should add error when no puppet class found' do
-    puppet_class = Puppetclass.find_by :name => ForemanOpenscap::ClientConfig::Puppet.new.puppetclass_name
+    skip unless puppet_available?
+    puppet_class = ::ForemanPuppet::Puppetclass.find_by :name => ForemanOpenscap::ClientConfig::Puppet.new.puppetclass_name
     puppet_class.destroy if puppet_class
     policy = FactoryBot.create(:policy, :scap_content => @scap_content, :scap_content_profile => @scap_content_profile, :deploy_by => :puppet)
     ForemanOpenscap::LookupKeyOverrider.new(policy).override
@@ -41,6 +43,7 @@ class LookupKeyOverriderTest < ActiveSupport::TestCase
   end
 
   test 'should add error when lookup keys not present' do
+    skip unless puppet_available?
     server_param, port_param, policies_param = setup_puppet_class.values_at :server_param, :port_param, :policies_param
     server_param.destroy
     port_param.destroy