foreman_openscap 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: feef787c3ec3853ea3ea69ec359a943e81fed594
-  data.tar.gz: c2c279115757242903e06b02a38477bbc130762e
+  metadata.gz: 6beda936505b017451aaf916fc4295f10f323be1
+  data.tar.gz: f696a2b12c6861fd6fbc934e9451b2d77fb3879d
 SHA512:
-  metadata.gz: 7cc362c03e631e6c5141baeb72513316e71681102dfb8e750ddbd2b1d54e1f54a8290c3a76182c490e3e0913dfc8613f3c971fc886bcdbd299c3c22a6cedb327
-  data.tar.gz: df71b007ba7183e3ff55b5a90158530c784568244aa3164130d8ef9c4bb91c59a1bf4ff7e489d449f62de19bcf4b75ea9480b6dcfd1142d1e45907c784e85ad3
+  metadata.gz: e786d37b5a9980b2351f6b49f854a794270ab8ac4099dc15931fe7236cd823f4a97717632627b3ddde8fa1cc9a23b476dbee8c4d27f631bfb67185a4a7ddf3fb
+  data.tar.gz: e967277fca2f7f84855637cedeab78a9e4ea488e9111841a141f3cd3833f342e23b0ef14b9cd240cf1595eabad521f73c0a1868bc5185f70329acc822d1c9268

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

@@ -10,7 +10,8 @@ module Api
 
         add_smart_proxy_filters :create, :features => 'Openscap'
 
-        before_filter :find_resource, :only => %w(show destroy)
+        before_filter :find_resource, :only => %w(show destroy download)
+        skip_after_filter :log_response_body, :only => %w(download)
 
         def resource_name
           '::ForemanOpenscap::ArfReport'
@@ -33,7 +34,7 @@ module Api
         def show
         end
 
-        api :DELETE, '/compliance/arf_reports/:id', N_('Deletes an ARF Report')
+        api :DELETE, '/compliance/arf_reports/:id', N_('Delete an ARF Report')
         param :id, :identifier, :required => true
 
         def destroy
@@ -52,12 +53,31 @@ module Api
           render :json => { :result => :OK, :id => arf_report.id.to_s }
         end
 
+        api :GET, "/compliance/arf_reports/:id/download/", N_("Download bzipped ARF report")
+        param :id, :identifier, :required => true
+
+        def download
+          response = @arf_report.to_bzip
+          send_data response, :filename => "#{@arf_report.id}_arf_report.bz2"
+        rescue => e
+          render_error 'standard_error', :status => :internal_error, :locals => { :exception => e }
+        end
+
         private
 
         def find_resource
           not_found and return if params[:id].blank?
           instance_variable_set("@arf_report", resource_scope.find(params[:id]))
         end
+
+        def action_permission
+          case params[:action]
+          when 'download'
+            :view
+          else
+            super
+          end
+        end
       end
     end
   end

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

@@ -1,4 +1,4 @@
-<%= javascript "jquery.cookie", "host_checkbox", "foreman_openscap/arf_reports" %>
+<%= javascript "host_checkbox", "foreman_openscap/arf_reports" %>
 
 <table class="table table-bordered table-striped ellipsis">
   <tr>

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

@@ -12,5 +12,5 @@
   display_delete_if_authorized(hash_for_arf_report_path(:id => @arf_report), :class=> "btn btn-danger"),
   link_to(_("Host details"), @arf_report.host, :class => "btn btn-default"),
   link_to(_("View full report"), show_html_arf_report_path(:id => @arf_report.id), :class => "btn btn-default"),
-  link_to(_("Download XML in bzip"), parse_bzip_arf_report_path(:id => @arf_report.id), :class => "btn btn-default")
+  link_to(_("Download XML in bzip"), parse_bzip_arf_report_path(:id => @arf_report.id), :class => "btn btn-default", :data => { :no_turbolink => true })
 %>

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

@@ -1,4 +1,4 @@
-<h4 class="ca"><%= _('Latest compliance reports') %></h4>
+<h4 class="ca"><%= _('Latest Compliance Reports') %></h4>
 <% latest_reports = ForemanOpenscap::ArfReport.latest.limit(9) %>
 <% if latest_reports.empty? %>
   <p class="ca"><%= _("No reports available") %></p>

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

@@ -1,3 +1,3 @@
-<h4 class="header ca"><%= _('Compliance reports breakdown') %></h4>
+<h4 class="header ca"><%= _('Compliance Reports Breakdown') %></h4>
 <% report = ForemanOpenscap::ReportDashboard::Data.new().report %>
-<%= reports_breakdown_chart(report, :class => 'statistics-pie small') %>
+<%= reports_breakdown_chart(report, :class => 'statistics-pie small') %>

data/config/routes.rb

@@ -55,7 +55,11 @@ Rails.application.routes.draw do
             get 'content'
           end
         end
-        resources :arf_reports, :only => [:index, :show, :destroy]
+        resources :arf_reports, :only => [:index, :show, :destroy] do
+          member do
+            get 'download'
+          end
+        end
         post 'arf_reports/:cname/:policy_id/:date', \
               :constraints => { :cname => /[^\/]+/ }, :to => 'arf_reports#create'
       end

data/db/migrate/20160925213031_change_scap_widget_names.rb

@@ -0,0 +1,15 @@
+class ChangeScapWidgetNames < ActiveRecord::Migration
+  def up
+    Widget.where(:name => 'OpenSCAP Host reports widget').\
+      update_all(:name => 'Latest Compliance Reports')
+    Widget.where(:name => 'OpenSCAP Reports breakdown widget').\
+      update_all(:name => 'Compliance Reports Breakdown')
+  end
+
+  def down
+    Widget.where(:name => 'Latest Compliance Reports').\
+      update_all(:name => 'OpenSCAP Host reports widget')
+    Widget.where(:name => 'Compliance Reports Breakdown').\
+      update_all(:name => 'OpenSCAP Reports breakdown widget')
+  end
+end

data/lib/foreman_openscap/engine.rb

@@ -52,7 +52,7 @@ module ForemanOpenscap
         security_block :foreman_openscap do
           permission :view_arf_reports, {:arf_reports => [:index, :show, :parse_html, :show_html,
                                                           :parse_bzip, :auto_complete_search],
-                                         'api/v2/compliance/arf_reports' => [:index, :show],
+                                         'api/v2/compliance/arf_reports' => [:index, :show, :download],
                                          :compliance_hosts => [:show]}
           permission :destroy_arf_reports, {:arf_reports => [:destroy, :delete_multiple, :submit_delete_multiple],
                                             'api/v2/compliance/arf_reports' => [:destroy]}
@@ -112,9 +112,9 @@ module ForemanOpenscap
 
         # add dashboard widget
         widget 'compliance_host_reports_widget',
-          :name => N_('OpenSCAP Host reports widget'), :sizex => 6, :sizey => 1
+          :name => N_('Latest Compliance Reports'), :sizex => 6, :sizey => 1
         widget 'compliance_reports_breakdown_widget',
-          :name => N_('OpenSCAP Reports breakdown widget'), :sizex => 6, :sizey => 1
+          :name => N_('Compliance Reports Breakdown'), :sizex => 6, :sizey => 1
 
         # As 'arf_report_breakdowns' is a view and does not appear in schema.rb, db:test:prepare will not create the view
         # which will make the following tests fail.

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

data/test/functional/api/v2/compliance/arf_reports_controller_test.rb

@@ -1,4 +1,5 @@
 require 'test_plugin_helper'
+require 'tmpdir'
 
 class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
   setup do
@@ -24,4 +25,14 @@ class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
     refute response['othered'].blank?
     assert_response :success
   end
+
+  test "should download report" do
+    bzipped_report = File.open "#{ForemanOpenscap::Engine.root}/test/files/arf_report/arf_report.bz2", &:read
+    ForemanOpenscap::ArfReport.any_instance.stubs(:to_bzip).returns(bzipped_report)
+    get :download, { :id => @report.to_param }, set_session_user
+    t = Tempfile.new('tmp_report')
+    t.write @response.body
+    t.close
+    refute t.size.zero?
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - "Šimon Lukašík"
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-21 00:00:00.000000000 Z
+date: 2016-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -191,6 +191,7 @@ files:
 - db/migrate/20151119155419_add_arf_fields_to_message.rb
 - db/migrate/20151120090851_add_openscap_proxy_to_host_and_hostgroup.rb
 - db/migrate/20160830113437_remove_deleted_policy.rb
+- db/migrate/20160925213031_change_scap_widget_names.rb
 - db/seeds.d/openscap_feature.rb
 - db/seeds.d/openscap_policy_notification.rb
 - lib/foreman_openscap.rb
@@ -236,6 +237,7 @@ files:
 - test/factories/policy_arf_report_factory.rb
 - test/factories/policy_factory.rb
 - test/factories/scap_content_related.rb
+- test/files/arf_report/arf_report.bz2
 - test/files/scap_contents/ssg-fedora-ds.xml
 - test/functional/api/v2/compliance/arf_reports_controller_test.rb
 - test/functional/api/v2/compliance/policies_controller_test.rb
@@ -272,31 +274,32 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Foreman plug-in for displaying OpenSCAP audit reports
 test_files:
-- test/lib/foreman_openscap/bulk_upload_test.rb
-- test/unit/scap_content_test.rb
-- test/unit/concerns/openscap_proxy_extenstions_test.rb
-- test/unit/openscap_host_test.rb
-- test/unit/policy_test.rb
-- test/unit/compliance_status_test.rb
-- test/unit/arf_report_status_calculator_test.rb
-- test/unit/policy_mailer_test.rb
-- test/unit/services/report_dashboard/data_test.rb
-- test/unit/arf_report_test.rb
-- test/test_plugin_helper.rb
-- test/functional/arf_reports_controller_test.rb
-- test/functional/api/v2/compliance/arf_reports_controller_test.rb
-- test/functional/api/v2/compliance/scap_contents_controller_test.rb
 - test/functional/api/v2/compliance/policies_controller_test.rb
+- test/functional/api/v2/compliance/scap_contents_controller_test.rb
+- test/functional/api/v2/compliance/arf_reports_controller_test.rb
+- test/functional/arf_reports_controller_test.rb
 - test/factories/asset_factory.rb
+- test/factories/compliance_host_factory.rb
+- test/factories/scap_content_related.rb
 - test/factories/compliance_log_factory.rb
 - test/factories/arf_report_factory.rb
-- test/factories/scap_content_related.rb
-- test/factories/compliance_host_factory.rb
 - test/factories/policy_arf_report_factory.rb
 - test/factories/policy_factory.rb
+- test/files/arf_report/arf_report.bz2
 - test/files/scap_contents/ssg-fedora-ds.xml
+- test/lib/foreman_openscap/bulk_upload_test.rb
+- test/test_plugin_helper.rb
+- test/unit/arf_report_status_calculator_test.rb
+- test/unit/compliance_status_test.rb
+- test/unit/arf_report_test.rb
+- test/unit/policy_mailer_test.rb
+- test/unit/openscap_host_test.rb
+- test/unit/scap_content_test.rb
+- test/unit/concerns/openscap_proxy_extenstions_test.rb
+- test/unit/services/report_dashboard/data_test.rb
+- test/unit/policy_test.rb