foreman_openscap 3.0.0 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6e301b29945537277b6a85512f2f44b0f510e2c32ba9caa27f41e86baa36b4e
-  data.tar.gz: bdbb2084e0f49402dc09d2361681ed8268b1df4bd1d4972b6c8dc47591885d98
+  metadata.gz: 9252b8e5a2b6e1d8c6fb846ad7d9057ba60791dd5f1dba7a64bb5e38899ddb56
+  data.tar.gz: ce78ad017257f0ed398b3e898d4e3245083e0fe6d0c0011e89f4760049090969
 SHA512:
-  metadata.gz: 40f777835363faccd5f7ec85200615f29b4278eb0b0c858dd18ce09321faf3665fffb78fba14002e697efb83b125b3a483725a3a6ca10e07954700e8fa83b19d
-  data.tar.gz: 29337269bae75e609e62530b2ae94b92cde2b7e5f10c41ddd7b4ab2af4d14e8cdc3a60e250b0244c60dc6e2337e8620af822b8fd40bee18b2952e13fdc92281c
+  metadata.gz: c15b7190aea03e446fa77c35c162453d93c755888630efc4db503543f823769dba36a3ab071631d522d9ed39d556ab0637758e9dd9cc2e35f019f0c7a20da7e3
+  data.tar.gz: 14de584928d7d4f2913deb9c93b9d634a8f5c491929eed27242c8ce05f9cd65927b3df2e9bf1f348d4285cd112500578516b7d0e4bd505b8469216bad65d14aa

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

@@ -90,12 +90,14 @@ module Api
         end
 
         def find_resources_before_create
-          unless ForemanOpenscap::Policy.where(:id => params[:policy_id]).any?
-            upload_fail(_("Policy with id %s not found.") % params[:policy_id])
+          policy_id = params[:policy_id].to_i
+
+          unless ForemanOpenscap::Policy.where(:id => policy_id).any?
+            upload_fail(_("Policy with id %s not found.") % policy_id)
             return
           end
 
-          @asset = ForemanOpenscap::Helper::get_asset(params[:cname], params[:policy_id])
+          @asset = ForemanOpenscap::Helper::get_asset(params[:cname], policy_id)
 
           unless @asset
             upload_fail(_('Could not find host identified by: %s') % params[:cname])

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

@@ -51,7 +51,7 @@ module Api::V2
       param_group :scap_content
 
       def update
-        process_response @scap_content.update_attributes(scap_content_params)
+        process_response @scap_content.update(scap_content_params)
       end
 
       api :DELETE, '/compliance/scap_contents/:id', N_('Deletes an SCAP content')

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

@@ -52,7 +52,7 @@ module Api::V2
       param_group :tailoring_file
 
       def update
-        process_response @tailoring_file.update_attributes(tailoring_file_params)
+        process_response @tailoring_file.update(tailoring_file_params)
       end
 
       api :DELETE, '/compliance/tailoring_files/:id', N_('Deletes a Tailoring file')

data/app/controllers/scap_contents_controller.rb

@@ -33,7 +33,7 @@ class ScapContentsController < ApplicationController
   end
 
   def update
-    if @scap_content.update_attributes(scap_content_params)
+    if @scap_content.update(scap_content_params)
       process_success
     else
       process_error

data/app/controllers/tailoring_files_controller.rb

@@ -30,7 +30,7 @@ class TailoringFilesController < ApplicationController
   end
 
   def update
-    if @tailoring_file.update_attributes(tailoring_file_params)
+    if @tailoring_file.update(tailoring_file_params)
       process_success
     else
       process_error

data/app/models/foreman_openscap/policy.rb

@@ -67,7 +67,7 @@ module ForemanOpenscap
           ForemanOpenscap::LookupKeyOverrider.new(self).override
         end
 
-        errors.none? && update_attributes(params)
+        errors.none? && update(params)
       end
     end
 
@@ -312,7 +312,7 @@ module ForemanOpenscap
     end
 
     def assign_ids(ids, class_name)
-      new_assets = ids.reject { |id| id.respond_to?(:empty?) && id.empty? }.reduce([]) do |memo, id|
+      new_assets = ids.uniq.reject { |id| id.respond_to?(:empty?) && id.empty? }.reduce([]) do |memo, id|
         memo << assets.where(:assetable_type => class_name, :assetable_id => id).first_or_initialize
       end
       complimentary_class_name = class_name == 'Host::Base' ? 'Hostgroup' : 'Host::Base'

data/db/migrate/20200803065041_migrate_port_overrides_for_ansible.rb

@@ -0,0 +1,34 @@
+class MigratePortOverridesForAnsible < ActiveRecord::Migration[6.0]
+  def up
+    transform_lookup_values :to_i
+  end
+
+  def down
+    transform_lookup_values :to_s
+  end
+
+  private
+
+  def transform_lookup_values(method)
+    return unless defined?(ForemanAnsible)
+    role = AnsibleRole.find_by :name => 'theforeman.foreman_scap_client'
+    return unless role
+    port_key = role.ansible_variables.find_by :key => 'foreman_scap_client_port'
+    return unless port_key
+    if method == :to_i
+      port_key.key_type =  "integer"
+      port_key.default_value = 8080
+    else
+      port_key.key_type == "string"
+      port_key.default_value = ""
+    end
+
+    port_key.save
+    port_key.lookup_values.in_batches do |batch|
+      batch.each do |lookup_value|
+        lookup_value.value = lookup_value.value.send(method)
+        lookup_value.save
+      end
+    end
+  end
+end

data/db/seeds.d/75-job_templates.rb

@@ -7,9 +7,9 @@ if ForemanOpenscap.with_remote_execution?
         sync = !Rails.env.test? && Setting[:remote_execution_sync_templates]
         # import! was renamed to import_raw! around 1.3.1
         if JobTemplate.respond_to?('import_raw!')
-          template = JobTemplate.import_raw!(File.read(template), :default => true, :locked => true, :update => sync)
+          template = JobTemplate.import_raw!(File.read(template), :default => true, :lock => true, :update => sync)
         else
-          template = JobTemplate.import!(File.read(template), :default => true, :locked => true, :update => sync)
+          template = JobTemplate.import!(File.read(template), :default => true, :lock => true, :update => sync)
         end
         template.organizations = organizations if SETTINGS[:organizations_enabled] && template.present?
         template.locations = locations if SETTINGS[:locations_enabled] && template.present?

data/lib/foreman_openscap/helper.rb

@@ -2,7 +2,7 @@ module ForemanOpenscap::Helper
   def self.get_asset(cname, policy_id)
     asset = find_host_by_name_or_uuid(cname)&.get_asset
     return unless asset
-    asset.policy_ids += [policy_id]
+    asset.policy_ids += [policy_id] unless asset.policy_ids.include?(policy_id)
     asset
   end
 

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "3.0.0".freeze
+  VERSION = "4.0.3".freeze
 end

data/locale/action_names.rb

@@ -1,10 +1,5 @@
 # Autogenerated!
-_("Import Puppet classes")
-_("Remote action:")
 _("Action with sub plans")
 _("Import facts")
-_("Delete host")
-_("Update host")
-_("Update node")
-_("Create client")
-_("Delete client")
+_("Import Puppet classes")
+_("Remote action:")

data/locale/de/foreman_openscap.po

@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2020-02-11 07:20+0000\n"
-"Last-Translator: Ludwig B <lbayerlein@lbayerlein.de>\n"
+"PO-Revision-Date: 2020-03-02 20:59+0000\n"
+"Last-Translator: Crited <Alexander.Stoll@netways.de>\n"
 "Language-Team: German (http://www.transifex.com/foreman/foreman/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -166,9 +166,6 @@ msgstr "Richtlinie erstellen"
 msgid "Create a Tailoring file"
 msgstr ""
 
-msgid "Create client"
-msgstr ""
-
 msgid "Dashboard"
 msgstr "Übersichtsseite"
 
@@ -190,18 +187,12 @@ msgstr "Richtlinie löschen"
 msgid "Delete an ARF Report"
 msgstr "ARF-Bericht löschen"
 
-msgid "Delete client"
-msgstr ""
-
 msgid "Delete compliance policy %s with all of its reports?"
 msgstr "Compliance-Richtline %s löschen mit allen Berichten?"
 
 msgid "Delete compliance report for %s?"
 msgstr "Compliance-Bericht von %s löschen?"
 
-msgid "Delete host"
-msgstr ""
-
 msgid "Delete reports"
 msgstr "Berichte löschen"
 
@@ -834,12 +825,6 @@ msgstr ""
 msgid "Update an SCAP content"
 msgstr "Einen SCAP-Inhalt aktualisieren "
 
-msgid "Update host"
-msgstr ""
-
-msgid "Update node"
-msgstr ""
-
 msgid "Updated hosts: Assigned with OpenSCAP Proxy: %s"
 msgstr "Host aktualisiert: Zugewiesen mit OpenSCAP Proxy: %s"
 

data/locale/en_GB/foreman_openscap.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2019-12-23 01:05+0000\n"
-"Last-Translator: Andi Chandler <andi@gowling.com>\n"
+"PO-Revision-Date: 2020-03-02 20:59+0000\n"
+"Last-Translator: Lukáš Zapletal\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/foreman/fore"
 "man/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -163,9 +163,6 @@ msgstr ""
 msgid "Create a Tailoring file"
 msgstr ""
 
-msgid "Create client"
-msgstr ""
-
 msgid "Dashboard"
 msgstr ""
 
@@ -187,18 +184,12 @@ msgstr ""
 msgid "Delete an ARF Report"
 msgstr ""
 
-msgid "Delete client"
-msgstr ""
-
 msgid "Delete compliance policy %s with all of its reports?"
 msgstr ""
 
 msgid "Delete compliance report for %s?"
 msgstr ""
 
-msgid "Delete host"
-msgstr ""
-
 msgid "Delete reports"
 msgstr ""
 
@@ -831,12 +822,6 @@ msgstr ""
 msgid "Update an SCAP content"
 msgstr ""
 
-msgid "Update host"
-msgstr ""
-
-msgid "Update node"
-msgstr ""
-
 msgid "Updated hosts: Assigned with OpenSCAP Proxy: %s"
 msgstr ""
 

data/locale/es/foreman_openscap.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2019-10-23 20:36+0000\n"
+"PO-Revision-Date: 2020-03-02 20:59+0000\n"
 "Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/foreman/foreman/language/es/)"
 "\n"
@@ -165,9 +165,6 @@ msgstr "Crear una política"
 msgid "Create a Tailoring file"
 msgstr "Crear un archivo de personalización"
 
-msgid "Create client"
-msgstr ""
-
 msgid "Dashboard"
 msgstr "Tablero de mandos"
 
@@ -189,18 +186,12 @@ msgstr "Eliminar una política"
 msgid "Delete an ARF Report"
 msgstr "Eliminar un informe ARF"
 
-msgid "Delete client"
-msgstr ""
-
 msgid "Delete compliance policy %s with all of its reports?"
 msgstr "¿Eliminar política de cumplimiento %s junto con todos sus informes?"
 
 msgid "Delete compliance report for %s?"
 msgstr "¿Eliminar el informe de cumplimiento para %s?"
 
-msgid "Delete host"
-msgstr ""
-
 msgid "Delete reports"
 msgstr "Eliminar informes"
 
@@ -833,12 +824,6 @@ msgstr "Actualizar un archivo de personalización"
 msgid "Update an SCAP content"
 msgstr "Actualizar el contenido de SCAP"
 
-msgid "Update host"
-msgstr ""
-
-msgid "Update node"
-msgstr ""
-
 msgid "Updated hosts: Assigned with OpenSCAP Proxy: %s"
 msgstr "Hosts actualizados: Asignados con proxy OpenSCAP: %s"
 

data/locale/foreman_openscap.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foreman_openscap 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-02 13:32+0000\n"
-"PO-Revision-Date: 2020-03-02 13:32+0000\n"
+"POT-Creation-Date: 2020-05-11 18:31+0530\n"
+"PO-Revision-Date: 2020-05-11 18:31+0530\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -1295,37 +1295,17 @@ msgid "Run OpenSCAP scan"
 msgstr ""
 
 #: action_names.rb:2
-msgid "Import Puppet classes"
+msgid "Action with sub plans"
 msgstr ""
 
 #: action_names.rb:3
-msgid "Remote action:"
+msgid "Import facts"
 msgstr ""
 
 #: action_names.rb:4
-msgid "Action with sub plans"
+msgid "Import Puppet classes"
 msgstr ""
 
 #: action_names.rb:5
-msgid "Import facts"
-msgstr ""
-
-#: action_names.rb:6
-msgid "Delete host"
-msgstr ""
-
-#: action_names.rb:7
-msgid "Update host"
-msgstr ""
-
-#: action_names.rb:8
-msgid "Update node"
-msgstr ""
-
-#: action_names.rb:9
-msgid "Create client"
-msgstr ""
-
-#: action_names.rb:10
-msgid "Delete client"
+msgid "Remote action:"
 msgstr ""

data/locale/fr/foreman_openscap.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2019-10-23 20:36+0000\n"
+"PO-Revision-Date: 2020-03-02 20:59+0000\n"
 "Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/foreman/foreman/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -165,9 +165,6 @@ msgstr "Créer une stratégie"
 msgid "Create a Tailoring file"
 msgstr "Créer un fichier de personnalisation"
 
-msgid "Create client"
-msgstr ""
-
 msgid "Dashboard"
 msgstr "Tableau de bord"
 
@@ -189,18 +186,12 @@ msgstr "Supprimer une Stratégie"
 msgid "Delete an ARF Report"
 msgstr "Supprimer un rapport ARF"
 
-msgid "Delete client"
-msgstr ""
-
 msgid "Delete compliance policy %s with all of its reports?"
 msgstr "Souhaitez-vous  supprimer la stratégie de conformité %s avec tous ses rapports ?"
 
 msgid "Delete compliance report for %s?"
 msgstr "Supprimer les rapports de conformité pour %s ?"
 
-msgid "Delete host"
-msgstr ""
-
 msgid "Delete reports"
 msgstr "Supprimer les rapports"
 
@@ -839,12 +830,6 @@ msgstr "Mettre à jour un fichier de personnalisation"
 msgid "Update an SCAP content"
 msgstr "Mettre à jour un contenu SCAP"
 
-msgid "Update host"
-msgstr ""
-
-msgid "Update node"
-msgstr ""
-
 msgid "Updated hosts: Assigned with OpenSCAP Proxy: %s"
 msgstr "Hôtes mis à jour : attribué avec le proxy OpenSCAP : %s"
 

data/locale/gl/foreman_openscap.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2019-10-23 20:36+0000\n"
-"Last-Translator: Carmela Rubiños <carmela.rubinos@gmail.com>\n"
+"PO-Revision-Date: 2020-03-02 20:59+0000\n"
+"Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Galician (http://www.transifex.com/foreman/foreman/language/gl/"
 ")\n"
 "MIME-Version: 1.0\n"
@@ -163,9 +163,6 @@ msgstr ""
 msgid "Create a Tailoring file"
 msgstr ""
 
-msgid "Create client"
-msgstr ""
-
 msgid "Dashboard"
 msgstr "Escritorio"
 
@@ -187,18 +184,12 @@ msgstr ""
 msgid "Delete an ARF Report"
 msgstr ""
 
-msgid "Delete client"
-msgstr ""
-
 msgid "Delete compliance policy %s with all of its reports?"
 msgstr ""
 
 msgid "Delete compliance report for %s?"
 msgstr ""
 
-msgid "Delete host"
-msgstr ""
-
 msgid "Delete reports"
 msgstr ""
 
@@ -831,12 +822,6 @@ msgstr ""
 msgid "Update an SCAP content"
 msgstr ""
 
-msgid "Update host"
-msgstr ""
-
-msgid "Update node"
-msgstr ""
-
 msgid "Updated hosts: Assigned with OpenSCAP Proxy: %s"
 msgstr ""