foreman_openscap 0.4.3 → 0.5.0

data/app/views/{scaptimony_policies → policies}/_form.html.erb

@@ -1,7 +1,7 @@
 <%= javascript 'foreman_openscap/policy_edit' %>
 <%= javascript 'foreman_openscap/period_selector' %>
 <%= form_for @policy,
-    :url => (@policy.id? ? scaptimony_policy_path(:id => @policy.id) : scaptimony_policies_path) do |f| %>
+    :url => (@policy.id? ? policy_path(:id => @policy.id) : policies_path) do |f| %>
   <%= base_errors_for @policy %>
 
   <ul class="nav nav-tabs" data-tabs="tabs">
@@ -26,18 +26,12 @@
       <span id="scap_content_profile_select">
         <%= scap_content_profile_selector(f) %>
       </span>
-      <div class="alert alert-info">
-        <%= icon_text("info-sign", _('Notice: Ensure the selected SCAP content exists on your hosts.')) %>
-        <div id="file-location">
-          <b><%= _('SCAP content file should be /var/lib/openscap/content/%s.xml on your clients.') % @policy.scap_content.digest %></b>
-        </div>
-      </div>
     </div>
     <div class="tab-pane" id="scap_schedule">
       <%= select_f(f, :period, %w[Weekly Monthly Custom], :downcase, :to_s,
                    { :include_blank => _('Choose period') },
                    { :onchange => 'period_selected(this)' }) %>
-      <%= select_f(f, :weekday, Date::DAYNAMES, :downcase, :to_s, :include_blank => _('Choose weekday')) %>
+      <%= select_f(f, :weekday, days_of_week_hash, :first, :last, :include_blank => _('Choose weekday')) %>
       <%= text_f(f, :day_of_month, :help_inline => _('Number of a day in month, note that not all months have same count of days')) %>
       <%= text_f(f, :cron_line, :help_inline => _('You can specify custom cron line, e.g. "0  3  *  *  *", separate each of 5 values by space')) %>
     </div>

data/app/views/{scaptimony_policies → policies}/_list.html.erb

@@ -8,12 +8,12 @@
   <% for policy in @policies %>
     <tr>
       <td>
-        <%= link_to_if_authorized(policy.name.to_s, hash_for_scaptimony_policy_dashboard_scaptimony_policy_path(:id => policy.id)) %>
+        <%= link_to_if_authorized(policy.name.to_s, hash_for_policy_dashboard_policy_path(:id => policy.id)) %>
       </td>
       <td>
         <% if !policy.scap_content.nil? %>
           <%= link_to_if_authorized policy.scap_content.title,
-                                         hash_for_edit_scaptimony_scap_content_path(:id => policy.scap_content) %>
+                                         hash_for_edit_scap_content_path(:id => policy.scap_content) %>
         <% end %>
       </td>
       <td>
@@ -21,9 +21,9 @@
       </td>
       <td>
         <%= action_buttons(
-                display_link_if_authorized(_("Show Guide"), hash_for_scaptimony_policy_path(:id => policy.id)),
-                display_link_if_authorized(_("Edit"), hash_for_edit_scaptimony_policy_path(:id => policy.id)),
-                display_delete_if_authorized(hash_for_scaptimony_policy_path(:id => policy.id),
+                display_link_if_authorized(_("Show Guide"), hash_for_policy_path(:id => policy.id)),
+                display_link_if_authorized(_("Edit"), hash_for_edit_policy_path(:id => policy.id)),
+                display_delete_if_authorized(hash_for_policy_path(:id => policy.id),
                                              :confirm => _("Delete compliance policy %s with all the reports?") % policy.name)
             ) %>
       </td>

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

@@ -0,0 +1,3 @@
+<%= fields_for @policy do |f| %>
+  <%= scap_content_profile_selector(f) %>
+<% end %>

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

@@ -0,0 +1,2 @@
+<% title _("New Compliance Policy") %>
+<%= render :partial => "policies/steps/step_form" %>

data/app/views/{scaptimony_policies → policies}/disassociate_multiple_hosts.html.erb

@@ -1,7 +1,7 @@
 <%= render 'hosts/selected_hosts', :hosts => @hosts %>
 <%= form_for :policy,
-             :url => remove_policy_from_multiple_hosts_scaptimony_policies_path(:host_ids => params[:host_ids]) do |f| %>
+             :url => remove_policy_from_multiple_hosts_policies_path(:host_ids => params[:host_ids]) do |f| %>
     <%= selectable_f f, :id, [[_('Select Compliance Policy'), 'disabled'],
-                             ] + Scaptimony::Policy.all.map{|e| [e.name, e.id]},{},
+                             ] + ForemanOpenscap::Policy.all.map{|e| [e.name, e.id]},{},
                         :onchange => 'toggle_multiple_ok_button(this)' %>
 <% end %>

data/app/views/{scaptimony_policies → policies}/index.html.erb

@@ -2,7 +2,7 @@
 <% title _("Compliance Policies") %>
 
 <% title_actions(
-  display_link_if_authorized(_("New Compliance Policy"), hash_for_new_scaptimony_policy_path),
+  display_link_if_authorized(_("New Compliance Policy"), hash_for_new_policy_path),
   link_to(_("Help"), :action => "welcome")
   ) %>
 

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

@@ -0,0 +1,2 @@
+<% title _("New Compliance Policy") %>
+<%= render :partial => "policies/steps/step_form" %>

data/app/views/{scaptimony_policies → policies}/select_multiple_hosts.html.erb

@@ -1,8 +1,8 @@
 <%= render 'hosts/selected_hosts', :hosts => @hosts %>
 
 <%= form_for :policy,
-             :url => update_multiple_hosts_scaptimony_policies_path(:host_ids => params[:host_ids]) do |f| %>
+             :url => update_multiple_hosts_policies_path(:host_ids => params[:host_ids]) do |f| %>
     <%= selectable_f f, :id, [[_("Select Compliance Policy"), "disabled"],
-                             ] + Scaptimony::Policy.all.map{|e| [e.name, e.id]},{},
+                             ] + ForemanOpenscap::Policy.all.map{|e| [e.name, e.id]},{},
                         :onchange => "toggle_multiple_ok_button(this)" %>
 <% end %>

data/app/views/{scaptimony_policies → policies}/show.html.erb

@@ -1,3 +1,3 @@
 <div class="row">
-  <iframe style="min-height: 800px" height="100%" width="100%" frameborder="0" src="<%= parse_scaptimony_policy_path(@policy) %>"></iframe>
+  <iframe style="min-height: 800px" height="100%" width="100%" frameborder="0" src="<%= parse_policy_path(@policy) %>"></iframe>
 </div>

data/app/views/policies/steps/_scap_content_form.html.erb

@@ -0,0 +1,9 @@
+<div class="tab-pane <%= show_partial_wizard(step) %>" id="scap_content">
+  <%= wizard_header @policy.step_index, *@policy.steps %>
+
+  <%= scap_content_selector(f) %>
+  <span id="scap_content_profile_select">
+    <%= scap_content_profile_selector(f) %>
+  </span>
+</div>
+

data/app/views/{scaptimony_policies → policies}/steps/_schedule_form.html.erb

@@ -5,7 +5,7 @@
   <%= select_f(f, :period, %w[Weekly Monthly Custom], :downcase, :to_s,
                { :include_blank => _('Choose period') },
                { :onchange => 'period_selected(this)' }) %>
-  <%= select_f(f, :weekday, Date::DAYNAMES, :downcase, :to_s, :include_blank => _('Choose weekday')) %>
+  <%= select_f(f, :weekday, days_of_week_hash, :first, :last, :include_blank => _('Choose weekday')) %>
   <%= text_f(f, :day_of_month, :help_inline => _('Number of a day in month, note that not all months have same count of days')) %>
   <%= text_f(f, :cron_line, :help_inline => _('You can specify custom cron line, e.g. "0  3  *  *  *", separate each of 5 values by space')) %>
 </div>

data/app/views/{scaptimony_policies → policies}/steps/_step_form.html.erb

@@ -1,11 +1,11 @@
 <%= javascript 'foreman_openscap/policy_edit' %>
 <%= stylesheet 'foreman_openscap/policy' %>
 <%= form_for @policy,
-             :url => (@policy.id? ? scaptimony_policy_path(:id => @policy.id) : scaptimony_policies_path) do |f| %>
+             :url => (@policy.id? ? policy_path(:id => @policy.id) : policies_path) do |f| %>
   <%= base_errors_for @policy %>
   <%= f.hidden_field(:current_step, :value => @policy.next_step) unless @policy.current_step.blank? %>
   <% @policy.steps.each do | step | %>
-    <%= render :partial => "scaptimony_policies/steps/#{step.downcase.tr(' ', '_')}_form", :locals => {:f => f, :step => step} %>
+    <%= render :partial => "policies/steps/#{step.downcase.tr(' ', '_')}_form", :locals => {:f => f, :step => step} %>
   <% end %>
   <%= submit_or_cancel_policy(f, (_('Next') unless @policy.last_step?) ) %>
-<% end %>
+<% end %>

data/app/views/{scaptimony_policies → policies}/welcome.html.erb

@@ -1,4 +1,4 @@
-<% title_actions display_link_if_authorized(_("New Compliance policy"), hash_for_new_scaptimony_policy_path) %>
+<% title_actions display_link_if_authorized(_("New Compliance policy"), hash_for_new_policy_path) %>
 
 <% title _("Compliance policy configuration") %>
 <div id="welcome">
@@ -9,6 +9,6 @@
   </p>
   <p>
     <%= (_('In Foreman, a compliance policy checklist is defined via %s, once SCAP content is present, you can create a policy,
-            assign select hostgroups and schedule to run.') % link_to(_('SCAP content'), scaptimony_scap_contents_path)).html_safe %>
+            assign select hostgroups and schedule to run.') % link_to(_('SCAP content'), scap_contents_path)).html_safe %>
   </p>
 </div>

data/app/views/{scaptimony_policy_dashboard → policy_dashboard}/_policy_reports.html.erb

@@ -10,13 +10,13 @@
   <% for arf_report in @policy.arf_reports.latest %>
     <tr>
       <td><%= name_column(arf_report.host) %></td>
-      <td><%= _("%s ago") % time_ago_in_words(arf_report.date) %></td>
+      <td><%= _("%s ago") % time_ago_in_words(arf_report.reported_at) %></td>
       <td><%= report_arf_column(arf_report.passed, "label-info") %></th>
       <td><%= report_arf_column(arf_report.failed, "label-danger") %></th>
       <td><%= report_arf_column(arf_report.othered, "label-warning") %></th>
       <td>
         <%= action_buttons(
-                link_to(_("View Report"), hash_for_scaptimony_arf_report_path(:id => arf_report.id))
+                link_to(_("View Report"), hash_for_arf_report_path(:id => arf_report.id))
             ) %>
       </td>
     </tr>

data/app/views/{scaptimony_policy_dashboard → policy_dashboard}/_policy_status_widget.html.erb

@@ -1,9 +1,9 @@
 <div id='status-table'>
   <h4 class="header"><%= _('Hosts Breakdown') %></h4>
   <ul>
-    <%= status_link _('Compliant with the policy'), :compliant_hosts, scaptimony_arf_reports_path(:search => "comply_with = #{@policy.name}") %>
-    <%= status_link _('Not compliant with the policy'), :incompliant_hosts, scaptimony_arf_reports_path(:search => "not_comply_with = #{@policy.name}") %>
-    <%= status_link _('Inconclusive results'), :inconclusive_hosts, scaptimony_arf_reports_path(:search => " inconclusive_with = #{@policy.name}") %>
+    <%= status_link _('Compliant with the policy'), :compliant_hosts, arf_reports_path(:search => "comply_with = #{@policy.name}") %>
+    <%= status_link _('Not compliant with the policy'), :incompliant_hosts, arf_reports_path(:search => "not_comply_with = #{@policy.name}") %>
+    <%= status_link _('Inconclusive results'), :inconclusive_hosts, arf_reports_path(:search => " inconclusive_with = #{@policy.name}") %>
     <%= status_link _('Never audited'), :report_missing, hosts_path(:search => "compliance_report_missing_for = #{@policy.name}") %>
     <h4 class="total">
       <%= link_to(_("Total hosts: %s") % @report[:assigned_hosts], hosts_path(:search => "compliance_policy = #{@policy.name}")) %>

data/app/views/{scaptimony_scap_contents → scap_contents}/_form.html.erb

@@ -1,9 +1,9 @@
-<%= form_for @scaptimony_scap_content,
-    :url => (@scaptimony_scap_content.id? ?
-        scaptimony_scap_content_path(:id => @scaptimony_scap_content.id) : scaptimony_scap_contents_path),
+<%= form_for @scap_content,
+    :url => (@scap_content.id? ?
+        scap_content_path(:id => @scap_content.id) : scap_contents_path),
     :html => { :multipart => true } do |f| %>
 
-  <%= base_errors_for @scaptimony_scap_content %>
+  <%= base_errors_for @scap_content %>
 
   <ul class="nav nav-tabs" data-tabs="tabs">
     <li class="active"><a href="#primary" data-toggle="tab"><%= _("File Upload") %></a></li>
@@ -18,9 +18,8 @@
     <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 %>
+    <%= render 'taxonomies/loc_org_tabs', :f => f, :obj => @scap_content %>
     <%= submit_or_cancel f %>
   </div>
 <% end %>

data/app/views/{scaptimony_scap_contents → scap_contents}/_list.html.erb

@@ -18,9 +18,9 @@
       </td>
       <td>
         <%= action_buttons(
-                display_link_if_authorized(_("Edit"), hash_for_edit_scaptimony_scap_content_path(:id => content.id)),
-                display_link_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),
+                display_link_if_authorized(_("Edit"), hash_for_edit_scap_content_path(:id => content.id)),
+                display_link_if_authorized(_("Download"), hash_for_scap_content_path(:id => content.id)),
+                display_delete_if_authorized(hash_for_scap_content_path(:id => content.id),
                                              :confirm => _("Delete compliance policy %s with all the reports?") % content.title)
             ) %>
       </td>

data/app/views/{scaptimony_scap_contents → scap_contents}/index.html.erb

@@ -1,6 +1,6 @@
 <% title _("SCAP Contents") %>
 
-<% title_actions(display_link_if_authorized(_("Upload New SCAP Content"), hash_for_new_scaptimony_scap_content_path),
+<% title_actions(display_link_if_authorized(_("Upload New SCAP Content"), hash_for_new_scap_content_path),
                  link_to(_("Help"), :action => "welcome")) %>
 
 <%= render :partial => 'list' %>

data/app/views/{scaptimony_scap_contents → scap_contents}/welcome.html.erb

@@ -1,4 +1,4 @@
-<% title_actions display_link_if_authorized(_("New SCAP content"), hash_for_new_scaptimony_scap_content_path) %>
+<% title_actions display_link_if_authorized(_("New SCAP content"), hash_for_new_scap_content_path) %>
 
 <% title _("SCAP content configuration") %>
 <div id="welcome">
@@ -10,6 +10,6 @@
   </p>
   <p>
     <%= (_("In Foreman, scap_contents represent the SCAP security guides on your hosts, and create SCAP profiles for you to assign to hosts / hostgroups
-          via %s") % link_to('compliance policies', scaptimony_policies_path)).html_safe %>
+          via %s") % link_to('compliance policies', policies_path)).html_safe %>
   </p>
 </div>

data/config/routes.rb

@@ -1,21 +1,24 @@
 Rails.application.routes.draw do
 
   scope '/compliance' do
-    resources :arf_reports, :only => [:index, :show, :destroy],
-              :as => :scaptimony_arf_reports, :controller => :scaptimony_arf_reports do
+
+    resources :arf_reports, :only => [:index, :show, :destroy] do
       member do
-        match 'parse', :to => 'scaptimony_arf_reports#parse'
+        get 'show_html'
+        get 'parse_html'
+        get 'parse_bzip'
       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
+
+    match 'dashboard', :to => 'compliance_dashboard#index', :as => "compliance_dashboard"
+
+    resources :policies, :only => [:index, :new, :show, :create, :edit, :update, :destroy] do
       member do
-        match 'parse', :to => 'scaptimony_policies#parse'
-        match 'dashboard', :to => 'scaptimony_policy_dashboard#index', :as => 'scaptimony_policy_dashboard'
+        # match 'parse', :to => 'policies#parse'
+        match 'dashboard', :to => 'policy_dashboard#index', :as => 'policy_dashboard'
       end
       collection do
         get 'auto_complete_search'
@@ -26,13 +29,14 @@ Rails.application.routes.draw do
         post 'remove_policy_from_multiple_hosts'
       end
     end
-    resources :scap_contents,
-              :as => :scaptimony_scap_contents, :controller => :scaptimony_scap_contents do
+
+    resources :scap_contents do
       collection do
         get 'auto_complete_search'
       end
     end
-    resources :hosts, :only => [:show], :as => :scaptimony_hosts, :controller => :scaptimony_hosts
+
+    resources :hosts, :only => [:show], :as => :compliance_hosts, :controller => :compliance_hosts
   end
 
   namespace :api do

data/db/migrate/20141013172051_create_scaptimony_policies.rb

@@ -0,0 +1,9 @@
+class CreateScaptimonyPolicies < ActiveRecord::Migration
+  def change
+    create_table :scaptimony_policies do |t|
+      t.string :name, limit: 80
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20141014105333_create_scaptimony_assets.rb

@@ -0,0 +1,10 @@
+class CreateScaptimonyAssets < ActiveRecord::Migration
+  def change
+    create_table :scaptimony_assets do |t|
+      t.string :name, limit: 255
+
+      t.timestamps
+    end
+    add_index :scaptimony_assets, :name, unique: true
+  end
+end

data/db/migrate/20141015092642_create_scaptimony_arf_reports.rb

@@ -0,0 +1,13 @@
+class CreateScaptimonyArfReports < ActiveRecord::Migration
+  def change
+    create_table :scaptimony_arf_reports do |t|
+      t.references :asset, index: true
+      t.references :policy, index: true
+      t.datetime :date
+      t.string :digest, limit: 128
+
+      t.timestamps
+    end
+    add_index :scaptimony_arf_reports, :digest, unique: true
+  end
+end

data/db/migrate/20141015115511_add_arf_report_unique_constraint.rb

@@ -0,0 +1,6 @@
+class AddArfReportUniqueConstraint < ActiveRecord::Migration
+  def change
+    add_index :scaptimony_arf_reports, [:asset_id, :policy_id, :date, :digest],
+              :unique => true, :name => :index_scaptimony_arf_reports_unique_set
+  end
+end

data/db/migrate/20141104164201_create_scaptimony_scap_contents.rb

@@ -0,0 +1,7 @@
+class CreateScaptimonyScapContents < ActiveRecord::Migration
+  def change
+    create_table :scaptimony_scap_contents do |t|
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20141104171545_create_scaptimony_policy_revisions.rb

@@ -0,0 +1,14 @@
+class CreateScaptimonyPolicyRevisions < ActiveRecord::Migration
+  def change
+    create_table :scaptimony_policy_revisions do |t|
+      t.references :policy, index: true
+      t.references :scap_content, index: true
+      t.string :xccdf_profile
+      t.string :period
+      t.string :weekday
+      t.timestamp :active_until
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20141105174625_add_description_to_scaptimony_policy_revisions.rb

@@ -0,0 +1,5 @@
+class AddDescriptionToScaptimonyPolicyRevisions < ActiveRecord::Migration
+  def change
+    add_column :scaptimony_policy_revisions, :description, :string
+  end
+end

data/db/migrate/20141105174834_add_columns_to_scaptimony_policies.rb

@@ -0,0 +1,12 @@
+class AddColumnsToScaptimonyPolicies < ActiveRecord::Migration
+  def change
+    add_column :scaptimony_policies, :xccdf_profile, :string
+    add_column :scaptimony_policies, :period, :string
+    add_column :scaptimony_policies, :weekday, :string
+    add_column :scaptimony_policies, :description, :string
+
+    # This works only with rails-4, I want to support rails-3 too
+    # add_reference :scaptimony_policies, :scap_content, index: true
+    add_column :scaptimony_policies, :scap_content_id, :integer, references: :scap_content
+  end
+end

data/db/migrate/20141107091756_add_columns_to_scaptimony_scap_contents.rb

@@ -0,0 +1,8 @@
+class AddColumnsToScaptimonyScapContents < ActiveRecord::Migration
+  def change
+    add_column :scaptimony_scap_contents, :title, :string
+    add_column :scaptimony_scap_contents, :original_filename, :string
+    add_index :scaptimony_scap_contents, :title
+    add_index :scaptimony_scap_contents, :original_filename
+  end
+end

data/db/migrate/20141111104519_add_constraint_to_scaptimony_scap_contents.rb

@@ -0,0 +1,5 @@
+class AddConstraintToScaptimonyScapContents < ActiveRecord::Migration
+  def change
+    change_column :scaptimony_scap_contents, :title, :string, :null => false
+  end
+end

data/db/migrate/20141113221054_create_scaptimony_scap_content_profiles.rb

@@ -0,0 +1,12 @@
+class CreateScaptimonyScapContentProfiles < ActiveRecord::Migration
+  def change
+    create_table :scaptimony_scap_content_profiles do |t|
+      t.references :scap_content, index: true
+      t.string :profile_id
+      t.string :title
+
+    end
+    add_index :scaptimony_scap_content_profiles, [:scap_content_id, :profile_id],
+      :unique => true, :name => :index_scaptimony_scap_content_profiles_scipi
+  end
+end