foreman_openscap 9.0.5 → 10.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '067348f069de3a505ff49bf8bddfb32ac0119374646235e546e4142442312fbc'
-  data.tar.gz: 5e4a33a0523ce68282648384180523e45b091eb8b4ef9a043fa3b13469d6b59f
+  metadata.gz: 3a4d3ac458d67a0eb92a2d7c826777976cffc2ab1b4e147aa6b50b8299676426
+  data.tar.gz: 142a02612a9db592e5ac24650d947c02d338f1cb7f3fb8474a0e067997275b3f
 SHA512:
-  metadata.gz: 758ddac232cf116aa8e8365d8241008f12a2daf1d0a98cf5070f50df913587659c7446b6145372f22e6fd5c038e8956a04d233c550458b37d14bbfba20cfbfdb
-  data.tar.gz: c60ae37836fc25b7651453ea37d1714543ca335faf9047d723ff0444fbfe493e571444e337e290425912eb450658d0504d21cceb1e5b35f9bad6f04c86d7bbd4
+  metadata.gz: 1428428c823197a8432fd1ddb25127ec1ad216c1df1c438047b78db92caf42267cbefc332f197adaf0276d3a759d366651d964f89ea391078f27db53cc145f61
+  data.tar.gz: fa1a35d80ac115895ae8abec058f67936273fe77f7cba9c56851febc5cf979094567427208d3bce459f10d38b6671db3f1ae38bbd03eec2eb898fa22a76f63e5

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

@@ -903,12 +903,6 @@
       "The following %{key_name} were missing for %{item_name}: %{key_names}. Make sure they are imported before proceeding.": [
         ""
       ],
-      "The following Smart Proxies need to be updated to unlock the feature: %s. ": [
-        ""
-      ],
-      "The following proxies could not be reached: %s. Please make sure they are available so Foreman can check their versions.": [
-        ""
-      ],
       "The identifier of the host": [
         ""
       ],
@@ -927,9 +921,6 @@
       "There's no available report for this host": [
         ""
       ],
-      "This feature is temporarily disabled. ": [
-        ""
-      ],
       "This leaves the setup of the foreman_scap_client solely on the user. The policy still needs to be defined in order to link incoming ARF reports.": [
         ""
       ],

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

@@ -903,12 +903,6 @@
       "The following %{key_name} were missing for %{item_name}: %{key_names}. Make sure they are imported before proceeding.": [
         "Die folgenden %{key_name} fehlten für %{item_name}: %{key_names}. Stellen Sie sicher, dass sie importiert wurden, bevor Sie fortfahren."
       ],
-      "The following Smart Proxies need to be updated to unlock the feature: %s. ": [
-        "Die folgenden Smart-Proxys müssen aktualisiert werden um das Feature freizuschalten: %s."
-      ],
-      "The following proxies could not be reached: %s. Please make sure they are available so Foreman can check their versions.": [
-        "Die folgenden Proxys konnten nicht erreicht werden: %s . Bitte stellen Sie sicher, dass sie verfügbar sind, damit Foreman ihre Versionen überprüfen kann."
-      ],
       "The identifier of the host": [
         "Die Kennung des Hosts"
       ],
@@ -927,9 +921,6 @@
       "There's no available report for this host": [
         ""
       ],
-      "This feature is temporarily disabled. ": [
-        "Dieses Feature ist temporär deaktiviert."
-      ],
       "This leaves the setup of the foreman_scap_client solely on the user. The policy still needs to be defined in order to link incoming ARF reports.": [
         ""
       ],

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

@@ -903,12 +903,6 @@
       "The following %{key_name} were missing for %{item_name}: %{key_names}. Make sure they are imported before proceeding.": [
         ""
       ],
-      "The following Smart Proxies need to be updated to unlock the feature: %s. ": [
-        ""
-      ],
-      "The following proxies could not be reached: %s. Please make sure they are available so Foreman can check their versions.": [
-        ""
-      ],
       "The identifier of the host": [
         ""
       ],
@@ -927,9 +921,6 @@
       "There's no available report for this host": [
         ""
       ],
-      "This feature is temporarily disabled. ": [
-        ""
-      ],
       "This leaves the setup of the foreman_scap_client solely on the user. The policy still needs to be defined in order to link incoming ARF reports.": [
         ""
       ],

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

@@ -903,12 +903,6 @@
       "The following %{key_name} were missing for %{item_name}: %{key_names}. Make sure they are imported before proceeding.": [
         ""
       ],
-      "The following Smart Proxies need to be updated to unlock the feature: %s. ": [
-        ""
-      ],
-      "The following proxies could not be reached: %s. Please make sure they are available so Foreman can check their versions.": [
-        ""
-      ],
       "The identifier of the host": [
         ""
       ],
@@ -927,9 +921,6 @@
       "There's no available report for this host": [
         ""
       ],
-      "This feature is temporarily disabled. ": [
-        ""
-      ],
       "This leaves the setup of the foreman_scap_client solely on the user. The policy still needs to be defined in order to link incoming ARF reports.": [
         ""
       ],

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

@@ -904,12 +904,6 @@
       "The following %{key_name} were missing for %{item_name}: %{key_names}. Make sure they are imported before proceeding.": [
         "Faltan los siguientes %{key_name} para %{item_name}: %{key_names}. Asegúrese de que se importan antes de continuar."
       ],
-      "The following Smart Proxies need to be updated to unlock the feature: %s. ": [
-        "Deben actualizarse los siguientes proxies inteligentes al desbloquear la funcionalidad: %s. "
-      ],
-      "The following proxies could not be reached: %s. Please make sure they are available so Foreman can check their versions.": [
-        "No se pudieron alcanzar los siguientes proxies: %s. Asegúrese de que estén disponibles para que Foreman pueda verificar sus versiones."
-      ],
       "The identifier of the host": [
         "El identificador del host"
       ],
@@ -928,9 +922,6 @@
       "There's no available report for this host": [
         ""
       ],
-      "This feature is temporarily disabled. ": [
-        "Esta función se encuentra temporalmente deshabilitada."
-      ],
       "This leaves the setup of the foreman_scap_client solely on the user. The policy still needs to be defined in order to link incoming ARF reports.": [
         ""
       ],

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

@@ -904,12 +904,6 @@
       "The following %{key_name} were missing for %{item_name}: %{key_names}. Make sure they are imported before proceeding.": [
         "Les %%s suivants étaient manquants pour %{class} : %{key_names}. Assurez-vous qu'ils aient bien été importés avant de poursuivre."
       ],
-      "The following Smart Proxies need to be updated to unlock the feature: %s. ": [
-        "Les smart proxies suivants doivent être mis à jour pour déverrouiller la fonction : %s "
-      ],
-      "The following proxies could not be reached: %s. Please make sure they are available so Foreman can check their versions.": [
-        "Impossible d'atteindre les proxies suivants : %s. Veillez à ce qu'ils soient disponibles de sorte que Foreman puisse vérifier leur version."
-      ],
       "The identifier of the host": [
         "Identifiant de l’hôte"
       ],
@@ -928,9 +922,6 @@
       "There's no available report for this host": [
         ""
       ],
-      "This feature is temporarily disabled. ": [
-        "Cette fonction est temporairement désactivée."
-      ],
       "This leaves the setup of the foreman_scap_client solely on the user. The policy still needs to be defined in order to link incoming ARF reports.": [
         ""
       ],

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

@@ -903,12 +903,6 @@
       "The following %{key_name} were missing for %{item_name}: %{key_names}. Make sure they are imported before proceeding.": [
         ""
       ],
-      "The following Smart Proxies need to be updated to unlock the feature: %s. ": [
-        ""
-      ],
-      "The following proxies could not be reached: %s. Please make sure they are available so Foreman can check their versions.": [
-        ""
-      ],
       "The identifier of the host": [
         ""
       ],
@@ -927,9 +921,6 @@
       "There's no available report for this host": [
         ""
       ],
-      "This feature is temporarily disabled. ": [
-        ""
-      ],
       "This leaves the setup of the foreman_scap_client solely on the user. The policy still needs to be defined in order to link incoming ARF reports.": [
         ""
       ],

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

@@ -903,12 +903,6 @@
       "The following %{key_name} were missing for %{item_name}: %{key_names}. Make sure they are imported before proceeding.": [
         ""
       ],
-      "The following Smart Proxies need to be updated to unlock the feature: %s. ": [
-        ""
-      ],
-      "The following proxies could not be reached: %s. Please make sure they are available so Foreman can check their versions.": [
-        ""
-      ],
       "The identifier of the host": [
         ""
       ],
@@ -927,9 +921,6 @@
       "There's no available report for this host": [
         ""
       ],
-      "This feature is temporarily disabled. ": [
-        ""
-      ],
       "This leaves the setup of the foreman_scap_client solely on the user. The policy still needs to be defined in order to link incoming ARF reports.": [
         ""
       ],

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

@@ -902,12 +902,6 @@
       "The following %{key_name} were missing for %{item_name}: %{key_names}. Make sure they are imported before proceeding.": [
         "以下の %{key_name} が %{item_name}: %{key_names} にありませんでした。続行前にインポートされていることを確認してください。"
       ],
-      "The following Smart Proxies need to be updated to unlock the feature: %s. ": [
-        "以下のスマートプロキシーを更新して機能のロックを解除する必要があります: %s "
-      ],
-      "The following proxies could not be reached: %s. Please make sure they are available so Foreman can check their versions.": [
-        "以下のプロキシーに到達できませんでした: %s。Foreman がバージョンを確認できるように、プロキシーが利用可能であることを確認してください。"
-      ],
       "The identifier of the host": [
         "ホストの ID"
       ],
@@ -926,9 +920,6 @@
       "There's no available report for this host": [
         ""
       ],
-      "This feature is temporarily disabled. ": [
-        "この機能は一時的に無効にされています。 "
-      ],
       "This leaves the setup of the foreman_scap_client solely on the user. The policy still needs to be defined in order to link incoming ARF reports.": [
         ""
       ],

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

@@ -903,12 +903,6 @@
       "The following %{key_name} were missing for %{item_name}: %{key_names}. Make sure they are imported before proceeding.": [
         ""
       ],
-      "The following Smart Proxies need to be updated to unlock the feature: %s. ": [
-        "ფუნქციის ჩასართავად საჭიროა შემდეგი ჭკვიანი პროქსიების განახლება: %s. "
-      ],
-      "The following proxies could not be reached: %s. Please make sure they are available so Foreman can check their versions.": [
-        ""
-      ],
       "The identifier of the host": [
         "ჰოსტის იდენტიფიკატორი"
       ],
@@ -927,9 +921,6 @@
       "There's no available report for this host": [
         ""
       ],
-      "This feature is temporarily disabled. ": [
-        "ფუნქცია დროებით გათიშულია. "
-      ],
       "This leaves the setup of the foreman_scap_client solely on the user. The policy still needs to be defined in order to link incoming ARF reports.": [
         ""
       ],

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

@@ -903,12 +903,6 @@
       "The following %{key_name} were missing for %{item_name}: %{key_names}. Make sure they are imported before proceeding.": [
         ""
       ],
-      "The following Smart Proxies need to be updated to unlock the feature: %s. ": [
-        ""
-      ],
-      "The following proxies could not be reached: %s. Please make sure they are available so Foreman can check their versions.": [
-        ""
-      ],
       "The identifier of the host": [
         ""
       ],
@@ -927,9 +921,6 @@
       "There's no available report for this host": [
         ""
       ],
-      "This feature is temporarily disabled. ": [
-        ""
-      ],
       "This leaves the setup of the foreman_scap_client solely on the user. The policy still needs to be defined in order to link incoming ARF reports.": [
         ""
       ],

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

@@ -904,12 +904,6 @@
       "The following %{key_name} were missing for %{item_name}: %{key_names}. Make sure they are imported before proceeding.": [
         "Os seguintes %{key_name} estavam ausentes para %{item_name}: %{key_names}. Certifique-se de que eles sejam importados antes de prosseguir."
       ],
-      "The following Smart Proxies need to be updated to unlock the feature: %s. ": [
-        "Os proxies inteligentes a seguir precisam ser atualizados para desbloquear o recurso: %s. "
-      ],
-      "The following proxies could not be reached: %s. Please make sure they are available so Foreman can check their versions.": [
-        "Não foi possível alcançar os proxies a seguir: %s. Certifique-se de que eles estejam disponíveis para que o Foreman possa verificar suas versões."
-      ],
       "The identifier of the host": [
         "O identificador do host"
       ],
@@ -928,9 +922,6 @@
       "There's no available report for this host": [
         ""
       ],
-      "This feature is temporarily disabled. ": [
-        "Esse recurso está temporariamente desabilitado."
-      ],
       "This leaves the setup of the foreman_scap_client solely on the user. The policy still needs to be defined in order to link incoming ARF reports.": [
         ""
       ],

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

@@ -903,12 +903,6 @@
       "The following %{key_name} were missing for %{item_name}: %{key_names}. Make sure they are imported before proceeding.": [
         ""
       ],
-      "The following Smart Proxies need to be updated to unlock the feature: %s. ": [
-        ""
-      ],
-      "The following proxies could not be reached: %s. Please make sure they are available so Foreman can check their versions.": [
-        ""
-      ],
       "The identifier of the host": [
         ""
       ],
@@ -927,9 +921,6 @@
       "There's no available report for this host": [
         ""
       ],
-      "This feature is temporarily disabled. ": [
-        ""
-      ],
       "This leaves the setup of the foreman_scap_client solely on the user. The policy still needs to be defined in order to link incoming ARF reports.": [
         ""
       ],

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

@@ -903,12 +903,6 @@
       "The following %{key_name} were missing for %{item_name}: %{key_names}. Make sure they are imported before proceeding.": [
         ""
       ],
-      "The following Smart Proxies need to be updated to unlock the feature: %s. ": [
-        ""
-      ],
-      "The following proxies could not be reached: %s. Please make sure they are available so Foreman can check their versions.": [
-        ""
-      ],
       "The identifier of the host": [
         ""
       ],
@@ -927,9 +921,6 @@
       "There's no available report for this host": [
         ""
       ],
-      "This feature is temporarily disabled. ": [
-        ""
-      ],
       "This leaves the setup of the foreman_scap_client solely on the user. The policy still needs to be defined in order to link incoming ARF reports.": [
         ""
       ],

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

@@ -902,12 +902,6 @@
       "The following %{key_name} were missing for %{item_name}: %{key_names}. Make sure they are imported before proceeding.": [
         "％{item_name} 缺少以下 ％{key_name}：％{key_names}。在继续操作之前，请确保已将其导入。"
       ],
-      "The following Smart Proxies need to be updated to unlock the feature: %s. ": [
-        "下列智能代理服务器需要更新，以便解锁功能：%s。 "
-      ],
-      "The following proxies could not be reached: %s. Please make sure they are available so Foreman can check their versions.": [
-        "无法访问下列代理服务器：%s。请确保它们可用，以便 Foreman 检查其版本。"
-      ],
       "The identifier of the host": [
         "主机 ID"
       ],
@@ -926,9 +920,6 @@
       "There's no available report for this host": [
         ""
       ],
-      "This feature is temporarily disabled. ": [
-        "此功能暂时被禁用。"
-      ],
       "This leaves the setup of the foreman_scap_client solely on the user. The policy still needs to be defined in order to link incoming ARF reports.": [
         ""
       ],

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

@@ -903,12 +903,6 @@
       "The following %{key_name} were missing for %{item_name}: %{key_names}. Make sure they are imported before proceeding.": [
         ""
       ],
-      "The following Smart Proxies need to be updated to unlock the feature: %s. ": [
-        ""
-      ],
-      "The following proxies could not be reached: %s. Please make sure they are available so Foreman can check their versions.": [
-        ""
-      ],
       "The identifier of the host": [
         ""
       ],
@@ -927,9 +921,6 @@
       "There's no available report for this host": [
         ""
       ],
-      "This feature is temporarily disabled. ": [
-        ""
-      ],
       "This leaves the setup of the foreman_scap_client solely on the user. The policy still needs to be defined in order to link incoming ARF reports.": [
         ""
       ],

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

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

data/app/helpers/foreman_openscap_helper.rb

@@ -2,26 +2,10 @@ require 'foreman_openscap/version'
 
 module ForemanOpenscapHelper
   def scap_doc_button(section)
-    documentation_button(section, root_url: scap_doc_url)
+    documentation_button('Managing_Security_Compliance', type: 'docs', chapter: section)
   end
 
   def scap_doc_url(section = '')
-    return scap_root_url if section.empty?
-
-    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 = SETTINGS[:version]
-      version = version.tag == 'develop' ? 'nightly' : version.short
-      "https://docs.theforeman.org/#{version}/Managing_Security_Compliance/index-#{doc_flavor}.html#"
-    end
+    documentation_url('Managing_Security_Compliance', type: 'docs', chapter: section)
   end
 end

data/db/migrate/20201217161511_add_url_to_oval_content.rb

@@ -1,4 +1,4 @@
-class AddUrlToOvalContent < ActiveRecord::Migration[6.0]
+class AddURLToOvalContent < ActiveRecord::Migration[6.0]
   def change
     add_column :foreman_openscap_oval_contents, :url, :string
   end

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

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