smart_proxy_openscap 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d72c5e418a9d30974b6154fbbdaf68e0c1cf88852626683021100310920e109a
-  data.tar.gz: d306fa47b4a2120c87d0ac8e7a4a0967cf9e77d8b689e83a2c4ccf655f227533
+  metadata.gz: d5b5f74d9ef8cf5528ed8352c5fcf086f066e0b4c287d7af2d793af4aa8ca8f3
+  data.tar.gz: 853c160e1bd5bc964cd1254462be6294c745f82903fbfe4527accc8c7b59358f
 SHA512:
-  metadata.gz: 9cba3aded1feccdd109d77c43579fc997388759ef00746da23e2c4005368655c7a04b4e971d7047cc67cca131b3dbf2ab07e789c3750c17d28fe5f7c26566ff0
-  data.tar.gz: 565420ad4a7368b91207eaa727c4243bb3abc09b92d806d8c98fd77f32b7346d216cd244afe14db8262b2b69e7f79b62bba9755abfe6197eb4ace92b41d67adc
+  metadata.gz: 76183d6d4a6cca39f0214b9de18b642bb939ae018a4374cd642bd94751c57368a40ba8287e515bf2cf49e3700a37f4071f57b2e5132b6e5cdbbf2307ad26a6c6
+  data.tar.gz: c83274635c726fe521dcd43441b1abf3d87fbf6322d6fcc2c0cc07a380add1683af520edcc11ac3e254353d2bebaebcc59b8918c81fe70a4634ac8f52ba33df1

data/lib/smart_proxy_openscap/helpers.rb

@@ -0,0 +1,33 @@
+# lib/helpers.rb
+
+module Proxy::OpenSCAP
+  module Helpers
+    if Process.respond_to?(:fork)
+      def forked_response
+        r, w = IO.pipe
+        if child_id = Process.fork
+          w.close
+          data = r.read
+          r.close
+          Process.wait(child_id)
+          JSON.parse(data)
+        else
+          r.close
+          begin
+            body, code = yield
+            w.write({ code: code, body: body }.to_json)
+          rescue Exception => e
+            w.write({ code: 500, body: e.message }.to_json)
+          end
+          w.close
+          Process.exit!
+        end
+      end
+    else
+      def forked_response
+        body, code = yield
+        { code: code, body: body }
+      end
+    end
+  end
+end

data/lib/smart_proxy_openscap/openscap_api.rb

@@ -8,6 +8,7 @@
 # along with this software; if not, see http://www.gnu.org/licenses/gpl.txt
 #
 require 'smart_proxy_openscap/openscap_lib'
+require 'smart_proxy_openscap/helpers'
 
 module Proxy::OpenSCAP
   HTTP_ERRORS = [
@@ -24,6 +25,7 @@ module Proxy::OpenSCAP
   class Api < ::Sinatra::Base
     include ::Proxy::Log
     helpers ::Proxy::Helpers
+    helpers ::Proxy::OpenSCAP::Helpers
     authorize_with_ssl_client
     CLIENT_PATHS = Regexp.compile(%r{^(/arf/\d+|/policies/\d+/content/|/policies/\d+/tailoring/)})
 
@@ -44,32 +46,37 @@ module Proxy::OpenSCAP
 
     post "/arf/:policy" do
       policy = params[:policy]
-
-      begin
-        post_to_foreman = ForemanArfForwarder.new.post_report(@cn, policy, @reported_at, request.body.string, Proxy::OpenSCAP::Plugin.settings.timeout)
-        Proxy::OpenSCAP::StorageFs.new(Proxy::OpenSCAP::Plugin.settings.reportsdir, @cn, post_to_foreman['id'], @reported_at).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'], @reported_at).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 Nokogiri::XML::SyntaxError => e
-        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, @reported_at).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
-        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, @reported_at).store_spool(request.body.string)
-        { :result => msg }.to_json
-      rescue Proxy::OpenSCAP::StoreSpoolError => e
-        log_halt 500, e.message
-      rescue Proxy::OpenSCAP::ReportUploadError, Proxy::OpenSCAP::ReportDecompressError => e
-        { :result => e.message }.to_json
+      response = forked_response do
+        begin
+          post_to_foreman = ForemanArfForwarder.new.post_report(@cn, policy, @reported_at, request.body.string, Proxy::OpenSCAP::Plugin.settings.timeout)
+          Proxy::OpenSCAP::StorageFs.new(Proxy::OpenSCAP::Plugin.settings.reportsdir, @cn, post_to_foreman['id'], @reported_at).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'], @reported_at).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 Nokogiri::XML::SyntaxError => e
+          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, @reported_at).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
+          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, @reported_at).store_spool(request.body.string)
+          { :result => msg }.to_json
+        rescue Proxy::OpenSCAP::StoreSpoolError => e
+          [e.message, 500]
+        rescue Proxy::OpenSCAP::ReportUploadError, Proxy::OpenSCAP::ReportDecompressError => e
+          { :result => e.message }.to_json
+        end
+      end
+      if code = response['code']
+        log_halt code, response['body']
       end
+      response['body']
     end
 
     get "/arf/:id/:cname/:date/:digest/xml" do

data/lib/smart_proxy_openscap/version.rb

@@ -10,6 +10,6 @@
 
 module Proxy
   module OpenSCAP
-    VERSION = '0.11.0'
+    VERSION = '0.11.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_openscap
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Šimon Lukašík
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-30 00:00:00.000000000 Z
+date: 2024-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -125,6 +125,7 @@ files:
 - lib/smart_proxy_openscap/fetch_scap_file.rb
 - lib/smart_proxy_openscap/foreman_arf_forwarder.rb
 - lib/smart_proxy_openscap/foreman_forwarder.rb
+- lib/smart_proxy_openscap/helpers.rb
 - lib/smart_proxy_openscap/http_config.ru
 - lib/smart_proxy_openscap/openscap_api.rb
 - lib/smart_proxy_openscap/openscap_exception.rb