foreman_openscap 0.5.3 → 0.5.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (60) hide show
  1. checksums.yaml +7 -7
  2. data/app/assets/javascripts/foreman_openscap/policy_edit.js +2 -2
  3. data/app/controllers/api/v2/compliance/arf_reports_controller.rb +3 -9
  4. data/app/controllers/api/v2/compliance/policies_controller.rb +3 -9
  5. data/app/controllers/api/v2/compliance/scap_contents_controller.rb +18 -10
  6. data/app/controllers/arf_reports_controller.rb +5 -5
  7. data/app/controllers/policies_controller.rb +2 -2
  8. data/app/helpers/concerns/foreman_openscap/lookup_keys_helper_extensions.rb +14 -0
  9. data/app/helpers/dashboard_helper.rb +26 -0
  10. data/app/lib/proxy_api/available_proxy.rb +20 -2
  11. data/app/lib/proxy_api/migration.rb +13 -0
  12. data/app/lib/proxy_api/openscap.rb +2 -2
  13. data/app/mailers/foreman_openscap/policy_mailer.rb +1 -1
  14. data/app/models/concerns/foreman_openscap/compliance_status_scoped_search.rb +1 -1
  15. data/app/models/concerns/foreman_openscap/host_extensions.rb +1 -1
  16. data/app/models/concerns/foreman_openscap/log_extensions.rb +10 -0
  17. data/app/models/concerns/foreman_openscap/openscap_proxy_core_extensions.rb +29 -9
  18. data/app/models/concerns/foreman_openscap/openscap_proxy_extensions.rb +1 -1
  19. data/app/models/foreman_openscap/arf_report.rb +2 -4
  20. data/app/models/foreman_openscap/policy.rb +3 -3
  21. data/app/models/foreman_openscap/scap_content.rb +7 -6
  22. data/app/services/foreman_openscap/report_dashboard/data.rb +1 -1
  23. data/app/views/api/v2/compliance/arf_reports/base.json.rabl +4 -1
  24. data/app/views/api/v2/compliance/arf_reports/main.json.rabl +5 -1
  25. data/app/views/api/v2/compliance/common/_loc.json.rabl +3 -0
  26. data/app/views/api/v2/compliance/common/_org.json.rabl +3 -0
  27. data/app/views/api/v2/compliance/policies/base.json.rabl +4 -1
  28. data/app/views/api/v2/compliance/scap_contents/base.json.rabl +4 -1
  29. data/app/views/api/v2/compliance/scap_contents/show.json.rabl +7 -1
  30. data/app/views/arf_reports/_list.html.erb +7 -1
  31. data/app/views/arf_reports/delete_multiple.html.erb +1 -1
  32. data/app/views/arf_reports/show.html.erb +1 -1
  33. data/app/views/compliance_hosts/_openscap_proxy.html.erb +1 -6
  34. data/app/views/compliance_hosts/show.html.erb +1 -1
  35. data/app/views/dashboard/_compliance_host_reports_widget.html.erb +2 -6
  36. data/app/views/foreman_openscap/policy_mailer/policy_summary.erb +1 -1
  37. data/app/views/policies/_form.html.erb +1 -1
  38. data/app/views/policies/welcome.html.erb +7 -6
  39. data/app/views/scap_contents/welcome.html.erb +1 -1
  40. data/config/routes.rb +5 -1
  41. data/db/migrate/20150821100137_migrate_from_scaptimony.rb +7 -6
  42. data/db/migrate/20150929152345_move_arf_reports_to_reports_table.rb +0 -97
  43. data/db/migrate/20151120090851_add_openscap_proxy_to_host_and_hostgroup.rb +0 -12
  44. data/db/seeds.d/openscap_policy_notification.rb +1 -1
  45. data/lib/foreman_openscap/bulk_upload.rb +1 -0
  46. data/lib/foreman_openscap/data_migration.rb +82 -0
  47. data/lib/foreman_openscap/engine.rb +5 -6
  48. data/lib/foreman_openscap/version.rb +1 -1
  49. data/lib/tasks/foreman_openscap_tasks.rake +14 -0
  50. data/test/factories/arf_report_factory.rb +1 -0
  51. data/test/factories/compliance_host_factory.rb +11 -1
  52. data/test/functional/api/v2/compliance/arf_reports_controller_test.rb +3 -1
  53. data/test/test_plugin_helper.rb +23 -2
  54. data/test/unit/scap_content_test.rb +1 -1
  55. data/test/unit/services/report_dashboard/data_test.rb +25 -0
  56. metadata +202 -194
  57. data/app/assets/javascripts/foreman_openscap/openscap_proxy.js +0 -52
  58. data/app/controllers/concerns/foreman_openscap/hosts_common_controller_extensions.rb +0 -45
  59. data/db/migrate/20151023131950_link_arf_report_directly_to_host.rb +0 -21
  60. data/db/seeds.d/openscap_scap_default.rb +0 -2
@@ -1,52 +0,0 @@
1
- function updateOpenscapProxy(element){
2
- var id = $("form").data('id')
3
- var url = $(element).attr('data-url');
4
- var data = $("form").serialize().replace('method=put', 'method=post');
5
- if (url.match('hostgroups')) {
6
- data = data + '&hostgroup_id=' + id
7
- } else {
8
- data = data + '&host_id=' + id
9
- }
10
-
11
- toggleErrorText("");
12
- $(element).indicator_show();
13
- $.ajax({
14
- type: 'post',
15
- url: url,
16
- data: data,
17
- error: function(response) {
18
- var text = $(response.responseText).find('.form-group.has-error').find('.help-block.help-inline').text();
19
- addOpenscapProxyError(text);
20
- $(element).indicator_hide();
21
- },
22
- success: function(response) {
23
- removeOpenscapProxyError();
24
- $('#puppetclasses_parameters').replaceWith($(response).find("#puppetclasses_parameters"));
25
- $(element).indicator_hide();
26
- }
27
- })
28
- }
29
-
30
- function findOpenscapProxyFormGroup(){
31
- return $('form').find("label[for='openscap_proxy_id']").parents(".form-group").first();
32
- }
33
-
34
- function addOpenscapProxyError(text){
35
- var formGroup = findOpenscapProxyFormGroup();
36
- $(formGroup).addClass("has-error");
37
- toggleErrorText(text);
38
- }
39
-
40
- function removeOpenscapProxyError(){
41
- var formGroup = findOpenscapProxyFormGroup();
42
- $(formGroup).removeClass("has-error");
43
- toggleErrorText("");
44
- }
45
-
46
- function toggleErrorText(text){
47
- if(text){
48
- $(findOpenscapProxyFormGroup()).find(".help-block.help-inline").append('<span id="openscap_error">' + text + '</span>');
49
- } else {
50
- $(findOpenscapProxyFormGroup()).find("#openscap_error").remove();
51
- }
52
- }
@@ -1,45 +0,0 @@
1
- module ForemanOpenscap
2
- module HostsCommonControllerExtensions
3
- extend ActiveSupport::Concern
4
-
5
- def openscap_proxy_changed
6
- model = if params[param_id_key].blank?
7
- controller_name.classify.constantize.new(params[param_model_key])
8
- else
9
- resource_base.find(params[param_id_key])
10
- end
11
- proxy_id = params[param_model_key][:openscap_proxy_id]
12
- instance_variable_set("@#{param_model_key}", model)
13
- if proxy_id.blank?
14
- render :partial => "form"
15
- else
16
- begin
17
- instance_variable_get("@#{param_model_key}").update_scap_client_params(proxy_id)
18
- render :partial => "form"
19
- rescue => e
20
- instance_variable_get("@#{param_model_key}").errors.add(:openscap_proxy_id, e.message)
21
- render :partial => "form", :status => 422
22
- end
23
- end
24
- end
25
-
26
- def action_permission
27
- case params[:action]
28
- when 'openscap_proxy_changed'
29
- :edit
30
- else
31
- super
32
- end
33
- end
34
-
35
- private
36
-
37
- def param_id_key
38
- "#{param_model_key}_id"
39
- end
40
-
41
- def param_model_key
42
- controller_name.singularize
43
- end
44
- end
45
- end
@@ -1,21 +0,0 @@
1
- class LinkArfReportDirectlyToHost < ActiveRecord::Migration
2
- def up
3
- ForemanOpenscap::ArfReport.find_in_batches do |batch|
4
- batch.each do |report|
5
- asset = ForemanOpenscap::Asset.find(:id => report.host_id)
6
- report.host_id = asset.host.id
7
- report.save!
8
- end
9
- end
10
- end
11
-
12
- def down
13
- ForemanOpenscap::ArfReport.find_in_batches do |batch|
14
- batch.all.each do |report|
15
- asset = ForemanOpenscap::Asset.find(:assetable_id => report.host_id, :assetable_type => 'Host::Base')
16
- report.host_id = asset.id
17
- report.save!
18
- end
19
- end
20
- end
21
- end
@@ -1,2 +0,0 @@
1
- require 'foreman_openscap/bulk_upload'
2
- ForemanOpenscap::BulkUpload.new(true).generate_scap_default_content