foreman_openscap 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2bb650d43ac1e63a3a59875b4f699aaa85c3f147
-  data.tar.gz: 1df85b65c444c8374458776bd3bd608bf2cda0d6
+SHA256:
+  metadata.gz: 0b6304ecdc7fd28bb61ee2274acf8bf5a281bad437a67aa4b0fbe8214b438432
+  data.tar.gz: e7545538f9f374458f0b1d3b365367bf21532971d2043068fd83b3b7afbe7db8
 SHA512:
-  metadata.gz: 5efb6c2e817057e687acf1ee59e33f3ec8ec2cd6efe5665251d985af370d6b1d399284cc9c08fcff534b5635e42664b20e80f8abca2d44ddcc574e178c967abd
-  data.tar.gz: 369139267348ea91d46c7dbd0f6950a40f68474109dee88e0366f9dbc0e874697e37c862e0d09050c850ca849942c1eb378c102b64928770fd558c0fde0dd74f
+  metadata.gz: 8206badfe4852a6a74ba2ced8aeb863f1fdb09383b4522c92604eb255fed2ee0fbe98bb3544b81be75969de2b581c2123ad5619f01f9e324e30f081a7224239f
+  data.tar.gz: baf9118c0c690b4c446f565848848cd11368345c59bcd44b44b4e443f387ba26c631e173d352cdc5de150a2cd792bad3cadb55b292c325cd7c93642e88eaf47d

data/app/controllers/policies_controller.rb

@@ -79,10 +79,14 @@ class PoliciesController < ApplicationController
   def update_multiple_hosts
     if (id = params['policy']['id'])
       policy = ::ForemanOpenscap::Policy.find(id)
-      policy.assign_hosts(@hosts)
-      success _("Updated hosts: Assigned with compliance policy: %s") % policy.name
-      # We prefer to go back as this does not lose the current search
-      redirect_to hosts_path
+      policy.host_ids = policy.host_ids + @hosts.pluck(:id)
+      if policy.save
+        success _("Updated hosts: Assigned with compliance policy: %s") % policy.name
+        # We prefer to go back as this does not lose the current search
+        return redirect_to hosts_path
+      else
+        return process_error :object => policy, :redirect => hosts_path
+      end
     else
       error _('No compliance policy selected.')
       redirect_to(select_multiple_hosts_policies_path)

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

@@ -9,6 +9,8 @@ module ForemanOpenscap
       base.has_many :arf_reports, :class_name => '::ForemanOpenscap::ArfReport', :foreign_key => :host_id
       base.has_one :compliance_status_object, :class_name => '::ForemanOpenscap::ComplianceStatus', :foreign_key => 'host_id'
 
+      base.validate :openscap_proxy_in_taxonomy, :if => Proc.new { |host| host.openscap_proxy_id.present? }
+
       base.scoped_search :relation => :policies, :on => :name, :complete_value => true, :rename => :compliance_policy,
                     :only_explicit => true, :operators => ['= '], :ext_method => :search_by_policy_name
 
@@ -121,13 +123,11 @@ module ForemanOpenscap
     end
 
     def reports_for_policy(policy, limit = nil)
-      if limit
-        ForemanOpenscap::ArfReport.joins(:policy_arf_report)
-                                  .merge(ForemanOpenscap::PolicyArfReport.of_policy(policy.id)).where(:host_id => id).limit limit
-      else
-        ForemanOpenscap::ArfReport.joins(:policy_arf_report)
-                                  .merge(ForemanOpenscap::PolicyArfReport.of_policy(policy.id)).where(:host_id => id)
-      end
+      report_scope = ForemanOpenscap::ArfReport.unscoped.joins(:policy_arf_report)
+                                               .merge(ForemanOpenscap::PolicyArfReport.of_policy(policy.id)).where(:host_id => id)
+                                               .order("#{ForemanOpenscap::ArfReport.table_name}.created_at DESC")
+      report_scope = report_scope.limit(limit) if limit
+      report_scope
     end
 
     def compliance_status(options = {})
@@ -138,6 +138,10 @@ module ForemanOpenscap
       @compliance_status_label ||= get_status(ForemanOpenscap::ComplianceStatus).to_label(options)
     end
 
+    def openscap_proxy_in_taxonomy
+      validate_association_taxonomy(:openscap_proxy)
+    end
+
     module ClassMethods
       def search_by_removed_from_policy(key, operator, policy_name)
         policy = ForemanOpenscap::Policy.find_by :name => policy_name

data/app/models/foreman_openscap/policy.rb

@@ -36,7 +36,7 @@ module ForemanOpenscap
     validates :scap_content_id, presence: true, if: Proc.new { |policy| policy.should_validate?('SCAP Content') }
     validate :matching_content_profile, if: Proc.new { |policy| policy.should_validate?('SCAP Content') }
 
-    validate :valid_cron_line, :valid_weekday, :valid_day_of_month, :valid_tailoring, :valid_tailoring_profile
+    validate :valid_cron_line, :valid_weekday, :valid_day_of_month, :valid_tailoring, :valid_tailoring_profile, :no_mixed_deployments
     after_save :assign_policy_to_hostgroups
     # before_destroy - ensure that the policy has no hostgroups, or classes
 
@@ -46,10 +46,6 @@ module ForemanOpenscap
       end
     end
 
-    def assign_assets(a)
-      self.asset_ids = (self.asset_ids + a.collect(&:id)).uniq
-    end
-
     def to_html
       if scap_content.nil?
         return html_error_message(_('Cannot generate HTML guide, scap content is missing.'))
@@ -112,6 +108,7 @@ module ForemanOpenscap
     end
 
     def previous_step
+      return steps.last if current_step.empty?
       steps[steps.index(current_step) - 1]
     end
 
@@ -165,10 +162,6 @@ module ForemanOpenscap
       []
     end
 
-    def assign_hosts(hosts)
-      assign_assets hosts.map &:get_asset
-    end
-
     def unassign_hosts(hosts)
       host_asset_ids = ForemanOpenscap::Asset.where(:assetable_type => 'Host::Base', :assetable_id => hosts.map(&:id)).pluck(:id)
       self.asset_ids = self.asset_ids - host_asset_ids
@@ -315,5 +308,14 @@ module ForemanOpenscap
       existing_assets = self.assets.where(:assetable_type => complimentary_class_name)
       self.assets = existing_assets + new_assets
     end
+
+    def no_mixed_deployments
+      assets.each do |asset|
+        assetable = asset.assetable
+        unless assetable.policies.pluck(:deploy_by).all? { |deployed_by| deployed_by == deploy_by }
+          errors.add(:base, _("cannot assign to %s, all assigned policies must be deployed in the same way") % assetable.name)
+        end
+      end
+    end
   end
 end

data/app/views/job_templates/run_openscap_scans.erb

@@ -15,6 +15,7 @@ template_inputs:
 provider_type: SSH
 kind: job_template
 %>
+<% raise "Create and assign a policy to this host before proceeding" unless input('policies').respond_to? :map %>
 
 <% input('policies').map { |policy_config| policy_config['id'] }.each do |id| -%>
 /usr/bin/foreman_scap_client <%= id %>

data/app/views/policy_dashboard/_policy_reports.html.erb

@@ -11,7 +11,7 @@
       <th><%= _("Other") %></th>
       <th><%= _('Actions') %></th>
     </tr>
-    <% @policy.arf_reports.latest.each do |arf_report| %>
+    <% @latest_reports.each do |arf_report| %>
       <tr>
         <td><%= name_column(arf_report.host) %></td>
         <td><%= assigned_icon(@policy, arf_report) %></td>

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "1.0.4".freeze
+  VERSION = "1.0.5".freeze
 end