foreman_rh_cloud 3.0.33 → 4.0.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f5ec744a85ab1dc41ab93fc5949cd4f86df921c6141848fd4a1f2de7d26e0f6
-  data.tar.gz: a9754dcaa8eb46f7260bccd6ba6e4fb730793df4caf2dff18370e19f7a8a62cf
+  metadata.gz: 97882071192995f2da93032050b9ecdfa616dba407c8d032bfd29f6741ea9d56
+  data.tar.gz: 88bca49cea9ee2abac2d2dc9d608a33329ad9e214d57035424e8e24984691537
 SHA512:
-  metadata.gz: a22b012bf970556113871948f939b034ca9a2487bd2bbb23118cbdfa475d46a4481a3f7b5934a49d2ca6871fb8fa3bd3d4ab2dd692f35024c7623f85491fa259
-  data.tar.gz: 1153735dba9d5f08046e331e4b560620a9d463270942e919c32d5f1d1b36f2fe674d25b605af9681eeecb06deacbc9a3c04dcf6fe4a998bf3d23b53bb92ecfa5
+  metadata.gz: 67dd2ada55ac862b2d57ddf893e7408d002c40c2f89a141e6bf8c115d6eeee32d19b156e7668751f591665f948fa04d628719e5f6f5ab9e4609c02f0a14a93f4
+  data.tar.gz: 54ded7bb163e4a38cd3fa4a62dfe101484b98e87c016514b985190f77a07c7556e980dd8574dc5fb70cacb3fcc521a37a1f4f2325e5360cdbb2ddd6f38816804

data/app/controllers/foreman_inventory_upload/reports_controller.rb

@@ -2,8 +2,6 @@
 
 module ForemanInventoryUpload
   class ReportsController < ::ApplicationController
-    include InventoryUpload::ReportActions
-
     def last
       label = ForemanInventoryUpload::Async::GenerateReportJob.output_label(params[:organization_id])
       output = ForemanInventoryUpload::Async::ProgressOutput.get(label)&.full_output
@@ -22,7 +20,7 @@ module ForemanInventoryUpload
     def generate
       organization_id = params[:organization_id]
 
-      start_report_generation(organization_id)
+      ForemanInventoryUpload::Async::GenerateReportJob.perform_later(ForemanInventoryUpload.generated_reports_folder, organization_id)
 
       render json: {
         action_status: 'success',

data/app/controllers/foreman_inventory_upload/tasks_controller.rb

@@ -1,17 +1,25 @@
 module ForemanInventoryUpload
   class TasksController < ::ApplicationController
-    include InventoryUpload::TaskActions
-
     def create
       selected_org = Organization.current
+      subscribed_hosts_ids = Set.new(
+        ForemanInventoryUpload::Generators::Queries.for_slice(
+          Host.unscoped.where(organization: selected_org)
+        ).pluck(:id)
+      )
 
-      task = start_inventory_sync(selected_org)
+      if subscribed_hosts_ids.empty?
+        return render json: {
+          message: N_('Nothing to sync, there are no hosts with subscription for this organization.'),
+        }, status: :method_not_allowed
+      else
+        task = ForemanTasks.async_task(InventorySync::Async::InventoryFullSync, selected_org)
+      end
+      return render json: { message: N_('there was an issue triggering the task') }, status: :internal_server_error unless task
 
       render json: {
         task: task,
       }, status: :ok
-    rescue InventoryUpload::TaskActions::NothingToSyncError => error
-      render json: { message: error.message }, status: :internal_server_error
     end
 
     def show

data/app/controllers/foreman_inventory_upload/uploads_controller.rb

@@ -1,7 +1,5 @@
 module ForemanInventoryUpload
   class UploadsController < ::ApplicationController
-    include InventoryUpload::ReportActions
-
     def last
       label = ForemanInventoryUpload::Async::UploadReportJob.output_label(params[:organization_id])
       output = ForemanInventoryUpload::Async::ProgressOutput.get(label)&.full_output
@@ -12,9 +10,11 @@ module ForemanInventoryUpload
     end
 
     def download_file
-      filename, file = report_file(params[:organization_id])
+      filename = ForemanInventoryUpload.facts_archive_name(params[:organization_id])
+      files = Dir["{#{ForemanInventoryUpload.uploads_file_path(filename)},#{ForemanInventoryUpload.done_file_path(filename)}}"]
 
-      send_file file, disposition: 'attachment', filename: filename
+      return send_file files.first, disposition: 'attachment', filename: filename unless files.empty?
+      raise ::Foreman::Exception.new("The report file doesn't exist")
     end
 
     def enable_cloud_connector

data/app/controllers/insights_cloud/api/machine_telemetries_controller.rb

@@ -5,7 +5,6 @@ module InsightsCloud::Api
     include ::InsightsCloud::ClientAuthentication
     include ::InsightsCloud::CandlepinCache
 
-    before_action :set_admin_user, only: [:forward_request]
     before_action :cert_uuid, :ensure_org, :ensure_branch_id, :only => [:forward_request, :branch_info]
     before_action :ensure_telemetry_enabled_for_consumer, :only => [:forward_request]
 
@@ -25,33 +24,14 @@ module InsightsCloud::Api
         }, status: :bad_gateway
       end
 
-      if @cloud_response.code >= 300
-        return render json: {
-          :message => 'Cloud request failed',
-          :headers => {},
-          :response => @cloud_response,
-        }, status: @cloud_response.code
+      if @cloud_response.headers[:content_disposition]
+        return send_data @cloud_response, disposition: @cloud_response.headers[:content_disposition], type: @cloud_response.headers[:content_type]
       end
 
-      # Append redhat-specific headers
-      @cloud_response.headers.each do |key, value|
-        assign_header(response, @cloud_response, key, false) if key.to_s.start_with?('x_rh_')
-      end
-      # Append general headers
       assign_header(response, @cloud_response, :x_resource_count, true)
-      headers[Rack::ETAG] = @cloud_response.headers[:etag]
+      assign_header(response, @cloud_response, :x_rh_insights_request_id, false)
 
-      if @cloud_response.headers[:content_disposition]
-        # If there is a Content-Disposition header, it means we are forwarding binary data, send the raw data with proper
-        # content type
-        send_data @cloud_response, disposition: @cloud_response.headers[:content_disposition], type: @cloud_response.headers[:content_type]
-      elsif @cloud_response.headers[:content_type] =~ /zip/
-        # if there is no Content-Disposition, but the content type is binary according the content type,
-        # forward the request as binry too
-        send_data @cloud_response, type: @cloud_response.headers[:content_type]
-      else
-        render json: @cloud_response, status: @cloud_response.code
-      end
+      render json: @cloud_response, status: @cloud_response.code
     end
 
     def branch_info
@@ -95,11 +75,9 @@ module InsightsCloud::Api
       return unless request.path == '/redhat_access/r/insights/platform/ingress/v1/upload' ||
                     request.path.include?('/redhat_access/r/insights/uploads/')
 
-      return unless @cloud_response.code.to_s.start_with?('2')
-
-      # create insights status if it wasn't there in the first place and refresh its reporting date
-      @host.get_status(InsightsClientReportStatus).refresh!
-      @host.refresh_global_status!
+      data = @cloud_response.code.to_s.start_with?('2')
+      host_status = @host.get_status(InsightsClientReportStatus)
+      host_status.update(reported_at: Time.now.utc, status: host_status.to_status(data: data))
     end
   end
 end

data/app/controllers/insights_cloud/hits_controller.rb

@@ -3,7 +3,7 @@ module InsightsCloud
     include Foreman::Controller::AutoCompleteSearch
 
     def index
-      hits = resource_base_search_and_page.preload(:host, :rule)
+      hits = resource_base_search_and_page.where(host: Host.authorized).preload(:host, :rule)
 
       render json: {
         hasToken: !Setting[:rh_cloud_token].empty?,
@@ -23,9 +23,9 @@ module InsightsCloud
 
     def resolutions
       if remediation_all_selected_param
-        hits = resource_base.with_playbook.search_for(params[:query])
+        hits = InsightsHit.with_playbook.search_for(params[:query])
       else
-        hits = resource_base_search_and_page.with_playbook.where(id: remediation_ids_param)
+        hits = resource_base_search_and_page.where(id: remediation_ids_param)
       end
 
       hits.preload(:host, rule: :resolutions)
@@ -74,9 +74,5 @@ module InsightsCloud
     def remediation_all_selected_param
       ActiveModel::Type::Boolean.new.cast(params[:isAllSelected])
     end
-
-    def resource_base
-      super.where(host: Host.authorized)
-    end
   end
 end

data/app/models/insights_client_report_status.rb

@@ -1,11 +1,10 @@
 class InsightsClientReportStatus < HostStatus::Status
   REPORT_INTERVAL = 48.hours
 
-  REPORTING             = 0
-  NO_REPORT             = 1
-
-  scope :stale, -> { where.not(reported_at: (Time.now - REPORT_INTERVAL)..Time.now) }
-  scope :reporting, -> { where(status: REPORTING) }
+  REPORTING             = 0 # host_registration_insights = true & getting data
+  NO_REPORT             = 1 # host_registration_insights = true & not getting data
+  NOT_MANAGED           = 2 # host_registration_insights = false
+  NOT_MANAGED_WITH_DATA = 3 # host_registration_insights = false & getting data
 
   def self.status_name
     N_('Insights')
@@ -17,6 +16,10 @@ class InsightsClientReportStatus < HostStatus::Status
         N_('Reporting')
       when NO_REPORT
         N_('Not reporting')
+      when NOT_MANAGED
+        N_('Not reporting (not set by registration)')
+      when NOT_MANAGED_WITH_DATA
+        N_('Reporting (not set by registration)')
     end
   end
 
@@ -26,16 +29,20 @@ class InsightsClientReportStatus < HostStatus::Status
         ::HostStatus::Global::OK
       when NO_REPORT
         ::HostStatus::Global::ERROR
+      when NOT_MANAGED
+        ::HostStatus::Global::OK
+      when NOT_MANAGED_WITH_DATA
+        ::HostStatus::Global::WARN
     end
   end
 
-  def to_status
-    in_interval? ? REPORTING : NO_REPORT
-  end
+  def to_status(data: false)
+    if insights_param
+      return REPORTING if data
+      return in_interval? ? REPORTING : NO_REPORT
+    end
 
-  # prevent creation of the status on global refresh, but show it if the record already exists
-  def relevant?(_options = {})
-    persisted?
+    data ? NOT_MANAGED_WITH_DATA : NOT_MANAGED
   end
 
   private
@@ -44,4 +51,8 @@ class InsightsClientReportStatus < HostStatus::Status
     return false unless reported_at
     (Time.now.utc - reported_at).to_i < REPORT_INTERVAL.to_i
   end
+
+  def insights_param
+    host.host_params_hash.dig('host_registration_insights', :value)
+  end
 end

data/app/services/foreman_rh_cloud/cloud_auth.rb

@@ -2,12 +2,6 @@ module ForemanRhCloud
   module CloudAuth
     extend ActiveSupport::Concern
 
-    include CloudRequest
-
-    def cloud_auth_available?
-      Setting[:rh_cloud_token].present?
-    end
-
     def rh_credentials
       @rh_credentials ||= query_refresh_token
     end
@@ -30,15 +24,5 @@ module ForemanRhCloud
       Foreman::Logging.exception('Unable to authenticate using rh_cloud_token setting', e)
       raise ::Foreman::WrappedException.new(e, N_('Unable to authenticate using rh_cloud_token setting'))
     end
-
-    def execute_cloud_request(params)
-      final_params = {
-        headers: {
-          Authorization: "Bearer #{rh_credentials}",
-        },
-      }.deep_merge(params)
-
-      super(final_params)
-    end
   end
 end

data/app/services/foreman_rh_cloud/cloud_request_forwarder.rb

@@ -2,7 +2,7 @@ require 'rest-client'
 
 module ForemanRhCloud
   class CloudRequestForwarder
-    include ForemanRhCloud::CloudRequest
+    include ::ForemanRhCloud::CloudAuth
 
     def forward_request(original_request, controller_name, branch_id, certs)
       forward_params = prepare_forward_params(original_request, branch_id)
@@ -17,24 +17,26 @@ module ForemanRhCloud
       logger.debug("Sending request to: #{request_opts[:url]}")
 
       execute_cloud_request(request_opts)
-    rescue RestClient::Exception => error_response
-      error_response.response
     end
 
     def prepare_request_opts(original_request, forward_payload, forward_params, certs)
       base_params = {
         method: original_request.method,
+        verify_ssl: ForemanRhCloud.verify_ssl_method,
         payload: forward_payload,
-        headers: original_headers(original_request).merge(
-          {
-            params: forward_params,
-            user_agent: http_user_agent(original_request),
-            content_type: original_request.media_type.presence || original_request.format.to_s,
-          }),
+        headers: {
+          params: forward_params,
+          user_agent: http_user_agent(original_request),
+          content_type: original_request.media_type,
+        },
       }
       base_params.merge(path_params(original_request.path, certs))
     end
 
+    def execute_cloud_request(request_opts)
+      RestClient::Request.execute request_opts
+    end
+
     def prepare_forward_payload(original_request, controller_name)
       forward_payload = original_request.request_parameters[controller_name]
 
@@ -59,15 +61,13 @@ module ForemanRhCloud
 
     def path_params(request_path, certs)
       case request_path
-      when platform_request?
+      when metadata_request?
         {
-          url: ForemanRhCloud.cert_base_url + request_path.sub('/redhat_access/r/insights/platform', '/api'),
-          ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
-          ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key]),
+          url: ForemanRhCloud.base_url + request_path.sub('/redhat_access/r/insights', '/api'),
         }
-      when connection_test_request?
+      when platform_request?
         {
-          url: ForemanRhCloud.cert_base_url + '/api/apicast-tests/ping',
+          url: ForemanRhCloud.cert_base_url + request_path.sub('/redhat_access/r/insights/platform', '/api'),
           ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
           ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key]),
         }
@@ -81,24 +81,14 @@ module ForemanRhCloud
       end
     end
 
-    def original_headers(original_request)
-      headers = {
-        if_none_match: original_request.if_none_match,
-        if_modified_since: original_request.if_modified_since,
-      }.compact
-
-      logger.debug("Sending headers: #{headers}")
-      headers
+    def metadata_request?
+      ->(request_path) { request_path.include? '/static' }
     end
 
     def platform_request?
       ->(request_path) { request_path.include? '/platform' }
     end
 
-    def connection_test_request?
-      ->(request_path) { request_path =~ /redhat_access\/r\/insights\/?$/ }
-    end
-
     def prepare_forward_cloud_url(base_url, request_path)
       cloud_path = request_path.sub('/redhat_access/r/insights/platform/', '')
                                .sub('/redhat_access/r/insights/', '')

data/app/services/foreman_rh_cloud/remediations_retriever.rb

@@ -12,11 +12,6 @@ module ForemanRhCloud
     end
 
     def create_playbook
-      unless cloud_auth_available?
-        logger.debug('Cloud authentication is not available, cannot continue')
-        return
-      end
-
       response = query_playbook
 
       logger.debug("Got playbook response: #{response.body}")
@@ -67,11 +62,14 @@ module ForemanRhCloud
     end
 
     def query_playbook
-      execute_cloud_request(
+      RestClient::Request.execute(
         method: :post,
         url: InsightsCloud.playbook_url,
+        verify_ssl: ForemanRhCloud.verify_ssl_method,
+        proxy: ForemanRhCloud.transformed_http_proxy_string(logger: logger),
         headers: {
           content_type: :json,
+          Authorization: "Bearer #{rh_credentials}",
         },
         payload: playbook_request.to_json
       )

data/app/subscribers/foreman_rh_cloud/insights_subscriber.rb

@@ -0,0 +1,9 @@
+module ForemanRhCloud
+  class InsightsSubscriber < ::Foreman::BaseSubscriber
+    def call(*args)
+      host = args.first.payload[:object]
+      host_status = host.get_status(InsightsClientReportStatus)
+      host_status.update(status: host_status.to_status)
+    end
+  end
+end