foreman_openscap 0.7.10 → 0.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad4157deaab66df390533ddf754462b72401a7ba
-  data.tar.gz: 4ca0953424ab3c085461c8a3ae5ed7d53229d86c
+  metadata.gz: a6c747f39e8243bed36344936a0bbe366c810561
+  data.tar.gz: be51caca5c71a20b037e69206aa36adbc0757dc9
 SHA512:
-  metadata.gz: c5c0ca9b12945799c94d9472e2f0964c1a9971216d2e008b3705642af371a4b8e5bc645f60d4a018cced788fa61ee6b54795aef720476add1bd66436a58d0dd5
-  data.tar.gz: 73094775f64cebfad019aa3853946aaf934c7d83541bd5a34090f9bd905e095190787b319768efd482041e2ec10bb7402d6cb4c997d104ee20445f8d3d18f3a2
+  metadata.gz: 9a56f11aeb006ac17936ed6936e087df613d72d7919dbb5184ec0f49560ccb9176fd47f16da34aa88dea27fd68a0adf8ea8fdba78a80e71caeb59483cfa84a8b
+  data.tar.gz: 59f5429305e04a0b61b060ca9e2025249a754efbd69aa182f00079121f595bc344d3eef6bc7891fadf1b1918231dbe5fd5bec47f0c4a3e2e747da0f973172a10

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

@@ -49,9 +49,13 @@ module Api
 
         def create
           asset = ForemanOpenscap::Helper::get_asset(params[:cname], params[:policy_id])
-          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 }
+          if asset.host.openscap_proxy
+            arf_report = ForemanOpenscap::ArfReport.create_arf(asset, params)
+            asset.host.refresh_statuses
+            render :json => { :result => :OK, :id => arf_report.id.to_s }
+          else
+            no_proxy_for_host asset
+          end
         end
 
         api :GET, "/compliance/arf_reports/:id/download/", N_("Download bzipped ARF report")
@@ -85,6 +89,12 @@ module Api
           render_error 'standard_error', :status => :internal_error, :locals => { :exception => error }
         end
 
+        def no_proxy_for_host(asset)
+          msg = _('Failed to upload Arf Report, no OpenSCAP proxy set for host %s') % asset.host.name
+          logger.error msg
+          render :json => { :result => msg }, :status => :unprocessable_entity
+        end
+
         def action_permission
           case params[:action]
           when 'download', 'download_html'

data/app/models/concerns/foreman_openscap/openscap_proxy_extensions.rb

@@ -5,7 +5,7 @@ module ForemanOpenscap
     def openscap_proxy_api
       return @openscap_api if @openscap_api
       proxy_url = openscap_proxy.url if openscap_proxy
-      raise ::Foreman::Exception.new(N_("No OpenSCAP proxy found for %{class} with %{id}"), { :class => self.class, :id => id }) unless proxy_url
+      raise ::Foreman::Exception.new(N_("No OpenSCAP proxy found for %{class} with id %{id}"), { :class => self.class, :id => id }) unless proxy_url
       @openscap_api = ::ProxyAPI::Openscap.new(:url => proxy_url)
     end
   end

data/app/models/foreman_openscap/arf_report.rb

@@ -15,10 +15,11 @@ module ForemanOpenscap
     has_one :policy_arf_report
     has_one :policy, :through => :policy_arf_report, :dependent => :destroy
     has_one :asset, :through => :host, :class_name => 'ForemanOpenscap::Asset', :as => :assetable
-    after_save :assign_locations_organizations
     has_one :log, :foreign_key => :report_id
     belongs_to :openscap_proxy, :class_name => "SmartProxy"
 
+    after_save :assign_locations_organizations
+    before_destroy :destroy_from_proxy
 
     delegate :asset=, :to => :host
 
@@ -175,7 +176,7 @@ module ForemanOpenscap
         policy.id == other.policy.id
     end
 
-    def destroy
+    def destroy_from_proxy
       if host
         begin
           openscap_proxy_api.destroy_report(self, ForemanOpenscap::Helper::find_name_or_uuid_by_host(host))
@@ -186,7 +187,6 @@ module ForemanOpenscap
       else
         logger.error "Failed to delete report with id #{id} from proxy, no host associated with report"
       end
-      super
     end
 
     def self.newline_to_space(string)

data/app/views/api/v2/compliance/common/_loc.json.rabl

@@ -1,3 +1,3 @@
 child :locations => :locations do |loc|
-  attributes :id, :name
+  attributes :id, :name, :title
 end

data/app/views/api/v2/compliance/common/_org.json.rabl

@@ -1,3 +1,3 @@
 child :organizations => :organizations do |org|
-  attributes :id, :name
+  attributes :id, :name, :title
 end

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

@@ -25,5 +25,5 @@
 
 <%= form_tag submit_delete_multiple_arf_reports_path({:arf_report_ids => params[:arf_report_ids]}) do %>
   <span class="label label-danger"><%= _('Delete') %></span>
-  <%= _('these Complianace reports') %>
+  <%= _('these Compliance reports') %>
 <% end %>

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "0.7.10".freeze
+  VERSION = "0.7.11".freeze
 end

data/lib/tasks/foreman_openscap_tasks.rake

@@ -56,6 +56,15 @@ namespace :foreman_openscap do
     ForemanOpenscap::MessageCleaner.new.clean
     puts 'Done'
   end
+
+  desc "Delete ArfReports without OpenSCAP proxy"
+  task :clean_reports_without_proxy => :environment do
+    User.as_anonymous_admin do
+      report_ids_without_proxy = ForemanOpenscap::ArfReport.unscoped.where(:openscap_proxy => nil).pluck(:id)
+      total = ForemanOpenscap::ArfReport.delete report_ids_without_proxy
+      puts "Done cleaning #{total} reports"
+    end
+  end
 end
 
 # Tests

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

@@ -6,17 +6,15 @@ class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
     # override validation of policy (puppetclass, lookup_key overrides)
     ForemanOpenscap::Policy.any_instance.stubs(:valid?).returns(true)
     @host = FactoryGirl.create(:compliance_host)
-    @report = FactoryGirl.create(:arf_report,
-                                 :host_id => @host.id,
-                                 :openscap_proxy => FactoryGirl.create(:smart_proxy, :url => "http://smart-proxy.org:8000"))
     @policy = FactoryGirl.create(:policy)
-    @asset = FactoryGirl.create(:asset)
+    @asset = FactoryBot.create(:asset, :assetable_id => @host.id)
 
     @from_json = arf_from_json "#{ForemanOpenscap::Engine.root}/test/files/arf_report/arf_report.json"
     @cname = '9521a5c5-8f44-495f-b087-20e86b30bf67'
   end
 
   test "should get index" do
+    create_arf_report
     get :index, {}, set_session_user
     response = ActiveSupport::JSON.decode(@response.body)
     assert_not response['results'].empty?
@@ -24,7 +22,8 @@ class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
   end
 
   test "should get show" do
-    get :show, { :id => @report.to_param }, set_session_user
+    report = create_arf_report
+    get :show, { :id => report.to_param }, set_session_user
     response = ActiveSupport::JSON.decode(@response.body)
     refute response['passed'].blank?
     refute response['failed'].blank?
@@ -33,9 +32,10 @@ class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
   end
 
   test "should download report" do
+    report = create_arf_report
     bzipped_report = File.read "#{ForemanOpenscap::Engine.root}/test/files/arf_report/arf_report.bz2"
     ForemanOpenscap::ArfReport.any_instance.stubs(:to_bzip).returns(bzipped_report)
-    get :download, { :id => @report.to_param }, set_session_user
+    get :download, { :id => report.to_param }, set_session_user
     t = Tempfile.new('tmp_report')
     t.write @response.body
     t.close
@@ -60,6 +60,20 @@ class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
     assert_equal msg_count, src_count
   end
 
+  test "should not create report for host without proxy" do
+    asset = FactoryBot.create(:asset)
+    date = Time.new(1944, 6, 6)
+    ForemanOpenscap::Helper.stubs(:get_asset).returns(asset)
+    post :create,
+         @from_json.merge(:cname => @cname,
+                          :policy_id => @policy.id,
+                          :date => date.to_i),
+         set_session_user
+    assert_response :unprocessable_entity
+    res = JSON.parse(@response.body)
+    assert_equal "Failed to upload Arf Report, no OpenSCAP proxy set for host #{asset.host.name}", res["result"]
+  end
+
   test "should not duplicate messages" do
     dates = [Time.new(1984, 9, 15), Time.new(1932, 3, 27)]
     ForemanOpenscap::Helper.stubs(:get_asset).returns(@asset)
@@ -145,4 +159,10 @@ class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
     file_content = File.read path
     JSON.parse file_content
   end
+
+  def create_arf_report
+    FactoryBot.create(:arf_report,
+                      :host_id => @host.id,
+                      :openscap_proxy => FactoryBot.create(:smart_proxy, :url => "http://smart-proxy.org:8000"))
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 0.7.10
+  version: 0.7.11
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-24 00:00:00.000000000 Z
+date: 2017-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface