smart_proxy_openscap 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17c8ac2a2ead069f4efa7282704a31bfc92b248a
-  data.tar.gz: bfe816a4639d132847e7ba97848aeed06829c80b
+  metadata.gz: 883ac2e4f642cc68a5f0745d8151df27d3abe928
+  data.tar.gz: edfc3d57b936f569addc9f9bf6c571164dd5d4f7
 SHA512:
-  metadata.gz: db6215253f5ddd5f6e862b5fa01a23a06f2eaeacb16d0a82bd037b493bc5c4cdcdabd21034f425aede1013ca7189c7b98b83ef81e06c6fa5684d75402d8008e8
-  data.tar.gz: cf76b07956f6d50a101ea9ec26432c2dd7a0206763db8732149e9d97bb97ae6114eb8b481354ecff08941e0253e90006673014913b2d9f0014cda393a27d7546
+  metadata.gz: a95f38139a3366889ed44c45129bcad94a1d22147926ee93e07459fb5a297ffa6727ab6676f9dfec5bc141dc423a39ad65dca4a5c8b7fcf76856dc38e788489e
+  data.tar.gz: 024d3d941c00fa8c965db51eaf5cd2b925512141c4e9704f8c5e9a5caa5cfbf9061a655e17e994fd00fb24be10c4c9219d7550183b5653ed4d6f20c1865729d9

data/lib/smart_proxy_openscap/foreman_forwarder.rb

@@ -3,10 +3,10 @@ module Proxy::OpenSCAP
     include ::Proxy::Log
 
     def post_arf_report(cname, policy_id, date, data)
+        parser = Proxy::OpenSCAP::Parse.new(data)
       begin
-        json_data = Proxy::OpenSCAP::Parse.new(data).as_json
         foreman_api_path = upload_path(cname, policy_id, date)
-        response = send_request(foreman_api_path, json_data)
+        response = send_request(foreman_api_path, parser.as_json)
         # Raise an HTTP error if the response is not 2xx (success).
         response.value
         res = JSON.parse(response.body)
@@ -18,6 +18,8 @@ module Proxy::OpenSCAP
         logger.debug response.body if response
         logger.debug e.backtrace.join("\n\t")
         raise e
+      ensure
+        parser.cleanup
       end
       res
     end

data/lib/smart_proxy_openscap/openscap_api.rb

@@ -114,22 +114,28 @@ module Proxy::OpenSCAP
     end
 
     post "/scap_content/policies" do
+      content_parser = create_content_parser
       begin
-        Proxy::OpenSCAP::ContentParser.new(request.body.string).extract_policies
+        content_parser.extract_policies
       rescue *HTTP_ERRORS => e
         log_halt 500, e.message
       rescue StandardError => e
         log_halt 500, "Error occurred: #{e.message}"
+      ensure
+        content_parser.cleanup
       end
     end
 
     post "/tailoring_file/profiles" do
+      content_parser = create_content_parser
       begin
-        Proxy::OpenSCAP::ContentParser.new(request.body.string).get_profiles
+        content_parser.get_profiles
       rescue *HTTP_ERRORS => e
         log_halt 500, e.message
       rescue StandardError => e
         log_halt 500, "Error occurred: #{e.message}"
+      ensure
+        content_parser.cleanup
       end
     end
 
@@ -144,12 +150,15 @@ module Proxy::OpenSCAP
     end
 
     post "/scap_content/guide/:policy" do
+      content_parser = create_content_parser
       begin
-        Proxy::OpenSCAP::ContentParser.new(request.body.string).guide(params[:policy])
+        content_parser.guide(params[:policy])
       rescue *HTTP_ERRORS => e
         log_halt 500, e.message
       rescue StandardError => e
         log_halt 500, "Error occurred: #{e.message}"
+      ensure
+        content_parser.cleanup
       end
     end
 
@@ -164,5 +173,9 @@ module Proxy::OpenSCAP
         log_halt 500, "Error occurred: #{e.message}"
       end
     end
+
+    def create_content_parser
+      Proxy::OpenSCAP::ContentParser.new(request.body.string)
+    end
   end
 end

data/lib/smart_proxy_openscap/openscap_content_parser.rb

@@ -11,6 +11,11 @@ module Proxy::OpenSCAP
       @type = type
     end
 
+    def cleanup
+      @source.destroy if @source
+      OpenSCAP.oscap_cleanup
+    end
+
     def allowed_types
       {
         'tailoring_file' => 'XCCDF Tailoring',

data/lib/smart_proxy_openscap/openscap_report_parser.rb

@@ -16,11 +16,21 @@ module Proxy::OpenSCAP
       size         = arf_data.size
       @arf_digest  = Digest::SHA256.hexdigest(arf_data)
       @arf         = OpenSCAP::DS::Arf.new(:content => arf_data, :path => 'arf.xml.bz2', :length => size)
-      @results     = @arf.test_result.rr
-      sds          = @arf.report_request
-      bench_source = sds.select_checklist!
-      @bench       = OpenSCAP::Xccdf::Benchmark.new(bench_source)
-      @items       = @bench.items
+      @test_result  = @arf.test_result
+
+      @results      = @test_result.rr
+      @sds          = @arf.report_request
+      bench_source = @sds.select_checklist!
+      @benchmark    = OpenSCAP::Xccdf::Benchmark.new(bench_source)
+      @items        = @benchmark.items
+    end
+
+    def cleanup
+      @test_result.destroy if @test_result
+      @benchmark.destroy if @benchmark
+      @sds.destroy if @sds
+      @arf.destroy if @arf
+      OpenSCAP.oscap_cleanup
     end
 
     def as_json

data/lib/smart_proxy_openscap/version.rb

@@ -10,6 +10,6 @@
 
 module Proxy
   module OpenSCAP
-    VERSION = '0.6.2'
+    VERSION = '0.6.3'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_openscap
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - "Šimon Lukašík"
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-13 00:00:00.000000000 Z
+date: 2017-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -157,8 +157,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: OpenSCAP plug-in for Foreman's smart-proxy.
 test_files: []
+has_rdoc: