RubyGems - foreman_openscap - Versions diffs - 10.1.0 → 10.2.1 - Mend

foreman_openscap 10.1.0 → 10.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (58) hide show

data/locale/sv_SE/foreman_openscap.po CHANGED Viewed

@@ -5,7 +5,7 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 10.1.0\n"
+"Project-Id-Version: foreman_openscap 10.2.0\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/LC_MESSAGES/foreman_openscap.mo CHANGED Viewed

Binary file

data/locale/zh_CN/foreman_openscap.po CHANGED Viewed

@@ -6,7 +6,7 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 10.1.0\n"
+"Project-Id-Version: foreman_openscap 10.2.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 @@ msgid "By default, remediation is applied to the current host. Optionally, remed
 msgstr "默认情况下，补救会应用到当前主机。（可选）修复任何规则失败的额外主机。"
 msgid "Can't find %{packages} RPM(s), are you sure it is installed on your server?"
-msgstr ""
+msgstr "无法找到 %{packages} RPM，您确定是否已安装在服务器上？"
 msgid "Cancel"
 msgstr "取消"
@@ -311,7 +311,7 @@ msgid "Failed to delete %s compliance reports"
 msgstr "刪除 %s 合规报告失败"
 msgid "Failed to delete ARF Report for host %{host_name} reported at %{reported_at}"
-msgstr "无法删除主机 %%{host_name} 在 %%{reported_at} 报告的 ARF 报告"
+msgstr "无法删除主机 %{host_name} 在 %{reported_at} 报告的 ARF 报告"
 msgid "Failed to downloaded ARF report as bzip: %s"
 msgstr "无法将 ARF 报告下载为 bzip：%s"
@@ -628,7 +628,7 @@ msgid "Please make sure you understand them by reading our"
 msgstr "请通过阅读我们的手册确保您了解它们"
 msgid "Please specify import type, received: %{received}, expected one of: %{expected}"
-msgstr "请指定导入类型，已收到：％%{received}，预期为％%{expected} 中的一个"
+msgstr "请指定导入类型，已收到：%{received}，预期为%{expected} 中的一个"
 msgid "Policies"
 msgstr "策略"
@@ -733,7 +733,7 @@ msgid "Request timed out. Please try increasing Settings -> proxy_request_timeou
 msgstr "请求超时。请尝试增加 Settings -> proxy_request_timeout"
 msgid "Required %{msg_name} %{class} was not found, please ensure it is imported first."
-msgstr "没有找到所需的％%{msg_name}%%{class}，请确认它已被导入。"
+msgstr "没有找到所需的%{msg_name}%{class}，请确认它已被导入。"
 msgid "Requires %s Puppet class. This will assign the class to the hosts or selected hostgroups."
 msgstr "需要 %s Puppet 类。这会将类分配给主机或所选主机组。"
@@ -914,7 +914,7 @@ msgstr ""
 "        配置问题的开源标准。"
 msgid "The following %{key_name} were missing for %{item_name}: %{key_names}. Make sure they are imported before proceeding."
-msgstr "％%{item_name} 缺少以下 ％%{key_name}：％%{key_names}。在继续操作之前，请确保已将其导入。"
+msgstr "%{item_name} 缺少以下 %{key_name}：%{key_names}。在继续操作之前，请确保已将其导入。"
 msgid "The identifier of the host"
 msgstr "主机 ID"

data/locale/zh_TW/LC_MESSAGES/foreman_openscap.mo CHANGED Viewed

Binary file

data/locale/zh_TW/foreman_openscap.po CHANGED Viewed

@@ -6,7 +6,7 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 10.1.0\n"
+"Project-Id-Version: foreman_openscap 10.2.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"

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

@@ -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 ADDED Viewed

@@ -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 CHANGED Viewed

@@ -60,4 +60,20 @@ class BulkUploadTest < ActiveSupport::TestCase
       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 CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 10.1.0
+  version: 10.2.1
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-03 00:00:00.000000000 Z
+date: 2025-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -388,6 +388,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
@@ -501,6 +503,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