foreman_openscap 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41886c4e7790fe8c029439e383a4935e63a7bec0
-  data.tar.gz: 4c3fe7f030d02d3fcf9aabf5deebb45ae961da35
+  metadata.gz: 416e356bc2870ed24cb951ba6dcd4d82b8a5ccb3
+  data.tar.gz: 53fc14379e71a0ff3ce51711a71974b33993c01d
 SHA512:
-  metadata.gz: ddebdbe79d9cd41fa94fdf0e5c84fd2dba412eba1767b1dc48e7d4bc96e9ccf2f38a4f69084eb616f941a47bc0ac9753aa0e91cfa4860e56292cec81a8324c93
-  data.tar.gz: 276132715e7943d15a90a61e562c8d3c93f71ab578dc0bf8ceb6815dea1abf557f4019b7e2d8b980bdce8014f57124580a5f8a22fea834860bdc2d2dea53acbb
+  metadata.gz: 94376bb05a0efba455dbd86ee1044e065b357e43f76572ed78659056128da0c1f2a4cb5be0b241a0372d4d87cddc27665566f170a731adcc223807da8deab881
+  data.tar.gz: 36ed74e3c3df1e3d46b47827c2af362c1a7744b5fdc7ec639713f56eace072994f64125a40bd6c141fa2261d1e999208a42a2b1750bcdc8e5b77559430f29480

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

@@ -50,7 +50,7 @@ module Api
         def create
           arf_report = ForemanOpenscap::ArfReport.create_arf(@asset, @smart_proxy, params.to_unsafe_h)
           @asset.host.refresh_statuses([HostStatus.find_status_by_humanized_name("compliance")])
-          render :json => { :result => :OK, :id => arf_report.id.to_s }
+          respond_for_report arf_report
         end
 
         api :GET, "/compliance/arf_reports/:id/download/", N_("Download bzipped ARF report")
@@ -75,6 +75,16 @@ module Api
 
         private
 
+        def respond_for_report(arf_report)
+          if arf_report.nil?
+            upload_fail(_("Policy with id %s not found.") % params[:policy_id])
+          elsif arf_report.new_record?
+            upload_fail arf_report.errors.full_messages.to_sentence
+          else
+            render :json => { :result => :ok, :id => arf_report.id.to_s }
+          end
+        end
+
         def find_resource
           not_found && return if params[:id].blank?
           instance_variable_set("@arf_report", resource_scope.find(params[:id]))
@@ -83,9 +93,14 @@ module Api
         def find_resources_before_create
           @asset = ForemanOpenscap::Helper::get_asset(params[:cname], params[:policy_id])
 
+          unless @asset
+            upload_fail(_('Could not find host identified by: %s') % params[:cname])
+            return
+          end
+
           if !params[:openscap_proxy_url] && !params[:openscap_proxy_name] && !@asset.host.openscap_proxy
             msg = _('Failed to upload Arf Report, OpenSCAP proxy name or url not found in params when uploading for %s and host is missing openscap_proxy') % @asset.host.name
-            no_proxy_for_host(msg)
+            upload_fail(msg)
             return
           elsif !params[:openscap_proxy_url] && !params[:openscap_proxy_name] && @asset.host.openscap_proxy
             logger.debug 'No proxy params found when uploading arf report, falling back to asset.host.openscap_proxy'
@@ -97,7 +112,7 @@ module Api
 
           unless @smart_proxy
             msg = _('No proxy found for %{name} or %{url}') % { :name => params[:openscap_proxy_name], :url => params[:openscap_proxy_url] }
-            no_proxy_for_host(msg)
+            upload_fail(msg)
             return
           end
         end
@@ -106,9 +121,9 @@ module Api
           render_error 'standard_error', :status => :internal_error, :locals => { :exception => error }
         end
 
-        def no_proxy_for_host(msg)
+        def upload_fail(msg)
           logger.error msg
-          render :json => { :result => msg }, :status => :unprocessable_entity
+          render :json => { :result => :fail, :errors => msg }, :status => :unprocessable_entity
         end
 
         def action_permission

data/app/models/foreman_openscap/arf_report.rb

@@ -105,16 +105,17 @@ module ForemanOpenscap
     end
 
     def self.create_arf(asset, proxy, params)
-      # fail if policy does not exist.
       arf_report = nil
-      policy = Policy.find(params[:policy_id])
+      policy = Policy.find_by :id => params[:policy_id]
+      return unless policy
+
       ArfReport.transaction do
-        # TODO:RAILS-4.0: This should become arf_report = ArfReport.find_or_create_by! ...
-        arf_report = ArfReport.create!(:host => asset.host,
-                                       :reported_at => Time.at(params[:date].to_i),
-                                       :status => params[:metrics],
-                                       :metrics => params[:metrics],
-                                       :openscap_proxy => proxy)
+        arf_report = ArfReport.create(:host => asset.host,
+                                      :reported_at => Time.at(params[:date].to_i),
+                                      :status => params[:metrics],
+                                      :metrics => params[:metrics],
+                                      :openscap_proxy => proxy)
+        return arf_report unless arf_report.persisted?
         PolicyArfReport.where(:arf_report_id => arf_report.id, :policy_id => policy.id, :digest => params[:digest]).first_or_create!
         if params[:logs]
           params[:logs].each do |log|

data/lib/foreman_openscap/helper.rb

@@ -1,6 +1,7 @@
 module ForemanOpenscap::Helper
   def self.get_asset(cname, policy_id)
-    asset = find_host_by_name_or_uuid(cname).get_asset
+    asset = find_host_by_name_or_uuid(cname)&.get_asset
+    return unless asset
     asset.policy_ids += [policy_id]
     asset
   end
@@ -16,11 +17,5 @@ module ForemanOpenscap::Helper
     else
       host = Host.find_by(name: cname)
     end
-
-    unless host
-      Rails.logger.error "Could not find Host with name: #{cname}"
-      raise ActiveRecord::RecordNotFound
-    end
-    host
   end
 end

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "0.11.1".freeze
+  VERSION = "0.11.2".freeze
 end

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

@@ -90,7 +90,41 @@ class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
     assert_response :unprocessable_entity
     res = JSON.parse(@response.body)
     msg = "Failed to upload Arf Report, OpenSCAP proxy name or url not found in params when uploading for #{asset.host.name} and host is missing openscap_proxy"
-    assert_equal msg, res["result"]
+    assert_equal msg, res["errors"]
+  end
+
+  test "should not create report when host is missing" do
+    reports_cleanup
+    date = Time.new(1984, 9, 16)
+    ForemanOpenscap::Helper.stubs(:get_asset).returns(nil)
+    cname = '9521a5c5-8f44-495f-b087-20e86b30bffg'
+    post :create,
+         :params => @from_json.merge(:cname => cname,
+                                     :policy_id => @policy.id,
+                                     :date => date.to_i,
+                                     :openscap_proxy_name => @proxy.name),
+         :session => set_session_user
+    assert_response :unprocessable_entity
+    res = JSON.parse(@response.body)
+    msg = "Could not find host identified by: #{cname}"
+    assert_equal msg, res["errors"]
+  end
+
+  test "should not create report when policy is missing" do
+    reports_cleanup
+    date = Time.new(1984, 9, 17)
+    ForemanOpenscap::Helper.stubs(:get_asset).returns(@asset)
+    policy_id = 0
+    post :create,
+         :params => @from_json.merge(:cname => @cname,
+                                     :policy_id => policy_id,
+                                     :date => date.to_i,
+                                     :openscap_proxy_name => @proxy.name),
+         :session => set_session_user
+    assert_response :unprocessable_entity
+    res = JSON.parse(@response.body)
+    msg = "Policy with id #{policy_id} not found."
+    assert_equal msg, res["errors"]
   end
 
   test "should not duplicate messages" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-13 00:00:00.000000000 Z
+date: 2018-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface