foreman_openscap 12.0.1 → 12.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afee8d8fb86be90f1ad203d30b24b97a9912f4b0b72746679af0cddcb98eaee8
-  data.tar.gz: 37f9e1a5864bf34a1891b9395b12bc233073e75b2e946bd6eb35db60aeaa32a5
+  metadata.gz: d6d702c15f10295e783094bf36709e7dfb87725df26fd0bd40cfe3a85516e5d8
+  data.tar.gz: df9a4e96688af91ac7841a323e93818c5a09b03bdbcad2990656faed696ecb29
 SHA512:
-  metadata.gz: 061e846c8486920ef45900caaab115dc7b9b1e6414abaf53a271013e8b2e3c91bc3efc1ee02616b8a14ce58d07ab90f7a0a49e8f44317ec6e724ddb2f511cc68
-  data.tar.gz: 114447087d697e43a382e3fd774278c264d086d18d325649a0f334f8987d1d4b06710b938fc109fdbfb70b6bf5fb994d61d8f0633e6070d4a24201d457e290fd
+  metadata.gz: b91020fb86c158f1314a722be4c72e6f48ef5a845b6854d3d6e47c5a739838bb133ff8f72efdc44f26d47f09fd6e3ee67bcc9a92fb6ac7c50a598a4b2a149812
+  data.tar.gz: 62e3c36e54a58d6da6a82d1511c5685f9879dd6110d617163537e1bef81cead7d782776d8bd35b7ba582e8efba1c91e57579bf5764bfdb871765033c7b964aa4

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

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_openscap": {
       "": {
-        "Project-Id-Version": "foreman_openscap 12.0.0",
+        "Project-Id-Version": "foreman_openscap 12.0.1",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2016-04-14 07:48+0000",
         "Last-Translator": "Pavel Borecki <pavel.borecki@gmail.com>, 2018-2020",

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

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_openscap": {
       "": {
-        "Project-Id-Version": "foreman_openscap 12.0.0",
+        "Project-Id-Version": "foreman_openscap 12.0.1",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2016-04-14 07:48+0000",
         "Last-Translator": "pdolinic, 2021",

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

@@ -3,19 +3,19 @@
   "locale_data": {
     "foreman_openscap": {
       "": {
-        "Project-Id-Version": "foreman_openscap 12.0.0",
+        "Project-Id-Version": "foreman_openscap 12.0.1",
         "Report-Msgid-Bugs-To": "",
-        "PO-Revision-Date": "2023-05-16 14:11+0200",
+        "PO-Revision-Date": "2026-02-10 13:04+0100",
         "Last-Translator": "FULL NAME <EMAIL@ADDRESS>",
-        "Language-Team": "English",
-        "Language": "en",
+        "Language-Team": "LANGUAGE <LL@li.org>",
+        "Language": "",
         "MIME-Version": "1.0",
         "Content-Type": "text/plain; charset=UTF-8",
         "Content-Transfer-Encoding": "8bit",
-        "Plural-Forms": "nplurals=; plural=;",
+        "Plural-Forms": "nplurals=INTEGER; plural=EXPRESSION;",
         "lang": "en",
         "domain": "foreman_openscap",
-        "plural_forms": "nplurals=; plural=;"
+        "plural_forms": "nplurals=INTEGER; plural=EXPRESSION;"
       },
       " for policy %s": [
         ""

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

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_openscap": {
       "": {
-        "Project-Id-Version": "foreman_openscap 12.0.0",
+        "Project-Id-Version": "foreman_openscap 12.0.1",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2016-04-14 07:48+0000",
         "Last-Translator": "FULL NAME <EMAIL@ADDRESS>",

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

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_openscap": {
       "": {
-        "Project-Id-Version": "foreman_openscap 12.0.0",
+        "Project-Id-Version": "foreman_openscap 12.0.1",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2016-04-14 07:48+0000",
         "Last-Translator": "FIRST AUTHOR <EMAIL@ADDRESS>, 2016",

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

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_openscap": {
       "": {
-        "Project-Id-Version": "foreman_openscap 12.0.0",
+        "Project-Id-Version": "foreman_openscap 12.0.1",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2016-04-14 07:48+0000",
         "Last-Translator": "Pierre-Emmanuel Dutang <dutangp@gmail.com>, 2016",

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

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_openscap": {
       "": {
-        "Project-Id-Version": "foreman_openscap 12.0.0",
+        "Project-Id-Version": "foreman_openscap 12.0.1",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2016-04-14 07:48+0000",
         "Last-Translator": "FULL NAME <EMAIL@ADDRESS>",

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

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_openscap": {
       "": {
-        "Project-Id-Version": "foreman_openscap 12.0.0",
+        "Project-Id-Version": "foreman_openscap 12.0.1",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2016-04-14 07:48+0000",
         "Last-Translator": "FIRST AUTHOR <EMAIL@ADDRESS>, 2016",

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

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_openscap": {
       "": {
-        "Project-Id-Version": "foreman_openscap 12.0.0",
+        "Project-Id-Version": "foreman_openscap 12.0.1",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2016-04-14 07:48+0000",
         "Last-Translator": "Kazuki Omo <kazuki.omo@gmail.com>, 2016",

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

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_openscap": {
       "": {
-        "Project-Id-Version": "foreman_openscap 12.0.0",
+        "Project-Id-Version": "foreman_openscap 12.0.1",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2016-04-14 07:48+0000",
         "Last-Translator": "FULL NAME <EMAIL@ADDRESS>",

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

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_openscap": {
       "": {
-        "Project-Id-Version": "foreman_openscap 12.0.0",
+        "Project-Id-Version": "foreman_openscap 12.0.1",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2016-04-14 07:48+0000",
         "Last-Translator": "FIRST AUTHOR <EMAIL@ADDRESS>, 2016",

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 12.0.0",
+        "Project-Id-Version": "foreman_openscap 12.0.1",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2016-04-14 07:48+0000",
         "Last-Translator": "FIRST AUTHOR <EMAIL@ADDRESS>, 2016",

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

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_openscap": {
       "": {
-        "Project-Id-Version": "foreman_openscap 12.0.0",
+        "Project-Id-Version": "foreman_openscap 12.0.1",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2016-04-14 07:48+0000",
         "Last-Translator": "FIRST AUTHOR <EMAIL@ADDRESS>, 2016",

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 12.0.0",
+        "Project-Id-Version": "foreman_openscap 12.0.1",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2016-04-14 07:48+0000",
         "Last-Translator": "FULL NAME <EMAIL@ADDRESS>",

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 12.0.0",
+        "Project-Id-Version": "foreman_openscap 12.0.1",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2016-04-14 07:48+0000",
         "Last-Translator": "FIRST AUTHOR <EMAIL@ADDRESS>, 2016",

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 12.0.0",
+        "Project-Id-Version": "foreman_openscap 12.0.1",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2016-04-14 07:48+0000",
         "Last-Translator": "FIRST AUTHOR <EMAIL@ADDRESS>, 2016",

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

@@ -49,8 +49,8 @@ module Api
         param :date, :identifier, :required => true
 
         def create
-          arf_report = ForemanOpenscap::ArfReport.create_arf(@asset, @smart_proxy, params.to_unsafe_h)
-          @asset.host.refresh_statuses([HostStatus.find_status_by_humanized_name("compliance")])
+          arf_report = ForemanOpenscap::ArfReport.create_arf(@host, @smart_proxy, params.to_unsafe_h)
+          @host.refresh_statuses([HostStatus.find_status_by_humanized_name("compliance")])
           respond_for_report arf_report
         end
 
@@ -97,20 +97,20 @@ module Api
             return
           end
 
-          @asset = ForemanOpenscap::Helper::get_asset(params[:cname], policy_id)
+          @host = ForemanOpenscap::Helper::find_host_by_name_or_uuid(params[:cname])
 
-          unless @asset
+          unless @host
             upload_fail(_('Could not find host identified by: %s') % params[:cname])
             return
           end
 
-          if !params[:openscap_proxy_url] && !params[:openscap_proxy_name] && !@asset.host.openscap_proxy
-            msg = _('Failed to upload Arf Report, OpenSCAP proxy name or url not found in params when uploading for %s and host is missing openscap_proxy') % @asset.host.name
+          if !params[:openscap_proxy_url] && !params[:openscap_proxy_name] && !@host.openscap_proxy
+            msg = _('Failed to upload Arf Report, OpenSCAP proxy name or url not found in params when uploading for %s and host is missing openscap_proxy') % @host.name
             upload_fail(msg)
             return
-          elsif !params[:openscap_proxy_url] && !params[:openscap_proxy_name] && @asset.host.openscap_proxy
-            logger.debug 'No proxy params found when uploading arf report, falling back to asset.host.openscap_proxy'
-            @smart_proxy = @asset.host.openscap_proxy
+          elsif !params[:openscap_proxy_url] && !params[:openscap_proxy_name] && @host.openscap_proxy
+            logger.debug 'No proxy params found when uploading arf report, falling back to host.openscap_proxy'
+            @smart_proxy = @host.openscap_proxy
           else
             @smart_proxy = SmartProxy.unscoped.find_by :name => params[:openscap_proxy_name]
             @smart_proxy ||= SmartProxy.unscoped.find_by :url => params[:openscap_proxy_url]

data/app/models/foreman_openscap/arf_report.rb

@@ -107,13 +107,13 @@ module ForemanOpenscap
       status.values.sum
     end
 
-    def self.create_arf(asset, proxy, params)
+    def self.create_arf(host, proxy, params)
       arf_report = nil
       policy = Policy.find_by :id => params[:policy_id]
       return unless policy
 
       ArfReport.transaction do
-        arf_report = ArfReport.create(:host => asset.host,
+        arf_report = ArfReport.create(:host => host,
                                       :reported_at => Time.at(params[:date].to_i),
                                       :status => params[:metrics],
                                       :metrics => params[:metrics],
@@ -230,7 +230,7 @@ module ForemanOpenscap
     def self.fixes(raw_fixes)
       return if raw_fixes.empty?
 
-      JSON.fast_generate(raw_fixes)
+      JSON.generate(raw_fixes)
     end
 
     def self.update_msg_with_changes(msg, incoming_data)

data/db/migrate/20260218133925_drop_host_policy_assignments_shadowing_hostgroup_policy_assignments.rb

@@ -0,0 +1,40 @@
+class DropHostPolicyAssignmentsShadowingHostgroupPolicyAssignments < ActiveRecord::Migration[7.0]
+  def up
+    ForemanOpenscap::Asset.where(assetable_type: 'Hostgroup').joins(:asset_policies).find_each do |hg_asset|
+      hostgroup = hg_asset.hostgroup
+      next if hostgroup.nil?
+
+      # Take all policies assigned to the hostgroup
+      policy_ids = hg_asset.asset_policies.pluck(:policy_id)
+
+      # Take ids of the hostgroup and all its children, all of these provide the policies extracted above
+      hostgroup_ids = hostgroup.subtree_ids
+
+      # Find hosts which are assigned to the hostgroup or its descendants, the hostgroup provides its policies to all of those
+      host_subselect = Host.where(hostgroup_id: hostgroup_ids)
+
+      # Take all the hosts which have direct association with a policy that is already provided by their hostgroup
+      scope = ForemanOpenscap::AssetPolicy.joins(:asset).joins(:policy)
+                .where(asset: { assetable_type: 'Host::Base', assetable_id: host_subselect })
+                .where(policy_id: policy_ids)
+      
+      scope.pluck(:asset_id, :policy_id).each_slice(1000) do |asset_id_policy_id_pairs|
+        # Composite primary keys are supported in rails >=7.1, since we're on 7.0, raw SQL will have to do.
+        connection = ActiveRecord::Base.connection
+        tuples_sql = asset_id_policy_id_pairs.map { |asset_id, policy_id|
+          "(#{connection.quote(asset_id)}, #{connection.quote(policy_id)})"
+        }.join(', ')
+        connection.execute("DELETE FROM foreman_openscap_asset_policies WHERE (asset_id, policy_id) IN (#{tuples_sql})")
+      end
+    end
+
+    # Prune host assets which do not have any policies assigned to them
+    scope = ForemanOpenscap::Asset.where(assetable_type: 'Host::Base').left_outer_joins(:asset_policies)
+    scope = scope.where('foreman_openscap_asset_policies.asset_id IS NULL')
+    # ForemanOpenscap::Asset has :dependent => :delete_all callback on asset_policies, but since we're pruning assets which don't have any asset_policies, we don't need the callback
+    scope.delete_all
+  end
+
+  def down
+  end
+end

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "12.0.1".freeze
+  VERSION = "12.0.2".freeze
 end

data/locale/cs_CZ/foreman_openscap.po

@@ -6,7 +6,7 @@
 # Pavel Borecki <pavel.borecki@gmail.com>, 2018-2020
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 12.0.0\n"
+"Project-Id-Version: foreman_openscap 12.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-04-14 07:48+0000\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018-2020\n"

data/locale/de/foreman_openscap.po

@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the foreman_openscap package.
 #
 # Translators:
-# Crited <Alexander.Stoll@netways.de>, 2019
+# Alexander Stoll <Alexander.Stoll@netways.de>, 2019
 # Ettore Atalan <atalanttore@googlemail.com>, 2016-2017
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2016
 # Ludwig B <lbayerlein@lbayerlein.de>, 2020
 # pdolinic, 2021
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 12.0.0\n"
+"Project-Id-Version: foreman_openscap 12.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-04-14 07:48+0000\n"
 "Last-Translator: pdolinic, 2021\n"

data/locale/en/foreman_openscap.po

@@ -1,21 +1,21 @@
-# English translations for foreman_openscap package.
-# Copyright (C) 2023 THE PACKAGE'S COPYRIGHT HOLDER
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the foreman_openscap package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2023.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 12.0.0\n"
+"Project-Id-Version: foreman_openscap 12.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2023-05-16 14:11+0200\n"
+"PO-Revision-Date: 2026-02-10 13:04+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: English\n"
-"Language: en\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=; plural=;\n"
-"\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 msgid " for policy %s"
 msgstr ""

data/locale/en_GB/foreman_openscap.po

@@ -5,7 +5,7 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 12.0.0\n"
+"Project-Id-Version: foreman_openscap 12.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-04-14 07:48+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

data/locale/es/foreman_openscap.po

@@ -7,7 +7,7 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 12.0.0\n"
+"Project-Id-Version: foreman_openscap 12.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-04-14 07:48+0000\n"
 "Last-Translator: FIRST AUTHOR <EMAIL@ADDRESS>, 2016\n"

data/locale/fr/foreman_openscap.po

@@ -8,7 +8,7 @@
 # Pierre-Emmanuel Dutang <dutangp@gmail.com>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 12.0.0\n"
+"Project-Id-Version: foreman_openscap 12.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-04-14 07:48+0000\n"
 "Last-Translator: Pierre-Emmanuel Dutang <dutangp@gmail.com>, 2016\n"

data/locale/gl/foreman_openscap.po

@@ -5,7 +5,7 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 12.0.0\n"
+"Project-Id-Version: foreman_openscap 12.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-04-14 07:48+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

data/locale/it/foreman_openscap.po

@@ -6,7 +6,7 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 12.0.0\n"
+"Project-Id-Version: foreman_openscap 12.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-04-14 07:48+0000\n"
 "Last-Translator: FIRST AUTHOR <EMAIL@ADDRESS>, 2016\n"

data/locale/ja/foreman_openscap.po

@@ -7,7 +7,7 @@
 # Kazuki Omo <kazuki.omo@gmail.com>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 12.0.0\n"
+"Project-Id-Version: foreman_openscap 12.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-04-14 07:48+0000\n"
 "Last-Translator: Kazuki Omo <kazuki.omo@gmail.com>, 2016\n"

data/locale/ka/foreman_openscap.po

@@ -5,7 +5,7 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 12.0.0\n"
+"Project-Id-Version: foreman_openscap 12.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-04-14 07:48+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

data/locale/ko/foreman_openscap.po

@@ -7,7 +7,7 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 12.0.0\n"
+"Project-Id-Version: foreman_openscap 12.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-04-14 07:48+0000\n"
 "Last-Translator: FIRST AUTHOR <EMAIL@ADDRESS>, 2016\n"

data/locale/pt_BR/foreman_openscap.po

@@ -6,7 +6,7 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 12.0.0\n"
+"Project-Id-Version: foreman_openscap 12.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-04-14 07:48+0000\n"
 "Last-Translator: FIRST AUTHOR <EMAIL@ADDRESS>, 2016\n"

data/locale/ru/foreman_openscap.po

@@ -7,7 +7,7 @@
 # Yulia <yulia.poyarkova@redhat.com>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 12.0.0\n"
+"Project-Id-Version: foreman_openscap 12.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-04-14 07:48+0000\n"
 "Last-Translator: FIRST AUTHOR <EMAIL@ADDRESS>, 2016\n"

data/locale/sv_SE/foreman_openscap.po

@@ -5,7 +5,7 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 12.0.0\n"
+"Project-Id-Version: foreman_openscap 12.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-04-14 07:48+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

data/locale/zh_CN/foreman_openscap.po

@@ -6,7 +6,7 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 12.0.0\n"
+"Project-Id-Version: foreman_openscap 12.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-04-14 07:48+0000\n"
 "Last-Translator: FIRST AUTHOR <EMAIL@ADDRESS>, 2016\n"

data/locale/zh_TW/foreman_openscap.po

@@ -6,7 +6,7 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 12.0.0\n"
+"Project-Id-Version: foreman_openscap 12.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-04-14 07:48+0000\n"
 "Last-Translator: FIRST AUTHOR <EMAIL@ADDRESS>, 2016\n"

data/test/functional/api/v2/compliance/arf_reports_controller_test.rb

@@ -46,7 +46,7 @@ class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
   test "should create report using proxy name" do
     reports_cleanup
     date = Time.new(1984, 9, 15)
-    ForemanOpenscap::Helper.stubs(:get_asset).returns(@asset)
+    ForemanOpenscap::Helper.stubs(:find_host_by_name_or_uuid).returns(@host)
     post :create,
          :params => @from_json.merge(:cname => @cname,
                                      :policy_id => @policy.id,
@@ -65,7 +65,8 @@ class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
   test "should create report using proxy url" do
     reports_cleanup
     date = Time.new(1984, 9, 15)
-    ForemanOpenscap::Helper.stubs(:get_asset).returns(@asset)
+    ForemanOpenscap::Helper.stubs(:find_host_by_name_or_uuid).returns(@host)
+    @host.stubs(:openscap_proxy).returns(nil)
     post :create,
          :params => @from_json.merge(:cname => @cname,
                                      :policy_id => @policy.id,
@@ -75,10 +76,35 @@ class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
     assert_response :success
   end
 
+  test "should not create host asset but tie report to hostgroup policy when policy is from hostgroup" do
+    policy = FactoryBot.create(:policy)
+    hostgroup = FactoryBot.create(:hostgroup, :openscap_proxy => @proxy)
+    host = FactoryBot.create(:host, :hostgroup_id => hostgroup.id)
+    hostgroup_asset = FactoryBot.create(:asset, :assetable_id => hostgroup.id, :assetable_type => 'Hostgroup', policies: [policy])
+
+    date = Time.new(1984, 9, 15)
+    post :create,
+         :params => @from_json.merge(:cname => host.name,
+                                     :policy_id => policy.id,
+                                     :date => date.to_i,
+                                     :openscap_proxy_name => @proxy.name),
+         :session => set_session_user
+
+    assert_response :success
+
+    User.current = users(:admin)
+    host_asset = ForemanOpenscap::Asset.find_by(:assetable_type => 'Host::Base', :assetable_id => host.id)
+    assert_nil host_asset, 'Host-level asset should not be created when ARF report is uploaded for host with policy from hostgroup'
+
+    report = ForemanOpenscap::ArfReport.find_by(:host_id => host.id)
+    assert report
+    assert_equal policy.id, report.policy.id
+  end
+
   test "should not create report when no proxy params present" do
-    asset = FactoryBot.create(:asset)
     date = Time.new(1944, 6, 6)
-    ForemanOpenscap::Helper.stubs(:get_asset).returns(asset)
+    ForemanOpenscap::Helper.stubs(:find_host_by_name_or_uuid).returns(@host)
+    @host.stubs(:openscap_proxy).returns(nil)
     post :create,
          :params => @from_json.merge(:cname => @cname,
                                      :policy_id => @policy.id,
@@ -86,7 +112,7 @@ class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
          :session => set_session_user
     assert_response :unprocessable_entity
     res = JSON.parse(@response.body)
-    msg = "Failed to upload Arf Report, OpenSCAP proxy name or url not found in params when uploading for #{asset.host.name} and host is missing openscap_proxy"
+    msg = "Failed to upload Arf Report, OpenSCAP proxy name or url not found in params when uploading for #{@host.name} and host is missing openscap_proxy"
     assert_equal msg, res["errors"]
   end
 
@@ -130,9 +156,9 @@ class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
     params = @from_json.with_indifferent_access.merge(:cname => @cname,
                                                       :policy_id => @policy.id,
                                                       :date => dates[0].to_i)
-    assert ForemanOpenscap::ArfReport.create_arf(@asset, @proxy, params)
+    assert ForemanOpenscap::ArfReport.create_arf(@host, @proxy, params)
 
-    ForemanOpenscap::Helper.stubs(:get_asset).returns(@asset)
+    ForemanOpenscap::Helper.stubs(:find_host_by_name_or_uuid).returns(@host)
     post :create,
          :params => @from_json.merge(:cname => @cname,
                                      :policy_id => @policy.id,
@@ -146,9 +172,9 @@ class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
     params = @from_json.with_indifferent_access.merge(:cname => @cname,
                                                       :policy_id => @policy.id,
                                                       :date => Time.new(2017, 5, 6).to_i)
-    assert ForemanOpenscap::ArfReport.create_arf(@asset, @proxy, params)
+    assert ForemanOpenscap::ArfReport.create_arf(@host, @proxy, params)
 
-    ForemanOpenscap::Helper.stubs(:get_asset).returns(@asset)
+    ForemanOpenscap::Helper.stubs(:find_host_by_name_or_uuid).returns(@host)
     changed_from_json = arf_from_json "#{ForemanOpenscap::Engine.root}/test/files/arf_report/arf_report_msg_desc_changed.json"
     post :create,
          :params => changed_from_json.merge(:cname => @cname,
@@ -172,9 +198,9 @@ class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
     params = @from_json.with_indifferent_access.merge(:cname => @cname,
                                                       :policy_id => @policy.id,
                                                       :date => Time.new(2017, 7, 6).to_i)
-    assert ForemanOpenscap::ArfReport.create_arf(@asset, @proxy, params)
+    assert ForemanOpenscap::ArfReport.create_arf(@host, @proxy, params)
 
-    ForemanOpenscap::Helper.stubs(:get_asset).returns(@asset)
+    ForemanOpenscap::Helper.stubs(:find_host_by_name_or_uuid).returns(@host)
     changed_from_json = arf_from_json "#{ForemanOpenscap::Engine.root}/test/files/arf_report/arf_report_msg_value_changed.json"
     post :create,
          :params => changed_from_json.merge(:cname => @cname,
@@ -447,17 +473,32 @@ class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
     get :index, :params => { :order => "compliance_failed DESC" }, :session => set_session_user
     assert_response :success
     response = ActiveSupport::JSON.decode(@response.body)
-    assert_equal 7, response['results'].first['failed']
+    assert_equal [7, 1, 0, 0], response['results'].map { |r| r['failed'] }
+
+    get :index, :params => { :order => "compliance_failed ASC" }, :session => set_session_user
+    assert_response :success
+    response = ActiveSupport::JSON.decode(@response.body)
+    assert_equal [0, 0, 1, 7], response['results'].map { |r| r['failed'] }
 
     get :index, :params => { :order => "compliance_passed DESC" }, :session => set_session_user
     assert_response :success
     response = ActiveSupport::JSON.decode(@response.body)
-    assert_equal 15, response['results'].first['passed']
+    assert_equal [15, 4, 2, 1], response['results'].map { |r| r['passed'] }
+
+    get :index, :params => { :order => "compliance_passed ASC" }, :session => set_session_user
+    assert_response :success
+    response = ActiveSupport::JSON.decode(@response.body)
+    assert_equal [1, 2, 4, 15], response['results'].map { |r| r['passed'] }
 
     get :index, :params => { :order => "compliance_othered DESC" }, :session => set_session_user
     assert_response :success
     response = ActiveSupport::JSON.decode(@response.body)
-    assert_equal 9, response['results'].first['othered']
+    assert_equal [9, 3, 0, 0], response['results'].map { |r| r['othered'] }
+
+    get :index, :params => { :order => "compliance_othered ASC" }, :session => set_session_user
+    assert_response :success
+    response = ActiveSupport::JSON.decode(@response.body)
+    assert_equal [0, 0, 3, 9], response['results'].map { |r| r['othered'] }
   end
 
   private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 12.0.1
+  version: 12.0.2
 platform: ruby
 authors:
 - slukasik@redhat.com
@@ -296,6 +296,7 @@ files:
 - db/migrate/20240313111822_drop_oval.rb
 - db/migrate/20240426143215_remove_orphaned_asset_policies.rb
 - db/migrate/20240617105409_remove_oval_permissions.rb
+- db/migrate/20260218133925_drop_host_policy_assignments_shadowing_hostgroup_policy_assignments.rb
 - db/seeds.d/75-job_templates.rb
 - db/seeds.d/openscap_feature.rb
 - db/seeds.d/openscap_policy_notification.rb
@@ -451,7 +452,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Foreman plug-in for displaying OpenSCAP audit reports
 test_files: