smart_proxy_openscap 0.6.11 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6076ca39518813d5f4ac1dbf16a0f741200c8d66
-  data.tar.gz: 0045badb98b310b25bed8fd61faae944856dfcf4
+  metadata.gz: f62ed4762438b0c37885cb031bdec5257e72721c
+  data.tar.gz: f4060366424d6b06adb28c21732286c984a70fc7
 SHA512:
-  metadata.gz: 2acd7a57974547171d678219a32ac804a6606f5508ff20bcfbe07bc348c8ef5c1d7802618ee69fa79590898748a6d2f3724bcf2354c271d27dcdef95deeb2f17
-  data.tar.gz: 54fd17a312559d449bbbcf0a7d5d6826e9c1149d6d55503f80575c2087302ff687ee9beed33c927343aad234c4978e2c9ea64f9640a7178012de8c2c92575e5a
+  metadata.gz: d1b8e805310270da3fe76bea4771d29c150a2a6ed7d5fbaa62d156c0edcd59aba152f5e36cd4cc47de36396fb3b2806a0d21cb1c9a996a3b89bd8497767b41f3
+  data.tar.gz: ff8b396f02fea2f3244bde0988a5ef6a39d643b5f38917199221968d88a85e18714d4b39f0ee2432ef9f654fbb01260dbefe796737704ffaadb451689e9a66e9

data/lib/smart_proxy_openscap/openscap_api.rb

@@ -39,17 +39,23 @@ module Proxy::OpenSCAP
       begin
         post_to_foreman = ForemanForwarder.new.post_arf_report(cn, policy, date, request.body.string)
         Proxy::OpenSCAP::StorageFS.new(Proxy::OpenSCAP::Plugin.settings.reportsdir, cn, post_to_foreman['id'], date).store_archive(request.body.string)
+        post_to_foreman.to_json
       rescue Proxy::OpenSCAP::StoreReportError => e
         Proxy::OpenSCAP::StorageFS.new(Proxy::OpenSCAP::Plugin.settings.failed_dir, cn, post_to_foreman['id'], date).store_failed(request.body.string)
         logger.error "Failed to save Report in reports directory (#{Proxy::OpenSCAP::Plugin.settings.reportsdir}). Failed with: #{e.message}.
                       Saving file in #{Proxy::OpenSCAP::Plugin.settings.failed_dir}. Please copy manually to #{Proxy::OpenSCAP::Plugin.settings.reportsdir}"
+        { :result => 'Storage failure on proxy, see proxy logs for details' }.to_json
       rescue Proxy::OpenSCAP::OpenSCAPException => e
-        logger.error "Failed to parse Arf Report, moving to #{Proxy::OpenSCAP::Plugin.settings.corrupted_dir}"
+        error = "Failed to parse Arf Report, moving to #{Proxy::OpenSCAP::Plugin.settings.corrupted_dir}"
+        logger.error error
         Proxy::OpenSCAP::StorageFS.new(Proxy::OpenSCAP::Plugin.settings.corrupted_dir, cn, policy, date).store_corrupted(request.body.string)
+        { :result => (error << ' on proxy') }.to_json
       rescue *HTTP_ERRORS => e
         ### If the upload to foreman fails then store it in the spooldir
-        logger.error "Failed to upload to Foreman, saving in spool. Failed with: #{e.message}"
+        msg = "Failed to upload to Foreman, saving in spool. Failed with: #{e.message}"
+        logger.error msg
         Proxy::OpenSCAP::StorageFS.new(Proxy::OpenSCAP::Plugin.settings.spooldir, cn, policy, date).store_spool(request.body.string)
+        { :result => msg }.to_json
       rescue Proxy::OpenSCAP::StoreSpoolError => e
         log_halt 500, e.message
       end
@@ -156,6 +162,14 @@ module Proxy::OpenSCAP
       end
     end
 
+    get "/spool_errors" do
+      begin
+        Proxy::OpenSCAP::StorageFS.new(Proxy::OpenSCAP::Plugin.settings.corrupted_dir, nil, nil, nil).spool_errors.to_json
+      rescue StandardError => e
+        log_halt 500, "Error occurred: #{e.message}"
+      end
+    end
+
     private
 
     def validate_scap_file(params)

data/lib/smart_proxy_openscap/openscap_lib.rb

@@ -35,8 +35,8 @@ module Proxy::OpenSCAP
   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)
+    ::Proxy::OpenSCAP::Plugin.default_settings.merge(
+      YAML.load_file(File.join(::Proxy::SETTINGS.settings_directory, ::Proxy::OpenSCAP::Plugin.settings_file)))
   end
 
   def self.common_name(request)

data/lib/smart_proxy_openscap/storage.rb

@@ -41,7 +41,7 @@ module Proxy::OpenSCAP
     private
 
     def validate_id(id)
-      raise Proxy::OpenSCAP::OpenSCAPException, 'Malformed ARF ID' unless /\A\d+\Z/ =~ id
+      raise Proxy::OpenSCAP::OpenSCAPException, 'Malformed ARF ID' if (id.is_a?(String) && !id.match(/\A\d+\Z/))
     end
   end
 end

data/lib/smart_proxy_openscap/storage_fs.rb

@@ -1,3 +1,4 @@
+require 'pathname'
 require 'smart_proxy_openscap/storage'
 
 module Proxy::OpenSCAP
@@ -45,6 +46,15 @@ module Proxy::OpenSCAP
       full_path
     end
 
+    def spool_errors
+      path = "#{@path_to_dir}/#{@namespace}"
+      { :errors_count => File.exists?(path) ? list_dirs(path).count : 0 }
+    end
+
+    def list_dirs(path)
+      Pathname.new(path).children.select(&:directory?)
+    end
+
     private
 
     def store_arf(spool_arf_dir, data)

data/lib/smart_proxy_openscap/version.rb

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

data/smart_proxy_openscap.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |s|
 
   s.author = ['Šimon Lukašík', 'Shlomi Zadok', 'Marek Hulan']
   s.email = 'slukasik@redhat.com'
-  s.homepage = 'http://github.com/OpenSCAP/smart_proxy_openscap'
-  s.license = 'GPL-3'
+  s.homepage = 'https://github.com/theforeman/smart_proxy_openscap'
+  s.license = 'GPL-3.0-or-later'
 
   s.files = `git ls-files`.split("\n") - ['.gitignore']
   s.executables = ['smart-proxy-openscap-send']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_openscap
 version: !ruby/object:Gem::Version
-  version: 0.6.11
+  version: 0.7.0
 platform: ruby
 authors:
 - Šimon Lukašík
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-19 00:00:00.000000000 Z
+date: 2018-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -153,9 +153,9 @@ files:
 - test/script_class_test.rb
 - test/spool_forwarder_test.rb
 - test/test_helper.rb
-homepage: http://github.com/OpenSCAP/smart_proxy_openscap
+homepage: https://github.com/theforeman/smart_proxy_openscap
 licenses:
-- GPL-3
+- GPL-3.0-or-later
 metadata: {}
 post_install_message: 
 rdoc_options: []