foreman_openscap 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f968e87b516e2d4c5741f81baaa0b600a0fa22e27cc66de44c0564ca409ab6f
-  data.tar.gz: f2a64b24fd9222676b6a91d315e792114627380fa6264acb2a229a7d939de024
+  metadata.gz: afb07ec68598ddfebdea1a16d50489cb5ca88cd7e5e0eb0294591704ac41d06d
+  data.tar.gz: 2c9aeed9bd9244263002370796e1439801dbe29183f4f19c99bc33d5aa5168b3
 SHA512:
-  metadata.gz: 250422cf84eebf5f22bfc1954d567b7af7851477534fcea29581af421a066fb1904ec3279386aae69777f1212526b83de3460f9da3549a9c3935619d9ea7d51f
-  data.tar.gz: ae5d719e7467bf7b5850864e02e7335befab425035e763299e6a2fe0bbcf24835a1e0c58af22878d5a46278dbf520f5d5bd76c58ce4b3e25d3837a80ae8d6b47
+  metadata.gz: 93afb936e476d4b8ddc3c616ec5820b7609cf8fefc59478ac7011b78edef1e33946d194ba4a47dde89acf19dcbc6d6fd74f6e5ba501502ae9a1ef7663e1b77ed
+  data.tar.gz: c5aeec2a9ceee0c88d40e279dda82316e4a13eeb5e4b31856fa2625b20e994cf10e13b338286b5550e6d9ba107c78de0049d6587610404c31d2c3d5ecbc7b85f

data/app/controllers/api/v2/compliance/arf_reports_controller.rb

@@ -90,12 +90,14 @@ module Api
         end
 
         def find_resources_before_create
-          unless ForemanOpenscap::Policy.where(:id => params[:policy_id]).any?
-            upload_fail(_("Policy with id %s not found.") % params[:policy_id])
+          policy_id = params[:policy_id].to_i
+
+          unless ForemanOpenscap::Policy.where(:id => policy_id).any?
+            upload_fail(_("Policy with id %s not found.") % policy_id)
             return
           end
 
-          @asset = ForemanOpenscap::Helper::get_asset(params[:cname], params[:policy_id])
+          @asset = ForemanOpenscap::Helper::get_asset(params[:cname], policy_id)
 
           unless @asset
             upload_fail(_('Could not find host identified by: %s') % params[:cname])

data/lib/foreman_openscap/helper.rb

@@ -2,7 +2,7 @@ module ForemanOpenscap::Helper
   def self.get_asset(cname, policy_id)
     asset = find_host_by_name_or_uuid(cname)&.get_asset
     return unless asset
-    asset.policy_ids += [policy_id]
+    asset.policy_ids += [policy_id] unless asset.policy_ids.include?(policy_id)
     asset
   end
 

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "4.0.0".freeze
+  VERSION = "4.0.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-21 00:00:00.000000000 Z
+date: 2020-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -348,7 +348,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Foreman plug-in for displaying OpenSCAP audit reports
@@ -380,7 +380,6 @@ test_files:
 - test/helpers/arf_report_dashboard_helper_test.rb
 - test/helpers/policy_dashboard_helper_test.rb
 - test/lib/foreman_openscap/bulk_upload_test.rb
-- test/test_plugin_helper.rb
 - test/unit/arf_report_status_calculator_test.rb
 - test/unit/arf_report_test.rb
 - test/unit/compliance_status_test.rb
@@ -389,7 +388,6 @@ test_files:
 - test/unit/message_cleaner_test.rb
 - test/unit/openscap_host_test.rb
 - test/unit/policy_mailer_test.rb
-- test/unit/policy_test.rb
 - test/unit/scap_content_test.rb
 - test/unit/services/config_name_service_test.rb
 - test/unit/services/hostgroup_overrider_test.rb
@@ -397,3 +395,5 @@ test_files:
 - test/unit/services/report_dashboard/data_test.rb
 - test/unit/services/tailoring_files_proxy_check_test.rb
 - test/unit/tailoring_file_test.rb
+- test/unit/policy_test.rb
+- test/test_plugin_helper.rb