foreman_openscap 7.0.0 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32e523ca94995efeb93913ed51fe844b7cd35f13cdd97f5d36950652ffb4be59
-  data.tar.gz: bfbcdacdc4ea2d64b2bb93c77704795418138f3fa8214957294e58035db13277
+  metadata.gz: 16941921f85d0e28984ca4553bd6d691759e010361d85c594f73b1c9990472e3
+  data.tar.gz: '091fee372a66387cc96005e4efd52c913bcd16c64a1551168f387c21c3d647d1'
 SHA512:
-  metadata.gz: b8b01c48d281d7c971838cc4ee217beb8d17e453f7878befa26e43542f27241b51a89cdb13e4c62e2411c56d4b9eb8a46cb433b22b69b6c58893d4ad602d3339
-  data.tar.gz: 520bdecd037730e7925f55ab3e5cd0f11ebb694663c6a1190ac13c815fbcb3e74829f7f05f12363585bb7ba28e9bff7f678d2c8e9449314715a30e509b9d64ea
+  metadata.gz: a655fefe13951aa0716620f8ea16bec4c3e1c0977a2b8b959b4c65440f396da48cc2b0179903d60cc8647672727de2a906bd74f3857eaa68f04c8d7205c82b80
+  data.tar.gz: 1be53b5c854a5b3ef1edf6134337d742a4458b247306ff57ffce373525474f5c4503fa713b11c2e178d891b34355cdd518ffc7f5975ae5390071ab277a5e408d

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

@@ -431,9 +431,6 @@
       "Host is deleted": [
         ""
       ],
-      "documentation": [
-        ""
-      ],
       "Choose existing SCAP Content": [
         ""
       ],
@@ -919,6 +916,9 @@
       "Please make sure you understand them by reading our": [
         ""
       ],
+      "documentation": [
+        ""
+      ],
       "Choose day in month": [
         ""
       ],

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

@@ -431,9 +431,6 @@
       "Host is deleted": [
         "Host ist gelöscht"
       ],
-      "documentation": [
-        "Dokumentation"
-      ],
       "Choose existing SCAP Content": [
         "Vorhandenen SCAP-Inhalt auswählen"
       ],
@@ -919,6 +916,9 @@
       "Please make sure you understand them by reading our": [
         "Bitte stellen Sie sicher, dass Sie sie verstanden haben, indem Sie unsere lesen "
       ],
+      "documentation": [
+        "Dokumentation"
+      ],
       "Choose day in month": [
         "Wähle einen Tag im Monat"
       ],

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

@@ -431,9 +431,6 @@
       "Host is deleted": [
         ""
       ],
-      "documentation": [
-        ""
-      ],
       "Choose existing SCAP Content": [
         ""
       ],
@@ -919,6 +916,9 @@
       "Please make sure you understand them by reading our": [
         ""
       ],
+      "documentation": [
+        ""
+      ],
       "Choose day in month": [
         ""
       ],

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

@@ -431,9 +431,6 @@
       "Host is deleted": [
         ""
       ],
-      "documentation": [
-        ""
-      ],
       "Choose existing SCAP Content": [
         ""
       ],
@@ -919,6 +916,9 @@
       "Please make sure you understand them by reading our": [
         ""
       ],
+      "documentation": [
+        ""
+      ],
       "Choose day in month": [
         ""
       ],

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

@@ -431,9 +431,6 @@
       "Host is deleted": [
         "Se eliminó el host."
       ],
-      "documentation": [
-        "documentación"
-      ],
       "Choose existing SCAP Content": [
         "Elegir contenido de SCAP existente"
       ],
@@ -921,6 +918,9 @@
       "Please make sure you understand them by reading our": [
         "Asegúrese de entenderlas leyendo nuestro"
       ],
+      "documentation": [
+        "documentación"
+      ],
       "Choose day in month": [
         "Elegir día del mes"
       ],

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

@@ -431,9 +431,6 @@
       "Host is deleted": [
         "L'hôte est supprimé"
       ],
-      "documentation": [
-        "documentation"
-      ],
       "Choose existing SCAP Content": [
         "Sélectionner un contenu SCAP existant"
       ],
@@ -921,6 +918,9 @@
       "Please make sure you understand them by reading our": [
         "Assurez-vous de les comprendre en lisant notre"
       ],
+      "documentation": [
+        "documentation"
+      ],
       "Choose day in month": [
         "Choisir un jour du mois"
       ],

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

@@ -431,9 +431,6 @@
       "Host is deleted": [
         ""
       ],
-      "documentation": [
-        ""
-      ],
       "Choose existing SCAP Content": [
         ""
       ],
@@ -919,6 +916,9 @@
       "Please make sure you understand them by reading our": [
         ""
       ],
+      "documentation": [
+        ""
+      ],
       "Choose day in month": [
         ""
       ],

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

@@ -431,9 +431,6 @@
       "Host is deleted": [
         ""
       ],
-      "documentation": [
-        ""
-      ],
       "Choose existing SCAP Content": [
         ""
       ],
@@ -919,6 +916,9 @@
       "Please make sure you understand them by reading our": [
         ""
       ],
+      "documentation": [
+        ""
+      ],
       "Choose day in month": [
         ""
       ],

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

@@ -431,9 +431,6 @@
       "Host is deleted": [
         "ホストが削除されました"
       ],
-      "documentation": [
-        "ドキュメント"
-      ],
       "Choose existing SCAP Content": [
         "既存の SCAP コンテンツを選択"
       ],
@@ -917,6 +914,9 @@
       "Please make sure you understand them by reading our": [
         "理解するために読んでください。"
       ],
+      "documentation": [
+        "ドキュメント"
+      ],
       "Choose day in month": [
         "月の日付を選択"
       ],

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

@@ -431,9 +431,6 @@
       "Host is deleted": [
         "호스트가 삭제되었습니다."
       ],
-      "documentation": [
-        ""
-      ],
       "Choose existing SCAP Content": [
         "기존 SCAP 컨텐츠 선택"
       ],
@@ -919,6 +916,9 @@
       "Please make sure you understand them by reading our": [
         ""
       ],
+      "documentation": [
+        ""
+      ],
       "Choose day in month": [
         ""
       ],

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

@@ -431,9 +431,6 @@
       "Host is deleted": [
         "Host removido"
       ],
-      "documentation": [
-        "documentação"
-      ],
       "Choose existing SCAP Content": [
         "Escolha um conteúdo SCAP existente"
       ],
@@ -921,6 +918,9 @@
       "Please make sure you understand them by reading our": [
         "Por favor, certifique-se de compreendê-los lendo nosso"
       ],
+      "documentation": [
+        "documentação"
+      ],
       "Choose day in month": [
         "Escolher dia no mês"
       ],

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

@@ -431,9 +431,6 @@
       "Host is deleted": [
         "Узел удален"
       ],
-      "documentation": [
-        "документация"
-      ],
       "Choose existing SCAP Content": [
         "Выберите существующее описание SCAP"
       ],
@@ -919,6 +916,9 @@
       "Please make sure you understand them by reading our": [
         ""
       ],
+      "documentation": [
+        "документация"
+      ],
       "Choose day in month": [
         ""
       ],

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

@@ -431,9 +431,6 @@
       "Host is deleted": [
         ""
       ],
-      "documentation": [
-        ""
-      ],
       "Choose existing SCAP Content": [
         ""
       ],
@@ -919,6 +916,9 @@
       "Please make sure you understand them by reading our": [
         ""
       ],
+      "documentation": [
+        ""
+      ],
       "Choose day in month": [
         ""
       ],

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

@@ -431,9 +431,6 @@
       "Host is deleted": [
         "主机被删除"
       ],
-      "documentation": [
-        "文档"
-      ],
       "Choose existing SCAP Content": [
         "选择现有的SCAP内容"
       ],
@@ -917,6 +914,9 @@
       "Please make sure you understand them by reading our": [
         "请通过阅读我们的手册确保您了解它们"
       ],
+      "documentation": [
+        "文档"
+      ],
       "Choose day in month": [
         "选择月中的一天"
       ],

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

@@ -431,9 +431,6 @@
       "Host is deleted": [
         "已刪除主機"
       ],
-      "documentation": [
-        ""
-      ],
       "Choose existing SCAP Content": [
         "選擇現有的 SCAP 內容"
       ],
@@ -919,6 +916,9 @@
       "Please make sure you understand them by reading our": [
         ""
       ],
+      "documentation": [
+        ""
+      ],
       "Choose day in month": [
         ""
       ],

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

@@ -124,7 +124,8 @@ module Api
         end
 
         def handle_download_error(error)
-          render_error 'standard_error', :status => :internal_error, :locals => { :exception => error }
+          render_error :custom_error, :status => :unprocessable_entity,
+                       :locals => { :message => _("Downloading the report failed: #{error.message}") }
         end
 
         def upload_fail(msg)

data/app/controllers/policies_controller.rb

@@ -117,13 +117,18 @@ class PoliciesController < ApplicationController
     @tailoring_file = ForemanOpenscap::TailoringFile.find(params[:tailoring_file_id]) if params[:tailoring_file_id].present?
   end
 
+  def multiple_with_filter?
+    params.key?(:search)
+  end
+  
   def find_multiple
-    # Lets search by name or id and make sure one of them exists first
-    if params[:host_ids].present?
-      @hosts = Host.where("id IN (?)", params[:host_ids])
+    if params.key?(:host_names) || params.key?(:host_ids) || multiple_with_filter?
+      @hosts = Host.search_for(params[:search]) if multiple_with_filter?
+      @hosts ||= Host.merge(Host.where(id: params[:host_ids]).or(Host.where(name: params[:host_names])))
       if @hosts.empty?
-        error _('No hosts were found.')
-        redirect_to(hosts_path) && (return false)
+        error _('No hosts were found with that id, name or query filter')
+        redirect_to(hosts_path)
+        return false
       end
     else
       error _('No hosts selected')

data/app/controllers/tailoring_files_controller.rb

@@ -24,6 +24,9 @@ class TailoringFilesController < ApplicationController
     else
       process_error
     end
+  rescue RestClient::Exception => e
+    @tailoring_file.errors.add(:scap_file, :invalid, message: e.http_body)
+    process_error
   end
 
   def edit

data/app/helpers/foreman_openscap_helper.rb

@@ -1,12 +1,8 @@
 require 'foreman_openscap/version'
 
 module ForemanOpenscapHelper
-  def scap_doc_link(section = '', text = _('documentation'))
-    link_to(
-      text,
-      scap_doc_url(section),
-      :rel => 'external noopener noreferrer', :target => '_blank'
-    )
+  def scap_doc_button(section)
+    documentation_button(section, root_url: scap_doc_url)
   end
 
   def scap_doc_url(section = '')
@@ -15,10 +11,17 @@ module ForemanOpenscapHelper
     documentation_url(section, root_url: scap_root_url)
   end
 
+  private
+
+  def doc_flavor
+    ForemanOpenscap.with_katello? ? 'katello' : 'foreman-el'
+  end
+
   def scap_root_url
     @scap_root_url ||= begin
-      version = ForemanOpenscap::VERSION.split('.')[0..-2].join('.')
-      "https://theforeman.org/plugins/foreman_openscap/#{version}/index.html"
+      version = SETTINGS[:version]
+      version = version.tag == 'develop' ? 'nightly' : version.short
+      "https://docs.theforeman.org/#{version}/Managing_Security_Compliance/index-#{doc_flavor}.html#"
     end
   end
 end

data/app/helpers/policies_helper.rb

@@ -55,11 +55,13 @@ module PoliciesHelper
       select_f form, :scap_content_id, scap_contents, :id, :title,
                { :include_blank => _("Choose existing SCAP Content") },
                { :label => _("SCAP Content"),
+                 :required => true,
                  :onchange => 'scap_content_selected(this);',
                  :'data-url' => method_path('scap_content_selected') }
     else
       select_f form, :scap_content_id, scap_contents, :id, :title,
                { :label => _("SCAP Content"),
+                 :required => true,
                  :onchange => 'scap_content_selected(this);',
                  :'data-url' => method_path('scap_content_selected') }
     end

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

@@ -1,4 +1,3 @@
-<% javascript 'charts' %>
 <% javascript 'foreman_openscap/reports' %>
 <% stylesheet 'foreman_openscap/reports' %>
 

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

@@ -9,6 +9,6 @@
     <%= _("You don't seem to have any ARF report. ARF report is a summary of a single scan occurrence on a particular host for a given Compliance Policy.") %></br>
   </p>
   <div class="blank-slate-pf-main-action">
-    <%= link_to _('Documentation'), documentation_url("4.4ARFReports", :root_url => "https://www.theforeman.org/plugins/foreman_openscap/0.8/index.html#"), :rel => 'external', :class => 'btn btn-primary btn-lg'  %>
+    <%= link_to _('Documentation'), scap_doc_url("Monitoring_Compliance_security-compliance"), :rel => 'external', :class => 'btn btn-primary btn-lg'  %>
   </div>
 </div>

data/app/views/compliance_hosts/show.html.erb

@@ -1,4 +1,4 @@
-<% javascript 'charts', 'foreman_openscap/scap_hosts_show' %>
+<% javascript 'foreman_openscap/scap_hosts_show' %>
 <% stylesheet 'foreman_openscap/scap_breakdown_chart' %>
 
 <%= breadcrumbs(:resource_url => api_hosts_path,

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

@@ -3,7 +3,7 @@
 
 <% title_actions(
   display_link_if_authorized(_("New Compliance Policy"), hash_for_new_policy_path, :class => "btn btn-primary"),
-    documentation_button('#4.2Creatingpolicywizard', :root_url => scap_doc_url)
+    scap_doc_button('Managing_Compliance_Policies_security-compliance')
   ) %>
 
 <%= render :partial => 'list' %>

data/app/views/policies/steps/_deployment_options_form.html.erb

@@ -4,7 +4,7 @@
   <div class="alert alert-info" id="scap-deployment-options-info-banner">
     <span class="pficon pficon-info"></span>
     <strong><%= _('There are significant differences in deployment options.') %></strong>
-    <%= _('Please make sure you understand them by reading our') %> <%=scap_doc_link('#2.3Policydeploymentoptions') %>.
+    <%= _('Please make sure you understand them by reading our') %> <%= link_to(_('documentation'), scap_doc_url('deploying-compliance-policies_security-compliance'), :rel => 'external noopener noreferrer', :target => '_blank') %>.
   </div>
 
   <%= deploy_by_radios f, @policy %>

data/app/views/policies/steps/_policy_attributes_form.html.erb

@@ -1,5 +1,5 @@
 <div class="tab-pane <%= show_partial_wizard(step) %>" id="create-policy">
   <%= wizard_header @policy.step_index, *translate_steps(@policy) %>
-  <%= text_f(f, :name) %>
+  <%= text_f(f, :name, :required => true) %>
   <%= text_f(f, :description, :size => "col-md-8" ) %>
 </div>

data/app/views/policies/steps/_schedule_form.html.erb

@@ -4,8 +4,12 @@
   <%= wizard_header @policy.step_index, *@policy.steps %>
   <%= select_f(f, :period, %w[Weekly Monthly Custom], :downcase, :to_s,
                { :include_blank => _('Choose period') },
-               { :onchange => 'period_selected(this)' }) %>
-  <%= select_f(f, :weekday, days_of_week_hash, :first, :last, :include_blank => _('Choose weekday')) %>
-  <%= select_f(f, :day_of_month, (1..31).to_a, :to_i, :to_s, :help_inline => _('Number of a day in month, note that not all months have same count of days'), :include_blank => _('Choose day in month')) %>
-  <%= text_f(f, :cron_line, :help_inline => _('You can specify custom cron line, e.g. "0  3  *  *  *", separate each of 5 values by space')) %>
+               { :onchange => 'period_selected(this)', :required => true }) %>
+  <%= select_f(f, :weekday, days_of_week_hash, :first, :last,
+               { :include_blank => _('Choose weekday') },
+               { :required => true }) %>
+  <%= select_f(f, :day_of_month, (1..31).to_a, :to_i, :to_s,
+               { :include_blank => _('Choose day in month') },
+               { :help_inline => _('Number of a day in month, note that not all months have same count of days'), :required => true }) %>
+  <%= text_f(f, :cron_line, :help_inline => _('You can specify custom cron line, e.g. "0  3  *  *  *", separate each of 5 values by space'), :required => true) %>
 </div>

data/app/views/policy_dashboard/index.html.erb

@@ -1,4 +1,4 @@
-<% javascript 'charts', 'foreman_openscap/policy_dashboard' %>
+<% javascript 'foreman_openscap/policy_dashboard' %>
 
 <% title _("Compliance policy: %s") % @policy.name %>
 

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

@@ -1,6 +1,6 @@
 <% title _("SCAP Contents") %>
 
 <% title_actions(display_link_if_authorized(_("Upload New SCAP Content"), hash_for_new_scap_content_path, :class => 'btn btn-primary'),
-                 documentation_button('#4.1CreatingSCAPcontent', :root_url => scap_doc_url)) %>
+                 scap_doc_button('Configuring_SCAP_Contents_security-compliance')) %>
 
 <%= render :partial => 'list' %>

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

@@ -1,4 +1,4 @@
 <% title _("Tailoring Files") %>
 <% title_actions(display_link_if_authorized(_("Upload New Tailoring file"), hash_for_new_tailoring_file_path, :class => 'btn btn-primary'),
-                documentation_button('#4.5Tailoringfiles(foreman_openscap>=0.6.5)', :root_url => scap_doc_url)) %>
+                scap_doc_button('tailoring-xccdf-profiles_security-compliance')) %>
 <%= render :partial => 'list' %>

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "7.0.0".freeze
+  VERSION = "7.1.0".freeze
 end