foreman_openscap 4.0.0 → 4.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f968e87b516e2d4c5741f81baaa0b600a0fa22e27cc66de44c0564ca409ab6f
-  data.tar.gz: f2a64b24fd9222676b6a91d315e792114627380fa6264acb2a229a7d939de024
+  metadata.gz: 956d9e3fe1db2b42e88e44e4a6ba71831011f89786ca0f985a565b78b455e985
+  data.tar.gz: 115326eadadbb7eeeb179299327e58a51036228a561b8b8aad91d69fe5a2dd53
 SHA512:
-  metadata.gz: 250422cf84eebf5f22bfc1954d567b7af7851477534fcea29581af421a066fb1904ec3279386aae69777f1212526b83de3460f9da3549a9c3935619d9ea7d51f
-  data.tar.gz: ae5d719e7467bf7b5850864e02e7335befab425035e763299e6a2fe0bbcf24835a1e0c58af22878d5a46278dbf520f5d5bd76c58ce4b3e25d3837a80ae8d6b47
+  metadata.gz: b995ec07848fcb27313a4a75ba2971d9b7da32b4c53a5366cadbb858e3a8abc32bb80123494e666b2266ac0c31ad452631e961bbeb7f69b5d0bad42edaa2b9ad
+  data.tar.gz: 4a521e80f3b3b273b12c1c8d80e5a3f655ce9a01ce79cb641f1b3342a9b959abca8e8a941c702344fc290e4fa194d346a399400de041cacff465f4160d32b328

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/app/models/concerns/foreman_openscap/hostgroup_extensions.rb

@@ -22,18 +22,10 @@ module ForemanOpenscap
     end
 
     def inherited_openscap_proxy_id
-      inherited_ancestry_attribute(:openscap_proxy_id)
-    end
-
-    unless defined?(Katello::System)
-      private
-
-      def inherited_ancestry_attribute(attribute)
-        if ancestry.present?
-          self[attribute] || self.class.sort_by_ancestry(ancestors.where("#{attribute} is not NULL")).last.try(attribute)
-        else
-          self.send(attribute)
-        end
+      if ancestry.present?
+        self[:openscap_proxy_id] || self.class.sort_by_ancestry(ancestors.where.not(openscap_proxy_id: nil)).last.try(:openscap_proxy_id)
+      else
+        self.send(:openscap_proxy_id)
       end
     end
   end

data/app/models/concerns/foreman_openscap/openscap_proxy_core_extensions.rb

@@ -33,10 +33,6 @@ module ForemanOpenscap
       end
     end
 
-    def inherited_openscap_proxy_id
-      inherited_ancestry_attribute(:openscap_proxy_id)
-    end
-
     private
 
     def scap_client_lookup_values_for(lookup_keys, model_match)

data/app/models/foreman_openscap/policy.rb

@@ -312,7 +312,7 @@ module ForemanOpenscap
     end
 
     def assign_ids(ids, class_name)
-      new_assets = ids.reject { |id| id.respond_to?(:empty?) && id.empty? }.reduce([]) do |memo, id|
+      new_assets = ids.uniq.reject { |id| id.respond_to?(:empty?) && id.empty? }.reduce([]) do |memo, id|
         memo << assets.where(:assetable_type => class_name, :assetable_id => id).first_or_initialize
       end
       complimentary_class_name = class_name == 'Host::Base' ? 'Hostgroup' : 'Host::Base'

data/db/migrate/20200803065041_migrate_port_overrides_for_ansible.rb

@@ -0,0 +1,34 @@
+class MigratePortOverridesForAnsible < ActiveRecord::Migration[6.0]
+  def up
+    transform_lookup_values :to_i
+  end
+
+  def down
+    transform_lookup_values :to_s
+  end
+
+  private
+
+  def transform_lookup_values(method)
+    return unless defined?(ForemanAnsible)
+    role = AnsibleRole.find_by :name => 'theforeman.foreman_scap_client'
+    return unless role
+    port_key = role.ansible_variables.find_by :key => 'foreman_scap_client_port'
+    return unless port_key
+    if method == :to_i
+      port_key.key_type =  "integer"
+      port_key.default_value = 8080
+    else
+      port_key.key_type == "string"
+      port_key.default_value = ""
+    end
+
+    port_key.save
+    port_key.lookup_values.in_batches do |batch|
+      batch.each do |lookup_value|
+        lookup_value.value = lookup_value.value.send(method)
+        lookup_value.save
+      end
+    end
+  end
+end

data/db/migrate/20201202110213_update_puppet_port_param_type.rb

@@ -0,0 +1,28 @@
+class UpdatePuppetPortParamType < ActiveRecord::Migration[6.0]
+  def up
+    update_port_type :to_i
+  end
+
+  def down
+    update_port_type :to_s
+  end
+
+  private
+
+  def update_port_type(method)
+    puppet_class = Puppetclass.find_by :name => 'foreman_scap_client'
+    return unless puppet_class
+    port_key = puppet_class.class_params.find_by :key => 'port'
+    return unless port_key
+    def_value = port_key.default_value
+
+    if method == :to_i
+      port_key.key_type =  "integer"
+      port_key.default_value = def_value.to_i
+    else
+      port_key.key_type == "string"
+      port_key.default_value = port_key.default_value.to_s
+    end
+    port_key.save!
+  end
+end

data/db/seeds.d/75-job_templates.rb

@@ -7,9 +7,9 @@ if ForemanOpenscap.with_remote_execution?
         sync = !Rails.env.test? && Setting[:remote_execution_sync_templates]
         # import! was renamed to import_raw! around 1.3.1
         if JobTemplate.respond_to?('import_raw!')
-          template = JobTemplate.import_raw!(File.read(template), :default => true, :locked => true, :update => sync)
+          template = JobTemplate.import_raw!(File.read(template), :default => true, :lock => true, :update => sync)
         else
-          template = JobTemplate.import!(File.read(template), :default => true, :locked => true, :update => sync)
+          template = JobTemplate.import!(File.read(template), :default => true, :lock => true, :update => sync)
         end
         template.organizations = organizations if SETTINGS[:organizations_enabled] && template.present?
         template.locations = locations if SETTINGS[:locations_enabled] && template.present?

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.5".freeze
 end

data/test/unit/policy_test.rb

@@ -37,6 +37,15 @@ class PolicyTest < ActiveSupport::TestCase
     assert_equal hostgroup, policy.hostgroups.first
   end
 
+  test "should not raise when assiging same host by id" do
+    host1 = FactoryBot.create(:compliance_host)
+    asset = FactoryBot.create(:asset, :assetable_id => host1.id, :assetable_type => 'Host::Base')
+    policy = FactoryBot.create(:policy, :assets => [asset], :scap_content => @scap_content, :scap_content_profile => @scap_profile)
+    policy.host_ids = [host1, host1].map(&:id)
+    policy.save!
+    assert_equal 1, policy.hosts.count
+  end
+
   test "should remove associated hostgroup" do
     hg = FactoryBot.create(:hostgroup)
     asset = FactoryBot.create(:asset, :assetable_id => hg.id, :assetable_type => 'Hostgroup')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.5
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-21 00:00:00.000000000 Z
+date: 2021-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -244,6 +244,8 @@ files:
 - db/migrate/20171016125613_add_content_title_unique_constraint.foreman_openscap.rb
 - db/migrate/20190103093409_add_deployment_option_to_policy.foreman_openscap.rb
 - db/migrate/20200117135424_migrate_port_overrides_to_int.rb
+- db/migrate/20200803065041_migrate_port_overrides_for_ansible.rb
+- db/migrate/20201202110213_update_puppet_port_param_type.rb
 - db/seeds.d/75-job_templates.rb
 - db/seeds.d/openscap_feature.rb
 - db/seeds.d/openscap_policy_notification.rb
@@ -348,7 +350,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
@@ -356,10 +358,10 @@ test_files:
 - test/factories/arf_report_factory.rb
 - test/factories/asset_factory.rb
 - test/factories/compliance_host_factory.rb
-- test/factories/compliance_log_factory.rb
 - test/factories/policy_arf_report_factory.rb
 - test/factories/policy_factory.rb
 - test/factories/scap_content_related.rb
+- test/factories/compliance_log_factory.rb
 - test/files/arf_report/arf_report.bz2
 - test/files/arf_report/arf_report.html
 - test/files/arf_report/arf_report.json
@@ -368,11 +370,11 @@ test_files:
 - test/files/scap_contents/ssg-fedora-ds.xml
 - test/files/tailoring_files/ssg-firefox-ds-tailoring-2.xml
 - test/files/tailoring_files/ssg-firefox-ds-tailoring.xml
-- test/functional/api/v2/compliance/arf_reports_controller_test.rb
 - test/functional/api/v2/compliance/policies_controller_test.rb
 - test/functional/api/v2/compliance/scap_content_profiles_controller_test.rb
 - test/functional/api/v2/compliance/scap_contents_controller_test.rb
 - test/functional/api/v2/compliance/tailoring_files_controller_test.rb
+- test/functional/api/v2/compliance/arf_reports_controller_test.rb
 - test/functional/api/v2/hosts_controller_test.rb
 - test/functional/arf_reports_controller_test.rb
 - test/functional/openscap_proxies_controller_test.rb
@@ -380,7 +382,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 +390,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 +397,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