foreman_scap_client 0.5.3 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdea1319b49e7e730c03aad7fda81efe05ca03b40fbc4e935ef8be35a86a1dd8
-  data.tar.gz: 86281c1e0396bfde58cbff6b2f607e2d6bc2bda7d2428ae44180fc3adb20f4ee
+  metadata.gz: 07e020e26294471ddc11840c2e52796c5d1c955989c204ed73aaaca5de0a45e5
+  data.tar.gz: 2d68f8f29e34ea4ebc16051fdc80abcd36d3c70a20ec91a2f0e2e11db1117b8b
 SHA512:
-  metadata.gz: e0a30cc7e90e5e0b5c024a2ba035d8a8534b6fc8ffc01a81f732aa987e46fd97af5878da3f444ac115905902a74d588757e6f0b000972e5d9322b84045410ddb
-  data.tar.gz: 88b379a4e4b3f1aee52e6c4d2d2b85c38646b2170874132fd0a375ce76a87e34b82b23b2b38f477fb0c6af4ae067114e52209e147ecc4950c3c5721fc0a08151
+  metadata.gz: da76639059c37d8b83dfbf4a7b48bb672054d2fe868a8576d63cc110c0b2eb88776c4a11f9a0401757f545e1948b7c8fd42e2801578b29ea6b57a55d2a73089d
+  data.tar.gz: 149235483dae7d88e92e64b650c6cb03129989effffd733819f6e3fe21b1673382764b9bdc566c78cae50792b1df580b1285132d764942fb1c79fe18362edcbe

data/bin/foreman_scap_client

@@ -12,12 +12,11 @@ end
 
 if args.size == 1
   ForemanScapClient::Client.new.run(args[0].to_i, skip_upload)
+# Left around for compatibility
 elsif args.size == 2 && args[0] == 'ds'
   ForemanScapClient::Client.new.run(args[1].to_i, skip_upload)
-elsif args.size == 2 && args[0] == 'oval'
-  ForemanScapClient::OvalClient.new.run(args[1].to_i, skip_upload)
 else
-  puts "Usage: #{$0} [ds | oval] policy_id [--skip-upload]"
+  puts "Usage: #{$0} [ds] policy_id [--skip-upload]"
   puts "  where policy_id is a key used in config file"
   exit 2
 end

data/config/config.yaml.example

@@ -33,7 +33,3 @@
 2:
   :profile: 'xccdf_org.ssgproject.content_profile_common'
   :content_path: '/usr/share/xml/scap/ssg/content/ssg-fedora-ds.xml'
-
-:oval:
-  3:
-    :content_path: '/var/lib/openscap/oval_content/ansible-2.9.oval.xml.bz2'

data/lib/foreman_scap_client/client.rb

@@ -45,8 +45,9 @@ module ForemanScapClient
 
     def supports_local_file_option?
       # OpenSCAP 1.3.6 and newer requires the `--local-files` option to use local copies of remote SDS components
-      version, _stderr, status = Open3.capture3('rpm', '-q', '--qf', '%{version}', 'openscap')
+      versions, _stderr, status = Open3.capture3('oscap', '--version')
       return false unless status.success?
+      version = versions.lines[0].split.last
       Gem::Version.new(version) >= Gem::Version.new('1.3.6')
     end
 

data/lib/foreman_scap_client/version.rb

@@ -1,3 +1,3 @@
 module ForemanScapClient
-  VERSION = "0.5.3"
+  VERSION = "0.6.1"
 end

data/lib/foreman_scap_client.rb

@@ -1,3 +1,2 @@
 require "foreman_scap_client/version"
 require "foreman_scap_client/client"
-require "foreman_scap_client/oval_client"

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: foreman_scap_client
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.1
 platform: ruby
 authors:
 - Marek Hulan
 - Šimon Lukašík
 - Shlomi Zadok
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-15 00:00:00.000000000 Z
+date: 2024-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,13 +58,12 @@ files:
 - lib/foreman_scap_client.rb
 - lib/foreman_scap_client/base_client.rb
 - lib/foreman_scap_client/client.rb
-- lib/foreman_scap_client/oval_client.rb
 - lib/foreman_scap_client/version.rb
 homepage: https://github.com/theforeman/foreman_scap_client
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -80,8 +79,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - bzip2
-rubygems_version: 3.2.33
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Client script that runs openscap scan and uploads the result to foreman proxy
 test_files: []

data/lib/foreman_scap_client/oval_client.rb

@@ -1,31 +0,0 @@
-require 'foreman_scap_client/base_client'
-
-module ForemanScapClient
-  class OvalClient < BaseClient
-    private
-
-    def policy_namespace
-      :oval
-    end
-
-    def ensure_scan_files
-      ensure_file :content_path, :download_path, "OVAL content"
-    end
-
-    def upload_uri
-      foreman_proxy_uri + "/compliance/oval_reports/#{@policy_id}"
-    end
-
-    def scan_command
-      "oscap oval eval --results #{results_path} #{policy_from_config[:content_path]}"
-    end
-
-    def print_upload_result(parsed)
-      if parsed['reported_at']
-        puts "Report successfully uploaded at #{parsed['reported_at']}"
-      else
-        puts "Report not uploaded, cause: #{parsed['result']}"
-      end
-    end
-  end
-end