foreman_rh_cloud 2.0.4 → 2.0.9

data/lib/foreman_inventory_upload/generators/queries.rb

@@ -18,6 +18,13 @@ module ForemanInventoryUpload
               'uname::release',
               'lscpu::flags',
               'distribution::version',
+              'distribution::id',
+              'virt::is_guest',
+              'dmi::system::manufacturer',
+              'dmi::system::product_name',
+              'dmi::chassis::asset_tag',
+              'insights_client::obfuscate_hostname_enabled',
+              'insights_client::hostname',
             ]).pluck(:name, :id)
           ]
       end

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -4,11 +4,13 @@ module ForemanInventoryUpload
       include FactHelpers
 
       attr_accessor :slice_id
+      attr_reader :hosts_count
 
       def initialize(hosts, output = [], slice_id = Foreman.uuid)
         @stream = JsonStream.new(output)
         @hosts = hosts
         @slice_id = slice_id
+        @hosts_count = 0
       end
 
       def render
@@ -24,9 +26,12 @@ module ForemanInventoryUpload
           @stream.array_field('hosts', :last) do
             first = true
             hosts_batch.each do |host|
-              next unless host&.subscription_facet&.pools&.first
+              next unless host&.subscription_facet
               @stream.comma unless first
-              first = false if report_host(host)
+              if report_host(host)
+                first = false
+                @hosts_count += 1
+              end
             end
           end
         end
@@ -34,23 +39,14 @@ module ForemanInventoryUpload
 
       def report_host(host)
         @stream.object do
-          @stream.simple_field('display_name', host.name)
-          @stream.simple_field('fqdn', host.fqdn)
-          @stream.simple_field('account', host.subscription_facet.pools.first.account_number.to_s)
-          @stream.simple_field('subscription_manager_id', host.subscription_facet.uuid)
-          @stream.simple_field('satellite_id', host.subscription_facet.uuid)
+          @stream.simple_field('fqdn', fqdn(host))
+          @stream.simple_field('account', account_id(host.organization).to_s)
+          @stream.simple_field('subscription_manager_id', host.subscription_facet&.uuid)
+          @stream.simple_field('satellite_id', host.subscription_facet&.uuid)
           @stream.simple_field('bios_uuid', fact_value(host, 'dmi::system::uuid'))
           @stream.simple_field('vm_uuid', fact_value(host, 'virt::uuid'))
-          @stream.array_field('ip_addresses') do
-            @stream.raw(host.interfaces.map do |nic|
-              @stream.stringify_value(nic.ip) if nic.ip
-            end.compact.join(', '))
-          end
-          @stream.array_field('mac_addresses') do
-            @stream.raw(host.interfaces.map do |nic|
-              @stream.stringify_value(nic.mac) if nic.mac
-            end.compact.join(', '))
-          end
+          report_ip_addresses(host)
+          report_mac_addresses(host)
           @stream.object_field('system_profile') do
             report_system_profile(host)
           end
@@ -65,7 +61,7 @@ module ForemanInventoryUpload
 
           @stream.array_field('tags', :last) do
             report_tag('satellite', 'satellite_instance_id', Foreman.instance_id) if Foreman.respond_to?(:instance_id)
-            report_tag('satellite', 'organization_id', host.organization_id, :last)
+            report_tag('satellite', 'organization_id', host.organization_id.to_s, :last)
           end
         end
       end
@@ -105,12 +101,24 @@ module ForemanInventoryUpload
             end.join(', '))
           end
         end
-        @stream.simple_field('os_release', fact_value(host, 'distribution::name'))
+        @stream.simple_field(
+          'os_release',
+          os_release_value(
+            name: fact_value(host, 'distribution::name'),
+            version: fact_value(host, 'distribution::version'),
+            codename: fact_value(host, 'distribution::id')
+          )
+        )
         @stream.simple_field('os_kernel_version', fact_value(host, 'uname::release'))
         @stream.simple_field('arch', host.architecture&.name)
         @stream.simple_field('subscription_status', host.subscription_status_label)
         @stream.simple_field('katello_agent_running', host.content_facet&.katello_agent_installed?)
         @stream.simple_field('satellite_managed', true)
+        @stream.simple_field(
+          'infrastructure_type',
+          ActiveModel::Type::Boolean.new.cast(fact_value(host, 'virt::is_guest')) ? 'virtual' : 'physical'
+        )
+        @stream.simple_field('cloud_provider', cloud_provider(host))
         unless (installed_products = host.subscription_facet&.installed_products).empty?
           @stream.array_field('installed_products') do
             @stream.raw(installed_products.map do |product|
@@ -131,17 +139,35 @@ module ForemanInventoryUpload
       end
 
       def report_satellite_facts(host)
-        @stream.simple_field('virtual_host_name', host.subscription_facet.hypervisor_host&.name)
-        @stream.simple_field('virtual_host_uuid', host.subscription_facet.hypervisor_host&.subscription_facet&.uuid)
+        @stream.simple_field('virtual_host_name', host.subscription_facet&.hypervisor_host&.name)
+        @stream.simple_field('virtual_host_uuid', host.subscription_facet&.hypervisor_host&.subscription_facet&.uuid)
         if defined?(ForemanThemeSatellite)
           @stream.simple_field('satellite_version', ForemanThemeSatellite::SATELLITE_VERSION)
         end
         @stream.simple_field('system_purpose_usage', host.subscription_facet.purpose_usage)
         @stream.simple_field('system_purpose_role', host.subscription_facet.purpose_role)
         @stream.simple_field('distribution_version', fact_value(host, 'distribution::version'))
-        @stream.simple_field('satellite_instance_id', Foreman.respond_to?(:instance_id) ? Foreman.instance_id : nil)
+        @stream.simple_field('satellite_instance_id', Foreman.try(:instance_id))
+        @stream.simple_field('is_simple_content_access', golden_ticket?(host.organization))
+        @stream.simple_field('is_hostname_obfuscated', !!obfuscate_hostname?(host))
         @stream.simple_field('organization_id', host.organization_id, :last)
       end
+
+      def report_ip_addresses(host)
+        ip_addresses = host.interfaces.map { |nic| nic.ip }.compact
+
+        @stream.string_array_value('ip_addresses', ip_addresses)
+      end
+
+      def report_mac_addresses(host)
+        macs = host.interfaces.map { |nic| nic.mac }.compact
+
+        @stream.string_array_value('mac_addresses', macs)
+      end
+
+      def os_release_value(name:, version:, codename:)
+        "#{name} #{version} (#{codename})"
+      end
     end
   end
 end

data/lib/foreman_inventory_upload/notifications/manifest_import_success_notification_override.rb

@@ -0,0 +1,19 @@
+module ForemanInventoryUpload
+  module Notifications
+    module ManifestImportSuccessNotificationOverride
+      extend ActiveSupport::Concern
+
+      def actions
+        {
+          :links => [
+            {
+              :href => Rails.application.routes.url_helpers.foreman_rh_cloud_inventory_upload_path,
+              :title => _('Enable inventory upload'),
+              :external => false,
+            },
+          ],
+        }
+      end
+    end
+  end
+end

data/lib/foreman_inventory_upload/scripts/uploader.sh.erb

@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
 
 DEST=<%= @upload_url %>
 RH_USERNAME=<%= @rh_username %>

data/lib/foreman_rh_cloud/engine.rb

@@ -5,6 +5,10 @@ module ForemanRhCloud
   class Engine < ::Rails::Engine
     engine_name 'foreman_rh_cloud'
 
+    initializer 'foreman_rh_cloud.load_default_settings', :before => :load_config_initializers do
+      require_dependency File.expand_path('../../app/models/setting/rh_cloud.rb', __dir__)
+    end
+
     config.autoload_paths += Dir["#{config.root}/app/controllers/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/helpers/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
@@ -26,17 +30,41 @@ module ForemanRhCloud
 
         # Add permissions
         security_block :foreman_rh_cloud do
-          permission :view_foreman_rh_cloud, :'foreman_rh_cloud/reports' => [:last]
+          permission(
+            :generate_foreman_rh_cloud,
+            'foreman_inventory_upload/reports': [:generate]
+          )
+          permission(
+            :view_foreman_rh_cloud,
+            'foreman_inventory_upload/accounts': [:index],
+            'foreman_inventory_upload/reports': [:last],
+            'foreman_inventory_upload/uploads': [:auto_upload, :show_auto_upload, :download_file, :last],
+            'foreman_rh_cloud/react': [:inventory_upload]
+          )
         end
 
-        # Add a new role called 'Discovery' if it doesn't exist
-        role 'ForemanRhCloud', [:view_foreman_rh_cloud]
+        plugin_permissions = [:view_foreman_rh_cloud, :generate_foreman_rh_cloud]
+
+        role 'ForemanRhCloud', plugin_permissions, 'Role granting permissions to view the hosts inventory,
+                                                    generate a report, upload it to the cloud and download it locally'
+
+        add_permissions_to_default_roles Role::ORG_ADMIN => plugin_permissions,
+                                         Role::MANAGER => plugin_permissions,
+                                         Role::SYSTEM_ADMIN => plugin_permissions
 
         # Adding a sub menu after hosts menu
-        sub_menu :top_menu, :foreman_rh_cloud, :caption => N_('RH Cloud'), :icon => 'fa fa-cloud-upload' do
-          menu :top_menu, :level1, :caption => N_('Inventory Upload'), :url_hash => { controller: :'foreman_inventory_upload/react', :action => :index}
+        divider :top_menu, caption: N_('RH Cloud'), parent: :configure_menu
+        menu :top_menu, :inventory_upload, :caption => N_('Inventory Upload'), :url_hash => { controller: :'foreman_rh_cloud/react', :action => :inventory_upload}, parent: :configure_menu
+        menu :top_menu, :insights_hits_import, :caption => N_('Insights'), :url_hash => { controller: :'foreman_rh_cloud/react', :action => :insights_cloud }, parent: :configure_menu
+
+        register_facet InsightsFacet, :insights do
+          configure_host
         end
+
+        register_global_js_file 'subscriptions_extension'
       end
+
+      ::Katello::UINotifications::Subscriptions::ManifestImportSuccess.include ForemanInventoryUpload::Notifications::ManifestImportSuccessNotificationOverride if defined?(Katello)
     end
 
     initializer "foreman_rh_cloud.set_dynflow.config.on_init", :before => :finisher_hook do |_app|

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '2.0.4'.freeze
+  VERSION = '2.0.9'.freeze
 end

data/lib/insights_cloud.rb

@@ -0,0 +1,15 @@
+module InsightsCloud
+  def self.base_url
+    # for testing set ENV to 'https://ci.cloud.redhat.com'
+    @base_url ||= ENV['SATELLITE_INSIGHTS_CLOUD_URL'] || 'https://cloud.redhat.com'
+  end
+
+  def self.authentication_url
+    # https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token
+    @authentication_url ||= ENV['SATELLITE_INSIGHTS_CLOUD_SSO_URL'] || 'https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token'
+  end
+
+  def self.hits_export_url
+    base_url + '/api/insights/v1/export/hits/'
+  end
+end

data/lib/insights_cloud/async/insights_full_sync.rb

@@ -0,0 +1,96 @@
+require 'rest-client'
+
+module InsightsCloud
+  module Async
+    class InsightsFullSync < ::ApplicationJob
+      def perform(organization)
+        @organization = organization
+
+        hits = query_insights_hits
+
+        host_names = hits.map { |hit| hit['hostname'] }.uniq
+        setup_host_names(host_names)
+
+        replace_hits_data(hits)
+      end
+
+      def logger
+        Foreman::Logging.logger('background')
+      end
+
+      def rh_credentials
+        @rh_credentials ||= query_refresh_token
+      end
+
+      private
+
+      def query_insights_hits
+        hits_response = RestClient::Request.execute(
+          method: :get,
+          url: InsightsCloud.hits_export_url,
+          verify_ssl: ENV['SATELLITE_INSIGHTS_CLOUD_URL'] ? OpenSSL::SSL::VERIFY_NONE : OpenSSL::SSL::VERIFY_PEER,
+          headers: {
+            Authorization: "Bearer #{rh_credentials}",
+          }
+        )
+
+        JSON.parse(hits_response)
+      end
+
+      def query_refresh_token
+        token_response = RestClient::Request.execute(
+          method: :post,
+          url: InsightsCloud.authentication_url,
+          verify_ssl: ENV['SATELLITE_INSIGHTS_CLOUD_URL'] ? OpenSSL::SSL::VERIFY_NONE : OpenSSL::SSL::VERIFY_PEER,
+          payload: {
+            grant_type: 'refresh_token',
+            client_id: 'rhsm-api',
+            refresh_token: Setting[:rh_cloud_token],
+          }
+        )
+
+        JSON.parse(token_response)['access_token']
+      rescue RestClient::ExceptionWithResponse => e
+        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 setup_host_names(host_names)
+        @host_ids = Hash[
+          Host.where(name: host_names).pluck(:name, :id)
+        ]
+      end
+
+      def host_id(host_name)
+        @host_ids[host_name]
+      end
+
+      def replace_hits_data(hits)
+        InsightsHit.transaction do
+          InsightsHit.delete_all
+          InsightsHit.create(hits.map { |hits_hash| to_model_hash(hits_hash) }.compact)
+          # create new facets for hosts that are missing one
+          hosts_with_existing_facets = InsightsFacet.where(host_id: @host_ids.values).pluck(:host_id)
+          InsightsFacet.create((@host_ids.values - hosts_with_existing_facets).map { |id| {host_id: id} })
+        end
+      end
+
+      def to_model_hash(hit_hash)
+        hit_host_id = host_id(hit_hash['hostname'])
+
+        return unless hit_host_id
+
+        {
+          host_id: hit_host_id,
+          last_seen: DateTime.parse(hit_hash['last_seen']),
+          publish_date: DateTime.parse(hit_hash['publish_date']),
+          title: hit_hash['title'],
+          solution_url: hit_hash['solution_url'],
+          total_risk: hit_hash['total_risk'].to_i,
+          likelihood: hit_hash['likelihood'].to_i,
+          results_url: hit_hash['results_url'],
+        }
+      end
+    end
+  end
+end

data/test/controllers/accounts_controller_test.rb

@@ -14,12 +14,17 @@ class AccountsControllerTest < ActionController::TestCase
     upload_label = ForemanInventoryUpload::Async::UploadReportJob.output_label(test_org.id)
     upload_output = ForemanInventoryUpload::Async::ProgressOutput.register(upload_label)
     upload_output.status = 'upload_status_test'
+    FactoryBot.create(:setting, :name => 'allow_auto_inventory_upload', :value => true)
+    assert_equal true, Setting[:allow_auto_inventory_upload]
 
     get :index, session: set_session_user
 
     assert_response :success
-    actual = JSON.parse(response.body)['accounts'][test_org.id.to_s]
-    assert_equal 'generate_status_test', actual['generate_report_status']
-    assert_equal 'upload_status_test', actual['upload_report_status']
+    actual = JSON.parse(response.body)
+    actual_account_statuses = actual['accounts'][test_org.id.to_s]
+    assert_equal 'generate_status_test', actual_account_statuses['generate_report_status']
+    assert_equal 'upload_status_test', actual_account_statuses['upload_report_status']
+
+    assert_equal true, actual['autoUploadEnabled']
   end
 end

data/test/controllers/uploads_controller_test.rb

@@ -18,4 +18,17 @@ class UploadsControllerTest < ActionController::TestCase
     actual = JSON.parse(response.body)
     assert_equal 'test output', actual['output']
   end
+
+  test 'should update allow_auto_inventory_upload setting' do
+    FactoryBot.create(:setting, :name => 'allow_auto_inventory_upload', :settings_type => "boolean", :category => "Setting::RhCloud", :default => false, :value => false)
+
+    assert_equal false, Setting[:allow_auto_inventory_upload]
+
+    post :auto_upload, params: { value: true }, session: set_session_user
+
+    assert_response :success
+    actual = JSON.parse(response.body)
+    assert_equal true, actual['autoUploadEnabled']
+    assert_equal true, Setting[:allow_auto_inventory_upload]
+  end
 end

data/test/factories/inventory_upload_factories.rb

@@ -1,16 +1,16 @@
 # redefine katello factories, as long as katello is not compatible with dynamic properties
 FactoryBot.define do
   factory :katello_organization, :class => "Organization" do
-    type {"Organization"}
+    type { "Organization" }
     sequence(:name) { |n| "Organization#{n}" }
     sequence(:label) { |n| "org#{n}" }
     sequence(:id) { |n| n }
 
     trait :acme_corporation do
-      name {"ACME_Corporation"}
-      type {"Organization"}
-      description {"This is the first Organization."}
-      label {"acme_corporation_label"}
+      name { "ACME_Corporation" }
+      type { "Organization" }
+      description { "This is the first Organization." }
+      label { "acme_corporation_label" }
     end
 
     trait :with_library do
@@ -24,11 +24,11 @@ end
 FactoryBot.define do
   factory :katello_content_view, :class => Katello::ContentView do
     sequence(:name) { |n| "Database#{n}" }
-    description {"This content view is for database content"}
+    description { "This content view is for database content" }
     association :organization, :factory => :katello_organization
 
     trait :composite do
-      composite {true}
+      composite { true }
     end
   end
 end
@@ -50,23 +50,23 @@ end
 FactoryBot.define do
   factory :katello_subscription_facets, :aliases => [:subscription_facet], :class => ::Katello::Host::SubscriptionFacet do
     sequence(:uuid) { |n| "uuid-#{n}-#{rand(500)}" }
-    facts { {'memory.memtotal' => "12 GB"} }
+    facts { { 'memory.memtotal' => "12 GB" } }
   end
 end
 
 FactoryBot.define do
   factory :katello_pool, :class => Katello::Pool do
-    active {true}
-    end_date {Date.today + 1.year}
+    active { true }
+    end_date { Date.today + 1.year }
   end
 end
 
 FactoryBot.modify do
   factory :host do
     transient do
-      content_view {nil}
-      lifecycle_environment {nil}
-      content_source {nil}
+      content_view { nil }
+      lifecycle_environment { nil }
+      content_source { nil }
     end
 
     trait :with_content do