foreman_scap_client 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f5a6bc1a8e9ab962c33f4902ff845e6b7bcacf3
-  data.tar.gz: c692d959c101d2d18f63ea6c399a98dc8f99df7a
+  metadata.gz: 2e702d979ef4efb30e81f353704aa35d9329cdcb
+  data.tar.gz: 8637950187141f8c7b9a7ab74b8396da710d31e1
 SHA512:
-  metadata.gz: ce8cef68f46660c12b1e1fc1895681713fc06387eccb06a7ec03dad8bf7049952a24b8d9066255fcdee4f7d0bd202989d8199912492cc393ab5ab42e796e72aa
-  data.tar.gz: 8145d9d2dfd42bffe66d4daf7120410bfad5796f77a7ca857fc25851ff083bea67b88bc82083060bfa7c212f19d07bafdeab973340f156fc72ad60cf04adc9ab
+  metadata.gz: 616bb33708a3d3f2ca6644812ffc392126074d79a04e4dd7746a2a76b263dd8b4277fd8229f1ed6709f2791fdfbf415fef721750934ee579c3e180934be73a91
+  data.tar.gz: a66ed283164da3cf15c2fa32b1fd168d007ddafa6d10a0750fca694c394717185d1cd4e1fec3a7da8d77811a9e5feb6316adf8f0f71ff68bb545b0bd7ad9f047

data/config/config.yaml.example

@@ -2,6 +2,13 @@
 :server: 'foreman_proxy.example.com'
 :port: 8443
 
+# Should --fetch-remote-resources be added to `oscap xccdf eval` command
+:fetch_remote_resources: true
+
+# HTTP proxy server for downloading remote resources
+:http_proxy_server:
+:http_proxy_port:
+
 # SSL specific options
 :ca_file: '/var/lib/puppet/ssl/certs/ca.pem'
 # this client certificate, usually the same that puppet agent use

data/lib/foreman_scap_client/client.rb

@@ -4,6 +4,8 @@ require 'net/http'
 require 'net/https'
 require 'uri'
 require 'open-uri'
+require 'open3'
+require 'json'
 
 module ForemanScapClient
   CONFIG_FILE = '/etc/foreman_scap_client/config.yaml'
@@ -38,16 +40,35 @@ module ForemanScapClient
 
     def scan
       puts "DEBUG: running: " + scan_command
-      result = `#{scan_command}`
-      if $?.success? || $?.exitstatus == 2
+      stdout_str, error_str, result = Open3.capture3(scan_command_env_vars, scan_command)
+      if result.success? || result.exitstatus == 2
         @report = results_path
       else
         puts 'Scan failed'
-        puts result
+        puts stdout_str
+        puts error_str
         exit(2)
       end
     end
 
+    def scan_command_env_vars
+      if http_proxy_uri
+        {
+          'HTTP_PROXY'  => http_proxy_uri,
+          'HTTPS_PROXY' => http_proxy_uri
+        }
+      else
+        {}
+      end
+    end
+
+    def http_proxy_uri
+      return nil unless config[:http_proxy_server] && config[:http_proxy_port]
+      http_proxy_server = config[:http_proxy_server]
+      http_proxy_port   = config[:http_proxy_port]
+      "http://#{http_proxy_server}:#{http_proxy_port}"
+    end
+
     def results_path
       "#{@tmp_dir}/results.xml"
     end
@@ -62,7 +83,12 @@ module ForemanScapClient
       else
         profile = ''
       end
-      "oscap xccdf eval #{profile} #{tailoring_subcommand} --results-arf #{results_path} #{config[@policy_id][:content_path]}"
+      fetch_remote_resources = if config[:fetch_remote_resources]
+                                 '--fetch-remote-resources'
+                               else
+                                 ''
+                               end
+      "oscap xccdf eval #{fetch_remote_resources} #{profile} #{tailoring_subcommand} --results-arf #{results_path} #{config[@policy_id][:content_path]}"
     end
 
     def tailoring_subcommand
@@ -93,7 +119,8 @@ module ForemanScapClient
       request['Content-Encoding'] = 'x-bzip2'
       begin
         res = https.request(request)
-        res.value
+        value = res.value
+        foreman_upload_result res
       rescue StandardError => e
         puts res.body if res
         puts "Upload failed: #{e.message}"
@@ -165,5 +192,21 @@ module ForemanScapClient
     def download_uri(download_path)
       foreman_proxy_uri + "#{download_path}"
     end
+
+    def foreman_upload_result(response)
+      begin
+        print_upload_result JSON.parse(response.body)
+      rescue StandardError => e
+        # rescue and print nothing if older proxy version does not respond with json we expect
+      end
+    end
+
+    def print_upload_result(parsed)
+      if parsed['id']
+        puts "Report uploaded, report id: #{parsed['id']}"
+      else
+        puts "Report not uploaded from proxy to Foreman server, cause: #{parsed['result']}"
+      end
+    end
   end
 end

data/lib/foreman_scap_client/version.rb

@@ -1,3 +1,3 @@
 module ForemanScapClient
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: foreman_scap_client
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Marek Hulan
-- "Šimon Lukašík"
+- Šimon Lukašík
 - Shlomi Zadok
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-20 00:00:00.000000000 Z
+date: 2018-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - "/usr/bin/bzip2"
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Client script that runs openscap scan and uploads the result to foreman proxy