foreman_openscap 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3eb718bc077be262141cd60cd891a6cc6650056b
-  data.tar.gz: e13593ac24e549d77bd50a8ac36337a7b8394459
+  metadata.gz: '085004ef2bb328311e119ca13288b338e9f7a8cc'
+  data.tar.gz: a4c0a6abd4d4cc3f4fa1159bd36d0f008ecf0662
 SHA512:
-  metadata.gz: 19ac79890e7c2e2b85ff7729e996189a9a3a47ad8af4d7d164c576d15474486cc356314986739d47b7c8ecc7563b8a70f1567c5379a5aaf7f39dac5609a2a44b
-  data.tar.gz: 706d7965401c9572ec53f92853dd9a1c49a4d5d4ccb89ae97b8af38d079e99aae990af5fce9eea1fa3680c7f9022574184349311cd8be5ce7a6eacbfc2a58b17
+  metadata.gz: 0b9284ddb0c3b9b0eb46b67fc3700ff1c2aa5ba4e81b9f0ba91b625d367e0024208748abb8b55b8f4f0edaa2fe82543ec17ade91ea62103cbb505047eac8c5f5
+  data.tar.gz: ed70fc17d804fdff59bf090c3c9d6b04f233808757c8bd56865168e2f33d0c5c8dd2211235d65189b04471332c792c843049709e71d56b2a38ac427b61b5cc05

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

@@ -26,7 +26,7 @@ module Api
         param_group :search_and_pagination, ::Api::V2::BaseController
 
         def index
-          @arf_reports = resource_scope_for_index(:permission => :edit_compliance).includes(:asset)
+          @arf_reports = resource_scope_for_index(:permission => :edit_compliance).includes(:openscap_proxy, :policy, :host)
         end
 
         api :GET, '/compliance/arf_reports/:id', N_('Show an ARF report')

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

@@ -90,9 +90,13 @@ module Api::V2
 
       def tailoring
         @tailoring_file = @policy.tailoring_file
-        send_data @tailoring_file.scap_file,
-                  :type => 'application/xml',
-                  :filename => @tailoring_file.original_filename
+        if @tailoring_file
+          send_data @tailoring_file.scap_file,
+                    :type => 'application/xml',
+                    :filename => @tailoring_file.original_filename
+        else
+          render(:json => { :error => { :message => _("No Tailoring file assigned for policy with id %s") % @policy.id } }, :status => 404)
+        end
       end
 
       private

data/app/controllers/arf_reports_controller.rb

@@ -10,7 +10,7 @@ class ArfReportsController < ApplicationController
   end
 
   def index
-    @arf_reports = resource_base.includes(:host => %i[policies last_report_object host_statuses])
+    @arf_reports = resource_base.includes(:policy, :openscap_proxy, :host => %i[policies last_report_object host_statuses])
                                 .search_for(params[:search], :order => params[:order])
                                 .paginate(:page => params[:page], :per_page => params[:per_page])
   end

data/app/helpers/arf_reports_helper.rb

@@ -52,4 +52,17 @@ module ArfReportsHelper
          :'data-dialog-title' => _("%s - The following compliance reports are about to be changed") % action[0])
       end.flatten)
   end
+
+  def openscap_proxy_link(arf_report)
+    return _("No proxy found!") unless arf_report.openscap_proxy
+    display_link_if_authorized(arf_report.openscap_proxy.name, hash_for_smart_proxy_path(:id => arf_report.openscap_proxy_id))
+  end
+
+  def reported_info(arf_report)
+    msg = _("Reported at %s") % arf_report.reported_at
+    msg << _(" for policy %s") % display_link_if_authorized(arf_report.policy.name, hash_for_edit_policy_path(:id => arf_report.policy.id)) if arf_report.policy
+    return msg.html_safe unless arf_report.openscap_proxy
+    msg += _(" through %s") % openscap_proxy_link(arf_report)
+    msg.html_safe
+  end
 end

data/app/models/foreman_openscap/policy.rb

@@ -3,6 +3,7 @@ module ForemanOpenscap
     include Authorizable
     include Taxonomix
     attr_writer :current_step, :wizard_initiated
+    audited
 
     belongs_to :scap_content
     belongs_to :scap_content_profile
@@ -29,9 +30,9 @@ module ForemanOpenscap
 
     validates :scap_content_id, presence: true, if: Proc.new { |policy| policy.should_validate?('SCAP Content') }
     validates :scap_content_profile_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
-
     after_save :assign_policy_to_hostgroups
     # before_destroy - ensure that the policy has no hostgroups, or classes
 
@@ -294,6 +295,12 @@ module ForemanOpenscap
       end
     end
 
+    def matching_content_profile
+      if scap_content_id && scap_content_profile_id && !ScapContent.find(scap_content_id).scap_content_profile_ids.include?(scap_content_profile_id)
+        errors.add(:scap_content_id, _("does not have the selected SCAP content profile"))
+      end
+    end
+
     def assign_policy_to_hostgroups
       if hostgroups.any?
         puppetclass = find_scap_puppetclass

data/app/models/foreman_openscap/scap_content.rb

@@ -3,11 +3,13 @@ module ForemanOpenscap
     include Authorizable
     include Taxonomix
     include DataStreamContent
+    audited :except => [ :scap_file ]
 
     has_many :scap_content_profiles, :dependent => :destroy
     has_many :policies
 
     validates :title, :presence => true, :length => { :maximum => 255 }
+    validates :original_filename, :length => { :maximum => 255 }
 
     scoped_search :on => :title,             :complete_value => true
     scoped_search :on => :original_filename, :complete_value => true, :rename => :filename

data/app/models/foreman_openscap/tailoring_file.rb

@@ -3,6 +3,7 @@ module ForemanOpenscap
     include Authorizable
     include Taxonomix
     include DataStreamContent
+    audited :except => [ :scap_file ]
 
     has_many :policies
     has_many :scap_content_profiles, :dependent => :destroy

data/app/views/api/v2/compliance/arf_reports/main.json.rabl

@@ -2,8 +2,16 @@ object @arf_report
 
 extends "api/v2/compliance/arf_reports/base"
 
-attributes :created_at, :updated_at, :host_id, :openscap_proxy_id, :reported_at
+attributes :created_at, :updated_at, :reported_at
 
-node :openscap_proxy_name do |arf|
-  arf.openscap_proxy.name
+child :openscap_proxy => :openscap_proxy do
+  attributes :id, :name
+end
+
+child :host do
+  attributes :id, :name
+end
+
+child :policy do
+  attributes :id, :name
 end

data/app/views/api/v2/compliance/policies/show.json.rabl

@@ -1,3 +1,7 @@
 object @policy
 
+child :hostgroups => :hostgroups do |hostgroup|
+  attributes :id, :name, :title
+end
+
 extends "api/v2/compliance/policies/main"

data/app/views/api/v2/compliance/scap_contents/create.json.rabl

@@ -0,0 +1,3 @@
+object @scap_content
+
+extends "api/v2/compliance/scap_contents/main"

data/app/views/arf_reports/_list.html.erb

@@ -5,6 +5,8 @@
   <th class="ca" width="40px"><%= check_box_tag "check_all", "", false, { :onclick => "toggleCheck()", :'check-title' => _("Select all items in this page"), :'uncheck-title'=> _("items selected. Uncheck to Clear") } %></th>
     <th><%= sort :host %></th>
     <th><%= sort :reported, :as => _("Reported At") %></th>
+    <th><%= sort :policy, :as => _("Policy") %></th>
+    <th><%= sort :openscap_proxy, :as => _("Openscap Proxy") %></th>
     <th><%= sort :compliance_passed, :as => _("Passed") %></th>
     <th><%= sort :compliance_failed, :as => _("Failed") %></th>
     <th><%= sort :compliance_othered, :as => _("Other") %></th>
@@ -21,8 +23,10 @@
                              :class => 'host_select_boxes',
                              :onclick => 'hostChecked(this)' %>
         </td>
-      <td><%= name_column(arf_report.host) %></td>
+      <td class="elipsis"><%= name_column(arf_report.host) %></td>
       <td><%= display_link_if_authorized(_("%s ago") % time_ago_in_words(arf_report.reported_at), hash_for_arf_report_path(:id => arf_report.id)) %></td>
+      <td class="ellipsis"><%= display_link_if_authorized(arf_report.policy.name, hash_for_edit_policy_path(:id => arf_report.policy.id)) %></th>
+      <td class="ellipsis"><%= openscap_proxy_link arf_report %></th>
       <td><%= report_arf_column(arf_report.passed, "label-info") %></th>
       <td><%= report_arf_column(arf_report.failed, "label-danger") %></th>
       <td><%= report_arf_column(arf_report.othered, "label-warning") %></th>

data/app/views/arf_reports/show.html.erb

@@ -3,7 +3,8 @@
 <% stylesheet 'foreman_openscap/reports' %>
 
 <% title "#{@arf_report.host}" %>
-<p class='ra'> <%= _("Reported at %s") % @arf_report.reported_at %> </p>
+
+<p class='ra'><%= reported_info @arf_report %></p>
 
 <% content_for(:search_bar) {show_logs} %>
 

data/db/migrate/20170821081205_rename_mail_notification.foreman_openscap.rb

@@ -0,0 +1,15 @@
+class RenameMailNotification < ActiveRecord::Migration
+  def up
+    notification = MailNotification.where(:name => 'openscap_policy_summary').first
+    if notification
+      notification.update_attribute :name, 'compliance_policy_summary'
+    end
+  end
+
+  def down
+    notification = MailNotification.where(:name => 'compliance_policy_summary').first
+    if notification
+      notification.update_attribute :name, 'openscap_policy_summary'
+    end
+  end
+end

data/db/migrate/20170830221751_add_index_to_logs_result.rb

@@ -0,0 +1,9 @@
+class AddIndexToLogsResult < ActiveRecord::Migration
+  def up
+    add_index :logs, :result
+  end
+
+  def down
+    remove_index :logs, :result
+  end
+end

data/db/seeds.d/openscap_policy_notification.rb

@@ -1,7 +1,7 @@
-N_('Openscap policy summary')
+N_('Compliance policy summary')
 
 policy_notification = {
-  :name => :openscap_policy_summary,
+  :name => :compliance_policy_summary,
   :description => N_('A summary of reports for OpenSCAP policies'),
   :mailer => 'ForemanOpenscap::PolicyMailer',
   :method => 'policy_summary',

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "0.7.4".freeze
+  VERSION = "0.7.5".freeze
 end

data/test/factories/policy_factory.rb

@@ -3,8 +3,8 @@ FactoryGirl.define do
     sequence(:name) { |n| "policy#{n}" }
     period 'weekly'
     weekday 'monday'
-    scap_content
-    scap_content_profile
+    scap_content { FactoryGirl.create(:scap_content) }
+    scap_content_profile { FactoryGirl.create(:scap_content_profile, :scap_content => scap_content) }
     tailoring_file nil
     tailoring_file_profile nil
     day_of_month nil

data/test/functional/api/v2/compliance/policies_controller_test.rb

@@ -93,4 +93,12 @@ class Api::V2::Compliance::PoliciesControllerTest < ActionController::TestCase
     assert(@response.header['Content-Type'], 'application/xml')
     assert_response :success
   end
+
+  test "should return meaningufull error when no tailioring file assigned" do
+    policy = FactoryGirl.create(:policy)
+    get :tailoring, { :id => policy.id }, set_session_user
+    assert_response :not_found
+    response = ActiveSupport::JSON.decode(@response.body)
+    assert_equal "No Tailoring file assigned for policy with id #{policy.id}", response['error']['message']
+  end
 end

data/test/unit/policy_test.rb

@@ -6,7 +6,7 @@ class PolicyTest < ActiveSupport::TestCase
     ForemanOpenscap::DataStreamValidator.any_instance.stubs(:validate)
     ForemanOpenscap::ScapContent.any_instance.stubs(:fetch_profiles).returns({ 'test_profile_key' => 'test_profile_title' })
     @scap_content = FactoryGirl.create(:scap_content)
-    @scap_profile = FactoryGirl.create(:scap_content_profile)
+    @scap_profile = FactoryGirl.create(:scap_content_profile, :scap_content => @scap_content)
     @tailoring_profile = FactoryGirl.create(:scap_content_profile, :profile_id => 'xccdf_org.test.tailoring_test_profile')
   end
 
@@ -16,7 +16,7 @@ class PolicyTest < ActiveSupport::TestCase
     hg1 = FactoryGirl.create(:hostgroup)
     hg2 = FactoryGirl.create(:hostgroup)
     asset = FactoryGirl.create(:asset, :assetable_id => hg1.id, :assetable_type => 'Hostgroup')
-    policy = FactoryGirl.create(:policy, :assets => [asset])
+    policy = FactoryGirl.create(:policy, :assets => [asset], :scap_content => @scap_content, :scap_content_profile => @scap_profile)
     policy.hostgroup_ids = [hg1, hg2].map(&:id)
     policy.save!
     assert_equal 2, policy.hostgroups.count
@@ -28,7 +28,7 @@ class PolicyTest < ActiveSupport::TestCase
     ForemanOpenscap::Policy.any_instance.stubs(:populate_overrides)
     hg = FactoryGirl.create(:hostgroup)
     asset = FactoryGirl.create(:asset, :assetable_id => hg.id, :assetable_type => 'Hostgroup')
-    policy = FactoryGirl.create(:policy, :assets => [asset])
+    policy = FactoryGirl.create(:policy, :assets => [asset], :scap_content => @scap_content, :scap_content_profile => @scap_profile)
     policy.save!
     hg.hostgroup_classes.destroy_all
     hg.destroy
@@ -145,7 +145,7 @@ class PolicyTest < ActiveSupport::TestCase
   end
 
   test "should have correct scap profile in enc" do
-    p = FactoryGirl.create(:policy)
+    p = FactoryGirl.create(:policy, :scap_content => @scap_content, :scap_content_profile => @scap_profile)
     profile_id = p.scap_content_profile.profile_id
     assert_equal profile_id, p.to_enc['profile_id']
     tailoring_profile = FactoryGirl.create(:scap_content_profile, :profile_id => 'xccdf_org.test.tailoring_test_profile')
@@ -190,4 +190,21 @@ class PolicyTest < ActiveSupport::TestCase
     assert_equal 6, p.to_enc['tailoring_download_path'].split('/').length
     assert_equal tailoring_file.digest, p.to_enc['tailoring_download_path'].split('/').last
   end
+
+  test "should have assigned a content profile that belongs to assigned scap content" do
+    scap_content_2 = FactoryGirl.create(:scap_content)
+    p = ForemanOpenscap::Policy.create(:name => "valid_profile_policy",
+                                        :scap_content_id => @scap_content.id,
+                                        :scap_content_profile_id => @scap_profile.id,
+                                        :period => 'monthly',
+                                        :day_of_month => '5')
+    assert p.valid?
+    q = ForemanOpenscap::Policy.create(:name => "invalid_profile_policy",
+                                        :scap_content_id => scap_content_2.id,
+                                        :scap_content_profile_id => @scap_profile.id,
+                                        :period => 'monthly',
+                                        :day_of_month => '5')
+    refute q.valid?
+    assert_equal "does not have the selected SCAP content profile", q.errors.messages[:scap_content_id].first
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-28 00:00:00.000000000 Z
+date: 2017-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -113,6 +113,7 @@ files:
 - app/views/api/v2/compliance/policies/main.json.rabl
 - app/views/api/v2/compliance/policies/show.json.rabl
 - app/views/api/v2/compliance/scap_contents/base.json.rabl
+- app/views/api/v2/compliance/scap_contents/create.json.rabl
 - app/views/api/v2/compliance/scap_contents/index.json.rabl
 - app/views/api/v2/compliance/scap_contents/main.json.rabl
 - app/views/api/v2/compliance/scap_contents/show.json.rabl
@@ -216,6 +217,8 @@ files:
 - db/migrate/20160925213031_change_scap_widget_names.rb
 - db/migrate/20161109155255_create_tailoring_files.rb
 - db/migrate/20161223153249_add_permissions_to_arf_report.rb
+- db/migrate/20170821081205_rename_mail_notification.foreman_openscap.rb
+- db/migrate/20170830221751_add_index_to_logs_result.rb
 - db/seeds.d/75-job_templates.rb
 - db/seeds.d/openscap_feature.rb
 - db/seeds.d/openscap_policy_notification.rb
@@ -313,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Foreman plug-in for displaying OpenSCAP audit reports