foreman_openscap 0.7.1 → 0.7.2

data/lib/foreman_openscap/engine.rb

@@ -21,11 +21,11 @@ module ForemanOpenscap
     end
 
     assets_to_precompile =
-        Dir.chdir(root) do
-          Dir['app/assets/javascripts/foreman_openscap/**/*', 'app/assets/stylesheets/foreman_openscap/**/*'].map do |f|
-            f.split(File::SEPARATOR, 4).last
-          end
+      Dir.chdir(root) do
+        Dir['app/assets/javascripts/foreman_openscap/**/*', 'app/assets/stylesheets/foreman_openscap/**/*'].map do |f|
+          f.split(File::SEPARATOR, 4).last
         end
+      end
 
     initializer 'foreman_openscap.assets.precompile' do |app|
       app.config.assets.precompile += assets_to_precompile
@@ -33,7 +33,7 @@ module ForemanOpenscap
 
     initializer 'foreman_openscap.configure_assets', :group => :assets do
       SETTINGS[:foreman_openscap] =
-          {:assets => {:precompile => assets_to_precompile}}
+        {:assets => {:precompile => assets_to_precompile}}
     end
 
     initializer 'foreman_openscap.apipie' do
@@ -51,42 +51,42 @@ module ForemanOpenscap
 
         # Add permissions
         security_block :foreman_openscap do
-          permission :view_arf_reports, {:arf_reports => [:index, :show, :parse_html, :show_html,
-                                                          :parse_bzip, :auto_complete_search, :download_html],
-                                         'api/v2/compliance/arf_reports' => [:index, :show, :download, :download_html],
+          permission :view_arf_reports, {:arf_reports => %i(index show parse_html show_html
+parse_bzip auto_complete_search download_html),
+                                         'api/v2/compliance/arf_reports' => %i(index show download download_html),
                                          :compliance_hosts => [:show]},
                      :resource_type => 'ForemanOpenscap::ArfReport'
-          permission :destroy_arf_reports, {:arf_reports => [:destroy, :delete_multiple, :submit_delete_multiple],
+          permission :destroy_arf_reports, {:arf_reports => %i(destroy delete_multiple submit_delete_multiple),
                                             'api/v2/compliance/arf_reports' => [:destroy]},
                      :resource_type => 'ForemanOpenscap::ArfReport'
           permission :create_arf_reports, {'api/v2/compliance/arf_reports' => [:create]},
                      :resource_type => 'ForemanOpenscap::ArfReport'
 
-          permission :view_policies, {:policies => [:index, :show, :parse, :auto_complete_search],
+          permission :view_policies, {:policies => %i(index show parse auto_complete_search),
                                                  :policy_dashboard => [:index],
                                                  :compliance_dashboard        => [:index],
-                                                 'api/v2/compliance/policies' => [:index, :show, :content]},
+                                                 'api/v2/compliance/policies' => %i(index show content)},
                      :resource_type => 'ForemanOpenscap::Policy'
-          permission :edit_policies, {:policies => [:edit, :update, :scap_content_selected],
+          permission :edit_policies, {:policies => %i(edit update scap_content_selected),
                                                  'api/v2/compliance/policies' => [:update]},
                      :resource_type => 'ForemanOpenscap::Policy'
-          permission :create_policies, {:policies => [:new, :create],
+          permission :create_policies, {:policies => %i(new create),
                                                    'api/v2/compliance/policies' => [:create]},
                      :resource_type => 'ForemanOpenscap::Policy'
           permission :destroy_policies, {:policies => [:destroy],
                                                     'api/v2/compliance/policies' => [:destroy]},
                      :resource_type => 'ForemanOpenscap::Policy'
-          permission :assign_policies, {:policies => [:select_multiple_hosts, :update_multiple_hosts,
-                                                                            :disassociate_multiple_hosts,
-                                                                            :remove_policy_from_multiple_hosts]},
+          permission :assign_policies, {:policies => %i(select_multiple_hosts update_multiple_hosts
+disassociate_multiple_hosts
+remove_policy_from_multiple_hosts)},
                      :resource_type => 'ForemanOpenscap::Policy'
-          permission :view_scap_contents, {:scap_contents => [:index, :show, :auto_complete_search],
-                                                      'api/v2/compliance/scap_contents' => [:index, :show, :xml]},
+          permission :view_scap_contents, {:scap_contents => %i(index show auto_complete_search),
+                                                      'api/v2/compliance/scap_contents' => %i(index show xml)},
                      :resource_type => 'ForemanOpenscap::ScapContent'
-          permission :edit_scap_contents, {:scap_contents => [:edit, :update],
+          permission :edit_scap_contents, {:scap_contents => %i(edit update),
                                                       'api/v2/compliance/scap_contents' => [:update]},
                      :resource_type => 'ForemanOpenscap::ScapContent'
-          permission :create_scap_contents, {:scap_contents => [:new, :create],
+          permission :create_scap_contents, {:scap_contents => %i(new create),
                                                         'api/v2/compliance/scap_contents' => [:create]},
                      :resource_type => 'ForemanOpenscap::ScapContent'
           permission :destroy_scap_contents, {:scap_contents => [:destroy],
@@ -94,15 +94,15 @@ module ForemanOpenscap
                      :resource_type => 'ForemanOpenscap::ScapContent'
           permission :edit_hosts, { :hosts => [:openscap_proxy_changed] }, :resource_type => "Host"
           permission :edit_hostgroups, { :hostgroups => [:openscap_proxy_changed] }, :resource_type => "Hostgroup"
-          permission :create_tailoring_files, { :tailoring_files => [:create, :new],
+          permission :create_tailoring_files, { :tailoring_files => %i(create new),
                                                 'api/v2/compliance/tailoring_files' => [:create]},
                      :resource_type => 'ForemanOpenscap::TailoringFile'
-          permission :view_tailoring_files, { :tailoring_files => [:index, :auto_complete_search, :xml],
+          permission :view_tailoring_files, { :tailoring_files => %i(index auto_complete_search xml),
                                               :policies => [:tailoring_file_selected],
-                                              'api/v2/compliance/tailoring_files' => [:show, :xml, :index],
+                                              'api/v2/compliance/tailoring_files' => %i(show xml index),
                                               'api/v2/compliance/policies' => [:tailoring] },
                       :resource_type => 'ForemanOpenscap::TailoringFile'
-          permission :edit_tailoring_files, { :tailoring_files => [:edit, :update],
+          permission :edit_tailoring_files, { :tailoring_files => %i(edit update),
                                               'api/v2/compliance/tailoring_files' => [:update] },
                       :resource_type => 'ForemanOpenscap::TailoringFile'
           permission :destroy_tailoring_files, { :tailoring_files => [:destroy],
@@ -112,12 +112,12 @@ module ForemanOpenscap
                       :resource_type => 'SmartProxy'
         end
 
-        role "Compliance viewer", [:view_arf_reports, :view_policies, :view_scap_contents, :view_tailoring_files, :view_openscap_proxies]
-        role "Compliance manager", [:view_arf_reports, :view_policies, :view_scap_contents,
-                                    :destroy_arf_reports, :edit_policies, :edit_scap_contents, :assign_policies,
-                                    :create_policies, :create_scap_contents, :destroy_policies, :destroy_scap_contents,
-                                    :create_tailoring_files, :view_tailoring_files, :edit_tailoring_files, :destroy_tailoring_files,
-                                    :view_openscap_proxies]
+        role "Compliance viewer", %i(view_arf_reports view_policies view_scap_contents view_tailoring_files view_openscap_proxies)
+        role "Compliance manager", %i(view_arf_reports view_policies view_scap_contents
+destroy_arf_reports edit_policies edit_scap_contents assign_policies
+create_policies create_scap_contents destroy_policies destroy_scap_contents
+create_tailoring_files view_tailoring_files edit_tailoring_files destroy_tailoring_files
+view_openscap_proxies)
         role "Create ARF report", [:create_arf_reports] # special as only Proxy can create
 
         add_all_permissions_to_default_roles
@@ -150,8 +150,7 @@ module ForemanOpenscap
                            "dashboard link hosts in error state", "dashboard link good host reports",
                            "dashboard link hosts that had pending changes", "dashboard link out of sync hosts",
                            "dashboard link hosts with no reports", "dashboard link hosts with alerts disabled",
-                           "widgets not in dashboard show up in list"]
-                     })
+                           "widgets not in dashboard show up in list"]})
         # strong params
         parameter_filter Host::Managed, :openscap_proxy_id, :openscap_proxy
         parameter_filter Hostgroup, :openscap_proxy_id, :openscap_proxy
@@ -171,11 +170,11 @@ module ForemanOpenscap
         end
 
         add_controller_action_scope(::Api::V2::HostsController, :index) do |base_scope|
-          base_scope.includes(:policies)
+          base_scope.preload(:policies)
         end
 
         add_controller_action_scope(::HostsController, :index) do |base_scope|
-          base_scope.includes(:policies)
+          base_scope.preload(:policies)
         end
       end
     end

data/lib/foreman_openscap/helper.rb

@@ -6,22 +6,20 @@ module ForemanOpenscap::Helper
   end
 
   def self.find_name_or_uuid_by_host(host)
-    (host.respond_to?(:subscription_facet) && !host.subscription_facet.nil?) ? host.subscription_facet.try(:uuid) : host.name
+    host.respond_to?(:subscription_facet) && !host.subscription_facet.nil? ? host.subscription_facet.try(:uuid) : host.name
   end
 
-  private
-
   def self.find_host_by_name_or_uuid(cname)
     if Facets.registered_facets.keys.include?(:subscription_facet)
-      host = Katello::Host::SubscriptionFacet.find_by_uuid(cname).try(:host)
-      host ||= Host.find_by_name(cname)
+      host = Katello::Host::SubscriptionFacet.find_by(uuid: cname).try(:host)
+      host ||= Host.find_by(name: cname)
     else
-      host = Host.find_by_name(cname)
+      host = Host.find_by(name: cname)
     end
 
     unless host
       Rails.logger.error "Could not find Host with name: #{cname}"
-      fail ActiveRecord::RecordNotFound
+      raise ActiveRecord::RecordNotFound
     end
     host
   end

data/lib/foreman_openscap/message_cleaner.rb

@@ -0,0 +1,32 @@
+module ForemanOpenscap
+  class MessageCleaner
+    def clean
+      ForemanOpenscap::Policy.unscoped.all.find_in_batches do |batch|
+        batch.each do |policy|
+          process_policy policy
+        end
+      end
+    end
+
+    private
+
+    def process_policy(policy)
+      reports_of_policy = ForemanOpenscap::ArfReport.unscoped
+                                                    .of_policy(policy)
+                                                    .order("#{ForemanOpenscap::ArfReport.table_name}.created_at DESC")
+      latest = reports_of_policy.first
+      reports_of_policy.each do |report|
+        next if report == latest
+        report.logs.each do |log|
+          latest_log = latest.logs.find_by(:source_id => log.source_id)
+          next unless latest_log
+          next if log == latest_log
+          latest_message = latest_log.message
+          msg = log.message
+          log.update_attribute('message_id', latest_message.id)
+          msg.destroy! if msg.logs.empty?
+        end
+      end
+    end
+  end
+end

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "0.7.1"
+  VERSION = "0.7.2".freeze
 end

data/lib/tasks/foreman_openscap_tasks.rake

@@ -1,10 +1,13 @@
 # Tasks
 namespace :foreman_openscap do
   require 'foreman_openscap/bulk_upload'
+  require 'foreman_openscap/message_cleaner'
+
   namespace :bulk_upload do
     desc 'Bulk upload SCAP content from directory'
     task :directory, [:directory] => [:environment] do |task, args|
       abort("# No such directory, please check the path you have provided. #") unless args[:directory].blank? || Dir.exist?(args[:directory])
+      User.current = User.anonymous_admin
       ForemanOpenscap::BulkUpload.new.upload_from_directory(args[:directory])
     end
 
@@ -13,10 +16,12 @@ namespace :foreman_openscap do
       files_array.each do |file|
         abort("# #{file} is a directory, expecting file. Try using 'rake foreman_openscap:bulk_upload:directory' with this directory. #") if File.directory?(file)
       end
+      User.current = User.anonymous_admin
       ForemanOpenscap::BulkUpload.new.upload_from_files(files_array)
     end
 
     task :default => [:environment] do
+      User.current = User.anonymous_admin
       ForemanOpenscap::BulkUpload.new(true).generate_scap_default_content
     end
   end
@@ -44,6 +49,13 @@ namespace :foreman_openscap do
     end
     Rake::Task['rubocop_foreman_openscap'].invoke
   end
+
+  desc "Clean duplicate messages for ArfReport"
+  task :clean_messages => :environment do
+    puts 'Searching for duplicated messages and merging them... this can take a long time'
+    ForemanOpenscap::MessageCleaner.new.clean
+    puts 'Done'
+  end
 end
 
 # Tests