foreman_rh_cloud 4.0.25 → 5.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ac06b57bc84d2c31a7a2e5ad8ec8874053bf4419f018c94b95192ba7281ccf4
-  data.tar.gz: 1e8dd2dce4252a247123e0662f6b33621fadf34e3d03a008335d1902dc7d69db
+  metadata.gz: 012fcceed18a6413326df32052bee870b299682bc114d5c3e59954bda33b2475
+  data.tar.gz: bb72b384fc54d6c19951c453c69b0ecaae5d26bf844fc85b4d4b56f04e1e76bd
 SHA512:
-  metadata.gz: e7f0324f7854d483ce3c8836fcc5a70af02ed5f3f1bb64e3e1fcb68603eb4daa078b7cb7090ba4b9bcda6c4003639d5cd7265432f5d0b60b89cd5bccaf521fe3
-  data.tar.gz: f8e8b5317c59dc110e7315ba8bf665d7bdeda836e899dc81c1c7bcecdcd81a4568b0c8ad9849e69b9f74dd4cf7127ca097f234001b1492992d677d4cd5b44939
+  metadata.gz: 70904b446fce3a2ca3a794c418aaa1591f4276bd35d1636a629e7361b75c62163fc76ad45caa024752a763ef6a9e6344e979dff8f9e9a017c19ac878f667a649
+  data.tar.gz: 4fd0e25610e4848565178f19e5a3ffb1da2d9b1505cd604f18a9276bba931f6fea3fbbddcd6c1e375a9d655a4c0b506c3937d89e9e7899b4aed37ae05c72b542

data/app/controllers/api/v2/rh_cloud/inventory_controller.rb

@@ -7,6 +7,7 @@ module Api
         include InventoryUpload::TaskActions
 
         api :GET, "/organizations/:organization_id/rh_cloud/report", N_("Download latest report")
+        param :organization_id, Integer, required: true, desc: N_("Set the current organization context for the request")
         def download_file
           filename, file = report_file(params[:organization_id])
 
@@ -16,6 +17,7 @@ module Api
         end
 
         api :POST, "/organizations/:organization_id/rh_cloud/report", N_("Start report generation")
+        param :organization_id, Integer, required: true, desc: N_("Set the current organization context for the request")
         def generate_report
           organization_id = params[:organization_id]
 
@@ -27,6 +29,7 @@ module Api
         end
 
         api :POST, "/organizations/:organization_id/rh_cloud/inventory_sync", N_("Start inventory synchronization")
+        param :organization_id, Integer, required: true, desc: N_("Set the current organization context for the request")
         def sync_inventory_status
           selected_org = Organization.find(params[:organization_id])
 
@@ -39,7 +42,7 @@ module Api
           render json: { message: error.message }, status: :bad_request
         end
 
-        api :POST, "rh_cloud/enable_connector", N_("Enable cloud connector")
+        api :POST, "/rh_cloud/enable_connector", N_("Enable cloud connector")
         def enable_cloud_connector
           cloud_connector = ForemanRhCloud::CloudConnector.new
           render json: cloud_connector.install.to_json

data/app/controllers/concerns/inventory_upload/report_actions.rb

@@ -11,7 +11,7 @@ module InventoryUpload
     end
 
     def start_report_generation(organization_id)
-      ForemanInventoryUpload::Async::GenerateReportJob.perform_later(ForemanInventoryUpload.generated_reports_folder, organization_id)
+      ForemanTasks.async_task(ForemanInventoryUpload::Async::GenerateReportJob, ForemanInventoryUpload.generated_reports_folder, organization_id)
     end
 
     def report_file(organization_id)

data/app/controllers/foreman_inventory_upload/cloud_status_controller.rb

@@ -0,0 +1,26 @@
+module ForemanInventoryUpload
+  class CloudStatusController < ::ApplicationController
+    def index
+      organizations = User.current.my_organizations
+
+      ping_service = ForemanRhCloud::CloudPingService.new(organizations, logger)
+      ping_result = ping_service.ping
+      ping_result[:cert_auth] =  ping_result[:cert_auth].map do |org, status_hash|
+        status_hash.merge(
+          {
+            org_id: org.id,
+            org_name: org.name,
+          }
+        )
+      end
+
+      render json: {
+        ping: ping_result,
+      }, status: :ok
+    end
+
+    def logger
+      Foreman::Logging.logger('app')
+    end
+  end
+end

data/app/controllers/foreman_inventory_upload/reports_controller.rb

@@ -7,7 +7,7 @@ module ForemanInventoryUpload
     def last
       label = ForemanInventoryUpload::Async::GenerateReportJob.output_label(params[:organization_id])
       output = ForemanInventoryUpload::Async::ProgressOutput.get(label)&.full_output
-      task_label = ForemanInventoryUpload::Async::GenerateAllReportsJob.singleton_job_name
+      task_label = ForemanInventoryUpload::Async::GenerateAllReportsJob.name
       scheduled = ForemanTasks::Task.where(
         :label => task_label,
         :state => 'scheduled'

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

@@ -25,6 +25,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
+      end
+
       if @cloud_response.headers[:content_disposition]
         return send_data @cloud_response, disposition: @cloud_response.headers[:content_disposition], type: @cloud_response.headers[:content_type]
       end
@@ -49,13 +57,19 @@ module InsightsCloud::Api
     private
 
     def ensure_telemetry_enabled_for_consumer
-      render_message 'Telemetry is not enabled for your organization', :status => 403 unless telemetry_config
+      unless (config = telemetry_config(@host))
+        logger.debug("Rejected telemetry forwarding for host #{@host.name}, insights param is set to: #{config}")
+        render_message 'Telemetry is not enabled for this host', :status => 403
+      end
+      config
     end
 
-    def telemetry_config
-      ::RedhatAccess::TelemetryConfiguration.find_or_create_by(:organization_id => @organization.id) do |conf|
-        conf.enable_telemetry = true
+    def telemetry_config(host)
+      param_value = nil
+      User.as_anonymous_admin do
+        param_value = host.host_param(InsightsCloud.enable_client_param)
       end
+      param_value
     end
 
     def cert_uuid

data/app/controllers/insights_cloud/hits_controller.rb

@@ -9,7 +9,6 @@ module InsightsCloud
         hasToken: !Setting[:rh_cloud_token].empty?,
         hits: hits.map { |hit| hit.attributes.merge(hostname: hit.host&.name, has_playbook: hit.has_playbook?) },
         itemCount: hits.count,
-        isExperimentalMode: Setting[:lab_features],
       }, status: :ok
     end
 

data/app/models/setting/rh_cloud.rb

@@ -12,7 +12,6 @@ class Setting::RhCloud < Setting
   end
 
   def self.default_settings
-    return unless ActiveRecord::Base.connection.table_exists?('settings')
     [
       set('allow_auto_inventory_upload', N_('Enable automatic upload of your host inventory to the Red Hat cloud'), true, N_('Automatic inventory upload')),
       set('allow_auto_insights_sync', N_('Enable automatic synchronization of Insights recommendations from the Red Hat cloud'), false, N_('Synchronize recommendations Automatically')),

data/app/models/task_output_line.rb

@@ -0,0 +1,2 @@
+class TaskOutputLine < ApplicationRecord
+end

data/app/models/task_output_status.rb

@@ -0,0 +1,2 @@
+class TaskOutputStatus < ApplicationRecord
+end

data/app/services/foreman_rh_cloud/cloud_ping_service.rb

@@ -0,0 +1,83 @@
+require 'rest-client'
+
+module ForemanRhCloud
+  class CloudPingService
+    class TokenPing
+      include ForemanRhCloud::CloudAuth
+
+      attr_accessor :logger
+
+      def initialize(logger)
+        @logger = logger
+      end
+
+      def ping
+        execute_cloud_request(
+          method: :get,
+          url: ForemanRhCloud.base_url + "/api/inventory/v1/hosts?per_page=1",
+          headers: {
+            content_type: :json,
+          }
+        )
+      rescue StandardError => ex
+        ex
+      end
+    end
+
+    class CertPing
+      include ForemanRhCloud::CloudRequest
+      include InsightsCloud::CandlepinCache
+
+      attr_accessor :logger
+
+      def initialize(org, logger)
+        @org = org
+        @logger = logger
+      end
+
+      def ping
+        certs = candlepin_id_cert(@org)
+        return StandardError.new('certificate missing') unless certs
+
+        execute_cloud_request(
+          method: :get,
+          url: ForemanRhCloud.cert_base_url + "/api/apicast-tests/ping",
+          headers: {
+            content_type: :json,
+          },
+          ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
+          ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key])
+        )
+      rescue StandardError => ex
+        ex
+      end
+    end
+
+    def initialize(organizations, logger)
+      @organizations = organizations
+      @logger = logger
+    end
+
+    def ping
+      token_response = TokenPing.new(@logger).ping
+      {
+        token_auth: {
+          success: token_response.is_a?(RestClient::Response),
+          error: (token_response.is_a?(Exception) ? token_response.inspect : nil),
+        },
+        cert_auth: Hash[
+          @organizations.map do |org|
+            cert_response = CertPing.new(org, @logger).ping
+            [
+              org,
+              {
+                success: cert_response.is_a?(RestClient::Response),
+                error: (cert_response.is_a?(Exception) ? cert_response.inspect : nil),
+              },
+            ]
+          end
+        ],
+      }
+    end
+  end
+end

data/app/services/foreman_rh_cloud/cloud_request_forwarder.rb

@@ -17,6 +17,8 @@ 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)
@@ -62,12 +64,18 @@ module ForemanRhCloud
           ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
           ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key]),
         }
+      when connection_test_request?
+        {
+          url: ForemanRhCloud.cert_base_url + '/api/apicast-tests/ping',
+          ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
+          ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key]),
+        }
       else # Legacy insights API
         {
           url: ForemanRhCloud.legacy_insights_url + request_path.sub('/redhat_access/r/insights', '/r/insights'),
           ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
           ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key]),
-          ssl_ca_file: Class.new.include(RedhatAccess::Telemetry::LookUps).new.get_default_ssl_ca_file,
+          ssl_ca_file: ForemanRhCloud.legacy_insights_ca,
         }
       end
     end
@@ -76,6 +84,10 @@ module ForemanRhCloud
       ->(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/', '')
@@ -84,11 +96,11 @@ module ForemanRhCloud
     end
 
     def core_app_name
-      'Foreman'
+      BranchInfo.new.core_app_name
     end
 
     def core_app_version
-      Foreman::Version.new
+      BranchInfo.new.core_app_version
     end
 
     def http_user_agent(original_request)