foreman_openscap 0.5.0 → 0.5.1

data/app/models/foreman_openscap/scap_content.rb

@@ -19,7 +19,7 @@ module ForemanOpenscap
         api = ProxyAPI::Openscap.new(:url => scap_content.proxy_url)
         errors = api.validate_scap_content(scap_content.scap_file)
         if errors && errors['errors'].any?
-          errors['errors'].each {|error| scap_content.errors.add(:scap_file, _(error))}
+          errors['errors'].each { |error| scap_content.errors.add(:scap_file, _(error)) }
           return false
         end
       rescue *ProxyAPI::AvailableProxy::HTTP_ERRORS => e
@@ -57,22 +57,22 @@ module ForemanOpenscap
     scoped_search :on => :title,             :complete_value => true
     scoped_search :on => :original_filename, :complete_value => true, :rename => :filename
 
-    default_scope {
+    default_scope do
       with_taxonomy_scope do
         order("foreman_openscap_scap_contents.title")
       end
-    }
+    end
 
     def used_location_ids
       Location.joins(:taxable_taxonomies).where(
-          'taxable_taxonomies.taxable_type' => 'ForemanOpenscap::ScapContent',
-          'taxable_taxonomies.taxable_id' => id).pluck("#{Location.arel_table.name}.id")
+        'taxable_taxonomies.taxable_type' => 'ForemanOpenscap::ScapContent',
+        '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' => 'ForemanOpenscap::ScapContent',
-          'taxable_taxonomies.taxable_id' => id).pluck("#{Location.arel_table.name}.id")
+        'taxable_taxonomies.taxable_type' => 'ForemanOpenscap::ScapContent',
+        'taxable_taxonomies.taxable_id' => id).pluck("#{Location.arel_table.name}.id")
     end
 
     def to_label
@@ -100,9 +100,9 @@ module ForemanOpenscap
 
     def create_profiles
       profiles = fetch_profiles
-      profiles.each {|key, title|
+      profiles.each do|key, title|
         scap_content_profiles.find_or_create_by_profile_id_and_title(key, title)
-      }
+      end
     end
 
     def redigest

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

@@ -0,0 +1,4 @@
+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

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

data/app/services/foreman_openscap/host_report_dashboard/data.rb

@@ -20,11 +20,11 @@ module ForemanOpenscap::HostReportDashboard
 
     def fetch_data
       report.update(
-          {
-            :passed  => report_passed,
-            :failed  => report_failed,
-            :othered => report_othered
-          }
+        {
+          :passed  => report_passed,
+          :failed  => report_failed,
+          :othered => report_othered
+        }
       )
     end
 

data/app/services/foreman_openscap/report_dashboard/data.rb

@@ -14,11 +14,11 @@ module ForemanOpenscap::ReportDashboard
 
     def fetch_data
       report.update(
-          {
-            :passed  => passed_breakdowns,
-            :failed  => failed_breakdowns,
-            :othered => othered_breakdowns
-          }
+        {
+          :passed  => passed_breakdowns,
+          :failed  => failed_breakdowns,
+          :othered => othered_breakdowns
+        }
       )
     end
 

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

@@ -0,0 +1,9 @@
+<div>
+  <%= message.value %>
+  <%= link_to_function(content_tag(:span, "", {:rel => "twipsy", :class => 'glyphicon glyphicon-collapse-down', :"data-original-title" => _('More details')} ), "showReportDetails(#{message.id}, $(this))", :class => 'small more-info') %>
+</div>
+<div class="hidden message-details" id="details-<%= message.id %>">
+  <p><b><%= _('Description') %>:</b> <%= sanitize(message.description) %></p>
+  <p><b><%= _('Rationale') %>:</b> <%= sanitize(message.rationale) %></p>
+  <p><b><%= _('References') %>:</b> <%= sanitize(message.scap_references) %></p>
+</div>

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

@@ -1,27 +1,47 @@
+<%= javascript "jquery.cookie", "host_checkbox", "foreman_openscap/arf_reports" %>
+
 <table class="table table-bordered table-striped ellipsis">
   <tr>
+  <th class="ca" width="40px"><%= check_box_tag "check_all", "", false, { :onclick => "toggleCheck()", :'check-title' => _("Select all items in this page"), :'uncheck-title'=> _("items selected. Uncheck to Clear") } %></th>
     <th><%= sort :host %></th>
     <th><%= sort :reported_at, :as => _("Reported At") %></th>
-    <th><%= sort :passed, :as => _("Passed") %></th>
-    <th><%= sort :failed, :as => _("Failed") %></th>
-    <th><%= sort :othered, :as => _("Other") %></th>
+    <th><%= sort :compliance_passed, :as => _("Passed") %></th>
+    <th><%= sort :compliance_failed, :as => _("Failed") %></th>
+    <th><%= sort :compliance_othered, :as => _("Other") %></th>
     <th></th>
   </tr>
   <% for arf_report in @arf_reports %>
     <tr>
+    <td class="ca">
+          <%= check_box_tag "host_ids[]", nil, false, :id => "host_ids_#{arf_report.id}", :disabled => !authorized?, :class => 'host_select_boxes', :onclick => 'hostChecked(this)' %>
+        </td>
       <td><%= name_column(arf_report.host) %></td>
-      <td><%= _("%s ago") % time_ago_in_words(arf_report.reported_at) %></td>
+      <td><%= display_link_if_authorized(_("%s ago") % time_ago_in_words(arf_report.reported_at), hash_for_arf_report_path(:id => arf_report.id)) %></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(
-                display_link_if_authorized(_("View Report"), hash_for_arf_report_path(:id => arf_report.id)),
-                display_delete_if_authorized(hash_for_arf_report_path(:id => arf_report.id),
-                                             :confirm => _("Delete compliance report for %s?") % arf_report.asset.host)
-            ) %>
+        <%= display_delete_if_authorized(hash_for_arf_report_path(:id => arf_report.id),
+                                         :confirm => _("Delete compliance report for %s?") % arf_report.host)
+        %>
       </td>
     </tr>
   <% end %>
 </table>
+<div id="confirmation-modal" class="modal fade">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h4 class="modal-title"><%= _('Please Confirm') %></h4>
+      </div>
+      <div class="modal-body">
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal"><%= _('Cancel') %></button>
+        <button type="button" class="btn btn-primary" onclick="submit_modal_form()"><%= _('Submit') %></button>
+      </div>
+    </div>
+  </div>
+</div>
 <%= will_paginate_with_info @arf_reports %>

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

@@ -1,23 +1,27 @@
 <table id='report_log' class="table table-bordered table-striped">
   <thead>
     <tr>
-      <th><%= _("Level") %></th>
-      <th><%= _("Resource") %></th>
+      <th><%= _("Severity") %></th>
       <th><%= _("Message") %></th>
+      <th><%= _("Resource") %></th>
       <th><%= _("Result") %></th>
     </tr>
   </thead>
   <tbody>
     <% logs.each do |log| %>
       <tr>
-        <td><span <%= report_tag log.level %>><%= h log.level %></span></td>
-        <td><%= h log.source %></td>
-        <td><%= h log.message %></td>
+        <td><span <%= severity_tag log.message.severity %>><%= h log.message.severity %></span></td>
+        <td>
+          <%= render :partial => 'detailed_message', :locals => { :message => log.message } %>
+        </td>
+        <td><%= h trunc_with_tooltip(log.source) %></td>
         <td><span <%= result_tag log.result %>><%= h log.result %></span></td>
       </tr>
     <% end %>
-    <tr id='ntsh' <%= "style='display: none;'".html_safe if logs.size > 0%>><td colspan="3">
-        <%= _("Nothing to show") %>
-      </td></tr>
+    <tr id='ntsh' <%= "style='display: none;'".html_safe if logs.size > 0%>>
+      <td colspan="4">
+        <div class="alert alert-warning" role="alert"><%= _("Nothing to show") %></div>
+      </td>
+    </tr>
   </tbody>
 </table>

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

@@ -0,0 +1,29 @@
+<div class="row">
+  <div class="col-md-8">
+    <table class="table table-bordered table-striped">
+      <thead>
+        <tr>
+          <th>
+            <%= _("Host") %>
+          </th>
+          <th>
+            <%= _("Reported At") %>
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @arf_reports.each do |report| %>
+          <tr>
+            <td><%= report.host %></td>
+            <td><%=h report.created_at %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+</div>
+
+<%= form_tag submit_delete_multiple_arf_reports_path({:arf_report_ids => params[:arf_report_ids]}) do %>
+  <span class="label label-danger"><%= _('Delete') %></span>
+  <%= _('these Complinace reports') %>
+<% end %>

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

@@ -1,4 +1,4 @@
 <% title _("Compliance Reports") %>
-
+<% title_actions multiple_actions_arf_report_select %>
 <%= render :partial => 'list' %>
 

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

@@ -1,10 +1,12 @@
+<%= javascript 'foreman_openscap/reports' %>
+<%= stylesheet 'foreman_openscap/reports' %>
 <% title "#{@arf_report.host}" %>
 <p class='ra'> <%= _("Reported at %s ") % @arf_report.reported_at %> </p>
 
 <% content_for(:search_bar) {show_logs} %>
 
 <%= render 'output', :logs => @arf_report.logs%>
-<%= render 'metrics', :status => @arf_report.status, :metrics => @arf_report.metrics %>
+<%= render 'metrics', :status => @arf_report.status, :metrics => @arf_report.metrics  if @arf_report.logs.any? %>
 
 <%= title_actions link_to(_('Back'), :back),
   display_delete_if_authorized(hash_for_arf_report_path(:id => @arf_report), :class=> "btn btn-danger"),

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

@@ -0,0 +1,8 @@
+<%= javascript 'foreman_openscap/openscap_proxy' %>
+<% data_url = @host ? openscap_proxy_changed_hosts_path : openscap_proxy_changed_hostgroups_path%>
+<%= select_f f, :openscap_proxy_id, SmartProxy.with_features("Openscap"), :id, :name,
+    { :include_blank => blank_or_inherit_f(f, :openscap_proxy) },
+    { :label => _('Openscap Proxy'),
+      :onchange => 'updateOpenscapProxy(this)',
+      :'data-url' => data_url,
+      :help_inline => :indicator } %>

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

@@ -32,7 +32,7 @@
                    { :include_blank => _('Choose period') },
                    { :onchange => 'period_selected(this)' }) %>
       <%= 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')) %>
+      <%= select_f(f, :day_of_month, (1..31).to_a, :to_i, :to_s, :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/policies/steps/_schedule_form.html.erb

@@ -6,6 +6,6 @@
                { :include_blank => _('Choose period') },
                { :onchange => 'period_selected(this)' }) %>
   <%= 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')) %>
+  <%= select_f(f, :day_of_month, (1..31).to_a, :to_i, :to_s, :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/config/routes.rb

@@ -10,6 +10,8 @@ Rails.application.routes.draw do
       end
       collection do
         get 'auto_complete_search'
+        get 'delete_multiple'
+        post 'submit_delete_multiple'
       end
     end
 
@@ -17,7 +19,7 @@ Rails.application.routes.draw do
 
     resources :policies, :only => [:index, :new, :show, :create, :edit, :update, :destroy] do
       member do
-        # match 'parse', :to => 'policies#parse'
+        match 'parse'
         match 'dashboard', :to => 'policy_dashboard#index', :as => 'policy_dashboard'
       end
       collection do
@@ -56,3 +58,17 @@ Rails.application.routes.draw do
     end
   end
 end
+
+Foreman::Application.routes.draw do
+  resources :hosts do
+    collection do
+      post 'openscap_proxy_changed'
+    end
+  end
+
+  resources :hostgroups do
+    collection do
+      post 'openscap_proxy_changed'
+    end
+  end
+end

data/db/migrate/20141013172051_create_scaptimony_policies.rb

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

data/db/migrate/20141014105333_create_scaptimony_assets.rb

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

data/db/migrate/20141015092642_create_scaptimony_arf_reports.rb

@@ -1,13 +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.references :asset, :index => true
+      t.references :policy, :index => true
       t.datetime :date
-      t.string :digest, limit: 128
+      t.string :digest, :limit => 128
 
       t.timestamps
     end
-    add_index :scaptimony_arf_reports, :digest, unique: true
+    add_index :scaptimony_arf_reports, :digest, :unique => true
   end
 end

data/db/migrate/20141104164201_create_scaptimony_scap_contents.rb

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

data/db/migrate/20141104171545_create_scaptimony_policy_revisions.rb

@@ -1,8 +1,8 @@
 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.references :policy, :index => true
+      t.references :scap_content, :index => true
       t.string :xccdf_profile
       t.string :period
       t.string :weekday

data/db/migrate/20141105174834_add_columns_to_scaptimony_policies.rb

@@ -7,6 +7,6 @@ class AddColumnsToScaptimonyPolicies < ActiveRecord::Migration
 
     # 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
+    add_column :scaptimony_policies, :scap_content_id, :integer, :references => :scap_content
   end
 end

data/db/migrate/20141113221054_create_scaptimony_scap_content_profiles.rb

@@ -1,7 +1,7 @@
 class CreateScaptimonyScapContentProfiles < ActiveRecord::Migration
   def change
     create_table :scaptimony_scap_content_profiles do |t|
-      t.references :scap_content, index: true
+      t.references :scap_content, :index => true
       t.string :profile_id
       t.string :title
 

data/db/migrate/20141116171305_add_profile_to_scaptimony_policies.rb

@@ -1,6 +1,6 @@
 class AddProfileToScaptimonyPolicies < ActiveRecord::Migration
   def change
     # add_reference :scaptimony_policies, :scap_content_profile, index: true
-    add_column :scaptimony_policies, :scap_content_profile_id, :integer, references: :scap_content_profile
+    add_column :scaptimony_policies, :scap_content_profile_id, :integer, :references => :scap_content_profile
   end
 end

data/db/migrate/20141119182606_create_scaptimony_xccdf_rule_results.rb

@@ -1,9 +1,9 @@
 class CreateScaptimonyXccdfRuleResults < ActiveRecord::Migration
   def change
     create_table :scaptimony_xccdf_rule_results do |t|
-      t.references :arf_report, index: true, null: false
-      t.references :xccdf_result, index: true, null: false
-      t.references :xccdf_rule, index: true, null: false
+      t.references :arf_report, :index => true, :null => false
+      t.references :xccdf_result, :index => true, :null => false
+      t.references :xccdf_rule, :index => true, :null => false
     end
   end
 end

data/db/migrate/20150821100137_migrate_from_scaptimony.rb

@@ -25,7 +25,7 @@ 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!)
   end
 
   def down
@@ -54,6 +54,6 @@ class MigrateFromScaptimony < ActiveRecord::Migration
           SQL
 
     taxonomies = TaxableTaxonomy.where(:taxable_type => ["ForemanOpenscap::ArfReport", "ForemanOpenscap::Policy", "ForemanOpenscap::ScapContent"])
-    taxonomies.each { |t| t.taxable_type = t.taxable_type.sub(/^ForemanOpenscap/, "Scaptimony")}.map(&:save!)
+    taxonomies.each { |t| t.taxable_type = t.taxable_type.sub(/^ForemanOpenscap/, "Scaptimony") }.map(&:save!)
   end
 end