foreman_openscap 10.0.3 → 10.2.0

data/locale/pt_BR/foreman_openscap.po

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

data/locale/ru/foreman_openscap.po

@@ -7,7 +7,7 @@
 # Yulia <yulia.poyarkova@redhat.com>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 10.0.1\n"
+"Project-Id-Version: foreman_openscap 10.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-04-14 07:48+0000\n"
 "Last-Translator: FIRST AUTHOR <EMAIL@ADDRESS>, 2016\n"
@@ -98,7 +98,7 @@ msgstr "Назад"
 msgid "By default, remediation is applied to the current host. Optionally, remediate any additional hosts that fail the rule."
 msgstr ""
 
-msgid "Can't find scap-security-guide RPM, are you sure it is installed on your server?"
+msgid "Can't find %{packages} RPM(s), are you sure it is installed on your server?"
 msgstr ""
 
 msgid "Cancel"

data/locale/sv_SE/foreman_openscap.po

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

data/locale/zh_CN/foreman_openscap.po

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

data/locale/zh_TW/foreman_openscap.po

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

data/test/files/scap_contents/cs9-new/ssg-cs9-ds.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ds:data-stream-collection xmlns:cat="urn:oasis:names:tc:entity:xmlns:xml:catalog" xmlns:cpe-dict="http://cpe.mitre.org/dictionary/2.0" xmlns:cpe-lang="http://cpe.mitre.org/language/2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:ds="http://scap.nist.gov/schema/scap/source/1.2" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ind="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent" xmlns:linux="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux" xmlns:ocil="http://scap.nist.gov/schema/ocil/2.0" xmlns:oval="http://oval.mitre.org/XMLSchema/oval-common-5" xmlns:oval-def="http://oval.mitre.org/XMLSchema/oval-definitions-5" xmlns:unix="http://oval.mitre.org/XMLSchema/oval-definitions-5#unix" xmlns:xccdf-1.2="http://checklists.nist.gov/xccdf/1.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="scap_org.open-scap_collection_from_xccdf_ssg-rhel9-xccdf.xml" schematron-version="1.3">
+  <ds:data-stream id="scap_org.open-scap_datastream_from_xccdf_ssg-rhel9-xccdf.xml" scap-version="1.3" use-case="OTHER">
+    <ds:dictionaries>
+      <ds:component-ref id="scap_org.open-scap_cref_ssg-rhel9-cpe-dictionary.xml" xlink:href="#scap_org.open-scap_comp_ssg-rhel9-cpe-dictionary.xml">
+        <cat:catalog>
+          <cat:uri name="ssg-rhel9-cpe-oval.xml" uri="#scap_org.open-scap_cref_ssg-rhel9-cpe-oval.xml"/>
+        </cat:catalog>
+      </ds:component-ref>
+    </ds:dictionaries>
+    <ds:checklists>
+      <ds:component-ref id="scap_org.open-scap_cref_ssg-rhel9-xccdf.xml" xlink:href="#scap_org.open-scap_comp_ssg-rhel9-xccdf.xml">
+        <cat:catalog>
+          <cat:uri name="ssg-rhel9-oval.xml" uri="#scap_org.open-scap_cref_ssg-rhel9-oval.xml"/>
+          <cat:uri name="ssg-rhel9-ocil.xml" uri="#scap_org.open-scap_cref_ssg-rhel9-ocil.xml"/>
+          <cat:uri name="ssg-rhel9-cpe-oval.xml" uri="#scap_org.open-scap_cref_ssg-rhel9-cpe-oval.xml"/>
+        </cat:catalog>
+      </ds:component-ref>
+    </ds:checklists>
+    <ds:checks>
+      <ds:component-ref id="scap_org.open-scap_cref_ssg-rhel9-oval.xml" xlink:href="#scap_org.open-scap_comp_ssg-rhel9-oval.xml"/>
+      <ds:component-ref id="scap_org.open-scap_cref_ssg-rhel9-ocil.xml" xlink:href="#scap_org.open-scap_comp_ssg-rhel9-ocil.xml"/>
+      <ds:component-ref id="scap_org.open-scap_cref_ssg-rhel9-cpe-oval.xml" xlink:href="#scap_org.open-scap_comp_ssg-rhel9-cpe-oval.xml"/>
+    </ds:checks>
+  </ds:data-stream>
+  <ds:component id="scap_org.open-scap_comp_ssg-rhel9-cpe-dictionary.xml" timestamp="2024-11-15T00:00:00">
+    <cpe-dict:cpe-list xsi:schemaLocation="http://cpe.mitre.org/dictionary/2.0 http://cpe.mitre.org/files/cpe-dictionary_2.1.xsd">
+      <cpe-dict:cpe-item name="cpe:/o:redhat:enterprise_linux:9">
+        <cpe-dict:title xml:lang="en-us">Red Hat Enterprise Linux 9</cpe-dict:title>
+        <cpe-dict:check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="ssg-rhel9-cpe-oval.xml">oval:ssg-installed_OS_is_rhel9:def:1</cpe-dict:check>
+      </cpe-dict:cpe-item>
+      <cpe-dict:cpe-item name="cpe:/o:centos:centos:9">
+        <cpe-dict:title xml:lang="en-us">CentOS Stream 9</cpe-dict:title>
+        <cpe-dict:check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="ssg-rhel9-cpe-oval.xml">oval:ssg-installed_OS_is_centos9:def:1</cpe-dict:check>
+      </cpe-dict:cpe-item>
+    </cpe-dict:cpe-list>
+  </ds:component>
+</ds:data-stream-collection>

data/test/files/scap_contents/cs9-old/ssg-cs9-ds.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ds:data-stream-collection xmlns:cat="urn:oasis:names:tc:entity:xmlns:xml:catalog" xmlns:cpe-dict="http://cpe.mitre.org/dictionary/2.0" xmlns:cpe-lang="http://cpe.mitre.org/language/2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:ds="http://scap.nist.gov/schema/scap/source/1.2" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ind="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent" xmlns:linux="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux" xmlns:ocil="http://scap.nist.gov/schema/ocil/2.0" xmlns:oval="http://oval.mitre.org/XMLSchema/oval-common-5" xmlns:oval-def="http://oval.mitre.org/XMLSchema/oval-definitions-5" xmlns:unix="http://oval.mitre.org/XMLSchema/oval-definitions-5#unix" xmlns:xccdf-1.2="http://checklists.nist.gov/xccdf/1.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="scap_org.open-scap_collection_from_xccdf_ssg-rhel9-xccdf.xml" schematron-version="1.3">
+  <ds:data-stream id="scap_org.open-scap_datastream_from_xccdf_ssg-rhel9-xccdf.xml" scap-version="1.3" use-case="OTHER">
+    <ds:dictionaries>
+      <ds:component-ref id="scap_org.open-scap_cref_ssg-rhel9-cpe-dictionary.xml" xlink:href="#scap_org.open-scap_comp_ssg-rhel9-cpe-dictionary.xml">
+        <cat:catalog>
+          <cat:uri name="ssg-rhel9-cpe-oval.xml" uri="#scap_org.open-scap_cref_ssg-rhel9-cpe-oval.xml"/>
+        </cat:catalog>
+      </ds:component-ref>
+    </ds:dictionaries>
+    <ds:checklists>
+      <ds:component-ref id="scap_org.open-scap_cref_ssg-rhel9-xccdf.xml" xlink:href="#scap_org.open-scap_comp_ssg-rhel9-xccdf.xml">
+        <cat:catalog>
+          <cat:uri name="ssg-rhel9-oval.xml" uri="#scap_org.open-scap_cref_ssg-rhel9-oval.xml"/>
+          <cat:uri name="ssg-rhel9-ocil.xml" uri="#scap_org.open-scap_cref_ssg-rhel9-ocil.xml"/>
+          <cat:uri name="ssg-rhel9-cpe-oval.xml" uri="#scap_org.open-scap_cref_ssg-rhel9-cpe-oval.xml"/>
+        </cat:catalog>
+      </ds:component-ref>
+    </ds:checklists>
+    <ds:checks>
+      <ds:component-ref id="scap_org.open-scap_cref_ssg-rhel9-oval.xml" xlink:href="#scap_org.open-scap_comp_ssg-rhel9-oval.xml"/>
+      <ds:component-ref id="scap_org.open-scap_cref_ssg-rhel9-ocil.xml" xlink:href="#scap_org.open-scap_comp_ssg-rhel9-ocil.xml"/>
+      <ds:component-ref id="scap_org.open-scap_cref_ssg-rhel9-cpe-oval.xml" xlink:href="#scap_org.open-scap_comp_ssg-rhel9-cpe-oval.xml"/>
+    </ds:checks>
+  </ds:data-stream>
+  <ds:component id="scap_org.open-scap_comp_ssg-rhel9-cpe-dictionary.xml" timestamp="2024-05-20T00:00:00">
+    <cpe-dict:cpe-list xsi:schemaLocation="http://cpe.mitre.org/dictionary/2.0 http://cpe.mitre.org/files/cpe-dictionary_2.1.xsd">
+      <cpe-dict:cpe-item name="cpe:/o:redhat:enterprise_linux:9">
+        <cpe-dict:title xml:lang="en-us">Red Hat Enterprise Linux 9</cpe-dict:title>
+        <cpe-dict:check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="ssg-rhel9-cpe-oval.xml">oval:ssg-installed_OS_is_rhel9:def:1</cpe-dict:check>
+      </cpe-dict:cpe-item>
+      <cpe-dict:cpe-item name="cpe:/o:centos:centos:9">
+        <cpe-dict:title xml:lang="en-us">CentOS Stream 9</cpe-dict:title>
+        <cpe-dict:check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="ssg-rhel9-cpe-oval.xml">oval:ssg-installed_OS_is_centos9:def:1</cpe-dict:check>
+      </cpe-dict:cpe-item>
+    </cpe-dict:cpe-list>
+  </ds:component>
+</ds:data-stream-collection>

data/test/lib/foreman_openscap/bulk_upload_test.rb

@@ -2,7 +2,6 @@ require 'test_plugin_helper'
 
 class BulkUploadTest < ActiveSupport::TestCase
   setup do
-    require 'foreman_openscap/bulk_upload'
     ForemanOpenscap::ScapContent.all.map(&:destroy)
   end
 
@@ -48,17 +47,33 @@ class BulkUploadTest < ActiveSupport::TestCase
 
   test 'should handle case when scap security guide is not installed' do
     upload = ForemanOpenscap::BulkUpload.new
-    upload.stubs(:scap_guide_installed?).returns(false)
+    upload.stubs(:package_installed?).returns(false)
     res = upload.upload_from_scap_guide
-    assert_equal "Can't find scap-security-guide RPM, are you sure it is installed on your server?", res.errors.first
+    assert_equal "Can't find scap-security-guide RPM(s), are you sure it is installed on your server?", res.errors.first
   end
 
   test 'should upload files from guide' do
     upload = ForemanOpenscap::BulkUpload.new
-    upload.stubs(:scap_guide_installed?).returns(true)
+    upload.stubs(:package_installed?).returns(true)
     upload.stubs(:files_from_guide).returns(["#{ForemanOpenscap::Engine.root}/test/files/scap_contents/ssg-fedora-ds.xml"])
     assert_difference('ForemanOpenscap::ScapContent.count', 1) do
       upload.upload_from_scap_guide
     end
   end
+
+  test 'should upload new files from guide' do
+    upload = ForemanOpenscap::BulkUpload.new
+    upload.stubs(:package_installed?).returns(true)
+    upload.stubs(:files_from_guide).returns(["#{ForemanOpenscap::Engine.root}/test/files/scap_contents/cs9-old/ssg-cs9-ds.xml"])
+    assert_difference('ForemanOpenscap::ScapContent.count', 1) do
+      upload.upload_from_scap_guide
+    end
+    old_digest = ForemanOpenscap::ScapContent.last.digest
+    upload.stubs(:files_from_guide).returns(["#{ForemanOpenscap::Engine.root}/test/files/scap_contents/cs9-new/ssg-cs9-ds.xml"])
+    assert_no_difference('ForemanOpenscap::ScapContent.count') do
+      upload.upload_from_scap_guide
+    end
+    new_digest = ForemanOpenscap::ScapContent.last.digest
+    refute_equal old_digest, new_digest
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 10.0.3
+  version: 10.2.0
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-26 00:00:00.000000000 Z
+date: 2025-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Foreman plug-in for managing security compliance reports
 email:
 - slukasik@redhat.com
@@ -116,6 +130,7 @@ files:
 - app/models/foreman_openscap/scap_content_profile.rb
 - app/models/foreman_openscap/tailoring_file.rb
 - app/services/foreman_openscap/arf_report_status_calculator.rb
+- app/services/foreman_openscap/bulk_upload.rb
 - app/services/foreman_openscap/client_config/ansible.rb
 - app/services/foreman_openscap/client_config/base.rb
 - app/services/foreman_openscap/client_config/manual.rb
@@ -286,7 +301,6 @@ files:
 - db/seeds.d/openscap_feature.rb
 - db/seeds.d/openscap_policy_notification.rb
 - lib/foreman_openscap.rb
-- lib/foreman_openscap/bulk_upload.rb
 - lib/foreman_openscap/data_migration.rb
 - lib/foreman_openscap/engine.rb
 - lib/foreman_openscap/helper.rb
@@ -342,6 +356,8 @@ files:
 - test/files/arf_report/arf_report_msg_desc_changed.json
 - test/files/arf_report/arf_report_msg_value_changed.json
 - test/files/oval_contents/ansible-2.9.oval.xml.bz2
+- test/files/scap_contents/cs9-new/ssg-cs9-ds.xml
+- test/files/scap_contents/cs9-old/ssg-cs9-ds.xml
 - test/files/scap_contents/ssg-fedora-ds.xml
 - test/files/tailoring_files/ssg-firefox-ds-tailoring-2.xml
 - test/files/tailoring_files/ssg-firefox-ds-tailoring.xml
@@ -455,6 +471,8 @@ test_files:
 - test/files/arf_report/arf_report_msg_desc_changed.json
 - test/files/arf_report/arf_report_msg_value_changed.json
 - test/files/oval_contents/ansible-2.9.oval.xml.bz2
+- test/files/scap_contents/cs9-new/ssg-cs9-ds.xml
+- test/files/scap_contents/cs9-old/ssg-cs9-ds.xml
 - test/files/scap_contents/ssg-fedora-ds.xml
 - test/files/tailoring_files/ssg-firefox-ds-tailoring-2.xml
 - test/files/tailoring_files/ssg-firefox-ds-tailoring.xml