smart_proxy_openscap 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d64e75accfab154207646ea78d608d37877d3c293d38c3aa0fc0d4b7547b5ac0
-  data.tar.gz: dc18e3c41aaf4515abcc90ed7ec312a52705477bbc20372e9bd32c18203a479e
+  metadata.gz: 404a103b2ff24e1b3ff89bf63f548abd7269386df14b87225034fc52a30626e3
+  data.tar.gz: 1121a51545bdff52152bb63339b0be18b65a22241795e5e2b3423a5495295082
 SHA512:
-  metadata.gz: 0e4aa8c10499016653a8b7ef9151013ba3e23fb5ac0c1c12c40fa79bb3694135a4c6e33f765c53adaed9e83dd37dde090056dbe355ca4e1bcda626bea9c582fa
-  data.tar.gz: 5b40ab6cf91ecd6a5ffe87c9274714422deaf5b78e35c03c19ec304dda1ed2ec21275e0fb00836e42f5ef1dd4d60a9aedf47c0f224182ecd2b18568f104129c6
+  metadata.gz: b2fcf76c1a4742ba1d1d1b2b0883a5e9cc942f6f0bcb5740390f56e7f38ed95b50288cf7a07dc5b75779543821d6a6e7acd3ef0865097b0c083d102b6ddc40f8
+  data.tar.gz: c95f37095c506b144d9573b6f45fbbd540641828ad73762ead1a4845ddc2708ef42c863572e1579016be2118e1e0e870e330c0c9a5bed02b67fbefc1b760005e

data/.github/workflows/release.yml

@@ -0,0 +1,20 @@
+name: Release
+
+on:
+  push:
+    # Pattern matched against refs/tags
+    tags:
+      - '**'
+
+jobs:
+  release:
+    name: Release gem
+    runs-on: ubuntu-latest
+    environment: release
+    if: github.repository_owner == 'theforeman'
+
+    permissions:
+      id-token: write
+
+    steps:
+      - uses: voxpupuli/ruby-release@v0

data/.github/workflows/test.yml

@@ -11,4 +11,4 @@ jobs:
     name: Tests
     uses: theforeman/actions/.github/workflows/smart_proxy_plugin.yml@v0
     with:
-      extra_packages: libopenscap8
+      extra_packages: openscap-scanner

data/lib/smart_proxy_openscap/arf_html.rb

@@ -7,7 +7,7 @@ module Proxy
       include ::Proxy::Log
 
       def generate(cname, id, date, digest)
-        file_path = file_path_in_storage cname, id, date, digest
+        file_path = file_path_in_storage(cname, id, date, digest)
         as_html file_path
       end
 

data/lib/smart_proxy_openscap/arf_parser.rb

@@ -22,10 +22,7 @@ module Proxy
           raise Proxy::OpenSCAP::ReportDecompressError, "Failed to decompress received report bzip, cause: #{e.message}"
         end
         arf_file = ::OpenscapParser::TestResultFile.new(decompressed)
-        rules = arf_file.benchmark.rules.reduce({}) do |memo, rule|
-          memo[rule.id] = rule
-          memo
-        end
+        rules = arf_file.benchmark.rules.to_h { |rule| [rule.id, rule] }
 
         arf_digest = Digest::SHA256.hexdigest(arf_data)
         report = parse_results(rules, arf_file.test_result, arf_digest)
@@ -37,18 +34,16 @@ module Proxy
       private
 
       def parse_results(rules, test_result, arf_digest)
-        results = test_result.rule_results
         set_values = test_result.set_values
-        report = {}
-        report[:logs] = []
         passed = 0
         failed = 0
         othered = 0
-        results.each do |result|
+
+        logs = test_result.rule_results.filter_map do |result|
           next if result.result == 'notapplicable' || result.result == 'notselected'
+
           # get rules and their results
           rule_data = rules[result.id]
-          report[:logs] << populate_result_data(result.id, result.result, rule_data, set_values)
           # create metrics for the results
           case result.result
             when 'pass', 'fixed'
@@ -58,24 +53,29 @@ module Proxy
             else
               othered += 1
           end
+
+          populate_result_data(result.id, result.result, rule_data, set_values)
         end
-        report[:digest]  = arf_digest
-        report[:metrics] = { :passed => passed, :failed => failed, :othered => othered }
-        report[:score] = test_result.score
-        report
+
+        {
+          logs: logs,
+          digest: arf_digest,
+          metrics: { :passed => passed, :failed => failed, :othered => othered },
+          score: test_result.score,
+        }
       end
 
       def populate_result_data(result_id, rule_result, rule_data, set_values)
-        log               = {}
-        log[:source]      = result_id
-        log[:result]      = rule_result
-        log[:title]       = rule_data.title
-        log[:description] = rule_data.description
-        log[:rationale]   = rule_data.rationale
-        log[:references]  = rule_data.references.map { |ref| { :href => ref.href, :title => ref.label }}
-        log[:fixes]       = populate_fixes rule_data.fixes, set_values
-        log[:severity]    = rule_data.severity
-        log
+        {
+          source: result_id,
+          result: rule_result,
+          title: rule_data.title,
+          description: rule_data.description,
+          rationale: rule_data.rationale,
+          references: rule_data.references.map { |ref| { :href => ref.href, :title => ref.label }},
+          fixes: populate_fixes(rule_data.fixes, set_values),
+          severity: rule_data.severity,
+        }
       end
 
       def populate_fixes(fixes, set_values)

data/lib/smart_proxy_openscap/storage_fs.rb

@@ -27,6 +27,11 @@ module Proxy::OpenSCAP
       move "#{source}/#{digest}", StoreCorruptedError
     end
 
+    def move_from_spool(digest, spooldir)
+      path = Dir.glob("#{spooldir}/#{@namespace}/#{@cname}/*/#{@date}/#{digest}").first
+      move path, StoreSpoolError
+    end
+
     def get_arf_xml(digest)
       get_arf_file(digest)[:xml]
     end
@@ -45,8 +50,14 @@ module Proxy::OpenSCAP
 
     def get_path(digest)
       full_path = @path + digest
-      raise FileNotFound, "Can't find path #{full_path}" if !File.file?(full_path) || File.zero?(full_path)
+      if !File.file?(full_path) || File.zero?(full_path)
+        logger.info "File not found in storage, trying to get it from spool"
+        path_to_spool = Proxy::OpenSCAP::Plugin.settings.spooldir
+        move_from_spool(digest, path_to_spool)
+      end
       full_path
+    rescue StoreSpoolError
+      raise FileNotFound, "Can't find path #{full_path}"
     end
 
     def spool_errors

data/lib/smart_proxy_openscap/version.rb

@@ -10,6 +10,6 @@
 
 module Proxy
   module OpenSCAP
-    VERSION = '0.12.0'
+    VERSION = '0.12.1'
   end
 end

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_openscap
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Šimon Lukašík
 - Shlomi Zadok
 - Marek Hulan
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-03 00:00:00.000000000 Z
+date: 2025-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -91,6 +90,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/release.yml"
 - ".github/workflows/test.yml"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
@@ -153,7 +153,6 @@ homepage: https://github.com/theforeman/smart_proxy_openscap
 licenses:
 - GPL-3.0-or-later
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -172,8 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - oscap
-rubygems_version: 3.2.33
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: OpenSCAP plug-in for Foreman's smart-proxy.
 test_files: []