foreman_openscap 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b3596aacd8cc7e71c0eb938de52709ba4f79e79
-  data.tar.gz: d12acf03d688076d4367e84773c2af2ddbc0bf93
+  metadata.gz: f4717f3191e1244335417139e2dddef5297b612d
+  data.tar.gz: 54ac0f517e808a186d74a6a42a03f07a79565abf
 SHA512:
-  metadata.gz: a2f76e27c08d996a5c3ef629736c872f6638e2bbdcb53d8ab95b4d145e9f80a97279146aca5e87b55db8669924cab50a957e02f312c46aab834a816854034b5d
-  data.tar.gz: 7d667fb69ecd4568f960f73e23667d3ce9a8df69bbf0c1c0ffd8f745765ef2e33b7cbb870726c29e153e958879e88271e7932460d0070573595e451c49d8a6ef
+  metadata.gz: 2dbb8f627fdb059e1099c4f95288bfdc7b4ee9e2eef011cec3c45c9c7419ee8ccf7e99813894d46ba659c8d2cfc88d44cc86ebec0a5e24f91312489478133193
+  data.tar.gz: c74cd26daf940251810f9aae28728897da0d8d35848939476c2e90a882ae569e5a698835c11b24d669539c187c2bd6526a3c46f6e319bf5b251382190c09ae11

data/app/assets/javascripts/foreman_openscap/load_report.js

@@ -2,5 +2,5 @@ $(document).ready(function() {
     $('#frame').load(function() {
         $('#loading').hide();
         $('#frame').show().css('min-height', '800px');
-    });    
+    });
 });

data/app/assets/javascripts/foreman_openscap/policy_edit.js

@@ -8,9 +8,7 @@ function scap_content_selected(element){
     url: url,
     complete: function() { $(element).indicator_hide();},
     success: function(request) {
-      $('#file-location').remove();
       $('#scap_content_profile_select').html(request);
-      $('#scap_content .alert-info').append($('#file-location'));
     }
   })
 }

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

@@ -8,7 +8,6 @@
 # along with this software; if not, see http://www.gnu.org/licenses/gpl.txt
 #
 
-require 'scaptimony/arf_reports_helper'
 require 'foreman_openscap/helper'
 
 module Api
@@ -24,7 +23,7 @@ module Api
         before_filter :find_resource, :only => %w{show destroy}
 
         def resource_name
-          'Scaptimony::ArfReport'
+          '::ForemanOpenscap::ArfReport'
         end
 
         def get_resource
@@ -32,7 +31,7 @@ module Api
         end
 
         resource_description do
-          resource_id 'scaptimony_arf_reports'
+          resource_id 'foreman_openscap_arf_reports'
           api_version 'v2'
           api_base_url "/api/v2"
         end
@@ -41,7 +40,7 @@ module Api
         param_group :search_and_pagination, ::Api::V2::BaseController
 
         def index
-          @arf_reports = resource_scope_for_index(:permission => :edit_compliance).includes(:arf_report_breakdown, :asset)
+          @arf_reports = resource_scope_for_index(:permission => :edit_compliance).includes(:asset)
         end
 
         api :GET, '/compliance/arf_reports/:id', N_('Show an Arf report')
@@ -64,27 +63,13 @@ module Api
 
         def create
           asset = ForemanOpenscap::Helper::get_asset(params[:cname], params[:policy_id])
-          arf_bzip2 = request.body.read
-          arf_bzip2_size = request.body.size
-          Scaptimony::ArfReportsHelper.create_arf(asset, params, arf_bzip2, arf_bzip2_size)
-          render :json => { :result => :OK, :received => arf_bzip2_size }
-        end
-
-        def check_content_type
-          # Well, this is unfortunate. Parent class asserts that content-type is
-          # application/json. While we want to have content-type text/xml. We
-          # also need the content-encoding to equal with x-bzip2. However, when
-          # the framework sees text/xml, it will rewrite it to application/xml.
-          # What's worse, a framework will try to parse body as an utf8 string,
-          # no matter what content-encoding says. Let's pass content-type arf-bzip2
-          # and move forward.
-          super unless
-            params[:action] == 'create' and
-            request.content_type.end_with? 'arf-bzip2' and
-            request.env['HTTP_CONTENT_ENCODING'] == 'x-bzip2'
+          arf_report = ForemanOpenscap::ArfReport.create_arf(asset, params)
+          asset.host.refresh_statuses if asset.host
+          render :json => { :result => :OK, :id => arf_report.id.to_s }
         end
 
         private
+
         def find_resource
           not_found and return if params[:id].blank?
           instance_variable_set("@arf_report", resource_scope.find(params[:id]))

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

@@ -4,13 +4,13 @@ module Api::V2
       include Foreman::Controller::SmartProxyAuth
 
       add_smart_proxy_filters :content, :features => 'Openscap'
-      
+
       before_filter :find_resource, :except => %w{index create}
 
       skip_after_filter :log_response_body, :only => [:content]
-      
+
       def resource_name
-        'Scaptimony::Policy'
+        '::ForemanOpenscap::Policy'
       end
 
       def get_resource
@@ -22,7 +22,7 @@ module Api::V2
       end
 
       resource_description do
-        resource_id 'scaptimony_policies'
+        resource_id 'foreman_openscap_policies'
         api_version 'v2'
         api_base_url "/api/v2"
       end
@@ -57,7 +57,7 @@ module Api::V2
       param_group :policy, :as => :create
 
       def create
-        @policy = Scaptimony::Policy.new(params[:policy])
+        @policy = ForemanOpenscap::Policy.new(params[:policy])
         process_response @policy.save
       end
 

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

@@ -4,7 +4,7 @@ module Api::V2
       before_filter :find_resource, :except => %w{index create}
 
       def resource_name
-        'Scaptimony::ScapContent'
+        '::ForemanOpenscap::ScapContent'
       end
 
       def get_resource
@@ -12,7 +12,7 @@ module Api::V2
       end
 
       resource_description do
-        resource_id 'scaptimony_scap_contents'
+        resource_id 'foreman_openscap_scap_contents'
         api_version 'v2'
         api_base_url "/api/v2"
       end
@@ -45,7 +45,7 @@ module Api::V2
       param_group :scap_content, :as => :create
 
       def create
-        @scap_content = Scaptimony::ScapContent.new(params[:scap_content])
+        @scap_content = ForemanOpenscap::ScapContent.new(params[:scap_content])
         process_response @scap_content.save
       end
 

data/app/controllers/arf_reports_controller.rb

@@ -0,0 +1,62 @@
+class ArfReportsController < ApplicationController
+  include Foreman::Controller::AutoCompleteSearch
+
+  before_filter :find_by_id, :only => [:show, :show_html, :destroy, :parse_html, :parse_bzip]
+
+  def model_of_controller
+    ::ForemanOpenscap::ArfReport
+  end
+
+  def index
+    @arf_reports = resource_base.includes(:asset)
+      .search_for(params[:search], :order => params[:order])
+      .paginate(:page => params[:page], :per_page => params[:per_page])
+  end
+
+  def show
+  end
+
+  def show_html
+  end
+
+  def parse_html
+    begin
+      self.response_body = @arf_report.to_html
+    rescue => e
+      render :text => _(e.message)
+    end
+  end
+
+  def parse_bzip
+    begin
+      response = @arf_report.to_bzip
+      send_data response, :filename => "#{@arf_report.id}_arf_report.bz2", :type => 'application/octet-stream', :disposition => 'attachement'
+    rescue => e
+      process_error(:error_msg => (_("Failed to downloaded Arf report as bzip: #{e.message}")),
+                    :error_redirect => arf_report_path(@arf_report.id))
+    end
+  end
+
+  def destroy
+    if @arf_report.destroy
+      process_success(:success_msg => (_("Successfully deleted Arf report.")), :success_redirect => arf_reports_path)
+    else
+      process_error
+    end
+  end
+
+  private
+
+  def find_by_id
+    @arf_report = resource_base.find(params[:id])
+  end
+
+  def action_permission
+    case params[:action]
+    when 'show_html', 'parse_html', 'parse_bzip'
+      :view
+    else
+      super
+    end
+  end
+end

data/app/controllers/{scaptimony_dashboard_controller.rb → compliance_dashboard_controller.rb}

@@ -1,4 +1,4 @@
-class ScaptimonyDashboardController < ApplicationController
+class ComplianceDashboardController < ApplicationController
   include Foreman::Controller::AutoCompleteSearch
 
   def index

data/app/controllers/compliance_hosts_controller.rb

@@ -0,0 +1,5 @@
+class ComplianceHostsController < ApplicationController
+  def show
+    @host = Host.find(params[:id])
+  end
+end

data/app/controllers/{scaptimony_policies_controller.rb → policies_controller.rb}

@@ -1,10 +1,10 @@
-class ScaptimonyPoliciesController < ApplicationController
+class PoliciesController < ApplicationController
   include Foreman::Controller::AutoCompleteSearch
   before_filter :find_by_id, :only => [:show, :edit, :update, :parse, :destroy]
   before_filter :find_multiple, :only => [:select_multiple_hosts, :update_multiple_hosts, :disassociate_multiple_hosts, :remove_policy_from_multiple_hosts]
 
   def model_of_controller
-    ::Scaptimony::Policy
+    ::ForemanOpenscap::Policy
   end
 
   def index
@@ -12,13 +12,13 @@ class ScaptimonyPoliciesController < ApplicationController
                   .search_for(params[:search], :order => params[:order])
                   .paginate(:page => params[:page], :per_page => params[:per_page])
                   .includes(:scap_content, :scap_content_profile)
-    if @policies.empty? && Scaptimony::ScapContent.unconfigured?
-      redirect_to scaptimony_scap_contents_path
+    if @policies.empty? && ForemanOpenscap::ScapContent.unconfigured?
+      redirect_to scap_contents_path
     end
   end
 
   def new
-    @policy = ::Scaptimony::Policy.new
+    @policy = ::ForemanOpenscap::Policy.new
   end
 
   def show
@@ -29,9 +29,9 @@ class ScaptimonyPoliciesController < ApplicationController
   end
 
   def create
-    @policy = ::Scaptimony::Policy.new(params[:policy])
+    @policy = ::ForemanOpenscap::Policy.new(params[:policy])
     if @policy.wizard_completed? && @policy.save
-      process_success :success_redirect => scaptimony_policies_path
+      process_success :success_redirect => policies_path
     else
       if @policy.valid?
         render 'new' and return
@@ -47,7 +47,7 @@ class ScaptimonyPoliciesController < ApplicationController
 
   def update
     if @policy.update_attributes(params[:policy])
-      process_success :success_redirect => scaptimony_policies_path
+      process_success :success_redirect => policies_path
     else
       process_error :object => @policy
     end
@@ -62,8 +62,8 @@ class ScaptimonyPoliciesController < ApplicationController
   end
 
   def scap_content_selected
-    if params[:scap_content_id] && (@scap_content = ::Scaptimony::ScapContent.find(params[:scap_content_id]))
-      @policy ||= ::Scaptimony::Policy.new
+    if params[:scap_content_id] && (@scap_content = ::ForemanOpenscap::ScapContent.find(params[:scap_content_id]))
+      @policy ||= ::ForemanOpenscap::Policy.new
       render :partial => 'scap_content_results', :locals => {:policy => @policy}
     end
   end
@@ -72,14 +72,14 @@ class ScaptimonyPoliciesController < ApplicationController
 
   def update_multiple_hosts
     if (id = params['policy']['id'])
-      policy = ::Scaptimony::Policy.find(id)
+      policy = ::ForemanOpenscap::Policy.find(id)
       policy.assign_hosts(@hosts)
       notice _("Updated hosts: Assigned with compliance policy: #{policy.name}")
       # We prefer to go back as this does not lose the current search
       redirect_to hosts_path
     else
       error _('No compliance policy selected.')
-      redirect_to(select_multiple_hosts_scaptimony_policies_path)
+      redirect_to(select_multiple_hosts_policies_path)
     end
   end
 
@@ -87,7 +87,7 @@ class ScaptimonyPoliciesController < ApplicationController
 
   def remove_policy_from_multiple_hosts
     if (id = params.fetch(:policy, {})[:id])
-      policy = ::Scaptimony::Policy.find(id)
+      policy = ::ForemanOpenscap::Policy.find(id)
       policy.unassign_hosts(@hosts)
       notice _("Updated hosts: Unassigned from compliance policy '%s'") % policy.name
       redirect_to hosts_path

data/app/controllers/{scaptimony_policy_dashboard_controller.rb → policy_dashboard_controller.rb}

@@ -8,14 +8,14 @@
 # along with this software; if not, see http://www.gnu.org/licenses/gpl.txt
 #
 
-class ScaptimonyPolicyDashboardController < ApplicationController
+class PolicyDashboardController < ApplicationController
   before_filter :prefetch_data, :only => :index
 
   def index; end
 
   def prefetch_data
-    @policy = ::Scaptimony::Policy.find(params[:id])
-    dashboard = Scaptimony::PolicyDashboard::Data.new(@policy, params[:search])
+    @policy = ::ForemanOpenscap::Policy.find(params[:id])
+    dashboard = ForemanOpenscap::PolicyDashboard::Data.new(@policy, params[:search])
     @report = dashboard.report
   end
 end

data/app/controllers/{scaptimony_scap_contents_controller.rb → scap_contents_controller.rb}

@@ -1,10 +1,10 @@
-class ScaptimonyScapContentsController < ApplicationController
+class ScapContentsController < ApplicationController
   include Foreman::Controller::AutoCompleteSearch
   before_filter :handle_file_upload, :only => [:create, :update]
   before_filter :find_by_id, :only => [:show, :edit, :update, :destroy]
 
   def model_of_controller
-    ::Scaptimony::ScapContent
+    ::ForemanOpenscap::ScapContent
   end
 
   def index
@@ -12,18 +12,18 @@ class ScaptimonyScapContentsController < ApplicationController
   end
 
   def show
-    send_data @scaptimony_scap_content.scap_file,
+    send_data @scap_content.scap_file,
       :type     => 'application/xml',
-      :filename => @scaptimony_scap_content.original_filename
+      :filename => @scap_content.original_filename
   end
 
   def new
-    @scaptimony_scap_content = ::Scaptimony::ScapContent.new
+    @scap_content = ForemanOpenscap::ScapContent.new
   end
 
   def create
-    @scaptimony_scap_content = ::Scaptimony::ScapContent.new(params[:scap_content])
-    if @scaptimony_scap_content.save
+    @scap_content = ForemanOpenscap::ScapContent.new(params[:scap_content])
+    if @scap_content.save
       process_success
     else
       process_error
@@ -31,7 +31,7 @@ class ScaptimonyScapContentsController < ApplicationController
   end
 
   def update
-    if @scaptimony_scap_content.update_attributes(params[:scap_content])
+    if @scap_content.update_attributes(params[:scap_content])
       process_success
     else
       process_error
@@ -39,10 +39,10 @@ class ScaptimonyScapContentsController < ApplicationController
   end
 
   def destroy
-    if @scaptimony_scap_content.destroy
+    if @scap_content.destroy
       process_success
     else
-      process_error :object => @scaptimony_scap_content
+      process_error :object => @scap_content
     end
   end
 
@@ -58,7 +58,7 @@ class ScaptimonyScapContentsController < ApplicationController
 
   private
   def find_by_id
-    @scaptimony_scap_content = resource_base.find(params[:id])
+    @scap_content = resource_base.find(params[:id])
   end
 
   def handle_file_upload

data/app/helpers/{scaptimony_report_dashboard_helper.rb → arf_report_dashboard_helper.rb}

@@ -1,20 +1,18 @@
-module ScaptimonyReportDashboardHelper
-  Colors = {
+module ArfReportDashboardHelper
+  COLORS = {
       :passed => '#89A54E',
       :failed => '#AA4643',
       :othered => '#DB843D',
   }
 
-
   def reports_breakdown_chart(report, options = {})
     data = []
     [[:failed, _('Failed')],
      [:passed, _('Passed')],
      [:othered, _('Othered')],
     ].each { |i|
-      data << {:label => i[1], :data => report[i[0]], :color => Colors[i[0]]}
+      data << {:label => i[1], :data => report[i[0]], :color => COLORS[i[0]]}
     }
     flot_pie_chart 'overview', _('Compliance reports breakdown'), data, options
   end
-
 end

data/app/helpers/arf_reports_helper.rb

@@ -13,4 +13,25 @@ module ArfReportsHelper
     style = "label-default" if event == 0
     content_tag(:span, event, :class=>'label ' + style)
   end
+
+  def show_logs
+    return unless @arf_report.logs.size > 0
+    form_tag arf_report_path(@arf_report), :id => 'level_filter', :method => :get, :class => "form form-horizontal" do
+      content_tag(:span, _("Show log messages:") + ' ') +
+      select(nil, 'level', [[_('All messages'), 'info'],[_('Failed and Othered'), 'warning'],[_('Failed only'), 'error']],
+             {}, {:class=>"col-md-1 form-control", :onchange =>"filter_by_level(this);"})
+    end
+  end
+
+  def result_tag(level)
+    tag = case level
+          when 'pass'
+            "success"
+          when 'fail'
+            "danger"
+          else
+            "warning"
+          end
+    "class='label label-#{tag}'".html_safe
+  end
 end