foreman_openscap 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52ccf5d3a2cc3bae2f3c55710682384f2b61f014
-  data.tar.gz: 2d5b7cc101b171f481fa245491d00770e47ba40c
+  metadata.gz: feef787c3ec3853ea3ea69ec359a943e81fed594
+  data.tar.gz: c2c279115757242903e06b02a38477bbc130762e
 SHA512:
-  metadata.gz: 02cc5a12f0646e510c0b1eb5b637a796305adb0138f8dd6d61b715982a7e066385556b8dc91b10a8a2be9c57aa7b49a74ebcc2d560f508591e01ea563fc76dc5
-  data.tar.gz: 6ce694688245b777a394284ab7412d13b53f2f4d0d2c19e9a9e70c895c8a918256bc764b2a629ac329bda51cfd9be2c54e3c3d7c78c069c54619cf6dc8165741
+  metadata.gz: 7cc362c03e631e6c5141baeb72513316e71681102dfb8e750ddbd2b1d54e1f54a8290c3a76182c490e3e0913dfc8613f3c971fc886bcdbd299c3c22a6cedb327
+  data.tar.gz: df71b007ba7183e3ff55b5a90158530c784568244aa3164130d8ef9c4bb91c59a1bf4ff7e489d449f62de19bcf4b75ea9480b6dcfd1142d1e45907c784e85ad3

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

@@ -1,13 +1,3 @@
-#
-# Copyright (c) 2014--2015 Red Hat Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 3 (GPLv3). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv3
-# along with this software; if not, see http://www.gnu.org/licenses/gpl.txt
-#
-
 require 'foreman_openscap/helper'
 
 module Api

data/app/controllers/policies_controller.rb

@@ -31,9 +31,7 @@ class PoliciesController < ApplicationController
   end
 
   def create
-    # we must call unscoped, otherwise taxonomix default scope gets mixed into taxable_taxonomies object
-    # setting taxable_id, making them invalid
-    @policy = ::ForemanOpenscap::Policy.unscoped.new(policy_params)
+    @policy = ::ForemanOpenscap::Policy.new(policy_params)
     if @policy.wizard_completed? && @policy.save
       process_success :success_redirect => policies_path
     else

data/app/controllers/policy_dashboard_controller.rb

@@ -1,13 +1,3 @@
-#
-# Copyright (c) 2014 Red Hat Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 3 (GPLv3). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv3
-# along with this software; if not, see http://www.gnu.org/licenses/gpl.txt
-#
-
 class PolicyDashboardController < ApplicationController
   before_filter :prefetch_data, :only => :index
 

data/app/helpers/arf_reports_helper.rb

@@ -1,13 +1,3 @@
-#
-# Copyright (c) 2014 Red Hat Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 3 (GPLv3). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv3
-# along with this software; if not, see http://www.gnu.org/licenses/gpl.txt
-#
-
 module ArfReportsHelper
   def report_arf_column(event, style = "")
     style = "label-default" if event == 0

data/app/helpers/compliance_dashboard_helper.rb

@@ -1,13 +1,3 @@
-#
-# Copyright (c) 2014 Red Hat Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 3 (GPLv3). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv3
-# along with this software; if not, see http://www.gnu.org/licenses/gpl.txt
-#
-
 module ComplianceDashboardHelper
 
   def latest_compliance_headers

data/app/helpers/policy_dashboard_helper.rb

@@ -1,13 +1,3 @@
-#
-# Copyright (c) 2014 Red Hat Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 3 (GPLv3). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv3
-# along with this software; if not, see http://www.gnu.org/licenses/gpl.txt
-#
-
 module PolicyDashboardHelper
   COLORS = {
     :compliant_hosts => ArfReportDashboardHelper::COLORS[:passed],

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

@@ -20,7 +20,7 @@ module ForemanOpenscap
                     :complete_value => {:compliant => ::ForemanOpenscap::ComplianceStatus::COMPLIANT,
                                         :incompliant => ::ForemanOpenscap::ComplianceStatus::INCOMPLIANT,
                                         :inconclusive => ::ForemanOpenscap::ComplianceStatus::INCONCLUSIVE}
-      after_update :puppetrun!, :if => ->(host) { Setting[:puppetrun] && host.openscap_proxy_id_changed? }
+      after_update :puppetrun!, :if => ->(host) { Setting[:puppetrun] && host.changed.include?('openscap_proxy_id') }
 
       scope :comply_with, lambda { |policy|
         joins(:arf_reports).merge(ArfReport.latest_of_policy policy).merge(ArfReport.passed)

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

@@ -67,7 +67,7 @@ module ForemanOpenscap
     end
 
     def scap_client_class_present
-      if openscap_proxy_id_changed? && openscap_proxy_id
+      if changed.include?('openscap_proxy_id') && self.respond_to?(:openscap_proxy_id) && openscap_proxy_id
         errors.add(:openscap_proxy_id, _("Puppet class 'foreman_scap_client' not found, make sure it is imported from Puppet master")) unless find_scap_client
       end
     end

data/app/models/foreman_openscap/policy.rb

@@ -20,11 +20,13 @@ module ForemanOpenscap
 
     before_validation :update_period_attrs
 
-    validates :name, :presence => true, :uniqueness => true
+    validates :name, :presence => true, :uniqueness => true, :length => { :maximum => 255 }
     validate :ensure_needed_puppetclasses
     validates :period, :inclusion => {:in => %w(weekly monthly custom), :message => _('is not a valid value')},
               :if => Proc.new { |policy| policy.should_validate?('Schedule') }
 
+    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 :valid_cron_line, :valid_weekday, :valid_day_of_month
 

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

@@ -1,4 +1,4 @@
-<table class="table table-bordered table-striped">
+<table class="table table-bordered table-striped table-fixed">
   <tr>
     <th>Name</th>
     <th>Content</th>
@@ -7,7 +7,7 @@
   </tr>
   <% for policy in @policies %>
     <tr>
-      <td>
+      <td class="ellipsis">
         <%= link_to_if_authorized(policy.name.to_s, hash_for_policy_dashboard_policy_path(:id => policy.id)) %>
       </td>
       <td>

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

@@ -1,18 +1,14 @@
-<table class="table table-bordered table-striped table-two-pane">
+<table class="table table-bordered table-striped table-two-pane table-fixed">
   <tr>
-    <th>Title</th>
-    <th>Filename</th>
-    <th>Created</th>
-    <th></th>
+    <th class="col-md-4">Title</th>
+    <th class="col-md-4">Filename</th>
+    <th class="col-md-3">Created</th>
+    <th class="col-md-1"></th>
   </tr>
   <% for content in @contents %>
     <tr>
-      <td>
-        <%= content.title %>
-      </td>
-      <td>
-        <%= content.original_filename %>
-      </td>
+      <td class="ellipsis"><%= content.title %></td>
+      <td class="ellipsis"><%= content.original_filename %></td>
       <td>
         <%= _("%s ago") % time_ago_in_words(content.created_at.getlocal) %>
       </td>

data/lib/foreman_openscap/engine.rb

@@ -41,7 +41,7 @@ module ForemanOpenscap
 
     initializer 'foreman_openscap.register_plugin', :before => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_openscap do
-        requires_foreman '>= 1.11'
+        requires_foreman '>= 1.13'
 
         apipie_documented_controllers ["#{ForemanOpenscap::Engine.root}/app/controllers/api/v2/compliance/*.rb"]
 

data/lib/foreman_openscap/helper.rb

@@ -1,13 +1,3 @@
-#
-# Copyright (c) 2014 Red Hat Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 3 (GPLv3). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv3
-# along with this software; if not, see http://www.gnu.org/licenses/gpl.txt
-#
-
 module ForemanOpenscap::Helper
   def self.get_asset(cname, policy_id)
     asset = find_host_by_name_or_uuid(cname).get_asset

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/test/unit/policy_test.rb

@@ -122,4 +122,22 @@ class PolicyTest < ActiveSupport::TestCase
     p.day_of_month = nil
     assert p.save
   end
+
+  test "should not create policy without SCAP content" do
+    p = ForemanOpenscap::Policy.new(:name => "custom_policy",
+                                    :scap_content_profile_id => @scap_profile.id,
+                                    :period => 'monthly',
+                                    :day_of_month => '5')
+    refute p.save
+    assert p.errors[:scap_content_id].include?("can't be blank")
+  end
+
+  test "should not create policy without SCAP content profile" do
+    p = ForemanOpenscap::Policy.new(:name => "custom_policy",
+                                    :scap_content_id => @scap_content.id,
+                                    :period => 'monthly',
+                                    :day_of_month => '5')
+    refute p.save
+    assert p.errors[:scap_content_profile_id].include?("can't be blank")
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - "Šimon Lukašík"
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2016-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface