foreman_openscap 10.0.3 → 10.1.0

data/app/assets/javascripts/foreman_openscap/locale/pt_BR/foreman_openscap.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_openscap": {
       "": {
-        "Project-Id-Version": "foreman_openscap 10.0.1",
+        "Project-Id-Version": "foreman_openscap 10.1.0",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2016-04-14 07:48+0000",
         "Last-Translator": "FIRST AUTHOR <EMAIL@ADDRESS>, 2016",
@@ -94,7 +94,7 @@
       "By default, remediation is applied to the current host. Optionally, remediate any additional hosts that fail the rule.": [
         ""
       ],
-      "Can't find scap-security-guide RPM, are you sure it is installed on your server?": [
+      "Can't find %{packages} RPM(s), are you sure it is installed on your server?": [
         ""
       ],
       "Cancel": [

data/app/assets/javascripts/foreman_openscap/locale/ru/foreman_openscap.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_openscap": {
       "": {
-        "Project-Id-Version": "foreman_openscap 10.0.1",
+        "Project-Id-Version": "foreman_openscap 10.1.0",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2016-04-14 07:48+0000",
         "Last-Translator": "FIRST AUTHOR <EMAIL@ADDRESS>, 2016",
@@ -93,7 +93,7 @@
       "By default, remediation is applied to the current host. Optionally, remediate any additional hosts that fail the rule.": [
         ""
       ],
-      "Can't find scap-security-guide RPM, are you sure it is installed on your server?": [
+      "Can't find %{packages} RPM(s), are you sure it is installed on your server?": [
         ""
       ],
       "Cancel": [

data/app/assets/javascripts/foreman_openscap/locale/sv_SE/foreman_openscap.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_openscap": {
       "": {
-        "Project-Id-Version": "foreman_openscap 10.0.1",
+        "Project-Id-Version": "foreman_openscap 10.1.0",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2016-04-14 07:48+0000",
         "Last-Translator": "FULL NAME <EMAIL@ADDRESS>",
@@ -93,7 +93,7 @@
       "By default, remediation is applied to the current host. Optionally, remediate any additional hosts that fail the rule.": [
         ""
       ],
-      "Can't find scap-security-guide RPM, are you sure it is installed on your server?": [
+      "Can't find %{packages} RPM(s), are you sure it is installed on your server?": [
         ""
       ],
       "Cancel": [

data/app/assets/javascripts/foreman_openscap/locale/zh_CN/foreman_openscap.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_openscap": {
       "": {
-        "Project-Id-Version": "foreman_openscap 10.0.1",
+        "Project-Id-Version": "foreman_openscap 10.1.0",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2016-04-14 07:48+0000",
         "Last-Translator": "FIRST AUTHOR <EMAIL@ADDRESS>, 2016",
@@ -92,8 +92,8 @@
       "By default, remediation is applied to the current host. Optionally, remediate any additional hosts that fail the rule.": [
         "默认情况下，补救会应用到当前主机。（可选）修复任何规则失败的额外主机。"
       ],
-      "Can't find scap-security-guide RPM, are you sure it is installed on your server?": [
-        "无法找到 scap-security-guide RPM，您确定是否已安装在服务器上？"
+      "Can't find %{packages} RPM(s), are you sure it is installed on your server?": [
+        ""
       ],
       "Cancel": [
         "取消"

data/app/assets/javascripts/foreman_openscap/locale/zh_TW/foreman_openscap.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_openscap": {
       "": {
-        "Project-Id-Version": "foreman_openscap 10.0.1",
+        "Project-Id-Version": "foreman_openscap 10.1.0",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2016-04-14 07:48+0000",
         "Last-Translator": "FIRST AUTHOR <EMAIL@ADDRESS>, 2016",
@@ -93,7 +93,7 @@
       "By default, remediation is applied to the current host. Optionally, remediate any additional hosts that fail the rule.": [
         ""
       ],
-      "Can't find scap-security-guide RPM, are you sure it is installed on your server?": [
+      "Can't find %{packages} RPM(s), are you sure it is installed on your server?": [
         ""
       ],
       "Cancel": [

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

@@ -30,7 +30,7 @@ function tailoring_file_selected(element) {
 
 function previous_step(previous) {
   $('#policy_current_step').val(previous);
-  $('#new_policy').submit();
+  $('#new_policy').trigger("submit");
 }
 
 function period_selected(period) {

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

@@ -7,5 +7,5 @@ function showReportDetails(log_id, event) {
 function showRemediationWizard(log_id) {
   var wizard_button = $('#openscapRemediationWizardButton');
   wizard_button.attr('data-log-id', log_id);
-  wizard_button.click();
+  wizard_button.trigger("click");
 }

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

@@ -1,5 +1,3 @@
-require 'foreman_openscap/bulk_upload'
-
 module Api::V2
   module Compliance
     class ScapContentsController < ::Api::V2::BaseController

data/app/controllers/arf_reports_controller.rb

@@ -10,9 +10,15 @@ class ArfReportsController < ApplicationController
   end
 
   def index
+    # Avoid using includes() with nested associations and "order by" together. Otherwise,
+    # includes() will use join tables instead and Rails somehow create many objects and
+    # high memory consumption.
+    @arf_reports_pg = resource_base.search_for(params[:search], :order => params[:order])
+                                   .paginate(:page => params[:page], :per_page => params[:per_page])
+    arf_report_ids = @arf_reports_pg.pluck(:id)
     @arf_reports = resource_base.includes(:policy, :openscap_proxy, :host => %i[policies last_report_object host_statuses])
-                                .search_for(params[:search], :order => params[:order])
-                                .paginate(:page => params[:page], :per_page => params[:per_page])
+                                .where(id: arf_report_ids)
+                                .sort_by { |arf_report| arf_report_ids.index(arf_report.id) }
   end
 
   def show

data/{lib → app/services}/foreman_openscap/bulk_upload.rb

@@ -7,21 +7,28 @@ module ForemanOpenscap
       @result = OpenStruct.new(:errors => [], :results => [])
     end
 
-    def files_from_guide
-      `rpm -ql scap-security-guide | grep ds.xml`.split
+    def security_guide_packages
+      %w(scap-security-guide)
     end
 
-    def scap_guide_installed?
-      `rpm -qa | grep scap-security-guide`.present?
+    def files_from_guide(package)
+      `rpm -ql #{package} | grep ds.xml`.split
+    end
+
+    def package_installed?(package)
+      `rpm -qa | grep #{package}`.present?
     end
 
     def upload_from_scap_guide
-      unless scap_guide_installed?
-        @result.errors.push(_("Can't find scap-security-guide RPM, are you sure it is installed on your server?"))
+      package = security_guide_packages.find { |p| package_installed? p }
+      unless package
+        joined_packages = security_guide_packages.join(', ')
+        msg = _("Can't find %{packages} RPM(s), are you sure it is installed on your server?")
+        @result.errors.push(msg % {packages: joined_packages})
         return @result
       end
 
-      upload_from_files(files_from_guide, true)
+      upload_from_files(files_from_guide(package), true)
     end
 
     def upload_from_files(files_array, from_scap_guide = false)

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

@@ -56,4 +56,4 @@
     </div>
   </div>
 </div>
-<%= will_paginate_with_info @arf_reports %>
+<%= will_paginate_with_info @arf_reports_pg %>

data/lib/foreman_openscap/engine.rb

@@ -40,7 +40,7 @@ module ForemanOpenscap
     initializer 'foreman_openscap.register_plugin', :before => :finisher_hook do |app|
       app.reloader.to_prepare do
         Foreman::Plugin.register :foreman_openscap do
-          requires_foreman '>= 3.13'
+          requires_foreman '>= 3.14'
           register_gettext
 
           apipie_documented_controllers ["#{ForemanOpenscap::Engine.root}/app/controllers/api/v2/compliance/*.rb"]

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "10.0.3".freeze
+  VERSION = "10.1.0".freeze
 end

data/lib/tasks/foreman_openscap_tasks.rake

@@ -1,6 +1,5 @@
 # Tasks
 namespace :foreman_openscap do
-  require 'foreman_openscap/bulk_upload'
   require 'foreman_openscap/message_cleaner'
 
   namespace :bulk_upload do