foreman_openscap 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a0fee541322fe2be5e747618a102c84d5a5d7b3
-  data.tar.gz: 90e473ab4dfa3f7d7a84f039c6607b537d8c97a2
+  metadata.gz: a76b926f2bc21c2bdcd6a623b308cae1a9db5c03
+  data.tar.gz: e6415f8826e568b40231370f4b015a7c29b97256
 SHA512:
-  metadata.gz: f257f63e3205d94509fa5d8df3872b59dc52af37b942ebbe876178be9b8f7988d131dfa04e8526d4d5e3ceacbf06cd5f7094229fe84935baa9c8a246b7dffc56
-  data.tar.gz: 950b2a10804f0e74ed6c8101f6f55783d647cc39ca26095d18de485e3cf66de9f51d4f72af8cdbba5054d97f63c6a483d22d6035dc180e79d636008905f50fd4
+  metadata.gz: 7f63dc300a9823d29f5c522a43ffdb4dd84cb2c9805e28233af9e000154f88ec30ca7afe86aa00bc78ce69e1030ead4fb03ccedba0bd0de843cf7aeb501d96ae
+  data.tar.gz: 2bb1e9497ca5c9f4501b513a9ac576d0e234a3aa176479bcd0b3d3b975fdf6b8db2dce8f78012d126913f80fc1ecff14259a71b67327b27f2f8255abff7b8d1b

data/app/mailers/foreman_openscap/policy_mailer.rb

@@ -7,8 +7,8 @@ module ForemanOpenscap
       @time = options[:time] || 1.day.ago
 
       @policies = ::ForemanOpenscap::Policy.all.reject { |policy| policy.assets.map(&:host).compact.empty? }
-      @compliant_hosts = @policies.map { |policy| Host.where(:id => policy.assets.comply_with(policy).map(&:assetable_id)) }.flatten
-      @incompliant_hosts = @policies.map { |policy| Host.where(:id => policy.assets.incomply_with(policy).map(&:assetable_id)) }.flatten
+      @compliant_hosts = @policies.map { |policy| Host.comply_with policy }.flatten
+      @incompliant_hosts = @policies.map { |policy| Host.incomply_with policy }.flatten
       changed_hosts_of_policies(@policies)
 
       if user.nil? || user.mail.nil?

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

@@ -55,6 +55,11 @@ module ForemanOpenscap
       assign_hostgroup_attributes %w(openscap_proxy_id)
     end
 
+    def policies=(policies)
+      self.create_asset(:assetable => self) if self.asset.blank?
+      self.asset.policies = policies
+    end
+
     def get_asset
       ForemanOpenscap::Asset.where(:assetable_type => 'Host::Base', :assetable_id => id).first_or_create!
     end

data/app/models/foreman_openscap/arf_report.rb

@@ -15,8 +15,13 @@ module ForemanOpenscap
     has_one :policy, :through => :policy_arf_report
     has_one :asset, :through => :host, :class_name => 'ForemanOpenscap::Asset', :as => :assetable
     after_save :assign_locations_organizations
+    has_one :log, :foreign_key => :report_id
+
+    delegate :result, :to => :log, :allow_nil => true
     validate :result, :inclusion => { :in => RESULT }
 
+    delegate :asset=, :to => :host
+
     default_scope do
       with_taxonomy_scope do
         order("#{self.table_name}.created_at DESC")
@@ -26,12 +31,12 @@ module ForemanOpenscap
     scope :hosts, lambda { includes(:policy) }
     scope :of_policy, lambda { |policy_id| joins(:policy_arf_report).merge(PolicyArfReport.of_policy(policy_id)) }
 
-    scope :latest,
+    scope :latest, -> {
        joins('INNER JOIN (SELECT host_id, policy_id, max(reports.id) AS id
                           FROM reports INNER JOIN foreman_openscap_policy_arf_reports
                               ON reports.id = foreman_openscap_policy_arf_reports.arf_report_id
                           GROUP BY host_id, policy_id) latest
-              ON reports.id = latest.id')
+              ON reports.id = latest.id') }
 
     scope :latest_of_policy, lambda { |policy|
       joins("INNER JOIN (SELECT host_id, policy_id, max(reports.id) AS id

data/app/models/foreman_openscap/asset.rb

@@ -4,7 +4,7 @@ module ForemanOpenscap
     has_many :policies, :through => :asset_policies
     belongs_to :assetable, :polymorphic => true
 
-    scope :hosts, where(:assetable_type => 'Host::Base')
+    scope :hosts, lambda { where(:assetable_type => 'Host::Base') }
 
     def host
       fetch_asset('Host::Base')

data/app/models/foreman_openscap/scap_content.rb

@@ -96,13 +96,18 @@ module ForemanOpenscap
       end
     end
 
+    def as_json(*args)
+      hash = super
+      hash["scap_file"] = scap_file.to_s.encode('utf-8', :invalid => :replace, :undef => :replace, :replace => '_')
+    end
+
     private
 
     def create_profiles
       profiles = fetch_profiles
-      profiles.each do|key, title|
-        scap_content_profiles.find_or_create_by_profile_id_and_title(key, title)
-      end
+      profiles.each {|key, title|
+        scap_content_profiles.where(:profile_id => key, :title => title).first_or_create
+      }
     end
 
     def redigest

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

@@ -3,8 +3,7 @@
   <div id="loading">
     <div class="col-md-4"></div>
     <div class="col-md-4">
-      <%= image_tag('/assets/spinner.gif') %>
-      <%= _('Loading...') %>
+      <%= spinner(_('Loading...')) %>
     </div>
   </div>
   <iframe id="frame" style="display: none" height="100%" width="100%" frameborder="0" src="<%= parse_html_arf_report_path(@arf_report) %>"></iframe>

data/app/views/foreman_openscap/policy_mailer/_hosts.erb

@@ -36,7 +36,7 @@
         <%= host.scap_status_changed?(policy) ? _('Yes') : _('No') %>
       </td>
     <% else %>
-      <td style="<%= td_style %> border-right: 0px;">
+      <td style="<%= td_style %>" colspan="4">
         <%= _('No ARF reports for this policy') %>
       </td>
     <% end %>

data/config/routes.rb

@@ -15,12 +15,12 @@ Rails.application.routes.draw do
       end
     end
 
-    match 'dashboard', :to => 'compliance_dashboard#index', :as => "compliance_dashboard"
+    get 'dashboard', :to => 'compliance_dashboard#index', :as => "compliance_dashboard"
 
     resources :policies, :only => [:index, :new, :show, :create, :edit, :update, :destroy] do
       member do
-        match 'parse'
-        match 'dashboard', :to => 'policy_dashboard#index', :as => 'policy_dashboard'
+        get 'parse', :to => 'policies#parse'
+        get 'dashboard', :to => 'policy_dashboard#index', :as => 'policy_dashboard'
       end
       collection do
         get 'auto_complete_search'

data/db/migrate/20150112152944_create_scaptimony_arf_report_raws.rb

@@ -1,7 +1,7 @@
 class CreateScaptimonyArfReportRaws < ActiveRecord::Migration
   def change
     create_table :scaptimony_arf_report_raws, :id => false do |t|
-      t.references :arf_report, :index => true, :null => false
+      t.references :arf_report, :null => false
       t.integer :size
       t.binary :raw
     end

data/db/migrate/20150821100137_migrate_from_scaptimony.rb

@@ -1,5 +1,11 @@
 class MigrateFromScaptimony < ActiveRecord::Migration
   def up
+    ActiveRecord::ConnectionAdapters::SchemaStatements.module_eval do
+      # rename_tables renames the indexes, and their new names overflow, we cancel out the renaming of the indexes
+      alias_method :old_rename_table_indexes, :rename_table_indexes
+      def rename_table_indexes(a,b)
+      end
+    end
     ActiveRecord::Base.connection.tables.grep(/^scaptimony/).each do |table|
       rename_table table, table.sub(/^scaptimony/, "foreman_openscap")
     end
@@ -25,7 +31,11 @@ class MigrateFromScaptimony < ActiveRecord::Migration
           SQL
 
     taxonomies = TaxableTaxonomy.where(:taxable_type => ["Scaptimony::ArfReport", "Scaptimony::Policy", "Scaptimony::ScapContent"])
-    taxonomies.each { |t| t.taxable_type = t.taxable_type.sub(/^Scaptimony/, "ForemanOpenscap") }.map(&:save!)
+    taxonomies.each { |t| t.taxable_type = t.taxable_type.sub(/^Scaptimony/, "ForemanOpenscap")}.map(&:save!)
+  ensure
+    ActiveRecord::ConnectionAdapters::SchemaStatements.module_eval do
+      alias_method :rename_table_indexes, :old_rename_table_indexes
+    end
   end
 
   def down

data/db/seeds.d/openscap_feature.rb

@@ -1,2 +1,2 @@
-f = Feature.find_or_create_by_name('Openscap')
+f = Feature.where(:name => 'Openscap').first_or_create
 fail "Unable to create proxy feature: #{format_errors f}" if f.nil? || f.errors.any?

data/lib/foreman_openscap/engine.rb

@@ -14,7 +14,9 @@ module ForemanOpenscap
 
     # Add any db migrations
     initializer "foreman_openscap.load_app_instance_data" do |app|
-      app.config.paths['db/migrate'] += ForemanOpenscap::Engine.paths['db/migrate'].existent
+      ForemanOpenscap::Engine.paths['db/migrate'].existent.each do |path|
+        app.config.paths['db/migrate'] << path
+      end
     end
 
     assets_to_precompile =

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/test/factories/compliance_host_factory.rb

@@ -5,6 +5,5 @@ FactoryGirl.define do
     root_pass 'xybxa6JUkz63w'
     openscap_proxy FactoryGirl.build(:smart_proxy, :url => "http://test.org:8080")
     policies []
-    asset nil
   end
 end

data/test/factories/policy_factory.rb

@@ -8,5 +8,6 @@ FactoryGirl.define do
     day_of_month '1'
     cron_line '* * * * 30'
     hosts []
+    assets []
   end
 end

data/test/unit/arf_report_test.rb

@@ -86,8 +86,8 @@ module ForemanOpenscap
         reports << FactoryGirl.create(:arf_report, :host_id => host.id, :status => @status)
         FactoryGirl.create(:policy_arf_report, :arf_report_id => reports.last.id)
       end
-      assert ForemanOpenscap::ArfReport.latest.include? reports[-2]
-      assert ForemanOpenscap::ArfReport.latest.include? reports[-1]
+      assert ForemanOpenscap::ArfReport.latest.to_a.include? reports[-2]
+      assert ForemanOpenscap::ArfReport.latest.to_a.include? reports[-1]
     end
 
     test 'should return latest report of policy for each of the hosts' do

data/test/unit/policy_mailer_test.rb

@@ -11,9 +11,15 @@ class PolicyMailerTest < ActiveSupport::TestCase
                        :method => 'policy_summary',
                        :subscription_type => 'report',
                       )
+    #just to have some content to send
+    ForemanOpenscap::Policy.any_instance.stubs(:ensure_needed_puppetclasses).returns(true)
+    host = FactoryGirl.create(:compliance_host)
+    asset = FactoryGirl.create(:asset, :assetable_id => host.id)
+    policy = FactoryGirl.create(:policy, :assets => [asset])
+    arf_report = FactoryGirl.create(:arf_report, :policy => policy, :host_id => host.id)
+    policy_arf_report = FactoryGirl.create(:policy_arf_report, :policy_id => policy.id, :arf_report_id => arf_report.id)
 
     @user.mail_notifications << MailNotification[:openscap_policy_summary]
-
     ActionMailer::Base.deliveries = []
     @user.user_mail_notifications.first.deliver
     @email = ActionMailer::Base.deliveries.first

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
-- "Šimon Lukašík"
+- Šimon Lukašík
 - Shlomi Zadok
 - Marek Hulan
 - Ondrej Prazak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface