foreman_openscap 0.7.11 → 0.7.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6c747f39e8243bed36344936a0bbe366c810561
-  data.tar.gz: be51caca5c71a20b037e69206aa36adbc0757dc9
+  metadata.gz: cc3b45bd13e06f6643cd988849bce306296faf54
+  data.tar.gz: fc17630400c564c7d3144bf49e57786400a1e4e4
 SHA512:
-  metadata.gz: 9a56f11aeb006ac17936ed6936e087df613d72d7919dbb5184ec0f49560ccb9176fd47f16da34aa88dea27fd68a0adf8ea8fdba78a80e71caeb59483cfa84a8b
-  data.tar.gz: 59f5429305e04a0b61b060ca9e2025249a754efbd69aa182f00079121f595bc344d3eef6bc7891fadf1b1918231dbe5fd5bec47f0c4a3e2e747da0f973172a10
+  metadata.gz: 1f7f43276f7c01c32f019dc1621135e5d499daa534af1fe3818763cb1a673bcd5613a7a887e734a5880e5c4c9f3eeb0e9c08e57f31588c49163a3266a5658b88
+  data.tar.gz: 79a5d3c58b7b2d604f3ffb499a68776247d052d16897fd50f771193b72623111888231d34b882960ab23d698120704cabd1b3f1444858c0f67adf76036f3f094

data/app/lib/proxy_api/openscap.rb

@@ -51,8 +51,9 @@ module ::ProxyAPI
       begin
         parse(delete("arf/#{report.id}/#{cname}/#{report.reported_at.to_i}/#{report.policy_arf_report.digest}"))
       rescue => e
-        logger.error "Failed to destroy arf report with id #{report.id} on Smart Proxy"
-        logger.debug e.backtrace.join("\n\t")
+        msg = "Failed to destroy arf report with id #{report.id} on Smart Proxy, cause: #{e.message}"
+        logger.error msg
+        report.errors.add(:base, msg)
         false
       end
     end

data/app/models/foreman_openscap/arf_report.rb

@@ -177,18 +177,22 @@ module ForemanOpenscap
     end
 
     def destroy_from_proxy
-      if host
-        begin
-          openscap_proxy_api.destroy_report(self, ForemanOpenscap::Helper::find_name_or_uuid_by_host(host))
-        rescue Foreman::Exception => e
-          logger.error "Failed to delete report with id #{id} from proxy, cause: #{e.message}"
-          logger.debug e.backtrace.join("\n\t")
-        end
+      if !host
+        destroy_from_proxy_warning "host"
+      elsif !policy
+        destroy_from_proxy_warning "policy"
+      elsif !openscap_proxy
+        destroy_from_proxy_warning "OpenSCAP proxy"
       else
-        logger.error "Failed to delete report with id #{id} from proxy, no host associated with report"
+        openscap_proxy_api.destroy_report(self, ForemanOpenscap::Helper::find_name_or_uuid_by_host(host))
       end
     end
 
+    def destroy_from_proxy_warning(associated)
+      logger.warn "Skipping deletion of report with id #{id} from proxy, no #{associated} associated with report"
+      true
+    end
+
     def self.newline_to_space(string)
       string.gsub(/ *\n+/, " ")
     end

data/db/migrate/20171011134112_remove_arf_reports_without_policy.rb

@@ -1,8 +1,10 @@
 class RemoveArfReportsWithoutPolicy < ActiveRecord::Migration
   def up
-    ids_to_keep = ForemanOpenscap::ArfReport.unscoped.all.joins(:policy_arf_report).pluck(:id)
-    ForemanOpenscap::ArfReport.unscoped.where.not(:id => ids_to_keep).find_in_batches do |batch|
-      batch.map(&:destroy!)
+    User.as_anonymous_admin do
+      ids_to_keep = ForemanOpenscap::ArfReport.unscoped.all.joins(:policy_arf_report).pluck(:id)
+      ForemanOpenscap::ArfReport.unscoped.where.not(:id => ids_to_keep).find_in_batches do |batch|
+        batch.map(&:destroy!)
+      end
     end
   end
 end

data/lib/foreman_openscap/version.rb

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

metadata

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