foreman_openscap 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48ae466c6c227a222397d8a8151177798cf1a035
-  data.tar.gz: 6abafa02b5291e3b1aa4c36a682e4ea931ccd646
+  metadata.gz: 92cfa722f49b4849b12e6de9b12752f7403250c9
+  data.tar.gz: 216d2b98129dc7cf0de15c0c294522d8147e3a7c
 SHA512:
-  metadata.gz: d3c84160ddb908cd9f928878bed4f11c14e9691fe827f072795003e1bc97687db1c2ce33826b57a3ef64997c10bd7d4e44aa5b9d505da02bf9b0145e53511e85
-  data.tar.gz: e9fcbe1028267dbc7ca0d548e41d4390309e540465609eefe739a3fce064566119d72a8fc498e6174697057be2642520839f1f15227ca1e1ac09fcf7fafc0af5
+  metadata.gz: 8c90cfa657a43e9490a5246dc8a195d0476b2d2c84ff33c97ffc633c96af029a8ebe71f87b5bc980212192a25aa50bd773d19b01648fea3082f186120e05713a
+  data.tar.gz: b7044c839f2b328e2591f93dc85081f1cc97fded7d0346ed5ab0afdc1896bd4cb82c168ad3af354976e4fb6eaf76c8c3bd1c6f9b0fc0ec558f582257b0df6f50

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

@@ -70,6 +70,16 @@ module Api::V2
         process_response @policy.destroy
       end
 
+      api :GET, '/compliance/policies/:id/content', N_("Show a policy's SCAP content")
+      param :id, :identifier, :required => true
+
+      def content
+        @scap_content = @policy.scap_content
+        send_data @scap_content.scap_file,
+                  :type     => 'application/xml',
+                  :filename => @scap_content.original_filename
+      end
+
       private
       def find_resource
         not_found and return if params[:id].blank?

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

@@ -26,7 +26,7 @@ module ForemanOpenscap
     end
 
     def combined_policies
-      combined = self.policies + self.hostgroup.policies
+      combined = self.hostgroup ? self.policies + self.hostgroup.policies : self.policies
       combined.uniq
     end
 

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

@@ -19,19 +19,19 @@ module ForemanOpenscap
       attr_accessible :location_ids, :organization_ids, :current_step, :hostgroup_ids
       attr_writer :current_step
 
-      SCAP_PUPPET_CLASS = 'foreman_scap_client'
+      SCAP_PUPPET_CLASS        = 'foreman_scap_client'
       POLICIES_CLASS_PARAMETER = 'policies'
-      SERVER_CLASS_PARAMETER = 'server'
-      PORT_CLASS_PARAMETER = 'port'
+      SERVER_CLASS_PARAMETER   = 'server'
+      PORT_CLASS_PARAMETER     = 'port'
 
-      validates :name, :presence => true, :uniqueness => true, :format => { without: /\s/ }
+      validates :name, :presence => true, :uniqueness => true, :format => {without: /\s/}
       validate :ensure_needed_puppetclasses
       validates :period, :inclusion => {:in => %w[weekly monthly custom]},
-                :if => Proc.new { | policy | policy.new_record? ? policy.step_index > 3 : !policy.id.blank? }
+                :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.period == 'weekly' && (policy.new_record? ? policy.step_index > 3 : !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.period == 'monthly'&& (policy.new_record? ? policy.step_index > 3 : !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
 
@@ -82,7 +82,7 @@ module ForemanOpenscap
     end
 
     def next_step
-      steps[steps.index(current_step) + 1 ]
+      steps[steps.index(current_step) + 1]
     end
 
     def rewind_step
@@ -111,14 +111,14 @@ module ForemanOpenscap
 
     def used_location_ids
       Location.joins(:taxable_taxonomies).where(
-              'taxable_taxonomies.taxable_type' => 'Scaptimony::Policy',
-              'taxable_taxonomies.taxable_id' => id).pluck("#{Location.arel_table.name}.id")
+          'taxable_taxonomies.taxable_type' => 'Scaptimony::Policy',
+          'taxable_taxonomies.taxable_id'   => id).pluck("#{Location.arel_table.name}.id")
     end
 
     def used_organization_ids
       Organization.joins(:taxable_taxonomies).where(
-              'taxable_taxonomies.taxable_type' => 'Scaptimony::Policy',
-              'taxable_taxonomies.taxable_id' => id).pluck("#{Location.arel_table.name}.id")
+          'taxable_taxonomies.taxable_type' => 'Scaptimony::Policy',
+          'taxable_taxonomies.taxable_id'   => id).pluck("#{Location.arel_table.name}.id")
     end
 
     def used_hostgroup_ids
@@ -136,9 +136,10 @@ module ForemanOpenscap
 
     def to_enc
       {
-        'id' => self.id,
-        'profile_id' => self.scap_content_profile.try(:profile_id) || '',
-        'content_path' => "/var/lib/openscap/content/#{self.scap_content.digest}.xml",
+          'id'            => self.id,
+          'profile_id'    => self.scap_content_profile.try(:profile_id) || '',
+          'content_path'  => "/var/lib/openscap/content/#{self.scap_content.digest}.xml",
+          'download_path' => "/compliance/policies/#{self.id}/content" # default to proxy path
       }.merge(period_enc)
     end
 
@@ -147,22 +148,22 @@ module ForemanOpenscap
     def period_enc
       # get crontab expression as an array (minute hour day_of_month month day_of_week)
       cron_parts = case period
-        when 'weekly'
-          [ '0', '1', '*', '*', weekday_number.to_s ]
-        when 'monthly'
-          [ '0', '1', day_of_month.to_s, '*', '*']
-        when 'custom'
-          cron_line_split
-        else
-          raise 'invalid period specification'
-      end
+                     when 'weekly'
+                       ['0', '1', '*', '*', weekday_number.to_s]
+                     when 'monthly'
+                       ['0', '1', day_of_month.to_s, '*', '*']
+                     when 'custom'
+                       cron_line_split
+                     else
+                       raise 'invalid period specification'
+                   end
 
       {
-        'minute' => cron_parts[0],
-        'hour' => cron_parts[1],
-        'monthday' => cron_parts[2],
-        'month' => cron_parts[3],
-        'weekday' => cron_parts[4],
+          'minute'   => cron_parts[0],
+          'hour'     => cron_parts[1],
+          'monthday' => cron_parts[2],
+          'month'    => cron_parts[3],
+          'weekday'  => cron_parts[4],
       }
     end
 
@@ -182,8 +183,8 @@ module ForemanOpenscap
         return false
       end
 
-      policies_param.override = true
-      policies_param.key_type = 'array'
+      policies_param.override      = true
+      policies_param.key_type      = 'array'
       policies_param.default_value = '<%= @host.policies_enc %>'
 
       if policies_param.changed? && !policies_param.save
@@ -233,11 +234,11 @@ module ForemanOpenscap
         if hostgroup.puppet_proxy && (url = hostgroup.puppet_proxy.url).present?
           case override.key
             when SERVER_CLASS_PARAMETER
-              lookup_value = LookupValue.where(:match => "hostgroup=#{hostgroup.to_label}", :lookup_key_id => override.id).first_or_initialize
+              lookup_value      = LookupValue.where(:match => "hostgroup=#{hostgroup.to_label}", :lookup_key_id => override.id).first_or_initialize
               puppet_proxy_fqdn = URI.parse(url).host
               lookup_value.update_attribute(:value, puppet_proxy_fqdn)
             when PORT_CLASS_PARAMETER
-              lookup_value = LookupValue.where(:match => "hostgroup=#{hostgroup.to_label}", :lookup_key_id => override.id).first_or_initialize
+              lookup_value      = LookupValue.where(:match => "hostgroup=#{hostgroup.to_label}", :lookup_key_id => override.id).first_or_initialize
               puppet_proxy_port = URI.parse(url).port
               lookup_value.update_attribute(:value, puppet_proxy_port)
           end

data/app/views/dashboard/_foreman_openscap_host_reports_widget.html.erb

@@ -13,7 +13,7 @@
     </tr>
     <% latest_reports.each do |report| %>
       <tr>
-        <td><%= link_to h(report.host.name), scaptimony_arf_report_path(report) %></td>
+        <td><%= link_to h(report.host.nil? ? _('Host does not exist anymore') : report.host.name), scaptimony_arf_report_path(report) %></td>
         <td><%= link_to h(report.policy.name), scaptimony_policy_dashboard_scaptimony_policy_path(report.policy) %></td>
         <td><%= report_event_column(report.passed, "label-success")  %></td>
         <td><%= report_event_column(report.failed, "label-danger")  %></td>

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

@@ -9,7 +9,7 @@
   </tr>
   <% for arf_report in @arf_reports %>
     <tr>
-      <td><%= name_column(arf_report.host) %></td>
+      <td><%= arf_report.host.nil? ? _('Host does not exist anymore') : name_column(arf_report.host) %></td>
       <td><%= _("%s ago") % time_ago_in_words(arf_report.date) %></td>
       <td><%= report_arf_column(arf_report.passed, "label-info") %></th>
       <td><%= report_arf_column(arf_report.failed, "label-danger") %></th>

data/app/views/scaptimony_policy_dashboard/index.html.erb

@@ -2,24 +2,21 @@
 
 <% title _("Compliance policy: %s") % @policy.name %>
 
-<div id='dashboard' class="row gridster">
+<div id='dashboard' class="gridster col-md-12 ready">
   <ul>
-    <%= policy_widget_list.map do |widget|
-      content_tag(:li, render(widget.id), :data => {
-                         :id    => widget.id,
-                         :name  => widget.name || widget.id,
-                         :row   => widget.row,
-                         :col   => widget.col,
-                         :sizex => widget.sizex,
-                         :sizey => widget.sizey,
-                         :hide  => widget.hide
-                     })
-    end.join(' ').html_safe
-    %>
+    <% [{:template => 'policy_status_widget', :sizex => 8, :sizey => 1, :name => N_('Status table')},
+        {:template => 'policy_chart_widget', :sizex => 4, :sizey => 1, :name => N_('Status chart')}].each do |w| %>
+      <% widget = Widget.new(w) %>
+      <%= content_tag(:li, widget_data(widget)) do %>
+        <div class="widget <%= widget.name.parameterize %>">
+          <%= render_widget(widget) %>
+        </div>
+      <% end %>
+    <% end %>
   </ul>
 </div>
 <% if @policy.arf_reports.any? %>
-  <div class="row gridster">
+  <div class="col-md-12 gridster">
     <%= _("Latest reports for policy: %s") % @policy.name %>
     <%= render :partial => 'policy_reports' %>
   </div>

data/config/routes.rb

@@ -40,7 +40,11 @@ Rails.application.routes.draw do
           :apiv => /v1|v2/, :constraints => ApiConstraints.new(:version => 2) do
       namespace :compliance do
         resources :scap_contents, :except => [:new, :edit]
-        resources :policies, :except => [:new, :edit]
+        resources :policies, :except => [:new, :edit] do
+          member do
+            get 'content'
+          end
+        end
         resources :arf_reports, :only => [:index, :show, :destroy]
         post 'arf_reports/:cname/:policy_id/:date', \
               :constraints => { :cname => /[^\/]+/ }, :to => 'arf_reports#create'

data/db/seeds.d/openscap_scap_default.rb

@@ -0,0 +1,2 @@
+require 'foreman_openscap/bulk_upload'
+ForemanOpenscap::BulkUpload.new(true).generate_scap_default_content

data/lib/foreman_openscap/bulk_upload.rb

@@ -0,0 +1,62 @@
+require 'digest/sha2'
+module ForemanOpenscap
+  class BulkUpload
+    attr_accessor :from_scap_security_guide
+    def initialize(from_scap_security_guide=false)
+      @from_scap_security_guide = from_scap_security_guide
+    end
+
+    def generate_scap_default_content
+      return unless @from_scap_security_guide
+
+      if `rpm -qa | grep scap-security-guide`.empty?
+        Rails.logger.debug "Can't find scap-security-guide RPM"
+        return
+      end
+
+      files_array = `rpm -ql scap-security-guide | grep ds.xml`.split
+      upload_from_files(files_array) unless files_array.empty?
+    end
+
+    def upload_from_files(files_array)
+      files_array.each do |datastream|
+        file = File.open(datastream, 'rb').read
+        digest = Digest::SHA2.hexdigest(datastream)
+        title = content_name(datastream)
+        filename = original_filename(datastream)
+        scap_content = Scaptimony::ScapContent.where(:title => title, :digest => digest, :scap_file => file).first_or_initialize
+        unless scap_content.persisted?
+          scap_content.original_filename = filename
+          next puts "## SCAP content is invalid: #{scap_content.errors.full_messages.uniq.join(',')} ##" unless scap_content.valid?
+          if scap_content.save
+            puts "Saved #{datastream} as #{scap_content.title}"
+          else
+            puts "Failed saving #{datastream}"
+          end
+        end
+      end
+    end
+
+    def upload_from_directory(directory_path)
+      files_array = Dir["#{directory_path}/*-ds.xml"]
+      upload_from_files(files_array) unless files_array.empty?
+    end
+
+    private
+
+    def extract_name_from_file(file)
+      # SCAP datastream files are in format of ssg-<OS>-ds.xml
+      # We wish to extract the <OS> and create a name of it
+      original_filename(file).gsub('ssg-','').gsub('-ds.xml', '')
+    end
+
+    def original_filename(file)
+      file.split('/').last
+    end
+
+    def content_name(datastream)
+      os_name = extract_name_from_file(datastream)
+      @from_scap_security_guide ? "Red Hat #{os_name} default content" : "#{os_name} content"
+    end
+  end
+end

data/lib/foreman_openscap/helper.rb

@@ -10,8 +10,25 @@
 
 module ForemanOpenscap::Helper
   def self.get_asset(cname, policy_id)
-    asset = Host.find_by_name!(cname).get_asset
+    asset = find_host_by_name_or_uuid(cname).get_asset
     asset.policy_ids += [policy_id]
     asset
   end
+
+  private
+
+  def self.find_host_by_name_or_uuid(cname)
+    if defined?(Katello::System)
+      host = Host.includes(:content_host).where(:katello_systems => {:uuid => cname}).first
+      host ||= Host.find_by_name(cname)
+    else
+      host = Host.find_by_name(cname)
+    end
+    unless host
+      Rails.logger.error "Could not find Host with name: #{cname}"
+      Rails.logger.error "Please check that Content host is linked to Foreman host" if defined?(Katello::System)
+      raise ActiveRecord::RecordNotFound
+    end
+    host
+  end
 end

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/tasks/foreman_openscap_tasks.rake

@@ -1,9 +1,19 @@
 # Tasks
 namespace :foreman_openscap do
-  namespace :example do
-    desc 'Example Task'
-    task :task => :environment do
-      # Task goes here
+  require 'foreman_openscap/bulk_upload'
+  namespace :bulk_upload do
+    desc 'Bulk upload SCAP content from directory'
+    task :directory, [:directory] => [:environment] do |task, args|
+      abort("# No such directory, please check the path you have provided. #") unless args[:directory].blank? || Dir.exist?(args[:directory])
+      ForemanOpenscap::BulkUpload.new.upload_from_directory(args[:directory])
+    end
+
+    task :files, [:files] => [:environment] do |task, args|
+      files_array = args[:files].split(' ')
+      files_array.each do |file|
+        abort("# #{file} is a directory, expecting file. Try using 'rake foreman_openscap:bulk_upload:directory' with this directory. #") if File.directory?(file)
+      end
+      ForemanOpenscap::BulkUpload.new.upload_from_files(files_array)
     end
   end
 end

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

@@ -55,4 +55,11 @@ class Api::V2::PoliciesControllerTest < ActionController::TestCase
     assert_response :ok
     refute Scaptimony::Policy.exists?(policy.id)
   end
+
+  test "should return xml of scap content" do
+    policy = FactoryGirl.create(:policy)
+    get :content, { :id => policy.id }, set_session_user
+    assert(@response.header['Content-Type'], 'application/xml')
+    assert_response :success
+  end
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
-- "Šimon Lukašík"
+- Šimon Lukašík
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: scaptimony
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.0
 description: Foreman plug-in for managing security compliance reports
@@ -75,8 +75,6 @@ files:
 - app/overrides/hosts/overview/host_compliance_status.rb
 - app/services/scaptimony/host_report_dashboard/data.rb
 - app/services/scaptimony/policy_dashboard/data.rb
-- app/services/scaptimony/policy_dashboard/loader.rb
-- app/services/scaptimony/policy_dashboard/manager.rb
 - app/services/scaptimony/report_dashboard/data.rb
 - app/views/api/v2/compliance/arf_reports/base.json.rabl
 - app/views/api/v2/compliance/arf_reports/index.json.rabl
@@ -128,7 +126,9 @@ files:
 - app/views/scaptimony_scap_contents/welcome.html.erb
 - config/routes.rb
 - db/seeds.d/openscap_feature.rb
+- db/seeds.d/openscap_scap_default.rb
 - lib/foreman_openscap.rb
+- lib/foreman_openscap/bulk_upload.rb
 - lib/foreman_openscap/engine.rb
 - lib/foreman_openscap/helper.rb
 - lib/foreman_openscap/version.rb
@@ -153,12 +153,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -168,14 +168,14 @@ signing_key:
 specification_version: 4
 summary: Foreman plug-in for displaying OpenSCAP audit reports
 test_files:
-- test/unit/openscap_host_test.rb
-- test/test_plugin_helper.rb
-- test/files/scap_contents/ssg-fedora-ds.xml
-- test/functional/api/v2/arf_reports_controller_test.rb
-- test/functional/api/v2/scap_contents_controller_test.rb
-- test/functional/api/v2/policies_controller_test.rb
-- test/factories/asset_factory.rb
 - test/factories/policy_factory.rb
+- test/factories/asset_factory.rb
 - test/factories/scap_content_related.rb
 - test/factories/arf_report_factory.rb
+- test/unit/openscap_host_test.rb
+- test/files/scap_contents/ssg-fedora-ds.xml
+- test/functional/api/v2/policies_controller_test.rb
+- test/functional/api/v2/scap_contents_controller_test.rb
+- test/functional/api/v2/arf_reports_controller_test.rb
+- test/test_plugin_helper.rb
 has_rdoc: 

data/app/services/scaptimony/policy_dashboard/loader.rb

@@ -1,20 +0,0 @@
-#
-# 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 Scaptimony::PolicyDashboard
-  class Loader
-    def self.load
-      Scaptimony::PolicyDashboard::Manager.map do |dashboard|
-        dashboard.widget 'policy_status_widget', :row=>1,:col=>1,:sizex=>8,:sizey=>1,:name=> N_('Status table')
-        dashboard.widget 'policy_chart_widget',  :row=>1,:col=>9,:sizex=>4,:sizey=>1,:name=> N_('Status chart')
-      end
-    end
-  end
-end

data/app/services/scaptimony/policy_dashboard/manager.rb

@@ -1,32 +0,0 @@
-#
-# 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 Scaptimony::PolicyDashboard
-  module Manager
-    class << self
-      def map
-        @widgets ||= []
-        mapper = Mapper.new(@widgets)
-        if block_given?
-          yield mapper
-        else
-          mapper
-        end
-      end
-
-      def widgets
-        @widgets ||= Scaptimony::PolicyDashboard::Loader.load
-      end
-    end
-
-    class Mapper < ::Dashboard::Manager::Mapper
-    end
-  end
-end