foreman_openscap 4.3.1 → 5.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (105) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/api/v2/compliance/arf_reports_controller.rb +0 -6
  3. data/app/controllers/api/v2/compliance/oval_policies_controller.rb +1 -1
  4. data/app/graphql/mutations/oval_contents/delete.rb +9 -0
  5. data/app/graphql/mutations/oval_policies/delete.rb +9 -0
  6. data/app/graphql/mutations/oval_policies/update.rb +15 -0
  7. data/app/graphql/types/oval_check.rb +11 -0
  8. data/app/graphql/types/oval_content.rb +2 -0
  9. data/app/graphql/types/oval_policy.rb +3 -0
  10. data/app/helpers/arf_report_dashboard_helper.rb +2 -4
  11. data/app/helpers/compliance_hosts_helper.rb +1 -1
  12. data/app/helpers/policies_helper.rb +1 -1
  13. data/app/models/concerns/foreman_openscap/host_extensions.rb +0 -6
  14. data/app/models/concerns/foreman_openscap/oval_facet_hostgroup_extensions.rb +15 -0
  15. data/app/models/foreman_openscap/oval_content.rb +2 -0
  16. data/app/services/foreman_openscap/client_config/base.rb +1 -0
  17. data/app/services/foreman_openscap/client_config/puppet.rb +6 -2
  18. data/app/services/foreman_openscap/oval/configure.rb +1 -1
  19. data/app/services/foreman_openscap/oval/setup.rb +5 -5
  20. data/app/services/foreman_openscap/oval/setup_check.rb +5 -2
  21. data/app/views/api/v2/compliance/oval_contents/destroy.json.rabl +3 -0
  22. data/app/views/arf_reports/_metrics.html.erb +4 -4
  23. data/app/views/compliance_hosts/show.html.erb +4 -6
  24. data/app/views/dashboard/_compliance_reports_breakdown_widget.html.erb +4 -3
  25. data/app/views/policy_dashboard/_policy_chart_widget.html.erb +3 -2
  26. data/db/migrate/20200117135424_migrate_port_overrides_to_int.rb +2 -1
  27. data/db/migrate/20201202110213_update_puppet_port_param_type.rb +2 -1
  28. data/db/migrate/20210819143316_drop_unused_tables.rb +6 -0
  29. data/lib/foreman_openscap/engine.rb +5 -7
  30. data/lib/foreman_openscap/version.rb +1 -1
  31. data/package.json +3 -6
  32. data/test/functional/api/v2/compliance/oval_reports_controller_test.rb +1 -1
  33. data/test/functional/api/v2/compliance/policies_controller_test.rb +2 -0
  34. data/test/graphql/mutations/oval_policies/delete_mutation_test.rb +63 -0
  35. data/test/graphql/queries/oval_content_query_test.rb +29 -0
  36. data/test/helpers/arf_report_dashboard_helper_test.rb +9 -10
  37. data/test/helpers/policy_dashboard_helper_test.rb +1 -1
  38. data/test/test_plugin_helper.rb +9 -4
  39. data/test/unit/policy_test.rb +1 -1
  40. data/test/unit/services/config_name_service_test.rb +1 -0
  41. data/test/unit/services/hostgroup_overrider_test.rb +2 -1
  42. data/test/unit/services/lookup_key_overrider_test.rb +4 -1
  43. data/test/unit/services/oval/setup_check_test.rb +37 -0
  44. data/webpack/components/ConfirmModal.js +63 -0
  45. data/webpack/components/ConfirmModal.scss +3 -0
  46. data/webpack/components/EditableInput.js +157 -0
  47. data/webpack/components/EditableInput.scss +3 -0
  48. data/webpack/components/EmptyState.js +12 -3
  49. data/webpack/components/IndexLayout.js +11 -4
  50. data/webpack/components/IndexTable/index.js +17 -18
  51. data/webpack/components/LinkButton.js +26 -0
  52. data/webpack/components/withDeleteModal.js +51 -0
  53. data/webpack/components/withLoading.js +41 -4
  54. data/webpack/graphql/mutations/deleteOvalContent.gql +9 -0
  55. data/webpack/graphql/mutations/deleteOvalPolicy.gql +9 -0
  56. data/webpack/graphql/mutations/updateOvalPolicy.gql +14 -0
  57. data/webpack/graphql/queries/currentUserAttributes.gql +11 -0
  58. data/webpack/graphql/queries/cves.gql +5 -0
  59. data/webpack/graphql/queries/hostgroups.gql +14 -0
  60. data/webpack/graphql/queries/ovalContent.gql +8 -0
  61. data/webpack/graphql/queries/ovalContents.gql +8 -0
  62. data/webpack/graphql/queries/ovalPolicies.gql +8 -0
  63. data/webpack/graphql/queries/ovalPolicy.gql +5 -0
  64. data/webpack/helpers/formFieldsHelper.js +63 -0
  65. data/webpack/helpers/mutationHelper.js +68 -0
  66. data/webpack/helpers/pathsHelper.js +5 -0
  67. data/webpack/helpers/permissionsHelper.js +42 -0
  68. data/webpack/helpers/toastHelper.js +3 -0
  69. data/webpack/routes/OvalContents/OvalContentsIndex/OvalContentsIndex.js +26 -0
  70. data/webpack/routes/OvalContents/OvalContentsIndex/OvalContentsTable.js +50 -5
  71. data/webpack/routes/OvalContents/OvalContentsIndex/__tests__/OvalContentsDestroy.fixtures.js +105 -0
  72. data/webpack/routes/OvalContents/OvalContentsIndex/__tests__/OvalContentsDestroy.test.js +124 -0
  73. data/webpack/routes/OvalContents/OvalContentsIndex/__tests__/OvalContentsIndex.fixtures.js +93 -77
  74. data/webpack/routes/OvalContents/OvalContentsIndex/__tests__/OvalContentsIndex.test.js +53 -6
  75. data/webpack/routes/OvalContents/OvalContentsIndex/index.js +7 -1
  76. data/webpack/routes/OvalContents/OvalContentsNew/OvalContentsNew.js +138 -0
  77. data/webpack/routes/OvalContents/OvalContentsNew/OvalContentsNew.scss +3 -0
  78. data/webpack/routes/OvalContents/OvalContentsNew/OvalContentsNewHelper.js +73 -0
  79. data/webpack/routes/OvalContents/OvalContentsNew/__tests__/OvalContentsNew.test.js +104 -0
  80. data/webpack/routes/OvalContents/OvalContentsNew/index.js +13 -0
  81. data/webpack/routes/OvalContents/OvalContentsShow/OvalContentsShow.js +62 -0
  82. data/webpack/routes/OvalContents/OvalContentsShow/OvalContentsShow.test.js +45 -0
  83. data/webpack/routes/OvalContents/OvalContentsShow/OvalContentsShowHelper.js +0 -0
  84. data/webpack/routes/OvalContents/OvalContentsShow/index.js +35 -0
  85. data/webpack/routes/OvalPolicies/OvalPoliciesIndex/OvalPoliciesIndex.js +18 -2
  86. data/webpack/routes/OvalPolicies/OvalPoliciesIndex/OvalPoliciesTable.js +16 -3
  87. data/webpack/routes/OvalPolicies/OvalPoliciesIndex/__tests__/OvalPoliciesDestroy.fixtures.js +101 -0
  88. data/webpack/routes/OvalPolicies/OvalPoliciesIndex/__tests__/OvalPoliciesDestroy.test.js +117 -0
  89. data/webpack/routes/OvalPolicies/OvalPoliciesIndex/__tests__/OvalPoliciesIndex.fixtures.js +71 -21
  90. data/webpack/routes/OvalPolicies/OvalPoliciesIndex/__tests__/OvalPoliciesIndex.test.js +34 -2
  91. data/webpack/routes/OvalPolicies/OvalPoliciesIndex/index.js +7 -1
  92. data/webpack/routes/OvalPolicies/OvalPoliciesShow/CvesTab.js +1 -0
  93. data/webpack/routes/OvalPolicies/OvalPoliciesShow/DetailsTab.js +85 -0
  94. data/webpack/routes/OvalPolicies/OvalPoliciesShow/HostgroupsTab.js +49 -0
  95. data/webpack/routes/OvalPolicies/OvalPoliciesShow/HostgroupsTable.js +38 -0
  96. data/webpack/routes/OvalPolicies/OvalPoliciesShow/OvalPoliciesShow.js +15 -12
  97. data/webpack/routes/OvalPolicies/OvalPoliciesShow/OvalPoliciesShowHelper.js +77 -0
  98. data/webpack/routes/OvalPolicies/OvalPoliciesShow/__tests__/OvalPoliciesEdit.fixtures.js +48 -0
  99. data/webpack/routes/OvalPolicies/OvalPoliciesShow/__tests__/OvalPoliciesEdit.test.js +175 -0
  100. data/webpack/routes/OvalPolicies/OvalPoliciesShow/__tests__/OvalPoliciesShow.fixtures.js +40 -4
  101. data/webpack/routes/OvalPolicies/OvalPoliciesShow/__tests__/OvalPoliciesShow.test.js +64 -4
  102. data/webpack/routes/OvalPolicies/OvalPoliciesShow/index.js +4 -0
  103. data/webpack/routes/routes.js +14 -0
  104. data/webpack/testHelper.js +42 -2
  105. metadata +53 -7
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 279a2b2f763e2b1f7c333a66e812b359f02c67a91626577e6212b4d69f093e08
4
- data.tar.gz: 4d2116542474424bb0c7918c7c877b626bf725420e3b704794d401a68688b73f
3
+ metadata.gz: 0deaa4503a6ab004120595983e5b6fac947691d57e7b8da5d38a0aed3316f1a6
4
+ data.tar.gz: 7447310d905705fbf71ca93f1cca7b2314e7d13827e90ce9c3a8b321cfcba411
5
5
  SHA512:
6
- metadata.gz: ee9601dfb4fc7ea3a6f88ad3ec238824aa30e169e5d74e6177e4d926cf60f5e715fe17faea13c0d2119ae5a28b91ac9b8c4ccb3b6e52228fa66ffb7462b3d388
7
- data.tar.gz: c04a455c484bd2bc6dfc631626f0f8dc3ef88c727695eaf0af2f8cde5c8c033bf6ce5094f5a14c140fdde006a1769b87095754f1fa9c3f40328161b926daafff
6
+ metadata.gz: 192e4e96375311fbf3225aa5e715eed99797338a8ba2be9d5b19cdf3f49dcae9ff5a78cb0136df175744360dbcc5ffc2ce453058ac31839a71f0373e79fa22cc
7
+ data.tar.gz: 2b231f618e80bc0bd187417328afae0c2b7f4c7a10d0954dc26ff554fd4ad34c67073b252cdc6f86ae6194d9a9d7c53c5c08bb00ba7348d884e334baac82f1fe
@@ -140,12 +140,6 @@ module Api
140
140
  super
141
141
  end
142
142
  end
143
-
144
- protected
145
-
146
- def assign_lone_taxonomies
147
- # do not assign lone taxonomies to arf report
148
- end
149
143
  end
150
144
  end
151
145
  end
@@ -75,7 +75,7 @@ module Api::V2
75
75
  assign _('hosts'), params["host_ids"], ::Host::Managed
76
76
  end
77
77
 
78
- api :GET, '/compliance/oval_policies/:id/oval_content', N_("Show a policy's SCAP content")
78
+ api :GET, '/compliance/oval_policies/:id/oval_content', N_("Show a policy's OVAL content")
79
79
  param :id, :identifier, :required => true
80
80
 
81
81
  def oval_content
@@ -0,0 +1,9 @@
1
+ module Mutations
2
+ module OvalContents
3
+ class Delete < DeleteMutation
4
+ graphql_name 'DeleteOvalContentMutation'
5
+ description 'Deletes an OVAL Content'
6
+ resource_class ::ForemanOpenscap::OvalContent
7
+ end
8
+ end
9
+ end
@@ -0,0 +1,9 @@
1
+ module Mutations
2
+ module OvalPolicies
3
+ class Delete < DeleteMutation
4
+ graphql_name 'DeleteOvalPolicyMutation'
5
+ description 'Deletes an OVAL Policy'
6
+ resource_class ::ForemanOpenscap::OvalPolicy
7
+ end
8
+ end
9
+ end
@@ -0,0 +1,15 @@
1
+ module Mutations
2
+ module OvalPolicies
3
+ class Update < UpdateMutation
4
+ graphql_name 'UpdateOvalPolicyMutation'
5
+ description 'Updates an OVAL Policy'
6
+ resource_class ::ForemanOpenscap::OvalPolicy
7
+
8
+ argument :name, String, required: false
9
+ argument :description, String, required: false
10
+ argument :cron_line, String, required: false
11
+
12
+ field :oval_policy, ::Types::OvalPolicy, 'The OVAL policy.', null: true
13
+ end
14
+ end
15
+ end
@@ -0,0 +1,11 @@
1
+ module Types
2
+ class OvalCheck < GraphQL::Schema::Object
3
+ description 'A check that contains information about whether a particual prerequisite for OVAL policy deployment is configured correctly'
4
+
5
+ field :id, String, null: false
6
+ field :title, String, null: false
7
+ field :fail_msg, String, null: true
8
+ field :errors, ::Types::RawJson, null: true
9
+ field :result, String, null: false
10
+ end
11
+ end
@@ -3,6 +3,8 @@ module Types
3
3
  description 'An OVAL Content'
4
4
  model_class ::ForemanOpenscap::OvalContent
5
5
 
6
+ include ::Types::Concerns::MetaField
7
+
6
8
  global_id_field :id
7
9
  timestamps
8
10
  field :name, String
@@ -3,6 +3,8 @@ module Types
3
3
  description 'An OVAL Policy'
4
4
  model_class ::ForemanOpenscap::OvalPolicy
5
5
 
6
+ include ::Types::Concerns::MetaField
7
+
6
8
  global_id_field :id
7
9
  timestamps
8
10
  field :name, String
@@ -12,6 +14,7 @@ module Types
12
14
  field :day_of_month, String
13
15
  field :cron_line, String
14
16
  belongs_to :oval_content, ::Types::OvalContent
17
+
15
18
  has_many :hostgroups, ::Types::Hostgroup
16
19
 
17
20
  def self.graphql_definition
@@ -6,11 +6,9 @@ module ArfReportDashboardHelper
6
6
  }.freeze
7
7
 
8
8
  def breakdown_chart_data(categories, report, colors = COLORS)
9
- data = categories.reduce([]) do |memo, (key, value)|
9
+ categories.reduce([]) do |memo, (key, value)|
10
10
  memo << [value, report[key], colors[key]]
11
11
  end
12
-
13
- data.to_json
14
12
  end
15
13
 
16
14
  def donut_breakdown_chart_data(report)
@@ -27,6 +25,6 @@ module ArfReportDashboardHelper
27
25
  :data => status.to_a,
28
26
  :yAxisLabel => _("Number of Events"),
29
27
  :xAxisLabel => _("Rule Results"),
30
- }.to_json
28
+ }
31
29
  end
32
30
  end
@@ -16,7 +16,7 @@ module ComplianceHostsHelper
16
16
  [_("Othered"), othered, ArfReportDashboardHelper::COLORS[:othered]],
17
17
  ['dates', date, nil]
18
18
  ]
19
- { :data => data, :xAxisDataLabel => 'dates', :config => 'timeseries' }.to_json
19
+ { :data => data, :xAxisDataLabel => 'dates', :config => 'timeseries' }
20
20
  end
21
21
 
22
22
  def compliance_host_multiple_actions
@@ -41,7 +41,7 @@ module PoliciesHelper
41
41
  end
42
42
 
43
43
  def deploy_by_radio_checked(policy, tool)
44
- type = policy.deploy_by ? policy.deploy_by.to_sym : :puppet
44
+ type = policy.deploy_by ? policy.deploy_by.to_sym : :manual
45
45
  tool.type == type
46
46
  end
47
47
 
@@ -50,12 +50,6 @@ module ForemanOpenscap
50
50
  base.scoped_search :on => :id, :rename => :removed_from_policy,
51
51
  :only_explicit => true, :operators => ['= '], :ext_method => :search_by_removed_from_policy
52
52
 
53
- base.after_update :puppetrun!, :if => ->(host) do
54
- Setting[:puppetrun] &&
55
- host.changed.include?('openscap_proxy_id') &&
56
- (host.individual_puppetclasses + host.parent_classes).pluck(:name).include?(ClientConfig::Puppet.new.puppetclass_name)
57
- end
58
-
59
53
  base.scope :comply_with, lambda { |policy|
60
54
  joins(:arf_reports).merge(ArfReport.latest_of_policy(policy)).merge(ArfReport.passed)
61
55
  }
@@ -6,10 +6,25 @@ module ForemanOpenscap
6
6
 
7
7
  included do
8
8
  has_many :oval_policies, :through => :oval_facet, :class_name => 'ForemanOpenscap::OvalPolicy'
9
+
10
+ scoped_search :relation => :oval_policies,
11
+ :on => :id,
12
+ :rename => :oval_policy_id,
13
+ :complete_value => false,
14
+ :ext_method => :find_by_oval_policy_id,
15
+ :operators => ['= ']
9
16
  end
10
17
 
11
18
  def inherited_oval_policies
12
19
  find_inherited_policies :oval_policies
13
20
  end
21
+
22
+ module ClassMethods
23
+ def find_by_oval_policy_id(_key, operator, value)
24
+ conditions = sanitize_sql_for_conditions(["#{::ForemanOpenscap::HostgroupOvalFacetOvalPolicy.table_name}.oval_policy_id #{operator} ?", value])
25
+ hg_ids = ::ForemanOpenscap::Hostgroup::OvalFacet.joins(:hostgroup_oval_facet_oval_policies).where(conditions).pluck(:hostgroup_id)
26
+ { :conditions => ::Hostgroup.arel_table[:id].in(hg_ids).to_sql }
27
+ end
28
+ end
14
29
  end
15
30
  end
@@ -5,6 +5,8 @@ module ForemanOpenscap
5
5
  include Taxonomix
6
6
  include ScapFileContent
7
7
 
8
+ before_destroy ActiveRecord::Base::EnsureNotUsedBy.new(:oval_policies)
9
+
8
10
  scoped_search :on => :name, :complete_value => true
9
11
 
10
12
  has_many :oval_policies
@@ -38,6 +38,7 @@ module ForemanOpenscap
38
38
  end
39
39
 
40
40
  def find_config_item(scope = config_item_class_name.constantize)
41
+ return unless scope
41
42
  return scope.find_by :name => config_item_name if scope.respond_to?(:find_by)
42
43
  # all_puppetclasses, all_ansible_roles methods return Array, not ActiveRecord::Relation
43
44
  scope.find { |item| item.name == config_item_name }
@@ -10,7 +10,7 @@ module ForemanOpenscap
10
10
  end
11
11
 
12
12
  def available?
13
- defined?(Puppetclass)
13
+ defined?(ForemanPuppet)
14
14
  end
15
15
 
16
16
  def inline_help
@@ -21,13 +21,17 @@ module ForemanOpenscap
21
21
  }
22
22
  end
23
23
 
24
+ def collection_method
25
+ :puppetclasses
26
+ end
27
+
24
28
  def constants
25
29
  OpenStruct.new(
26
30
  :server_param => 'server',
27
31
  :port_param => 'port',
28
32
  :policies_param => 'policies',
29
33
  :puppetclass_name => 'foreman_scap_client',
30
- :config_item_class_name => 'Puppetclass',
34
+ :config_item_class_name => 'ForemanPuppet::Puppetclass',
31
35
  :override_method_name => 'class_params',
32
36
  :msg_name => _('Puppet class'),
33
37
  :lookup_key_plural_name => _('Smart Class Parameters'),
@@ -58,7 +58,7 @@ module ForemanOpenscap
58
58
  memo.add_check(
59
59
  SetupCheck.new(
60
60
  :title => (_("Was %s configured successfully?") % item.class.name),
61
- :fail_msg => ->(_) { _("Assign openscap_proxy to %s before proceeding.") % item.name }
61
+ :fail_msg => (_("Assign openscap_proxy to %s before proceeding.") % item.name)
62
62
  ).fail!
63
63
  )
64
64
  end
@@ -59,12 +59,12 @@ module ForemanOpenscap
59
59
  {
60
60
  :id => :foreman_ansible_present,
61
61
  :title => _("Is foreman_ansible present?"),
62
- :fail_msg => ->(hash) { _("foreman_ansible plugin not found, please install it before running this action again.") }
62
+ :fail_msg => _("foreman_ansible plugin not found, please install it before running this action again.")
63
63
  },
64
64
  {
65
65
  :id => :foreman_scap_client_role_present,
66
66
  :title => _("Is theforeman.foreman_scap_client present?"),
67
- :fail_msg => ->(hash) { @config.ansible_role_missing_msg }
67
+ :fail_msg => @config.ansible_role_missing_msg
68
68
  },
69
69
  {
70
70
  :id => :foreman_scap_client_vars_present,
@@ -74,17 +74,17 @@ module ForemanOpenscap
74
74
  {
75
75
  :id => :foreman_scap_client_server_overriden,
76
76
  :title => _("Is %s param set to be overriden?") % @config.server_param,
77
- :fail_msg => ->(hash) { override_msg }
77
+ :fail_msg => override_msg
78
78
  },
79
79
  {
80
80
  :id => :foreman_scap_client_port_overriden,
81
81
  :title => _("Is %s param set to be overriden?") % @config.port_param,
82
- :fail_msg => ->(hash) { override_msg }
82
+ :fail_msg => override_msg
83
83
  },
84
84
  {
85
85
  :id => :foreman_scap_client_policies_overriden,
86
86
  :title => _("Is %s param set to be overriden?") % @config.policies_param,
87
- :fail_msg => ->(hash) { override_msg }
87
+ :fail_msg => override_msg
88
88
  }
89
89
  ]
90
90
  end
@@ -1,7 +1,7 @@
1
1
  module ForemanOpenscap
2
2
  module Oval
3
3
  class SetupCheck
4
- attr_reader :result, :id
4
+ attr_reader :result, :id, :errors
5
5
 
6
6
  def initialize(hash)
7
7
  @id = hash[:id]
@@ -17,6 +17,7 @@ module ForemanOpenscap
17
17
  end
18
18
 
19
19
  def fail!
20
+ raise 'Cannot fail a check that expects fail message data, use fail_with! method instead' if @fail_msg.respond_to?(:call) && @fail_msg_data.empty?
20
21
  @result = :fail
21
22
  self
22
23
  end
@@ -39,7 +40,9 @@ module ForemanOpenscap
39
40
  end
40
41
 
41
42
  def fail_msg
42
- @fail_msg.call @fail_msg_data if @fail_msg
43
+ return unless failed?
44
+ return @fail_msg.call(@fail_msg_data) if @fail_msg.respond_to?(:call) && @fail_msg_data
45
+ @fail_msg
43
46
  end
44
47
 
45
48
  def to_h
@@ -0,0 +1,3 @@
1
+ object @oval_content
2
+
3
+ extends "api/v2/compliance/oval_contents/base"
@@ -4,15 +4,15 @@
4
4
  <div class="col-md-5 scap-breakdown-chart-col">
5
5
  <div class="stats-well">
6
6
  <h4 class="ca" ><%= _('Report Metrics') %></h4>
7
- <div id="arf-report-breakdown-chart" class="scap-breakdown-chart"></div>
8
- <%= mount_react_component('DonutChart', "#arf-report-breakdown-chart", donut_breakdown_chart_data(metrics)) %>
7
+ <div class="scap-breakdown-chart">
8
+ <%= react_component('DonutChart', :data => donut_breakdown_chart_data(metrics)) %>
9
+ </div>
9
10
  </div>
10
11
  </div>
11
12
  <div class="col-md-5 arf-report-rule-chart-col">
12
13
  <div class="stats-well">
13
14
  <h4 class="ca" ><%= _('Report Status') %></h4>
14
- <div id="arf-report-rule-chart"></div>
15
- <%= mount_react_component('BarChart', "#arf-report-rule-chart", arf_report_status_chart_data(status), :flatten_data => true) %>
15
+ <%= react_component('BarChart', arf_report_status_chart_data(status)) %>
16
16
  </div>
17
17
  </div>
18
18
  <div class="col-md-2">
@@ -17,18 +17,16 @@
17
17
  hash_for_arf_report_path(:id => data.latest_report.id)
18
18
  .merge(:auth_object => data.latest_report)) %></h4>
19
19
  <% report = data.report %>
20
- <% id = "host-policy-breakdown-chart-#{policy.id}" %>
21
- <div id="<%= id %>" class="scap-breakdown-chart"></div>
22
- <%= mount_react_component('DonutChart', "##{id}", donut_breakdown_chart_data(report)) %>
20
+ <div class="scap-breakdown-chart">
21
+ <%= react_component('DonutChart', :data => donut_breakdown_chart_data(report)) %>
22
+ </div>
23
23
  </div>
24
24
  </div>
25
25
 
26
26
  <div class="col-md-8">
27
27
  <div class="stats-well">
28
28
  <h4 class="ca"><%= _("%s reports over time") % policy %></h4>
29
- <% reports_graph_id = "arf-reports-over-time-#{policy.id}" %>
30
- <div id="<%= reports_graph_id %>"></div>
31
- <%= mount_react_component('LineChart', "##{reports_graph_id}", host_arf_reports_chart_data(policy.id), :flatten_data => true) %>
29
+ <%= react_component('LineChart', host_arf_reports_chart_data(policy.id)) %>
32
30
  </div>
33
31
  </div>
34
32
  <% else %>
@@ -1,4 +1,5 @@
1
1
  <h4 class="header ca"><%= _('Compliance Reports Breakdown') %></h4>
2
- <div id="compliance-reports-breakdown" class="host-configuration-chart"/>
3
- <% report = ForemanOpenscap::ReportDashboard::Data.new().report %>
4
- <%= mount_react_component('DonutChart', "#compliance-reports-breakdown", donut_breakdown_chart_data(report)) %>
2
+ <div class="host-configuration-chart">
3
+ <% report = ForemanOpenscap::ReportDashboard::Data.new().report %>
4
+ <%= react_component('DonutChart', :data => donut_breakdown_chart_data(report)) %>
5
+ </div>
@@ -2,6 +2,7 @@
2
2
 
3
3
  <div id='status-chart'>
4
4
  <h4 class="header ca"><%= _('Host Breakdown Chart') %></h4>
5
- <div id="policy-breakdown-chart" class="scap-breakdown-chart"></div>
6
- <%= mount_react_component('DonutChart', "#policy-breakdown-chart", policy_breakdown_chart_data(@report)) %>
5
+ <div class="scap-breakdown-chart">
6
+ <%= react_component('DonutChart', :data => policy_breakdown_chart_data(@report)) %>
7
+ </div>
7
8
  </div>
@@ -10,7 +10,8 @@ class MigratePortOverridesToInt < ActiveRecord::Migration[5.2]
10
10
  private
11
11
 
12
12
  def transform_lookup_values(method)
13
- puppet_class = Puppetclass.find_by :name => 'foreman_scap_client'
13
+ return unless defined?(ForemanPuppet)
14
+ puppet_class = ::ForemanPuppet::Puppetclass.find_by :name => 'foreman_scap_client'
14
15
  return unless puppet_class
15
16
  port_key = puppet_class.class_params.find_by :key => 'port'
16
17
  return unless port_key
@@ -10,7 +10,8 @@ class UpdatePuppetPortParamType < ActiveRecord::Migration[6.0]
10
10
  private
11
11
 
12
12
  def update_port_type(method)
13
- puppet_class = Puppetclass.find_by :name => 'foreman_scap_client'
13
+ return unless defined?(ForemanPuppet)
14
+ puppet_class = ::ForemanPuppet::Puppetclass.find_by :name => 'foreman_scap_client'
14
15
  return unless puppet_class
15
16
  port_key = puppet_class.class_params.find_by :key => 'port'
16
17
  return unless port_key
@@ -0,0 +1,6 @@
1
+ class DropUnusedTables < ActiveRecord::Migration[6.0]
2
+ def up
3
+ drop_table :foreman_openscap_arf_reports
4
+ drop_table :foreman_openscap_arf_report_raws
5
+ end
6
+ end
@@ -219,16 +219,14 @@ module ForemanOpenscap
219
219
  register_global_js_file 'global'
220
220
 
221
221
  register_graphql_query_field :oval_contents, '::Types::OvalContent', :collection_field
222
+ register_graphql_query_field :oval_content, '::Types::OvalContent', :record_field
222
223
  register_graphql_query_field :oval_policies, '::Types::OvalPolicy', :collection_field
223
224
  register_graphql_query_field :oval_policy, '::Types::OvalPolicy', :record_field
224
225
  register_graphql_query_field :cves, '::Types::Cve', :collection_field
225
226
 
226
- # move to core
227
- extend_graphql_type type: ::Types::Hostgroup do
228
- field :descendants, Types::Hostgroup.connection_type, null: true, resolve: (proc do |object|
229
- RecordLoader.for(model_class).load_many(object.descendant_ids)
230
- end)
231
- end
227
+ register_graphql_mutation_field :delete_oval_policy, ::Mutations::OvalPolicies::Delete
228
+ register_graphql_mutation_field :delete_oval_content, ::Mutations::OvalContents::Delete
229
+ register_graphql_mutation_field :update_oval_policy, ::Mutations::OvalPolicies::Update
232
230
 
233
231
  register_facet ForemanOpenscap::Host::OvalFacet, :oval_facet do
234
232
  configure_host do
@@ -283,7 +281,7 @@ module ForemanOpenscap
283
281
 
284
282
  if Gem::Version.new(ForemanRemoteExecution::VERSION) >= Gem::Version.new('1.2.3')
285
283
  options[:host_action_button] = true
286
- oval_options[:host_action_button] = Setting[:lab_features]
284
+ oval_options[:host_action_button] = (!::Foreman.in_rake? && ActiveRecord::Base.connection.table_exists?(:settings)) ? (Setting.find_by(:name => 'lab_features')&.value || false) : false
287
285
  end
288
286
 
289
287
  RemoteExecutionFeature.register(:foreman_openscap_run_scans, N_("Run OpenSCAP scan"), options)
@@ -1,3 +1,3 @@
1
1
  module ForemanOpenscap
2
- VERSION = "4.3.1".freeze
2
+ VERSION = "5.1.0".freeze
3
3
  end
data/package.json CHANGED
@@ -24,23 +24,20 @@
24
24
  "@theforeman/vendor": ">= 4.13.2"
25
25
  },
26
26
  "devDependencies": {
27
- "@apollo/react-testing": "^4.0.0",
28
27
  "@babel/core": "^7.7.0",
29
- "@testing-library/dom": "^7.30.4",
28
+ "@testing-library/dom": "^8.9.1",
30
29
  "@testing-library/jest-dom": "^5.11.9",
31
- "@testing-library/react": "^11.2.5",
32
- "@testing-library/user-event": "^13.1.2",
30
+ "@testing-library/user-event": "^13.2.1",
33
31
  "@theforeman/builder": "^8.4.1",
34
32
  "@theforeman/eslint-plugin-foreman": "8.4.1",
35
33
  "@theforeman/find-foreman": "^8.4.1",
36
34
  "@theforeman/stories": "^8.4.1",
37
- "@theforeman/test": "^8.4.1",
35
+ "@theforeman/test": "^8.9.0",
38
36
  "@theforeman/vendor-dev": "^8.4.1",
39
37
  "babel-eslint": "^10.0.3",
40
38
  "eslint": "^6.7.2",
41
39
  "jed": "^1.1.1",
42
40
  "jest-svg-transformer": "^1.0.0",
43
- "jest-transform-graphql": "^2.1.0",
44
41
  "prettier": "^1.13.5",
45
42
  "stylelint": "^9.3.0",
46
43
  "stylelint-config-standard": "^18.0.0"
@@ -20,7 +20,7 @@ class Api::V2::Compliance::OvalReportsControllerTest < ActionController::TestCas
20
20
 
21
21
  test 'should show host errors on CVEs upload' do
22
22
  proxy = FactoryBot.create(:smart_proxy)
23
- host = FactoryBot.create(:host, :puppet_proxy => proxy, :environment => FactoryBot.create(:environment))
23
+ host = FactoryBot.create(:host, :puppet_proxy => proxy)
24
24
  SmartProxy.any_instance.stubs(:smart_proxy_features).returns([])
25
25
  post :create, :params => @params.merge(:cname => host.name), :session => set_session_user
26
26
 
@@ -40,6 +40,7 @@ class Api::V2::Compliance::PoliciesControllerTest < ActionController::TestCase
40
40
  end
41
41
 
42
42
  test "should get index and show hostgroups" do
43
+ skip unless puppet_available?
43
44
  ForemanOpenscap::Policy.any_instance.stubs(:find_scap_puppetclass).returns(FactoryBot.create(:puppetclass, :name => 'foreman_scap_client'))
44
45
  ForemanOpenscap::Policy.any_instance.stubs(:populate_overrides)
45
46
  hostgroup = FactoryBot.create(:hostgroup)
@@ -61,6 +62,7 @@ class Api::V2::Compliance::PoliciesControllerTest < ActionController::TestCase
61
62
  end
62
63
 
63
64
  test "should show a policy hosts and hostgroups" do
65
+ skip unless puppet_available?
64
66
  ForemanOpenscap::Policy.any_instance.stubs(:find_scap_puppetclass).returns(FactoryBot.create(:puppetclass, :name => 'foreman_scap_client'))
65
67
  ForemanOpenscap::Policy.any_instance.stubs(:populate_overrides)
66
68
  hostgroup = FactoryBot.create(:hostgroup)
@@ -0,0 +1,63 @@
1
+ require 'test_plugin_helper'
2
+
3
+ module Mutations
4
+ module OvalPolicies
5
+ class DeleteMutationTest < ActiveSupport::TestCase
6
+ let(:policy) { FactoryBot.create(:oval_policy, :oval_content => FactoryBot.create(:oval_content)) }
7
+ let(:policy_id) { Foreman::GlobalId.for(policy) }
8
+ let(:variables) do
9
+ {
10
+ id: policy_id,
11
+ }
12
+ end
13
+ let(:query) do
14
+ <<-GRAPHQL
15
+ mutation DeleteOvalPolicyMutation($id:ID!){
16
+ deleteOvalPolicy(input:{id:$id}) {
17
+ id
18
+ errors {
19
+ message
20
+ path
21
+ }
22
+ }
23
+ }
24
+ GRAPHQL
25
+ end
26
+
27
+ context 'with admin user' do
28
+ let(:user) { FactoryBot.create(:user, :admin) }
29
+
30
+ test 'should delete oval policy' do
31
+ context = { current_user: user }
32
+
33
+ policy
34
+
35
+ assert_difference('::ForemanOpenscap::OvalPolicy.count', -1) do
36
+ result = ForemanGraphqlSchema.execute(query, variables: variables, context: context)
37
+ assert_empty result['errors']
38
+ assert_empty result['data']['deleteOvalPolicy']['errors']
39
+ assert_equal policy_id, result['data']['deleteOvalPolicy']['id']
40
+ end
41
+ assert_equal user.id, Audit.last.user_id
42
+ end
43
+ end
44
+
45
+ context 'with user with view permissions' do
46
+ setup do
47
+ policy
48
+ @user = setup_user 'view', 'oval_policies'
49
+ end
50
+
51
+ test 'should not delete oval policy' do
52
+ context = { current_user: @user }
53
+
54
+ assert_difference('ForemanOpenscap::OvalPolicy.count', 0) do
55
+ result = ForemanGraphqlSchema.execute(query, variables: variables, context: context)
56
+ assert_not_empty result['errors']
57
+ assert_includes result['errors'].map { |error| error['message'] }.to_sentence, 'Unauthorized.'
58
+ end
59
+ end
60
+ end
61
+ end
62
+ end
63
+ end
@@ -0,0 +1,29 @@
1
+ require 'test_plugin_helper'
2
+
3
+ module Queries
4
+ class OvalContentQueryTest < GraphQLQueryTestCase
5
+ let(:query) do
6
+ <<-GRAPHQL
7
+ query($id:String!) {
8
+ ovalContent(id: $id) {
9
+ id
10
+ name
11
+ originalFilename
12
+ url
13
+ }
14
+ }
15
+ GRAPHQL
16
+ end
17
+
18
+ let(:oval_content) { FactoryBot.create(:oval_content) }
19
+
20
+ let(:global_id) { Foreman::GlobalId.for(oval_content) }
21
+ let(:variables) { { id: global_id } }
22
+ let(:data) { result['data']['ovalContent'] }
23
+
24
+ test 'should return OVAL Content' do
25
+ assert_equal global_id, data['id']
26
+ assert_equal oval_content.name, data['name']
27
+ end
28
+ end
29
+ end