foreman_openscap 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0b2635b4110d762e082b3b0deea79656f308712
-  data.tar.gz: 6488a4c319870ff0347bfedf2d1ad27659dab5a9
+  metadata.gz: dc23a893a6f93d33f710ee464f998add2a5e1498
+  data.tar.gz: fcf1e51452a94983844f42a62d198bc0f95240d7
 SHA512:
-  metadata.gz: 257acb224a1ffaeed43d9cba4216038920357ea2fed6c493d52b8d0efa0b639f58021cd159681d4eef6970de6067bfdbc358cd5cebf8d60af5b28c6627269797
-  data.tar.gz: 351b39d8450200c2884d63a419741a93900600b229c7fa492db305b74c9bfd7b74701ed206705472842490d17b0d1932925e34a1c718e0dd6403a99a47042e0b
+  metadata.gz: 68084f2791991b42c7e1eb313a892f892b5a16e10f1fe14e2ac6ab45cc1c00684b587a218cf0b9ea81a7ce28fc9d73598606e962bfb0189d1b35a63ae7d464c4
+  data.tar.gz: 930e20cabae6c401715cf968d438b87afcb0b2de32364f9e72a2e51c2dfb29fa5071164ee9edf763e901e62e26e1331e8d98c99dfc2bc83ffd68459f3bf68688

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

@@ -27,7 +27,7 @@ module Api
         param :date, :identifier, :required => true
 
         def create
-          asset = ForemanOpenscap::Helper::get_asset(params[:cname])
+          asset = ForemanOpenscap::Helper::get_asset(params[:cname], params[:policy_id])
           arf_bzip2 = request.body.read
           arf_bzip2_size = request.body.size
           Scaptimony::ArfReportsHelper.create_arf(asset, params, arf_bzip2, arf_bzip2_size)

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

@@ -22,7 +22,12 @@ module ForemanOpenscap
     end
 
     def policies_enc
-      self.policies.map(&:to_enc).to_json
+      combined_policies.map(&:to_enc).to_json
+    end
+
+    def combined_policies
+      combined = self.policies + self.hostgroup.policies
+      combined.uniq
     end
 
     module ClassMethods

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

@@ -0,0 +1,13 @@
+require 'scaptimony/asset'
+
+module ForemanOpenscap
+  module HostgroupExtensions
+    extend ActiveSupport::Concern
+
+    included do
+      has_one :asset, :as => :assetable, :class_name => "::Scaptimony::Asset"
+      has_many :asset_policies, :through => :asset, :class_name => "::Scaptimony::AssetPolicy"
+      has_many :policies, :through => :asset_policies, :class_name => "::Scaptimony::Policy"
+    end
+  end
+end

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

@@ -29,9 +29,9 @@ module ForemanOpenscap
       validates :period, :inclusion => {:in => %w[weekly monthly custom]},
                 :if => Proc.new { | policy | policy.new_record? ? policy.step_index > 3 : !policy.id.blank? }
       validates :weekday, :inclusion => {:in => Date::DAYNAMES.map(&:downcase)},
-                :if => Proc.new { | policy | policy.new_record? ? policy.step_index > 3 && policy.period == 'weekly' : !policy.id.blank? }
+                :if => Proc.new { | policy | policy.period == 'weekly' && (policy.new_record? ? policy.step_index > 3 : !policy.id.blank?) }
       validates :day_of_month, :numericality => {:greater_than => 0, :less_than => 32},
-                :if => Proc.new { | policy | policy.new_record? ? policy.step_index > 3 && policy.period == 'monthly' : !policy.id.blank? }
+                :if => Proc.new { | policy | policy.period == 'monthly'&& (policy.new_record? ? policy.step_index > 3 : !policy.id.blank?) }
       validate :valid_cron_line
       validate :ensure_period_specification_present
 

data/app/views/scaptimony_policies/steps/_scap_content_form.html.erb

@@ -7,6 +7,11 @@
   </span>
   <div class="alert alert-info">
     <%= icon_text("info-sign", _('Notice: Ensure the selected SCAP content exists on your hosts.')) %>
+    <div id="file-location">
+      <% if @policy.scap_content %>
+        <b><%= _('SCAP content file should be /var/lib/openscap/content/%s.xml on your clients.') % @policy.scap_content.digest %></b>
+      <% end %>
+    </div>
   </div>
 </div>
 

data/lib/foreman_openscap/engine.rb

@@ -72,6 +72,7 @@ module ForemanOpenscap
     config.to_prepare do
       Host::Managed.send(:include, ForemanOpenscap::HostExtensions)
       HostsHelper.send(:include, ForemanOpenscap::HostsHelperExtensions)
+      Hostgroup.send(:include, ForemanOpenscap::HostgroupExtensions)
       ::Scaptimony::ArfReport.send(:include, ForemanOpenscap::ArfReportExtensions)
       ::Scaptimony::Asset.send(:include, ForemanOpenscap::AssetExtensions)
       ::Scaptimony::Policy.send(:include, ForemanOpenscap::PolicyExtensions)

data/lib/foreman_openscap/helper.rb

@@ -9,7 +9,9 @@
 #
 
 module ForemanOpenscap::Helper
-  def self.get_asset(cname)
-    Host.find_by_name!(cname).get_asset
+  def self.get_asset(cname, policy_id)
+    asset = Host.find_by_name!(cname).get_asset
+    asset.policy_ids += [policy_id]
+    asset
   end
 end

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/test/unit/openscap_host_test.rb

@@ -0,0 +1,28 @@
+require 'test_plugin_helper'
+
+class OpenscapHostTest < ActiveSupport::TestCase
+  setup do
+    disable_orchestration
+    User.current = users :admin
+    Setting[:token_duration] = 0
+    Scaptimony::Policy.any_instance.stubs(:ensure_needed_puppetclasses).returns(true)
+  end
+
+  test 'Host has policy' do
+    host = FactoryGirl.create(:host)
+    assert_empty(host.policies)
+    policy = FactoryGirl.create(:policy)
+
+    assert(policy.assign_hosts([host]), 'Host policies should be assigned')
+    assert_includes(host.policies, policy)
+  end
+
+  test 'Host has policies via its hostgroup' do
+    host = FactoryGirl.create(:host, :with_hostgroup)
+    hostgroup = host.hostgroup
+    policy = FactoryGirl.create(:policy)
+    assert(policy.hostgroup_ids = ["#{hostgroup.id}"])
+    refute_empty(host.combined_policies)
+    assert_includes(host.combined_policies, policy)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - "Šimon Lukašík"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -65,6 +65,7 @@ files:
 - app/models/concerns/foreman_openscap/arf_report_extensions.rb
 - app/models/concerns/foreman_openscap/asset_extensions.rb
 - app/models/concerns/foreman_openscap/host_extensions.rb
+- app/models/concerns/foreman_openscap/hostgroup_extensions.rb
 - app/models/concerns/foreman_openscap/policy_extensions.rb
 - app/models/concerns/foreman_openscap/scap_content_extensions.rb
 - app/overrides/hosts/index/host_arf_report.rb
@@ -114,7 +115,7 @@ files:
 - lib/tasks/foreman_openscap_tasks.rake
 - test/factories/foreman_openscap_factories.rb
 - test/test_plugin_helper.rb
-- test/unit/foreman_openscap_test.rb
+- test/unit/openscap_host_test.rb
 homepage: https://github.com/OpenSCAP/foreman_openscap
 licenses:
 - GPL-3.0
@@ -140,7 +141,7 @@ signing_key:
 specification_version: 4
 summary: Foreman plug-in for displaying OpenSCAP audit reports
 test_files:
-- test/unit/foreman_openscap_test.rb
+- test/unit/openscap_host_test.rb
 - test/test_plugin_helper.rb
 - test/factories/foreman_openscap_factories.rb
 has_rdoc: 

data/test/unit/foreman_openscap_test.rb

@@ -1,12 +0,0 @@
-require 'test_plugin_helper'
-
-class ForemanOpenscapTest < ActiveSupport::TestCase
-  setup do
-    User.current = User.find_by_login "admin"
-  end
-
-  test "the truth" do
-    assert true
-  end
-
-end