foreman_openscap 10.1.0 → 10.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99477093ef8367f5665ae531c5f4fc9b04076133d2518fdebd6090ceffac5042
-  data.tar.gz: 45f208e897338d09b0cf032d52257df497c9c1760ab7dac701c5269b8b1c1de1
+  metadata.gz: '0439888bf908c1a7ad5f03474f3b48411e5a1bab3c5a5bd84ecd405e716a355e'
+  data.tar.gz: 1d3615c32e243df1d121c0a628cd555d65f4481826710c454b219ff8d76d2aa2
 SHA512:
-  metadata.gz: '009f9195a8031f350a79f5bd09735a3dc7d0c9e98f6fa3af0a5e5607da38cf0a1b39069dcda965659953fb3b0aa298dea0e776816514de1eb168ade1fd1e650e'
-  data.tar.gz: bfcdb2e5b51f652a5b03020b92f474c61e94d03af53bc1e3630975160ead3caa2d3cf1c99ed88e4a9d8e4a99f2e76d58381e151199495e7d42bd6780be5c2131
+  metadata.gz: 6a7d1cba25e21591b06f5cd5eaa4e98cb3013b7b54cbb89dacf49b7383a6bdcc1f9eb498e6c1a3c34b068398aaef5a217d582018e5ae7a171eef3f7de1ee4268
+  data.tar.gz: 9f2f93540bc1a4405a9d37ffaa6ce89632c7656622022734dfaf7e90727cc2623e613a5a6baa8abf6fb0a515fd98741478e7e863d29bdd3f565841a23f9c5487

data/app/assets/javascripts/foreman_openscap/load_report.js

@@ -1,5 +1,5 @@
 $(document).ready(function() {
-    $('#frame').load(function() {
+    $('#frame').on("load",function() {
         $('#loading').hide();
         $('#frame').show().css('min-height', '800px');
     });

data/app/models/concerns/foreman_openscap/scap_file_content.rb

@@ -8,7 +8,7 @@ module ForemanOpenscap
       validates :digest, :presence => true
       validates :scap_file, :presence => true
 
-      before_validation :redigest, :if => lambda { |file_content| file_content.persisted? && file_content.scap_file_changed? }
+      before_validation :redigest, :if => lambda { |file_content| !file_content.persisted? || file_content.scap_file_changed? }
     end
 
     def digest

data/app/services/foreman_openscap/bulk_upload.rb

@@ -48,12 +48,11 @@ module ForemanOpenscap
           next
         end
 
-        file = File.open(datastream, 'rb').read
-        digest = Digest::SHA2.hexdigest(datastream)
+        file = File.read(datastream, mode: 'rb')
         title = content_name(datastream, from_scap_guide)
         filename = original_filename(datastream)
-        scap_content = ScapContent.where(:title => title, :digest => digest).first_or_initialize
-        next if scap_content.persisted?
+
+        scap_content = ScapContent.where(:title => title).first_or_initialize
         scap_content.scap_file = file
         scap_content.original_filename = filename
         scap_content.location_ids = Location.all.pluck(:id)

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "10.1.0".freeze
+  VERSION = "10.2.0".freeze
 end

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

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

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 10.1.0
+  version: 10.2.0
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-03 00:00:00.000000000 Z
+date: 2025-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -309,71 +309,39 @@ files:
 - lib/tasks/foreman_openscap_tasks.rake
 - locale/Makefile
 - locale/cs_CZ/LC_MESSAGES/foreman_openscap.mo
-- locale/cs_CZ/foreman_openscap.edit.po
 - locale/cs_CZ/foreman_openscap.po
-- locale/cs_CZ/foreman_openscap.po.time_stamp
 - locale/de/LC_MESSAGES/foreman_openscap.mo
-- locale/de/foreman_openscap.edit.po
 - locale/de/foreman_openscap.po
-- locale/de/foreman_openscap.po.time_stamp
 - locale/en/LC_MESSAGES/foreman_openscap.mo
-- locale/en/foreman_openscap.edit.po
 - locale/en/foreman_openscap.po
-- locale/en/foreman_openscap.po.time_stamp
 - locale/en_GB/LC_MESSAGES/foreman_openscap.mo
-- locale/en_GB/foreman_openscap.edit.po
 - locale/en_GB/foreman_openscap.po
-- locale/en_GB/foreman_openscap.po.time_stamp
 - locale/es/LC_MESSAGES/foreman_openscap.mo
-- locale/es/foreman_openscap.edit.po
 - locale/es/foreman_openscap.po
-- locale/es/foreman_openscap.po.time_stamp
 - locale/foreman_openscap.pot
 - locale/fr/LC_MESSAGES/foreman_openscap.mo
-- locale/fr/foreman_openscap.edit.po
 - locale/fr/foreman_openscap.po
-- locale/fr/foreman_openscap.po.time_stamp
 - locale/gl/LC_MESSAGES/foreman_openscap.mo
-- locale/gl/foreman_openscap.edit.po
 - locale/gl/foreman_openscap.po
-- locale/gl/foreman_openscap.po.time_stamp
 - locale/it/LC_MESSAGES/foreman_openscap.mo
-- locale/it/foreman_openscap.edit.po
 - locale/it/foreman_openscap.po
-- locale/it/foreman_openscap.po.time_stamp
 - locale/ja/LC_MESSAGES/foreman_openscap.mo
-- locale/ja/foreman_openscap.edit.po
 - locale/ja/foreman_openscap.po
-- locale/ja/foreman_openscap.po.time_stamp
 - locale/ka/LC_MESSAGES/foreman_openscap.mo
-- locale/ka/foreman_openscap.edit.po
 - locale/ka/foreman_openscap.po
-- locale/ka/foreman_openscap.po.time_stamp
 - locale/ko/LC_MESSAGES/foreman_openscap.mo
-- locale/ko/foreman_openscap.edit.po
 - locale/ko/foreman_openscap.po
-- locale/ko/foreman_openscap.po.time_stamp
 - locale/pt_BR/LC_MESSAGES/foreman_openscap.mo
-- locale/pt_BR/foreman_openscap.edit.po
 - locale/pt_BR/foreman_openscap.po
-- locale/pt_BR/foreman_openscap.po.time_stamp
 - locale/ru/LC_MESSAGES/foreman_openscap.mo
-- locale/ru/foreman_openscap.edit.po
 - locale/ru/foreman_openscap.po
-- locale/ru/foreman_openscap.po.time_stamp
 - locale/sv_SE/LC_MESSAGES/foreman_openscap.mo
-- locale/sv_SE/foreman_openscap.edit.po
 - locale/sv_SE/foreman_openscap.po
-- locale/sv_SE/foreman_openscap.po.time_stamp
 - locale/zanata.xml
 - locale/zh_CN/LC_MESSAGES/foreman_openscap.mo
-- locale/zh_CN/foreman_openscap.edit.po
 - locale/zh_CN/foreman_openscap.po
-- locale/zh_CN/foreman_openscap.po.time_stamp
 - locale/zh_TW/LC_MESSAGES/foreman_openscap.mo
-- locale/zh_TW/foreman_openscap.edit.po
 - locale/zh_TW/foreman_openscap.po
-- locale/zh_TW/foreman_openscap.po.time_stamp
 - package.json
 - test/factories/arf_report_factory.rb
 - test/factories/asset_factory.rb
@@ -388,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
@@ -483,7 +453,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.3.27
 signing_key:
 specification_version: 4
 summary: Foreman plug-in for displaying OpenSCAP audit reports
@@ -501,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