foreman_rh_cloud 3.0.17 → 3.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de4c573e51011ac6fd99707859fa86d659454b7f30183494ab5e240e773bec0a
-  data.tar.gz: f0510f09adf430834e01b9732a9cf6faedff0b18471e7b90fbca8a47fe867a13
+  metadata.gz: 50f4cac8e85d4aa6a6f5311e0276277ee3de729dfe29954d2fb8e907c2996e65
+  data.tar.gz: 96a40dac10cabdcf362add97a29d841a88a16d96a9cfb2a59c10eab0a64b8b5d
 SHA512:
-  metadata.gz: a5ef31993d25982136027082f9fb3d382133378627afd0f5da6eeb5eb24a971aa36cdb7f8995347b017ab438124219113e6b326a52f1821e0ccbdb0a6e402f52
-  data.tar.gz: e5da37635a059fadc6e6c62464aec98f75e803fddb1f8b1ca9b23ad27e42cffdb006bdd4ae5e59d10317d8599f6629ff8f4e08065a15947aff7f93133ec49e8a
+  metadata.gz: 9dee0e2da14903584e433cf39e5f21c0e6e913ee54a6c579d929dee1db8163d60990502d7404285d7df8fed49f2b2910e923d47adc529dbda0c5f9aada23174b
+  data.tar.gz: 9c468f95609d7d844ae0b0c1b8bbe697c4b43e55529a6dfc5030b74089b05c2d0fae0843e415cb98bec95dacd45c056d25b2130c8df141238059552303a62573

data/app/controllers/foreman_inventory_upload/accounts_controller.rb

@@ -10,36 +10,24 @@ module ForemanInventoryUpload
           upload_report_status = status_for(id, ForemanInventoryUpload::Async::UploadReportJob)
 
           [
-            id,
+            label,
             {
               generate_report_status: generate_report_status,
               upload_report_status: upload_report_status,
-              label: label,
+              id: id,
             },
           ]
         end
       ]
 
       render json: {
-        autoUploadEnabled: Setting[:allow_auto_inventory_upload],
-        hostObfuscationEnabled: Setting[:obfuscate_inventory_hostnames],
-        ipsObfuscationEnabled: Setting[:obfuscate_inventory_ips],
-        cloudToken: !Setting[:rh_cloud_token].empty?,
-        excludePackages: Setting[:exclude_installed_packages],
         accounts: accounts,
-        CloudConnectorStatus: cloud_connector_status,
+        CloudConnectorStatus: ForemanInventoryUpload::UploadsSettingsController.cloud_connector_status,
       }, status: :ok
     end
 
     private
 
-    def cloud_connector_status
-      cloud_connector = ForemanRhCloud::CloudConnector.new
-      job = cloud_connector&.latest_job
-      return nil unless job
-      { id: job.id, task: ForemanTasks::Task.where(:id => job.task_id).first }
-    end
-
     def status_for(label, job_class)
       label = job_class.output_label(label)
       ForemanInventoryUpload::Async::ProgressOutput.get(label)&.status

data/app/controllers/foreman_inventory_upload/uploads_controller.rb

@@ -21,53 +21,5 @@ module ForemanInventoryUpload
       cloud_connector = ForemanRhCloud::CloudConnector.new
       render json: cloud_connector.install.to_json
     end
-
-    def auto_upload
-      Setting[:allow_auto_inventory_upload] = auto_upload_params
-      render_setting(:autoUploadEnabled, :allow_auto_inventory_upload)
-    end
-
-    def show_auto_upload
-      render_setting(:autoUploadEnabled, :allow_auto_inventory_upload)
-    end
-
-    def auto_upload_params
-      ActiveModel::Type::Boolean.new.cast(params.require(:value))
-    end
-
-    def host_obfuscation
-      Setting[:obfuscate_inventory_hostnames] = host_obfuscation_params
-      render_setting(:hostObfuscationEnabled, :obfuscate_inventory_hostnames)
-    end
-
-    def host_obfuscation_params
-      ActiveModel::Type::Boolean.new.cast(params.require(:value))
-    end
-
-    def installed_packages_inclusion
-      Setting[:exclude_installed_packages] = host_obfuscation_params
-      render_setting(:excludePackages, :exclude_installed_packages)
-    end
-
-    def installed_packages_inclusion_params
-      ActiveModel::Type::Boolean.new.cast(params.require(:value))
-    end
-
-    def ips_obfuscation
-      Setting[:obfuscate_inventory_ips] = ips_obfuscation_params
-      render_setting(:ipsObfuscationEnabled, :obfuscate_inventory_ips)
-    end
-
-    def ips_obfuscation_params
-      ActiveModel::Type::Boolean.new.cast(params.require(:value))
-    end
-
-    private
-
-    def render_setting(node_name, setting)
-      render json: {
-        node_name => Setting[setting],
-      }
-    end
   end
 end

data/app/controllers/foreman_inventory_upload/uploads_settings_controller.rb

@@ -0,0 +1,26 @@
+module ForemanInventoryUpload
+  class UploadsSettingsController < ::ApplicationController
+    def index
+      render json: {
+        autoUploadEnabled: Setting[:allow_auto_inventory_upload],
+        hostObfuscationEnabled: Setting[:obfuscate_inventory_hostnames],
+        ipsObfuscationEnabled: Setting[:obfuscate_inventory_ips],
+        excludePackagesEnabled: Setting[:exclude_installed_packages],
+        CloudConnectorStatus: ForemanInventoryUpload::UploadsSettingsController.cloud_connector_status,
+        cloudToken: !Setting[:rh_cloud_token].empty?,
+      }, status: :ok
+    end
+
+    def set_advanced_setting
+      Setting[params.require(:setting)] = ActiveModel::Type::Boolean.new.cast(params.require(:value))
+      index
+    end
+
+    def self.cloud_connector_status
+      cloud_connector = ForemanRhCloud::CloudConnector.new
+      job = cloud_connector&.latest_job
+      return nil unless job
+      { id: job.id, task: ForemanTasks::Task.where(:id => job.task_id).first }
+    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?,

data/app/services/foreman_rh_cloud/branch_info.rb

@@ -38,20 +38,9 @@ module ForemanRhCloud
     end
 
     def host_labels(host)
-      labels = [new_label('Organization', host.organization.name, 'Satellite')]
-      labels += labels_from_items(host.location.title.split('/'), 'Satellite', ->(item) { 'Location' }) if host.location
-      labels += labels_from_items(host.hostgroup.title.split('/'), 'Satellite', ->(item) { 'Host Group' }) if host.hostgroup
-      labels += labels_from_items(host.host_collections, 'Satellite', ->(item) { 'Host Collection' }, :name)
-
-      if Setting[:include_parameter_tags]
-        labels += labels_from_items(
-          host.host_inherited_params_objects,
-          'SatelliteParameter',
-          ->(item) { item.name },
-          :value)
-      end
-
-      labels
+      tags_generator = ForemanInventoryUpload::Generators::Tags.new(host)
+      tags_generator.generate.map { |key, value| new_label(key, value, ForemanInventoryUpload::Generators::Slice::SATELLITE_NAMESPACE) } +
+        tags_generator.generate_parameters.map { |key, value| new_label(key, value, ForemanInventoryUpload::Generators::Slice::SATELLITE_PARAMS_NAMESPACE) }
     end
   end
 end

data/app/services/foreman_rh_cloud/cloud_connector.rb

@@ -9,13 +9,18 @@ module ForemanRhCloud
     def install
       user = service_user
       token_value = personal_access_token(user)
+      target_host = foreman_host
+      composer = nil
+
+      Taxonomy.as_taxonomy(target_host.organization, target_host.location) do
+        composer = ::JobInvocationComposer.for_feature(
+          CLOUD_CONNECTOR_FEATURE,
+          [target_host.id],
+          {:satellite_user => service_user.login, :satellite_password => token_value}
+        )
+        composer.trigger!
+      end
 
-      composer = ::JobInvocationComposer.for_feature(
-        CLOUD_CONNECTOR_FEATURE,
-        [foreman_host.id],
-        {:satellite_user => service_user.login, :satellite_password => token_value}
-      )
-      composer.trigger!
       composer.job_invocation
     end
 
@@ -54,7 +59,7 @@ module ForemanRhCloud
     end
 
     def foreman_host
-      ::Host.friendly.find(::SmartProxy.default_capsule.name)
+      ::Host.unscoped.friendly.find(::SmartProxy.default_capsule.name)
     end
   end
 end

data/app/services/foreman_rh_cloud/cloud_request_forwarder.rb

@@ -29,25 +29,7 @@ module ForemanRhCloud
           user_agent: http_user_agent(original_request),
         },
       }
-
-      if no_cert_paths.any? { |path| path.match original_request.path }
-        base_params.merge(url: prepare_forward_cloud_url(ForemanRhCloud.base_url, original_request.path))
-      else
-        base_params.merge(
-          url: prepare_forward_cloud_url(ForemanRhCloud.cert_base_url, original_request.path),
-          ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
-          ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key])
-        )
-      end
-    end
-
-    def no_cert_paths
-      [
-        "/redhat_access/r/insights/v1/static/release/insights-core.egg",
-        "/redhat_access/r/insights/v1/static/uploader.v2.json",
-        "/redhat_access/r/insights/v1/static/uploader.v2.json.asc",
-        "/redhat_access/r/insights/v1/static/core/insights-core.egg",
-      ]
+      base_params.merge(path_params(original_request.path, certs))
     end
 
     def execute_cloud_request(request_opts)
@@ -76,6 +58,36 @@ module ForemanRhCloud
       forward_params
     end
 
+    def path_params(request_path, certs)
+      case request_path
+      when metadata_request?
+        {
+          url: ForemanRhCloud.base_url + request_path.sub('/redhat_access/r/insights', '/api'),
+        }
+      when platform_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]),
+        }
+      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,
+        }
+      end
+    end
+
+    def metadata_request?
+      ->(request_path) { request_path.include? '/static' }
+    end
+
+    def platform_request?
+      ->(request_path) { request_path.include? '/platform' }
+    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/config/routes.rb

@@ -5,11 +5,8 @@ Rails.application.routes.draw do
     get ':organization_id/uploads/last', to: 'uploads#last', constraints: { organization_id: %r{[^\/]+} }
     get ':organization_id/uploads/file', to: 'uploads#download_file', constraints: { organization_id: %r{[^\/]+} }
     get 'accounts', to: 'accounts#index'
-    get 'auto_upload', to: 'uploads#show_auto_upload'
-    post 'auto_upload', to: 'uploads#auto_upload'
-    post 'host_obfuscation', to: 'uploads#host_obfuscation'
-    post 'installed_packages_inclusion', to: 'uploads#installed_packages_inclusion'
-    post 'ips_obfuscation', to: 'uploads#ips_obfuscation'
+    get 'settings', to: 'uploads_settings#index'
+    post 'setting', to: 'uploads_settings#set_advanced_setting'
 
     post 'cloud_connector', to: 'uploads#enable_cloud_connector'
 

data/db/migrate/20210307000001_add_unique_to_insights_facet.foreman_rh_cloud.rb

@@ -0,0 +1,11 @@
+class AddUniqueToInsightsFacet < ActiveRecord::Migration[5.2]
+  def change
+    # Remove duplicate records
+    InsightsFacet.where.not(id: InsightsFacet.select('max(id)').group(:host_id)).delete_all
+
+    # remove old index
+    remove_index :insights_facets, [:host_id]
+    # add unique constraint
+    add_index :insights_facets, [:host_id], unique: true
+  end
+end

data/lib/foreman_inventory_upload.rb

@@ -62,6 +62,7 @@ module ForemanInventoryUpload
   end
 
   def self.inventory_export_url
-    ForemanRhCloud.base_url + '/api/inventory/v1/hosts'
+    tags = URI.encode("satellite/satellite_instance_id=#{Foreman.instance_id}")
+    ForemanRhCloud.base_url + "/api/inventory/v1/hosts?tags=#{tags}"
   end
 end

data/lib/foreman_inventory_upload/generators/json_stream.rb

@@ -63,7 +63,7 @@ module ForemanInventoryUpload
         return value if value.is_a?(FalseClass)
         return value.to_json if value.is_a?(Hash)
 
-        "\"#{value}\""
+        ActiveSupport::JSON.encode(value)
       end
     end
   end

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -4,6 +4,7 @@ module ForemanInventoryUpload
       include FactHelpers
 
       SATELLITE_NAMESPACE = 'satellite'
+      SATELLITE_PARAMS_NAMESPACE = 'satellite_parameter'
 
       attr_accessor :slice_id
       attr_reader :hosts_count
@@ -63,15 +64,19 @@ module ForemanInventoryUpload
           end
 
           @stream.array_field('tags', :last) do
-            report_satellite_tag('satellite_instance_id', Foreman.instance_id) if Foreman.respond_to?(:instance_id)
-            report_satellite_tag('lifecycle_environment', host.lifecycle_environment&.name)
-            report_satellite_tag('content_view', host.content_view&.name)
-            report_satellite_tag('activation_key', host.activation_keys) { |key| key.name }
-            report_satellite_tag('host_collection', host.host_collections) { |collection| collection.name }
-            report_satellite_tag('location', host.location.name)
-            report_satellite_tag('organization', host.organization.name)
-            report_satellite_tag('hostgroup', host.hostgroup&.name)
-            report_satellite_tag('organization_id', host.organization_id.to_s, :last)
+            tags_generator = Tags.new(host)
+
+            host_params_tags = tags_generator.generate_parameters
+            host_params_tags.each do |key, value|
+              report_tag(SATELLITE_PARAMS_NAMESPACE, key, value)
+            end
+
+            tags = tags_generator.generate
+            last_index = tags.count - 1
+            tags.each_with_index do |pair, index|
+              key, value = pair
+              report_tag(SATELLITE_NAMESPACE, key, value, index == last_index)
+            end
           end
         end
       end
@@ -85,18 +90,6 @@ module ForemanInventoryUpload
         @stream.comma unless last
       end
 
-      def report_satellite_tag(key, value, last = nil)
-        return if value.nil?
-
-        array_value = Array(value)
-        last_index = array_value.count - 1
-
-        array_value.each_with_index do |value, index|
-          value = yield(value) if block_given?
-          report_tag(SATELLITE_NAMESPACE, key, value, last && index == last_index)
-        end
-      end
-
       def report_system_profile(host, host_ips_cache)
         @stream.simple_field('number_of_cpus', fact_value(host, 'cpu::cpu(s)')) { |v| v.to_i }
         @stream.simple_field('number_of_sockets', fact_value(host, 'cpu::cpu_socket(s)')) { |v| v.to_i }

data/lib/foreman_inventory_upload/generators/tags.rb

@@ -0,0 +1,59 @@
+module ForemanInventoryUpload
+  module Generators
+    class Tags
+      def initialize(host)
+        @host = host
+      end
+
+      def generate
+        locations +
+        hostgroups +
+        host_collections +
+        organizations +
+        content_data +
+        satellite_server_data
+      end
+
+      def generate_parameters
+        return [] unless Setting[:include_parameter_tags]
+
+        (@host.host_inherited_params_objects || []).map { |item| [item.name, item.value] }
+      end
+
+      private
+
+      def locations
+        return [] unless @host.location
+        @host.location.title.split('/').map { |item| ['location', item] }.push(['location', @host.location.title])
+      end
+
+      def hostgroups
+        return [] unless @host.hostgroup
+        @host.hostgroup.title.split('/').map { |item| ['hostgroup', item] }.push(['hostgroup', @host.hostgroup.title])
+      end
+
+      def host_collections
+        (@host.host_collections || []).map { |item| ['host collection', item.name] }
+      end
+
+      def organizations
+        [['organization', @host.organization.name]]
+      end
+
+      def content_data
+        [
+          ['lifecycle_environment', @host.lifecycle_environment&.name],
+          ['content_view', @host.content_view&.name],
+        ] +
+        (@host.activation_keys || []).map { |item| ['activation_key', item.name] }
+      end
+
+      def satellite_server_data
+        [
+          ['satellite_instance_id', Foreman.instance_id],
+          ['organization_id', @host.organization_id.to_s],
+        ]
+      end
+    end
+  end
+end

data/lib/foreman_rh_cloud.rb

@@ -12,6 +12,10 @@ module ForemanRhCloud
     @cert_base_url ||= ENV['SATELLITE_CERT_RH_CLOUD_URL'] || 'https://cert.cloud.redhat.com'
   end
 
+  def self.legacy_insights_url
+    @legacy_insights_url ||= ENV['SATELLITE_LEGACY_INSIGHTS_URL'] || 'https://cert-api.access.redhat.com'
+  end
+
   def self.authentication_url
     # https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token
     @authentication_url ||= ENV['SATELLITE_RH_CLOUD_SSO_URL'] || 'https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token'