foreman_scap_client 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 825ce2dba8229d5ed21451e89686f8b5d496d11a7b8520cc69e5e0b46be0f08c
-  data.tar.gz: fdde4a6929aaf4318acec62faf415121977f03cdb5a0034a09195520527ed83e
+  metadata.gz: ee515e83b0f3905864064b90029612792b2c607fa45b2d1e0b8d57739f1724aa
+  data.tar.gz: 62f2894c2f3e40fe977aff6f7b22e04add6c41a177da6be9061ed741432f8a1f
 SHA512:
-  metadata.gz: '086cbe81e50cbacdc9955ee9f5e65354fbd34e4a2c05937dbf333e37d890dc236508ca6dc6bd49d99d268178a7090a967c62e1debbfceed198135d09d6b35b56'
-  data.tar.gz: dfafef66458765b284a1b5ff37ec8ce94a083f881adecafb6bbc0b489f7686a17a36b648f1efaf29c4bc4b899f65c7e1f7346e218e2b6f706aa96c51218b5d55
+  metadata.gz: '08dc4cc7aec0dc4fea47b5202ee9b4b79aa409f18a45cf3d9c2602549d1d92ccc30bf1eafd6137f927f02e4fa4beecf3da595c3fc2f8ade50be71c7defe86316'
+  data.tar.gz: 41c69b9e16d6fcb586012fb6f57f581f0088d352176f3c62772ab409258592d4bc698b6f902e44361c3bdd2c4b7dbab4a791d4d554e4d6815bc810ab6616b3c4

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/base_client.rb

@@ -1,4 +1,3 @@
-require 'rubygems' if RUBY_VERSION.start_with? '1.8'
 require 'yaml'
 require 'tmpdir'
 require 'net/http'
@@ -71,17 +70,13 @@ module ForemanScapClient
       puts "DEBUG: running: " + scan_command
       puts "with ENV vars: #{scan_command_env_vars}" unless scan_command_env_vars.empty?
 
-      if RUBY_VERSION.start_with? '1.8'
-        legacy_run_scan
-      else
-        run_scan
-      end
+      run_scan
     end
 
     def run_scan
       stdout_str, error_str, result = Open3.capture3(scan_command_env_vars, scan_command)
       if result.success? || result.exitstatus == 2
-        puts error_str.scrub("?").split("\n").select { |item| item.start_with?('WARNING:') || item.start_with?('Downloading') }.join("\n")
+        error_str.each_line { |item| print item if item.start_with?('WARNING:') || item.start_with?('Downloading') }
         @report = results_path
       else
         puts 'Scan failed'
@@ -91,19 +86,6 @@ module ForemanScapClient
       end
     end
 
-    def legacy_run_scan
-      warn_proxy_not_supported
-      result = `#{scan_command}`
-
-      if $?.success? || $?.exitstatus == 2
-        @report = results_path
-      else
-        puts 'Scan failed'
-        puts result
-        exit(2)
-      end
-    end
-
     def scan_command_env_vars
       if http_proxy_uri
         {
@@ -130,10 +112,6 @@ module ForemanScapClient
       "#{results_path}.bz2"
     end
 
-    def warn_proxy_not_supported
-      puts 'Configuration for HTTP(S) proxy found but not supported for ruby 1.8' if http_proxy_uri
-    end
-
     def bzip_command
       "/usr/bin/env bzip2 #{results_path}"
     end

data/lib/foreman_scap_client/version.rb

@@ -1,3 +1,3 @@
 module ForemanScapClient
-  VERSION = "0.5.2"
+  VERSION = "0.6.0"
 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.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Marek Hulan
 - Šimon Lukašík
 - Shlomi Zadok
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-15 00:00:00.000000000 Z
+date: 2024-05-30 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