foreman_openscap 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '085004ef2bb328311e119ca13288b338e9f7a8cc'
-  data.tar.gz: a4c0a6abd4d4cc3f4fa1159bd36d0f008ecf0662
+  metadata.gz: 1b21df70f5c504cd8137c17a32671ee2971523cd
+  data.tar.gz: 3b921e1aa43c099a6f610b53f4a77e62ef31e310
 SHA512:
-  metadata.gz: 0b9284ddb0c3b9b0eb46b67fc3700ff1c2aa5ba4e81b9f0ba91b625d367e0024208748abb8b55b8f4f0edaa2fe82543ec17ade91ea62103cbb505047eac8c5f5
-  data.tar.gz: ed70fc17d804fdff59bf090c3c9d6b04f233808757c8bd56865168e2f33d0c5c8dd2211235d65189b04471332c792c843049709e71d56b2a38ac427b61b5cc05
+  metadata.gz: 941825497a559852ab21e236e2d8416dbae24215bcdf118a6755c0436894829cf804e3f7492343618e92c7514ef90765e1ee98259f9c6c3751910ec44ae083c5
+  data.tar.gz: c88a9e72bfc3e43186c07c9674cf3eb73910a3f4e93f89bf5fa940ac26ccfe3bac1992368ddd696e7dd15bcfc2414dc07d300e77e57228c662f70076c57d8e22

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

@@ -28,16 +28,23 @@ module ForemanOpenscap
       self[:digest] ||= Digest::SHA256.hexdigest(scap_file.to_s)
     end
 
+    def create_profiles
+      fetch_profiles.each do |key, title|
+        create_or_update_profile key, title
+      end
+    end
+
+    def create_or_update_profile(profile_id, title)
+      profile = ScapContentProfile.find_by(:profile_id => profile_id, "#{self.class.to_s.demodulize.underscore}_id".to_sym => id)
+      return ScapContentProfile.create(:profile_id => profile_id, :title => title, "#{self.class.to_s.demodulize.underscore}_id".to_sym => id) unless profile
+      profile.update(:title => title) unless profile.title == title
+      profile
+    end
+
     private
 
     def redigest
       self[:digest] = Digest::SHA256.hexdigest(scap_file.to_s)
     end
-
-    def create_profiles
-      fetch_profiles.each do |key, title|
-        ScapContentProfile.where(:profile_id => key, :title => title, "#{self.class.to_s.demodulize.underscore}_id".to_sym => id).first_or_create
-      end
-    end
   end
 end

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

@@ -2,10 +2,6 @@ module ForemanOpenscap
   module OpenscapProxyExtensions
     extend ActiveSupport::Concern
 
-    included do
-      belongs_to :openscap_proxy, :class_name => "SmartProxy"
-    end
-
     def openscap_proxy_api
       return @openscap_api if @openscap_api
       proxy_url = openscap_proxy.url if openscap_proxy

data/app/models/foreman_openscap/arf_report.rb

@@ -17,6 +17,8 @@ module ForemanOpenscap
     has_one :asset, :through => :host, :class_name => 'ForemanOpenscap::Asset', :as => :assetable
     after_save :assign_locations_organizations
     has_one :log, :foreign_key => :report_id
+    belongs_to :openscap_proxy, :class_name => "SmartProxy"
+
 
     delegate :asset=, :to => :host
 

data/app/models/foreman_openscap/policy.rb

@@ -1,3 +1,4 @@
+require 'rack/utils'
 module ForemanOpenscap
   class Policy < ActiveRecord::Base
     include Authorizable
@@ -29,7 +30,6 @@ module ForemanOpenscap
               :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 :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
@@ -47,18 +47,17 @@ module ForemanOpenscap
     end
 
     def to_html
-      if scap_content.nil? || scap_content_profile.nil?
-        return ("<h2>%s</h2>" % (_('Cannot generate HTML guide for %{scap_content}/%{profile}') %
-          { :scap_content => h(self.scap_content), :profile => h(self.scap_content_profile) })).html_safe
+      if scap_content.nil?
+        return html_error_message(_('Cannot generate HTML guide, scap content is missing.'))
       end
 
       if (proxy = scap_content.proxy_url)
         api = ProxyAPI::Openscap.new(:url => proxy)
       else
-        return ("<h2>%s</h2>" % _('No valid OpenSCAP proxy server found.')).html_safe
+        return html_error_message(_('Cannot generate HTML guide, no valid OpenSCAP proxy server found.'))
       end
 
-      api.policy_html_guide(scap_content.scap_file, scap_content_profile.profile_id)
+      api.policy_html_guide(scap_content.scap_file, scap_content_profile.try(:profile_id))
     end
 
     def hostgroup_ids
@@ -210,6 +209,13 @@ module ForemanOpenscap
 
     private
 
+    def html_error_message(message)
+      error_message = '<div class="alert alert-danger"><span class="pficon pficon-error-circle-o"></span><strong>' <<
+        message <<
+        '</strong></div>'
+      error_message.html_safe
+    end
+
     def erase_period_attrs(attrs)
       attrs.each { |attr| self.public_send("#{attr}=", nil) }
     end

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

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

data/lib/foreman_openscap/engine.rb

@@ -156,6 +156,18 @@ view_openscap_proxies]
         parameter_filter Hostgroup, :openscap_proxy_id, :openscap_proxy
         parameter_filter Log, :result
 
+        smart_proxy_for Hostgroup, :openscap_proxy,
+                        :feature => 'Openscap',
+                        :label => N_('OpenSCAP Proxy'),
+                        :description => N_('OpenSCAP Proxy to use for fetching SCAP content and uploading ARF reports'),
+                        :api_description => N_('ID of OpenSCAP Proxy')
+        smart_proxy_for Host::Managed, :openscap_proxy,
+                        :feature => 'Openscap',
+                        :label => N_('OpenSCAP Proxy'),
+                        :description => N_('OpenSCAP Proxy to use for fetching SCAP content and uploading ARF reports'),
+                        :api_description => N_('ID of OpenSCAP Proxy')
+
+
         if ForemanOpenscap.with_remote_execution?
           options = {
             :description => N_("Run OpenSCAP scan"),

data/lib/foreman_openscap/version.rb

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

data/test/unit/policy_test.rb

@@ -135,13 +135,12 @@ class PolicyTest < ActiveSupport::TestCase
     assert p.errors[:scap_content_id].include?("can't be blank")
   end
 
-  test "should not create policy without SCAP content profile" do
+  test "should create a policy with default SCAP content profile (profile id is nil)" 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")
+    assert p.save
   end
 
   test "should have correct scap profile in enc" do

data/test/unit/scap_content_test.rb

@@ -32,4 +32,19 @@ class ScapContentTest < ActiveSupport::TestCase
       assert_equal(available_proxy.url, scap_content.proxy_url)
     end
   end
+
+  test 'should update profile title when fetching profiles from proxy' do
+    scap_content = FactoryGirl.create(:scap_content)
+    scap_content.stubs(:fetch_profiles).returns({ "xccdf.test.profile" => "Changed title" })
+    scap_profile = FactoryGirl.create(:scap_content_profile, :scap_content => scap_content, :profile_id => 'xccdf.test.profile', :title => "Original title")
+    scap_content.create_profiles
+    assert_equal scap_profile.reload.title, 'Changed title'
+  end
+
+  test 'should create profile when fetching profiles from proxy' do
+    scap_content = FactoryGirl.create(:scap_content)
+    scap_content.stubs(:fetch_profiles).returns({ "xccdf.test.profile" => "My title" })
+    scap_content.create_profiles
+    assert scap_content.reload.scap_content_profiles.where(:title => 'My title').first
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-07 00:00:00.000000000 Z
+date: 2017-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -91,8 +91,6 @@ files:
 - app/models/foreman_openscap/scap_content.rb
 - app/models/foreman_openscap/scap_content_profile.rb
 - app/models/foreman_openscap/tailoring_file.rb
-- app/overrides/hostgroups/form/select_openscap_proxy.rb
-- app/overrides/hosts/form/select_openscap_proxy.rb
 - app/overrides/hosts/overview/host_compliance_status.rb
 - app/services/foreman_openscap/arf_report_status_calculator.rb
 - app/services/foreman_openscap/host_report_dashboard/data.rb
@@ -117,6 +115,7 @@ files:
 - 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
+- app/views/api/v2/compliance/scap_contents/update.json.rabl
 - app/views/api/v2/compliance/tailoring_files/base.json.rabl
 - app/views/api/v2/compliance/tailoring_files/index.json.rabl
 - app/views/api/v2/compliance/tailoring_files/main.json.rabl
@@ -130,7 +129,6 @@ files:
 - app/views/arf_reports/show.html.erb
 - app/views/arf_reports/show_html.html.erb
 - app/views/compliance_hosts/_compliance_status.erb
-- app/views/compliance_hosts/_openscap_proxy.html.erb
 - app/views/compliance_hosts/show.html.erb
 - app/views/dashboard/_compliance_host_reports_widget.html.erb
 - app/views/dashboard/_compliance_reports_breakdown_widget.html.erb

data/app/overrides/hostgroups/form/select_openscap_proxy.rb

@@ -1,4 +0,0 @@
-Deface::Override.new(:virtual_path => "hostgroups/_form",
-                     :name => "choose_openscap_proxy",
-                     :insert_bottom => "#primary",
-                     :partial => "compliance_hosts/openscap_proxy")

data/app/overrides/hosts/form/select_openscap_proxy.rb

@@ -1,4 +0,0 @@
-Deface::Override.new(:virtual_path => "hosts/_form",
-                     :name => "openscap_proxy",
-                     :insert_bottom => "#primary",
-                     :partial => "compliance_hosts/openscap_proxy")

data/app/views/compliance_hosts/_openscap_proxy.html.erb

@@ -1,3 +0,0 @@
-<%= select_f f, :openscap_proxy_id, SmartProxy.with_features("Openscap"), :id, :name,
-    { :include_blank => blank_or_inherit_f(f, :openscap_proxy) },
-    { :label => _('Openscap Proxy') } %>