foreman_openscap 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11979e99299089fd2351b7226729bd04c22b28e6
-  data.tar.gz: f6024f9b32f0692181a3b13f29b15a23d826c5f8
+  metadata.gz: 4fa6212889b88db1926a1167a196758e8be00c39
+  data.tar.gz: 936356cbe95d4e44a7bc93980a37d37cb5b55934
 SHA512:
-  metadata.gz: 6848c203268a565c4db241fc1a61a4dbd42ad142f3b29835e3db1b560ee91106313e8cf18d9a9e9c9881274f1cef939e5288623b49352fc4c94d5366e90a9e20
-  data.tar.gz: 6ff62df2218759cabd1fe823b7b4e7e9dfea66d8b8776b3e60603f83accfa2899aee3705c9246e91c59c40ca34897c6ef72e2f127b7bfb369084e839d2f008e4
+  metadata.gz: 880ec79e64d9501bdc9f80bbc1eec5d98dd6b622f1c84c56f032f461abc91760a427b87f7fb35d7b653e97b447514bd98822b3f7c5559559d0c2ab5708d5840b
+  data.tar.gz: 25358fba90e35c34445dcbdc4264faeecb64e58283018909099e527575d5b735ea78b68d315fcb572391a947787e4c1f4855fc686e231ace17c25d2d4338af48

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

@@ -1,5 +1,27 @@
+function readFromCookie() {
+  try {
+    var r = $.cookie(cookieName);
+    if (r) {
+      return $.parseJSON(r);
+    }
+    return [];
+  } catch (err) {
+    removeCookie();
+    return [];
+  }
+}
+
+function removeCookie() {
+  $.removeCookie(cookieName);
+}
+
+var cookieName = `_ForemanSelected${window.location.pathname.replace(
+  /\//,
+  ''
+)}`;
+
 function buildArfModal(element, url) {
-  var url = url + "?" + $.param({arf_report_ids: $.foremanSelectedHosts});
+  var url = url + "?" + $.param({arf_report_ids: readFromCookie()});
   var title = $(element).attr('data-dialog-title');
   $('#confirmation-modal .modal-header h4').text(title);
   $("#confirmation-modal .modal-body").load(url + " #content",

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

@@ -24,6 +24,7 @@ module Api
 
         api :GET, '/compliance/arf_reports', N_('List ARF reports')
         param_group :search_and_pagination, ::Api::V2::BaseController
+        add_scoped_search_description_for(::ForemanOpenscap::ArfReport)
 
         def index
           @arf_reports = resource_scope_for_index(:permission => :view_arf_reports).includes(:openscap_proxy, :policy, :host)

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

@@ -24,6 +24,7 @@ module Api::V2
 
       api :GET, '/compliance/policies', N_('List Policies')
       param_group :search_and_pagination, ::Api::V2::BaseController
+      add_scoped_search_description_for(::ForemanOpenscap::Policy)
 
       def index
         @policies = resource_scope_for_index(:permission => :view_policies)

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

@@ -15,6 +15,7 @@ module Api::V2
 
       api :GET, '/compliance/scap_contents', N_('List SCAP contents')
       param_group :search_and_pagination, ::Api::V2::BaseController
+      add_scoped_search_description_for(::ForemanOpenscap::ScapContent)
 
       def index
         @scap_contents = resource_scope_for_index(:permission => :view_scap_contents)

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

@@ -16,6 +16,7 @@ module Api::V2
 
       api :GET, '/compliance/tailoring_files', N_('List Tailoring files')
       param_group :search_and_pagination, ::Api::V2::BaseController
+      add_scoped_search_description_for(::ForemanOpenscap::TailoringFile)
 
       def index
         @tailoring_files = resource_scope_for_index(:permission => :view_tailoring_files)

data/app/models/concerns/foreman_openscap/openscap_proxy_core_extensions.rb

@@ -18,7 +18,7 @@ module ForemanOpenscap
     end
 
     def update_client_params(model_match, config)
-      client_item = config.find_config_item self.public_send(config.collection_method)
+      client_item = config.find_config_item self.public_send(config.all_collection_method)
       return unless client_item
       lookup_keys = client_item.public_send(config.override_method_name)
       server_key = lookup_keys.find { |param| param.key == config.server_param }
@@ -65,7 +65,7 @@ module ForemanOpenscap
     end
 
     def openscap_proxy_has_feature
-      errors.add(:openscap_proxy_id, _("must have Openscap feature")) if openscap_proxy_id && !openscap_proxy.has_feature?("Openscap")
+      errors.add(:openscap_proxy_id, _("must have Openscap feature")) if openscap_proxy && !openscap_proxy.has_feature?("Openscap")
     end
   end
 end

data/app/models/foreman_openscap/policy.rb

@@ -16,10 +16,10 @@ module ForemanOpenscap
     has_many :assets, :through => :asset_policies, :as => :assetable, :dependent => :destroy
 
     scoped_search :on => :name, :complete_value => true
-    scoped_search :in => :scap_content, :on => :title, :rename => 'content', :complete_value => true
-    scoped_search :in => :scap_content_profile, :on => :title, :rename => 'profile', :complete_value => true
-    scoped_search :in => :tailoring_file, :on => :name, :rename => 'tailoring_file', :complete_value => true
-    scoped_search :in => :tailoring_file_profile, :on => :title, :rename => 'tailoring_file_profile', :complete_value => true
+    scoped_search :relation => :scap_content, :on => :title, :rename => 'content', :complete_value => true
+    scoped_search :relation => :scap_content_profile, :on => :title, :rename => 'profile', :complete_value => true
+    scoped_search :relation => :tailoring_file, :on => :name, :rename => 'tailoring_file', :complete_value => true
+    scoped_search :relation => :tailoring_file_profile, :on => :title, :rename => 'tailoring_file_profile', :complete_value => true
     before_validation :update_period_attrs
 
     def self.deploy_by_variants

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

@@ -33,8 +33,14 @@ module ForemanOpenscap
         constants.config_item_class_name&.pluralize&.underscore
       end
 
+      def all_collection_method
+        "all_#{collection_method}".to_sym
+      end
+
       def find_config_item(scope = config_item_class_name.constantize)
-        scope.find_by :name => config_item_name
+        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 }
       end
     end
   end

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

@@ -1,8 +1,8 @@
-<%= javascript "host_checkbox", "foreman_openscap/arf_reports" %>
+<%= javascript "foreman_openscap/arf_reports" %>
 
 <table class="<%= table_css_classes %>">
   <tr>
-  <th class="ca" width="40px"><%= check_box_tag "check_all", "", false, { :onclick => "toggleCheck()", :'check-title' => _("Select all items in this page"), :'uncheck-title'=> _("items selected. Uncheck to Clear") } %></th>
+  <th class="ca" width="40px"><%= check_box_tag "check_all", "", false, { :onclick => "tfm.hosts.table.toggleCheck()", :'check-title' => _("Select all items in this page"), :'uncheck-title'=> _("items selected. Uncheck to Clear") } %></th>
     <th><%= sort :host %></th>
     <th><%= sort :reported, :as => _("Reported At") %></th>
     <th><%= sort :policy, :as => _("Policy") %></th>
@@ -21,7 +21,7 @@
                              :id => "host_ids_#{arf_report.id}",
                              :disabled => !authorized_for(:controller => :arf_reports, :action => :destroy),
                              :class => 'host_select_boxes',
-                             :onclick => 'hostChecked(this)' %>
+                             :onclick => 'tfm.hosts.table.hostChecked(this)' %>
         </td>
       <td class="elipsis"><%= name_column(arf_report.host) %></td>
       <td><%= display_link_if_authorized(date_time_relative_value(arf_report.reported_at), hash_for_arf_report_path(:id => arf_report.id)) %></td>
@@ -34,7 +34,7 @@
         <%= action_buttons(display_link_if_authorized(_("Full Report"), hash_for_show_html_arf_report_path(:id => arf_report.id
                           )),
                            display_delete_if_authorized(hash_for_arf_report_path(:id => arf_report.id),
-                                                        :confirm => _("Delete compliance report for %s?") % arf_report.host))
+                                                       :data => { :confirm => _("Delete compliance report for %s?") % arf_report.host}))
         %>
       </td>
     </tr>

data/app/views/policies/_list.html.erb

@@ -36,7 +36,7 @@
                 display_link_if_authorized(_("Dashboard"), hash_for_policy_dashboard_policy_path(:id => policy.id)),
                 display_link_if_authorized(_("Show Guide"), hash_for_policy_path(:id => policy.id)),
                 display_delete_if_authorized(hash_for_policy_path(:id => policy.id),
-                                             :confirm => _("Delete compliance policy %s with all of its reports?") % policy.name)
+                                             :data => {:confirm => _("Delete compliance policy %s with all of its reports?") % policy.name})
             ) %>
       </td>
     </tr>

data/app/views/scap_contents/_list.html.erb

@@ -16,7 +16,7 @@
         <%= action_buttons(
 		display_link_if_authorized(_("Download"), hash_for_scap_content_path(:id => content.id), :data => { :no_turbolink => true }),
                 display_delete_if_authorized(hash_for_scap_content_path(:id => content.id),
-                                             :confirm => _("Delete scap content %s?") % content.title)
+                                             :data => {:confirm => _("Delete scap content %s?") % content.title})
             ) %>
       </td>
     </tr>

data/app/views/tailoring_files/_list.html.erb

@@ -19,7 +19,7 @@
       <td>
         <%= action_buttons(
                 display_delete_if_authorized(hash_for_tailoring_file_path(:id => file.id),
-                                             :confirm => _("Delete tailoring file %s?") % file.name),
+                                             :data => {:confirm => _("Delete tailoring file %s?") % file.name}),
                 display_link_if_authorized(_("Download"), hash_for_xml_tailoring_file_path(:id => file.id), :data => { :no_turbolink => true })
             ) %>
       </td>

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "1.0.1".freeze
+  VERSION = "1.0.2".freeze
 end

data/test/factories/arf_report_factory.rb

@@ -1,12 +1,12 @@
 FactoryBot.define do
   factory :arf_report, :class => ::ForemanOpenscap::ArfReport do
-    host_id 1
-    policy nil
-    policy_arf_report nil
+    host_id { 1 }
+    policy { nil }
+    policy_arf_report { nil }
     sequence(:reported_at) { |n| Time.new(1490 + n, 0o1, 13, 15, 24, 0o0) }
     sequence(:created_at) { |n| Time.new(1490 + n, 0o1, 13, 15, 24, 0o0) }
-    status 0
-    metrics({})
-    openscap_proxy nil
+    status { 0 }
+    metrics { {} }
+    openscap_proxy { nil }
   end
 end

data/test/factories/asset_factory.rb

@@ -1,11 +1,11 @@
 FactoryBot.define do
   factory :asset, :class => ::ForemanOpenscap::Asset do |f|
     f.assetable_id { FactoryBot.create(:host).id }
-    f.assetable_type 'Host::Base'
+    f.assetable_type { 'Host::Base' }
   end
 
   factory :asset_policy, :class => ForemanOpenscap::AssetPolicy do |f|
-    f.asset_id nil
-    f.policy_id nil
+    f.asset_id { nil }
+    f.policy_id { nil }
   end
 end

data/test/factories/compliance_host_factory.rb

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :openscap_feature, :class => Feature do
-    name 'Openscap'
+    name { 'Openscap' }
   end
 
   factory :openscap_proxy, :class => SmartProxy do
@@ -12,8 +12,8 @@ FactoryBot.define do
   factory :compliance_host, :class => Host::Managed do
     sequence(:name) { |n| "host#{n}" }
     sequence(:hostname) { |n| "hostname#{n}" }
-    root_pass 'xybxa6JUkz63w'
+    root_pass { 'xybxa6JUkz63w' }
     openscap_proxy { SmartProxy.unscoped.with_features('Openscap').first || FactoryBot.create(:openscap_proxy) }
-    policies []
+    policies { [] }
   end
 end

data/test/factories/compliance_log_factory.rb

@@ -1,8 +1,8 @@
 FactoryBot.define do
   factory :compliance_log, :class => :log do
-    result "fail"
+    result { "fail" }
     association :report
-    level_id 1
+    level_id { 1 }
     association :source
     association :message
   end

data/test/factories/policy_arf_report_factory.rb

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :policy_arf_report, :class => ForemanOpenscap::PolicyArfReport do
-    policy_id nil
-    arf_report_id nil
+    policy_id { nil }
+    arf_report_id { nil }
   end
 end

data/test/factories/policy_factory.rb

@@ -1,16 +1,16 @@
 FactoryBot.define do
   factory :policy, :class => ::ForemanOpenscap::Policy do
     sequence(:name) { |n| "policy#{n}" }
-    period 'weekly'
-    weekday 'monday'
+    period { 'weekly' }
+    weekday { 'monday' }
     scap_content { FactoryBot.create(:scap_content) }
     scap_content_profile { FactoryBot.create(:scap_content_profile, :scap_content => scap_content) }
-    tailoring_file nil
-    tailoring_file_profile nil
-    day_of_month nil
-    cron_line nil
-    hosts []
-    assets []
-    deploy_by 'manual'
+    tailoring_file { nil }
+    tailoring_file_profile { nil }
+    day_of_month { nil }
+    cron_line { nil }
+    hosts { [] }
+    assets { [] }
+    deploy_by { 'manual' }
   end
 end

data/test/factories/scap_content_related.rb

@@ -3,20 +3,20 @@ include ActionDispatch::TestProcess
 FactoryBot.define do
   factory :scap_content, :class => ::ForemanOpenscap::ScapContent do |f|
     f.sequence(:title) { |n| "scap_content_title_#{n}" }
-    f.original_filename 'fedora ds'
+    f.original_filename { 'fedora ds' }
     f.scap_file { File.new("#{ForemanOpenscap::Engine.root}/test/files/scap_contents/ssg-fedora-ds.xml", 'rb').read }
   end
 
   factory :scap_content_profile, :class => ::ForemanOpenscap::ScapContentProfile do |f|
     f.scap_content
-    f.profile_id 'xccdf_org.test.common_test_profile'
-    f.title 'test Profile for testing'
+    f.profile_id { 'xccdf_org.test.common_test_profile' }
+    f.title { 'test Profile for testing' }
   end
 
   factory :tailoring_file, :class => ForemanOpenscap::TailoringFile do |f|
     f.sequence(:name) { |n| "tailoring_file_#{n}" }
-    f.original_filename 'original tailoring filename'
+    f.original_filename { 'original tailoring filename' }
     f.scap_file { File.new("#{ForemanOpenscap::Engine.root}/test/files/tailoring_files/ssg-firefox-ds-tailoring.xml", 'rb').read }
-    f.scap_content_profiles []
+    f.scap_content_profiles { [] }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-16 00:00:00.000000000 Z
+date: 2019-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface