smart_proxy_openscap 0.6.10 → 0.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a93f2467106e6d7bcdeab29c7cc83671c3f3922
-  data.tar.gz: 59d764d975e32881bc3a5469c7b0be5651bdd623
+  metadata.gz: 6076ca39518813d5f4ac1dbf16a0f741200c8d66
+  data.tar.gz: 0045badb98b310b25bed8fd61faae944856dfcf4
 SHA512:
-  metadata.gz: 5cf5e451c9bc4d9e0ae2ef7e149b482b13934b85db03bd8875a78378a0535e6c0c858f7e020f7484cc2d3bb7477e15a7673177b48c1f1abdb4f1fbaee58d4814
-  data.tar.gz: 36e945df701ac5c9122011552bce0cce6e65ae2eb5aa7c48242f9c3db210099a3bd4ffa1c2d38f7c16d2fb9b288a141262b031427d4169fba38c922b37023da6
+  metadata.gz: 2acd7a57974547171d678219a32ac804a6606f5508ff20bcfbe07bc348c8ef5c1d7802618ee69fa79590898748a6d2f3724bcf2354c271d27dcdef95deeb2f17
+  data.tar.gz: 54fd17a312559d449bbbcf0a7d5d6826e9c1149d6d55503f80575c2087302ff687ee9beed33c927343aad234c4978e2c9ea64f9640a7178012de8c2c92575e5a

data/bin/smart-proxy-arf-json

@@ -4,4 +4,4 @@ $:.unshift(path) if File.exist? path
 
 require 'smart_proxy_openscap/arf_json'
 
-Proxy::OpenSCAP::ArfJson.new.as_json ARGV[0], ARGV[1]
+Proxy::OpenSCAP::ArfJson.new.as_json ARGV[0], ARGV[1], ARGV[2], ARGV[3]

data/lib/smart_proxy_openscap/arf_json.rb

@@ -12,7 +12,7 @@ require 'digest'
 module Proxy
   module OpenSCAP
     class ArfJson
-      def as_json(file_in, file_out)
+      def as_json(file_in, file_out, proxy_name, proxy_url)
         ::OpenSCAP.oscap_init
         arf_digest   = Digest::SHA256.hexdigest(File.read(file_in))
 
@@ -26,6 +26,9 @@ module Proxy
         items        = benchmark.items
 
         report = parse_results(items, results, arf_digest)
+        report[:openscap_proxy_name] = proxy_name
+        report[:openscap_proxy_url] = proxy_url
+
         File.write file_out, report.to_json
       ensure
         cleanup test_result, benchmark, sds, arf

data/lib/smart_proxy_openscap/arf_parser.rb

@@ -28,7 +28,11 @@ module Proxy
       end
 
       def command(in_file, out_file)
-        "#{script_location} #{in_file.path} #{out_file.path}"
+        "#{script_location} " <<
+        "#{in_file.path} " <<
+        "#{out_file.path} " <<
+        "#{Proxy::OpenSCAP::Plugin.settings.registered_proxy_name} " <<
+        "#{Proxy::OpenSCAP::Plugin.settings.registered_proxy_url}"
       end
     end
   end

data/lib/smart_proxy_openscap/spool_forwarder.rb

@@ -59,7 +59,7 @@ module Proxy::OpenSCAP
       logger.error "Failed to parse Arf Report at #{arf_file_path}, moving to #{@loaded_settings.corrupted_dir}"
 
       Proxy::OpenSCAP::StorageFS.new(@loaded_settings.corrupted_dir, cname, policy_id, date).
-        move_corrupted(arf_file_path.split('/').last)
+        move_corrupted(arf_file_path.split('/').last, @loaded_settings.spooldir)
 
     rescue StandardError => e
       logger.error "smart-proxy-openscap-send failed to upload Compliance report for #{cname}, generated on #{Time.at date.to_i}. Cause: #{e}"

data/lib/smart_proxy_openscap/storage_fs.rb

@@ -18,8 +18,8 @@ module Proxy::OpenSCAP
       store(data, StoreCorruptedError)
     end
 
-    def move_corrupted(digest)
-      source = "#{Proxy::OpenSCAP::Plugin.settings.spooldir}/#{@namespace}/#{@cname}/#{@id}/#{@date}"
+    def move_corrupted(digest, spooldir)
+      source = "#{spooldir}/#{@namespace}/#{@cname}/#{@id}/#{@date}"
       move "#{source}/#{digest}", StoreCorruptedError
     end
 

data/lib/smart_proxy_openscap/version.rb

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

data/test/script_class_test.rb

@@ -17,10 +17,12 @@ class ScriptClassTest < Test::Unit::TestCase
 
   def test_arf_as_json
     carry_out do |tmp|
-      Proxy::OpenSCAP::ArfJson.new.as_json("#{Dir.getwd}/test/data/arf_report", tmp.path)
+      Proxy::OpenSCAP::ArfJson.new.as_json("#{Dir.getwd}/test/data/arf_report", tmp.path, 'my-proxy', 'http://test-proxy.org')
       json = read_json tmp
       refute json['logs'].empty?
       refute json['metrics'].empty?
+      refute json['openscap_proxy_name'].empty?
+      refute json['openscap_proxy_url'].empty?
     end
   end
 
@@ -53,7 +55,7 @@ class ScriptClassTest < Test::Unit::TestCase
 
   def test_arf_json
     carry_out do |tmp|
-      Proxy::OpenSCAP::ArfJson.new.as_json("#{Dir.getwd}/test/data/arf_report", tmp.path)
+      Proxy::OpenSCAP::ArfJson.new.as_json("#{Dir.getwd}/test/data/arf_report", tmp.path, 'my-proxy', 'http://test-proxy.org')
       json = read_json tmp
       refute json['logs'].empty?
       refute json['metrics'].empty?

data/test/spool_forwarder_test.rb

@@ -1,6 +1,7 @@
 require 'test_helper'
 require 'smart_proxy_openscap'
 require 'smart_proxy_openscap/openscap_lib'
+require 'ostruct'
 
 class SpoolForwarderTest < Test::Unit::TestCase
   def setup
@@ -9,11 +10,13 @@ class SpoolForwarderTest < Test::Unit::TestCase
     @base_spool_for_test = ("#{Dir.getwd}/test/data/spool")
     @results_path = ("#{Dir.getwd}/test/test_run_files")
     FileUtils.mkdir_p(@results_path)
-    Proxy::OpenSCAP::Plugin.settings.stubs(:contentdir).returns(@results_path)
     @spooldir = @results_path + "/spool"
-    Proxy::OpenSCAP::Plugin.settings.stubs(:spooldir).returns(@spooldir)
-    Proxy::OpenSCAP::Plugin.settings.stubs(:reportsdir).returns(@results_path + "/reports")
-    Proxy::OpenSCAP::Plugin.settings.stubs(:corrupted_dir).returns(@results_path + "/corrupted")
+    @loaded_settings = OpenStruct.new(
+      :spooldir => @spooldir,
+      :contentdir => @results_path,
+      :reportsdir => @results_path + "/reports",
+      :corrupted_dir => @results_path + "/corrupted")
+
     @policy_id = 1
     @date_1 = 1484309984
     @date_2 = 1484313035
@@ -24,14 +27,13 @@ class SpoolForwarderTest < Test::Unit::TestCase
     @cname = "e20b9695-f655-401a-9dda-8cca7a47a8c0"
     @cname_2 = "2c101b95-033f-4b15-b490-f50bf9090dae"
 
-    @arf_dir = File.join(Proxy::OpenSCAP::Plugin.settings.spooldir, "/arf")
+    @arf_dir = File.join(@loaded_settings.spooldir, "/arf")
 
     stub_request(:post, "#{@foreman_url}/api/v2/compliance/arf_reports/#{@cname}/#{@policy_id}/#{@date_1}")
       .to_return(:status => 200, :body => "{\"result\":\"OK\",\"id\":\"#{@id_1}\"}")
 
     stub_request(:post, "#{@foreman_url}/api/v2/compliance/arf_reports/#{@cname}/#{@policy_id}/#{@date_2}")
       .to_return(:status => 200, :body => "{\"result\":\"OK\",\"id\":\"#{@id_2}\"}")
-
   end
 
   def teardown
@@ -42,7 +44,7 @@ class SpoolForwarderTest < Test::Unit::TestCase
     test_spool = @base_spool_for_test + "/valid_spool/"
     FileUtils.cp_r test_spool, @spooldir
 
-    Proxy::OpenSCAP::SpoolForwarder.new.post_arf_from_spool(@arf_dir)
+    Proxy::OpenSCAP::SpoolForwarder.new(@loaded_settings).post_arf_from_spool(@arf_dir)
     assert(File.file?("#{@results_path}/reports/arf/#{@cname}/#{@id_1}/#{@date_1}/#{@valid_digest}"), "File should be in reports directory")
     assert(File.file?("#{@results_path}/reports/arf/#{@cname}/#{@id_2}/#{@date_2}/#{@valid_digest}"), "File should be in reports directory")
     refute(File.file?("#{@spooldir}/arf/#{@cname}/#{@policy_id}/#{@date_1}/#{@valid_digest}"), "File should not be in spool directory")
@@ -53,7 +55,7 @@ class SpoolForwarderTest < Test::Unit::TestCase
     test_spool = @base_spool_for_test + "/corrupted_spool/"
     FileUtils.cp_r test_spool, @spooldir
 
-    Proxy::OpenSCAP::SpoolForwarder.new.post_arf_from_spool(@arf_dir)
+    Proxy::OpenSCAP::SpoolForwarder.new(@loaded_settings).post_arf_from_spool(@arf_dir)
 
     assert(File.file?("#{@results_path}/corrupted/arf/#{@cname}/#{@policy_id}/#{@date_1}/#{@corrupted_digest}"), "File should be in corrupted directory")
     assert(File.file?("#{@results_path}/reports/arf/#{@cname}/#{@id_2}/#{@date_2}/#{@valid_digest}"), "File should be in reports directory")
@@ -72,7 +74,7 @@ class SpoolForwarderTest < Test::Unit::TestCase
     stub_request(:post, "#{@foreman_url}/api/v2/compliance/arf_reports/#{@cname_2}/#{@policy_id}/#{@date_2}")
       .to_return(:status => 500)
 
-    Proxy::OpenSCAP::SpoolForwarder.new.post_arf_from_spool(@arf_dir)
+    Proxy::OpenSCAP::SpoolForwarder.new(@loaded_settings).post_arf_from_spool(@arf_dir)
 
     assert(File.file?("#{@results_path}/reports/arf/#{@cname}/#{@id_1}/#{@date_1}/#{@valid_digest}"), "File should be in reports directory")
     assert(File.file?("#{@spooldir}/arf/#{@cname_2}/#{@policy_id}/#{@date_2}/#{@valid_digest}"), "File should be in spool directory")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_openscap
 version: !ruby/object:Gem::Version
-  version: 0.6.10
+  version: 0.6.11
 platform: ruby
 authors:
 - Šimon Lukašík
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-13 00:00:00.000000000 Z
+date: 2018-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake