foreman_scap_client 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b28238d64ee3a46f8c5a26d708296465a01f36e4
-  data.tar.gz: 55b7c4e5c6f3e409b29e86eb1dfb09ead09a7341
+  metadata.gz: 8f5a6bc1a8e9ab962c33f4902ff845e6b7bcacf3
+  data.tar.gz: c692d959c101d2d18f63ea6c399a98dc8f99df7a
 SHA512:
-  metadata.gz: 50008f95f40178fb2840eaf529f882bbbee3bfe35850fbe364b9b17a73dfc34566d5b97aca5c176c4895420a826f74afc8742024f89115d63077d8621d15e219
-  data.tar.gz: aa2121ee4ae12f90d8d6c3305a53719caf1a40d478b628e2cd0fbd86f82e6077f3f411c2c12b90d0b2736495691f39e5c994be2136f7e9e6160f14618a3f2647
+  metadata.gz: ce8cef68f46660c12b1e1fc1895681713fc06387eccb06a7ec03dad8bf7049952a24b8d9066255fcdee4f7d0bd202989d8199912492cc393ab5ab42e796e72aa
+  data.tar.gz: 8145d9d2dfd42bffe66d4daf7120410bfad5796f77a7ca857fc25851ff083bea67b88bc82083060bfa7c212f19d07bafdeab973340f156fc72ad60cf04adc9ab

data/lib/foreman_scap_client/client.rb

@@ -9,10 +9,13 @@ module ForemanScapClient
   CONFIG_FILE = '/etc/foreman_scap_client/config.yaml'
 
   class Client
+    attr_reader :config, :policy_id, :tailored
+
     def run(policy_id)
       @policy_id = policy_id
-      ensure_policy_exist
+      load_config
       ensure_scan_file
+      ensure_tailoring_file
       Dir.mktmpdir do |dir|
         @tmp_dir = dir
         scan
@@ -23,8 +26,10 @@ module ForemanScapClient
 
     private
 
-    def config
+    def load_config
       @config ||= YAML.load_file(CONFIG_FILE)
+      ensure_policy_exist
+      @tailored = @config[policy_id][:tailoring_path] && !@config[policy_id][:tailoring_path].empty?
     rescue => e
       puts 'Config file could not be loaded'
       puts e.message
@@ -57,7 +62,11 @@ module ForemanScapClient
       else
         profile = ''
       end
-      "oscap xccdf eval #{profile} --results-arf #{results_path} #{config[@policy_id][:content_path]}"
+      "oscap xccdf eval #{profile} #{tailoring_subcommand} --results-arf #{results_path} #{config[@policy_id][:content_path]}"
+    end
+
+    def tailoring_subcommand
+      tailored ? "--tailoring-file #{config[policy_id][:tailoring_path]}" : ""
     end
 
     def bzip_command
@@ -125,25 +134,34 @@ module ForemanScapClient
       end
     end
 
-    def ensure_scan_file
-      return if File.exist?(config[@policy_id][:content_path])
-      puts "File #{config[@policy_id][:content_path]} is missing. Downloading it from proxy"
+    def ensure_file(dir, download_path, type_humanized)
+      return if File.exist?(config[policy_id][dir])
+      puts "File #{config[policy_id][dir]} is missing. Downloading it from proxy."
       begin
-        FileUtils.mkdir_p(File.dirname(config[@policy_id][:content_path]))
-        uri = URI.parse(download_uri(config[@policy_id][:download_path]))
-        puts "Download scap content xml from: #{uri}"
+        FileUtils.mkdir_p(File.dirname(config[policy_id][dir]))
+        uri = URI.parse(download_uri(config[policy_id][download_path]))
+        puts "Download #{type_humanized} xml from: #{uri}"
         request = generate_https_object(uri).get(uri.path)
         request.value
-        scap_content_xml = request.body
-        open(config[@policy_id][:content_path], 'wb') do |file|
-          file << scap_content_xml
+        ds_content_xml = request.body
+        open(config[policy_id][dir], 'wb') do |file|
+          file << ds_content_xml
         end
       rescue StandardError => e
-        puts "SCAP file is missing and download failed with error: #{e.message}"
+        puts "#{type_humanized} is missing and download failed with error: #{e.message}"
         exit(5)
       end
     end
 
+    def ensure_scan_file
+      ensure_file :content_path, :download_path, "SCAP content"
+    end
+
+    def ensure_tailoring_file
+      return unless tailored
+      ensure_file :tailoring_path, :tailoring_download_path, "Tailoring file"
+    end
+
     def download_uri(download_path)
       foreman_proxy_uri + "#{download_path}"
     end

data/lib/foreman_scap_client/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_scap_client
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Marek Hulan
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-01 00:00:00.000000000 Z
+date: 2017-02-20 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.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Client script that runs openscap scan and uploads the result to foreman proxy