foreman_openscap 0.2.1 → 0.3.0

data/app/views/scaptimony_scap_contents/_form.html.erb

@@ -7,12 +7,20 @@
 
   <ul class="nav nav-tabs" data-tabs="tabs">
     <li class="active"><a href="#primary" data-toggle="tab"><%= _("File Upload") %></a></li>
+    <% if show_location_tab? %>
+      <li><a href='#locations' data-toggle='tab'><%= _('Locations') %></a></li>
+    <% end %>
+    <% if show_organization_tab? %>
+      <li><a href='#organizations' data-toggle='tab'><%= _('Organizations') %></a></li>
+    <% end %>
   </ul>
   <div class="tab-content">
     <div class="tab-pane active" id="primary">
       <%= text_f(f, :title) %>
       <%= file_field_f f, :scap_file, :help_block  => _("Upload SCAP DataStream file") %>
+      <p class="alert alert-info"><%= (_('Notice: You need to %s OpenSCAP on your hosts, and upload this content to the hosts as well.') % link_to(_('install'), 'http://www.open-scap.org/page/Documentation#Installation', :target => '_blank')).html_safe %></p>
     </div>
+    <%= render 'taxonomies/loc_org_tabs', :f => f, :obj => @scaptimony_scap_content %>
     <%= submit_or_cancel f %>
   </div>
 <% end %>

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

@@ -5,21 +5,23 @@
     <th>Created</th>
     <th></th>
   </tr>
-  <% for c in @contents %>
+  <% for content in @contents %>
     <tr>
       <td>
-          <%= c.title %>
+          <%= content.title %>
       </td>
       <td>
-          <%= c.original_filename %>
+          <%= content.original_filename %>
       </td>
       <td>
-          <%= _("%s ago") % time_ago_in_words(c.created_at.getlocal) %>
+          <%= _("%s ago") % time_ago_in_words(content.created_at.getlocal) %>
       </td>
       <td>
         <%= action_buttons(
-          link_to_if_authorized(_("Edit"), hash_for_edit_scaptimony_scap_content_path(:id => c.id)),
-          link_to_if_authorized(_("Download"), hash_for_scaptimony_scap_content_path(:id => c.id))
+          link_to_if_authorized(_("Edit"), hash_for_edit_scaptimony_scap_content_path(:id => content.id)),
+          link_to_if_authorized(_("Download"), hash_for_scaptimony_scap_content_path(:id => content.id)),
+          display_delete_if_authorized(hash_for_scaptimony_scap_content_path(:id => content.id),
+                                       :confirm => _("Delete compliance policy %s with all the reports?") % content.title)
           ) %>
       </td>
     </tr>

data/config/routes.rb

@@ -1,24 +1,42 @@
 Rails.application.routes.draw do
 
-  scope '/scaptimony' do
+  scope '/compliance' do
     resources :arf_reports, :only => [:index, :show, :destroy],
-              :as => :scaptimony_arf_reports, :controller => :scaptimony_arf_reports
+              :as => :scaptimony_arf_reports, :controller => :scaptimony_arf_reports do
+      member do
+        match 'parse', :to => 'scaptimony_arf_reports#parse'
+      end
+      collection do
+        get 'auto_complete_search'
+      end
+    end
     match 'dashboard', :to => 'scaptimony_dashboard#index', :as => "scaptimony_dashboard"
     resources :policies, :only => [:index, :new, :show, :create, :edit, :update, :destroy],
               :as => :scaptimony_policies, :controller => :scaptimony_policies do
+      member do
+        match 'parse', :to => 'scaptimony_policies#parse'
+        match 'dashboard', :to => 'scaptimony_policy_dashboard#index', :as => 'scaptimony_policy_dashboard'
+      end
       collection do
+        get 'auto_complete_search'
         post 'scap_content_selected'
+        get 'select_multiple_hosts'
+        post 'update_multiple_hosts'
+      end
+    end
+    resources :scap_contents,
+              :as => :scaptimony_scap_contents, :controller => :scaptimony_scap_contents do
+      collection do
+        get 'auto_complete_search'
       end
     end
-    resources :scap_contents, :only => [:index, :show, :new, :create, :edit, :update],
-      :as => :scaptimony_scap_contents, :controller => :scaptimony_scap_contents
   end
 
   namespace :api do
     scope "(:apiv)", :module => :v2, :defaults => {:apiv => 'v2'},
           :apiv => /v1|v2/, :constraints => ApiConstraints.new(:version => 2) do
-      namespace :openscap do
-        post 'arf_reports/:cname/:policy/:date', \
+      namespace :compliance do
+        post 'arf_reports/:cname/:policy_id/:date', \
               :constraints => { :cname => /[^\/]+/ }, :to => 'arf_reports#create'
       end
     end

data/db/seeds.d/openscap_feature.rb

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

data/lib/foreman_openscap/engine.rb

@@ -17,13 +17,17 @@ module ForemanOpenscap
 
     initializer 'foreman_openscap.assets.precompile' do |app|
       app.config.assets.precompile += %w(
-        'foreman_openscap/policy_edit.js'
+        'foreman_openscap/policy_edit.js',
+        'foreman_openscap/period_selector.js',
+        'foreman_openscap/policy.css'
       )
     end
 
     initializer 'foreman_openscap.configure_assets', :group => :assets do
       SETTINGS[:foreman_openscap] =
-        { :assets => { :precompile => ['foreman_openscap/policy_edit.js']}}
+          {:assets => {:precompile => ['foreman_openscap/policy_edit.js',
+                                       'foreman_openscap/period_selector.js',
+                                       'foreman_openscap/policy.css']}}
     end
 
     initializer 'foreman_openscap.register_plugin', :after=> :finisher_hook do |app|
@@ -37,7 +41,8 @@ module ForemanOpenscap
                                          :scaptimony_scap_contents => [:index, :show],
                                         }
           permission :edit_compliance, {:scaptimony_arf_reports => [:destroy],
-                                        :scaptimony_policies => [:new, :create, :edit, :update, :destroy],
+                                        :scaptimony_policies => [:new, :create, :edit, :update, :destroy,
+                                          :select_multiple_hosts, :upldate_multiple_hosts],
                                         :scaptimony_scap_contents => [:new, :create, :edit, :update]
                                        }
         end
@@ -56,20 +61,21 @@ module ForemanOpenscap
         menu :top_menu, :compliance_reports, :caption => N_('Reports'),
              :url_hash => {:controller => :'scaptimony_arf_reports', :action => :index },
              :parent   => :hosts_menu
+
+        # add dashboard widget
+        widget 'foreman_openscap_host_reports_widget', :name => N_('OpenSCAP Host reports widget'), :sizex => 4, :sizey =>1
+        widget 'foreman_openscap_reports_breakdown_widget', :name => N_('OpenSCAP Host reports widget'), :sizex => 4, :sizey =>1
       end
     end
 
     #Include concerns in this config.to_prepare block
     config.to_prepare do
-      begin
-        Host::Managed.send(:include, ForemanOpenscap::HostExtensions)
-        HostsHelper.send(:include, ForemanOpenscap::HostsHelperExtensions)
-        ::Scaptimony::ArfReport.send(:include, ForemanOpenscap::ArfReportExtensions)
-        ::Scaptimony::Policy.send(:include, ForemanOpenscap::PolicyExtensions)
-        ::Scaptimony::ScapContent.send(:include, ForemanOpenscap::ScapContentExtensions)
-      rescue => e
-        puts "ForemanOpenscap: skipping engine hook (#{e.to_s})"
-      end
+      Host::Managed.send(:include, ForemanOpenscap::HostExtensions)
+      HostsHelper.send(:include, ForemanOpenscap::HostsHelperExtensions)
+      ::Scaptimony::ArfReport.send(:include, ForemanOpenscap::ArfReportExtensions)
+      ::Scaptimony::Asset.send(:include, ForemanOpenscap::AssetExtensions)
+      ::Scaptimony::Policy.send(:include, ForemanOpenscap::PolicyExtensions)
+      ::Scaptimony::ScapContent.send(:include, ForemanOpenscap::ScapContentExtensions)
     end
 
     rake_tasks do

data/lib/foreman_openscap/helper.rb

@@ -10,12 +10,6 @@
 
 module ForemanOpenscap::Helper
   def self.get_asset(cname)
-    host = Host.find_by_name!(cname)
-    if host.auditable_host.nil?
-      # TODO:RAILS-4.0: This should become: asset = Asset.find_or_create_by!(name: cname)
-      asset = Scaptimony::Asset.first_or_create!(:name => cname)
-      host.auditable_host = Scaptimony::AuditableHost.where(:asset_id => asset.id, :host_id => host.id).first_or_create
-    end
-    return host.auditable_host.asset
+    Host.find_by_name!(cname).get_asset
   end
 end

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Šimon Lukašík
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -45,48 +45,75 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/overrides/dashboard/index/sample_override.html.erb.deface
-- app/helpers/arf_reports_helper.rb
-- app/helpers/concerns/foreman_openscap/hosts_helper_extensions.rb
-- app/helpers/scaptimony_policies_helper.rb
-- app/assets/javascript/policy_edit.js
-- app/models/scaptimony/asset.rb
-- app/models/concerns/foreman_openscap/scap_content_extensions.rb
-- app/models/concerns/foreman_openscap/host_extensions.rb
-- app/models/concerns/foreman_openscap/policy_extensions.rb
-- app/models/concerns/foreman_openscap/arf_report_extensions.rb
-- app/controllers/scaptimony_policies_controller.rb
-- app/controllers/scaptimony_dashboard_controller.rb
-- app/controllers/api/v2/openscap/arf_reports_controller.rb
-- app/controllers/scaptimony_scap_contents_controller.rb
-- app/controllers/scaptimony_arf_reports_controller.rb
-- app/views/scaptimony_scap_contents/index.html.erb
+- app/views/scaptimony_arf_reports/show.html.erb
+- app/views/scaptimony_arf_reports/_host_report.html.erb
+- app/views/scaptimony_arf_reports/index.html.erb
+- app/views/scaptimony_arf_reports/_list.html.erb
+- app/views/dashboard/_foreman_openscap_host_reports_widget.html.erb
+- app/views/dashboard/_foreman_openscap_reports_breakdown_widget.html.erb
 - app/views/scaptimony_scap_contents/_form.html.erb
-- app/views/scaptimony_scap_contents/_list.html.erb
 - app/views/scaptimony_scap_contents/new.html.erb
+- app/views/scaptimony_scap_contents/index.html.erb
+- app/views/scaptimony_scap_contents/_list.html.erb
 - app/views/scaptimony_scap_contents/edit.html.erb
-- app/views/scaptimony_arf_reports/index.html.erb
-- app/views/scaptimony_arf_reports/_list.html.erb
-- app/views/scaptimony_policies/_scap_content_results.html.erb
-- app/views/scaptimony_policies/index.html.erb
+- app/views/scaptimony_policy_dashboard/_policy_reports.html.erb
+- app/views/scaptimony_policy_dashboard/index.html.erb
+- app/views/scaptimony_policy_dashboard/_policy_status_widget.html.erb
+- app/views/scaptimony_policy_dashboard/_policy_chart_widget.html.erb
+- app/views/scaptimony_policies/welcome.html.erb
 - app/views/scaptimony_policies/_form.html.erb
-- app/views/scaptimony_policies/_list.html.erb
+- app/views/scaptimony_policies/select_multiple_hosts.html.erb
+- app/views/scaptimony_policies/show.html.erb
 - app/views/scaptimony_policies/new.html.erb
+- app/views/scaptimony_policies/steps/_organizations_form.html.erb
+- app/views/scaptimony_policies/steps/_hostgroups_form.html.erb
+- app/views/scaptimony_policies/steps/_locations_form.html.erb
+- app/views/scaptimony_policies/steps/_scap_content_form.html.erb
+- app/views/scaptimony_policies/steps/_schedule_form.html.erb
+- app/views/scaptimony_policies/steps/_create_policy_form.html.erb
+- app/views/scaptimony_policies/steps/_step_form.html.erb
+- app/views/scaptimony_policies/create.html.erb
+- app/views/scaptimony_policies/index.html.erb
+- app/views/scaptimony_policies/_list.html.erb
+- app/views/scaptimony_policies/_scap_content_results.html.erb
 - app/views/scaptimony_policies/edit.html.erb
-- app/views/scaptimony_policies/welcome.html.erb
+- app/overrides/hosts/index/host_arf_report.rb
+- app/helpers/scaptimony_policies_helper.rb
+- app/helpers/scaptimony_report_dashboard_helper.rb
+- app/helpers/scaptimony_policy_dashboard_helper.rb
+- app/helpers/concerns/foreman_openscap/hosts_helper_extensions.rb
+- app/helpers/arf_reports_helper.rb
+- app/controllers/scaptimony_policy_dashboard_controller.rb
+- app/controllers/scaptimony_policies_controller.rb
+- app/controllers/scaptimony_scap_contents_controller.rb
+- app/controllers/api/v2/compliance/arf_reports_controller.rb
+- app/controllers/scaptimony_dashboard_controller.rb
+- app/controllers/scaptimony_arf_reports_controller.rb
+- app/assets/javascript/foreman_openscap/period_selector.js
+- app/assets/javascript/foreman_openscap/policy_edit.js
+- app/assets/stylesheets/foreman_openscap/policy.css.scss
+- app/services/scaptimony/policy_dashboard/data.rb
+- app/services/scaptimony/policy_dashboard/manager.rb
+- app/services/scaptimony/policy_dashboard/loader.rb
+- app/services/scaptimony/report_dashboard/data.rb
+- app/models/concerns/foreman_openscap/arf_report_extensions.rb
+- app/models/concerns/foreman_openscap/host_extensions.rb
+- app/models/concerns/foreman_openscap/policy_extensions.rb
+- app/models/concerns/foreman_openscap/scap_content_extensions.rb
+- app/models/concerns/foreman_openscap/asset_extensions.rb
 - config/routes.rb
-- db/migrate/20141017172055_create_scaptimony_auditable_hosts.rb
+- db/seeds.d/openscap_feature.rb
+- lib/tasks/foreman_openscap_tasks.rake
 - lib/foreman_openscap/engine.rb
 - lib/foreman_openscap/helper.rb
 - lib/foreman_openscap/version.rb
 - lib/foreman_openscap.rb
-- lib/tasks/foreman_openscap_tasks.rake
 - LICENSE
 - Rakefile
 - README.md
 - test/unit/foreman_openscap_test.rb
-- test/factories/foreman_openscap_factories.rb
 - test/test_plugin_helper.rb
+- test/factories/foreman_openscap_factories.rb
 homepage: https://github.com/OpenSCAP/foreman_openscap
 licenses:
 - GPL-3.0
@@ -107,12 +134,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Foreman plug-in for displaying OpenSCAP audit reports
 test_files:
 - test/unit/foreman_openscap_test.rb
-- test/factories/foreman_openscap_factories.rb
 - test/test_plugin_helper.rb
-has_rdoc: 
+- test/factories/foreman_openscap_factories.rb

data/app/assets/javascript/policy_edit.js

@@ -1,14 +0,0 @@
-function scap_content_selected(element){
-  var attrs = attribute_hash(['scap_content_id']);
-  var url = $(element).attr('data-url');
-  $(element).indicator_show();
-  $.ajax({
-    data: attrs,
-    type: 'post',
-    url: url,
-    complete: function() { $(element).indicator_hide();},
-    success: function(request) {
-      $('#scap_content_profile_select').html(request);
-    }
-  })
-}

data/app/overrides/dashboard/index/sample_override.html.erb.deface

@@ -1,4 +0,0 @@
-<!-- insert_before 'div:contains("title_action")' -->
-<%= title_actions "<h2>ForemanOpenSCAP</h2>" %>
-
-<!-- vim: set ft=eruby : -->

data/db/migrate/20141017172055_create_scaptimony_auditable_hosts.rb

@@ -1,9 +0,0 @@
-class CreateScaptimonyAuditableHosts < ActiveRecord::Migration
-  def change
-    create_table :scaptimony_auditable_hosts, :id => false do |t|
-      t.references :asset, :null => false
-      t.references :host, :null => false
-    end
-    add_index :scaptimony_auditable_hosts, [:asset_id, :host_id], :unique => true
-  end
-end