smart_proxy_openscap 0.6.9 → 0.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abf06e79ec5847fffc177d533e04ecab53de415d
-  data.tar.gz: 7691b28fb47b81dee23a7b6e0bcdcbdd713e52fe
+  metadata.gz: 1a93f2467106e6d7bcdeab29c7cc83671c3f3922
+  data.tar.gz: 59d764d975e32881bc3a5469c7b0be5651bdd623
 SHA512:
-  metadata.gz: b7d61afe8dc9ba22559dbf42738037b4f7e3347babb5e523f741ac8ea9718d22aa10881d734bc1c026991b7731c00800b3cbfc57ac8ff600378f63f33536ed32
-  data.tar.gz: 31986894ef094422a0290d99dd9b55fabaa90be4451a9b14e51817f3fd9c6c2190670183ea4c18789ef0f17e9115408c19dca96362e119125e086ecb1a1d6ae7
+  metadata.gz: 5cf5e451c9bc4d9e0ae2ef7e149b482b13934b85db03bd8875a78378a0535e6c0c858f7e020f7484cc2d3bb7477e15a7673177b48c1f1abdb4f1fbaee58d4814
+  data.tar.gz: 36e945df701ac5c9122011552bce0cce6e65ae2eb5aa7c48242f9c3db210099a3bd4ffa1c2d38f7c16d2fb9b288a141262b031427d4169fba38c922b37023da6

data/.travis.yml

@@ -0,0 +1,14 @@
+---
+before_install:
+  - sudo apt-get -qq update
+  - sudo apt-get install -y libopenscap8
+rvm:
+  - 2.0
+  - 2.1
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
+sudo: required
+cache: bundler
+

data/bin/smart-proxy-openscap-send

@@ -17,14 +17,16 @@ require 'smart_proxy_main'
 require 'smart_proxy_openscap'
 require 'smart_proxy_openscap/openscap_lib'
 
-# Don't run if OpenSCAP plugin is disabled.
-exit unless Proxy::OpenSCAP::Plugin.settings.enabled == true
+loaded_settings = Proxy::OpenSCAP.plugin_settings
 
-# TODO: include some jitter to not bring Foreman to its knees
+# Don't run if OpenSCAP plugin is disabled or settings are missing.
+if !loaded_settings.enabled || loaded_settings.nil? || loaded_settings.empty?
+  exit 436
+end
 
 module Proxy
   module Log
-    @@logger = ::Logger.new(Proxy::OpenSCAP.fullpath(Proxy::OpenSCAP::Plugin.settings.openscap_send_log_file), 6, 1024*1024*10)
+    @@logger = ::Logger.new(Proxy::OpenSCAP.fullpath(Proxy::OpenSCAP.plugin_settings.openscap_send_log_file), 6, 1024*1024*10)
     @@logger.level = ::Logger.const_get(Proxy::SETTINGS.log_level.upcase)
   end
 end
@@ -32,13 +34,13 @@ include Proxy::Log
 
 if !Proxy::SETTINGS.foreman_url
   logger.error "Foreman URL not configured"
-  exit false
+  exit 437
 end
 
 begin
-  Proxy::OpenSCAP::send_spool_to_foreman
+  Proxy::OpenSCAP::send_spool_to_foreman(loaded_settings)
 rescue StandardError => e
   logger.error e
-  puts "#{e} See #{Proxy::OpenSCAP.fullpath(Proxy::OpenSCAP::Plugin.settings.openscap_send_log_file)}"
-  exit false
+  puts "#{e} See #{Proxy::OpenSCAP.fullpath(loaded_settings.openscap_send_log_file)}"
+  exit 438
 end

data/lib/smart_proxy_openscap/openscap_lib.rb

@@ -13,6 +13,8 @@ require 'fileutils'
 require 'pathname'
 require 'json'
 require 'proxy/error'
+require 'yaml'
+require 'ostruct'
 require 'proxy/request'
 require 'smart_proxy_openscap/fetch_scap_content'
 require 'smart_proxy_openscap/foreman_forwarder'
@@ -28,6 +30,15 @@ require 'smart_proxy_openscap/profiles_parser'
 module Proxy::OpenSCAP
   extend ::Proxy::Log
 
+  def self.plugin_settings
+    @@settings ||= OpenStruct.new(read_settings)
+  end
+
+  def self.read_settings
+    YAML.load_file(File.join(::Proxy::SETTINGS.settings_directory, ::Proxy::OpenSCAP::Plugin.settings_file))
+      .merge(::Proxy::OpenSCAP::Plugin.default_settings)
+  end
+
   def self.common_name(request)
     client_cert = request.env['SSL_CLIENT_CERT']
     raise Proxy::Error::Unauthorized, "Client certificate required!" if client_cert.to_s.empty?
@@ -43,10 +54,10 @@ module Proxy::OpenSCAP
     cn
   end
 
-  def self.send_spool_to_foreman
-    arf_dir = File.join(Proxy::OpenSCAP::Plugin.settings.spooldir, "/arf")
+  def self.send_spool_to_foreman(loaded_settings)
+    arf_dir = File.join(loaded_settings.spooldir, "/arf")
     return unless File.exist? arf_dir
-    SpoolForwarder.new.post_arf_from_spool(arf_dir)
+    SpoolForwarder.new(loaded_settings).post_arf_from_spool(arf_dir)
   end
 
   def self.fullpath(path = Proxy::OpenSCAP::Plugin.settings.contentdir)

data/lib/smart_proxy_openscap/spool_forwarder.rb

@@ -2,6 +2,10 @@ module Proxy::OpenSCAP
   class SpoolForwarder
     include ::Proxy::Log
 
+    def initialize(loaded_settings)
+      @loaded_settings = loaded_settings
+    end
+
     def post_arf_from_spool(arf_dir)
       Dir.foreach(arf_dir) do |cname|
         next if cname == '.' || cname == '..'
@@ -49,12 +53,12 @@ module Proxy::OpenSCAP
     def forward_arf_file(cname, policy_id, date, arf_file_path)
       data = File.open(arf_file_path, 'rb') { |io| io.read }
       post_to_foreman = ForemanForwarder.new.post_arf_report(cname, policy_id, date, data)
-      Proxy::OpenSCAP::StorageFS.new(Proxy::OpenSCAP::Plugin.settings.reportsdir, cname, post_to_foreman['id'], date).store_archive(data)
+      Proxy::OpenSCAP::StorageFS.new(@loaded_settings.reportsdir, cname, post_to_foreman['id'], date).store_archive(data)
       File.delete arf_file_path
     rescue Proxy::OpenSCAP::OpenSCAPException => e
-      logger.error "Failed to parse Arf Report at #{arf_file_path}, moving to #{Proxy::OpenSCAP::Plugin.settings.corrupted_dir}"
+      logger.error "Failed to parse Arf Report at #{arf_file_path}, moving to #{@loaded_settings.corrupted_dir}"
 
-      Proxy::OpenSCAP::StorageFS.new(Proxy::OpenSCAP::Plugin.settings.corrupted_dir, cname, policy_id, date).
+      Proxy::OpenSCAP::StorageFS.new(@loaded_settings.corrupted_dir, cname, policy_id, date).
         move_corrupted(arf_file_path.split('/').last)
 
     rescue StandardError => e

data/lib/smart_proxy_openscap/version.rb

@@ -10,6 +10,6 @@
 
 module Proxy
   module OpenSCAP
-    VERSION = '0.6.9'
+    VERSION = '0.6.10'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_openscap
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.6.10
 platform: ruby
 authors:
 - Šimon Lukašík
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-16 00:00:00.000000000 Z
+date: 2018-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -93,6 +93,7 @@ extra_rdoc_files: []
 files:
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- ".travis.yml"
 - COPYING
 - Gemfile
 - README.md