foreman_rh_cloud 12.2.2 → 12.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3bc2f9bf0700b7f22d4bee9c0b1f02b10d7b91a441bfa125f38cf2b3b00f655
-  data.tar.gz: 21a3c48d1720f8ffbea0dd00fbf3b660dc6adea2a097254fd4c9a6c85791f49b
+  metadata.gz: f0c1c612bfa55b7b792c80577d33718502ad3ecc35273f6c9ae5fef2d055e872
+  data.tar.gz: 16f86dba2beea9aa6930b1a60579b6f29097bc1e06c8fa4c1eadeb7ebb4cfd46
 SHA512:
-  metadata.gz: 12b3933a12e68f827cd1a3130be3c4f0907eaa2235c2ac7850a734c7b8fc9e89780d2c87287874d6067337a3679c331d151cf695b5d4e3ad24647434e0a96714
-  data.tar.gz: 278421740888ba600cfd295c43e8eefb649053a4153430f74ff8729e32312f18d93723db1193de8bdc7cb82c96e5c4307405455671035407c978b8d659ab136a
+  metadata.gz: b5f2081a2f011ad358a56a13c51f7098e762faa98bba4556b60a24fa7dd3f05151a919eb61d40fb10e8125c083fb553a0fc5bc39c89a9b8ce6ca6a2dea12491c
+  data.tar.gz: a1a6496c40f2716c7b05606047f5daab3b0578f699bbc604d2082db36b8595514c2b6c681e487150eda127311e2142227b75fe23ce86f3a5fcaa7c4ad4a6510c

data/app/models/foreman_rh_cloud/ping.rb

@@ -0,0 +1,90 @@
+module ForemanRhCloud
+  class Ping
+    OK_RETURN_CODE = 'ok'.freeze
+    FAIL_RETURN_CODE = 'FAIL'.freeze
+
+    class << self
+      include ForemanRhCloud::CertAuth
+
+      def iop_smart_proxy_url
+        @iop_smart_proxy_url ||= ForemanRhCloud.iop_smart_proxy.url
+      end
+
+      def service_urls
+        {
+          :advisor => "#{iop_smart_proxy_url}/api/insights/v1/status/live/",
+          :vulnerability => "#{iop_smart_proxy_url}/api/vulnerability/v1/apistatus",
+        }
+      end
+
+      def services
+        service_urls.keys
+      end
+
+      def status
+        {
+          iop_smart_proxy_exists: ForemanRhCloud.with_iop_smart_proxy?,
+          timeUTC: Time.zone.now.getutc,
+        }
+      end
+
+      def exception_watch(result, &blk)
+        ::Katello::Ping.exception_watch(result, &blk)
+      end
+
+      def ping
+        ping_services
+      end
+
+      def ping!
+        result = ping_services
+
+        if result[:status] != OK_RETURN_CODE
+          failed_names = result[:services].reject do |_name, details|
+            details[:status] == OK_RETURN_CODE
+          end
+          raise "The following services have not been started or are reporting errors: #{failed_names.keys.join(', ')}"
+        end
+
+        result
+      end
+
+      def ping_services
+        result = {}
+        services.each do |service|
+          result[service] = {}
+          ping_service(service, result[service])
+        end
+
+        # set overall status result code
+        result = { :services => result }
+        result[:status] = result[:services].each_value.any? { |v| v[:status] == FAIL_RETURN_CODE } ? FAIL_RETURN_CODE : OK_RETURN_CODE
+        result
+      end
+
+      def logger
+        Rails.logger
+      end
+
+      def ping_url(url)
+        response = execute_cloud_request(
+          method: :get,
+          url: url
+        )
+        return {} if response.empty?
+        begin
+          result = JSON.parse(response).with_indifferent_access
+        rescue JSON::ParserError, NoMethodError
+          result = { :response => response.body&.strip }
+        end
+        result
+      end
+
+      def ping_service(service_name, service_result_hash)
+        exception_watch(service_result_hash) do
+          ping_url(service_urls[service_name])
+        end
+      end
+    end
+  end
+end

data/app/services/foreman_rh_cloud/insights_api_forwarder.rb

@@ -5,13 +5,13 @@ module ForemanRhCloud
     include ForemanRhCloud::GatewayRequest
 
     SCOPED_REQUESTS = [
-      %r{/api/vulnerability/v1/vulnerabilities/cves},
-      %r{/api/vulnerability/v1/dashbar},
-      %r{/api/vulnerability/v1/cves/[^/]+/affected_systems},
-      %r{/api/vulnerability/v1/systems/[^/]+/cves},
-      %r{/api/insights/.*},
-      %r{/api/inventory/.*},
-      %r{/api/tasks/.*},
+      { test: %r{api/vulnerability/v1/vulnerabilities/cves}, tag_name: :tags },
+      { test: %r{api/vulnerability/v1/dashbar}, tag_name: :tags },
+      { test: %r{api/vulnerability/v1/cves/[^/]+/affected_systems}, tag_name: :tags },
+      { test: %r{api/vulnerability/v1/systems/[^/]+/cves}, tag_name: :tags },
+      { test: %r{api/insights/.*}, tag_name: :tags },
+      { test: %r{api/inventory/.*}, tag_name: :tags },
+      { test: %r{api/tasks/.*}, tag_name: :tags },
     ].freeze
 
     def forward_request(original_request, path, controller_name, user, organization, location)
@@ -31,10 +31,10 @@ module ForemanRhCloud
       execute_cloud_request(request_opts)
     end
 
-    def prepare_tags(user, organization, location)
+    def prepare_tags(user, organization, location, tag_name)
       [
         TagsAuth.auth_tag_for(user, organization, location),
-      ].map { |tag_value| [:tag, tag_value] }
+      ].map { |tag_value| [tag_name, tag_value] }
     end
 
     def prepare_request_opts(original_request, path, forward_payload, forward_params)
@@ -70,7 +70,8 @@ module ForemanRhCloud
     def prepare_forward_params(original_request, path, user:, organization:, location:)
       forward_params = original_request.query_parameters.to_a
 
-      forward_params += prepare_tags(user, organization, location) if scope_request?(original_request, path)
+      tag_name = scope_request?(original_request, path)
+      forward_params += prepare_tags(user, organization, location, tag_name) if tag_name
 
       forward_params
     end
@@ -92,9 +93,10 @@ module ForemanRhCloud
     end
 
     def scope_request?(original_request, path)
-      return false unless original_request.get?
+      return nil unless original_request.get?
 
-      SCOPED_REQUESTS.any? { |request_pattern| request_pattern.match?(path) }
+      request_pattern = SCOPED_REQUESTS.find { |pattern| pattern[:test].match?(path) }
+      request_pattern[:tag_name] if request_pattern
     end
 
     def core_app_name

data/app/services/foreman_rh_cloud/tags_auth.rb

@@ -22,15 +22,16 @@ module ForemanRhCloud
     def update_tag
       logger.debug("Updating tags for user: #{@user}, org: #{@org.name}, loc: #{@loc.name}")
 
+      payload = tags_query_payload
       params = {
         method: :post,
         url: "#{InsightsCloud.gateway_url}/tags",
         headers: {
           content_type: :json,
         },
-        payload: tags_query_payload.to_json,
+        payload: payload.to_json,
       }
-      execute_cloud_request(params)
+      execute_cloud_request(params) unless payload[:host_id_list].empty?
     end
 
     def allowed_hosts

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -253,7 +253,6 @@ module ForemanInventoryUpload
 
       def report_yum_repos(host)
         return unless host&.content_facet&.bound_repositories&.any?
-        return unless ForemanRhCloud.with_iop_smart_proxy?
 
         @stream.array_field('yum_repos') do
           host.content_facet.bound_repositories.each_with_index do |repo, index|

data/lib/foreman_inventory_upload.rb

@@ -58,7 +58,7 @@ module ForemanInventoryUpload
 
   def self.upload_url
     # for testing set ENV to 'https://ci.cloud.redhat.com/api/ingress/v1/upload'
-    @upload_url ||= ENV['SATELLITE_INVENTORY_UPLOAD_URL'] || 'https://cert.cloud.redhat.com/api/ingress/v1/upload'
+    ENV['SATELLITE_INVENTORY_UPLOAD_URL'] || "#{ForemanRhCloud.cert_base_url}/api/ingress/v1/upload"
   end
 
   def self.slice_size

data/lib/foreman_rh_cloud/engine.rb

@@ -122,11 +122,11 @@ module ForemanRhCloud
   end
 
   def self.with_iop_smart_proxy?
-    SmartProxy.with_features('iop').exists?
+    SmartProxy.unscoped.with_features('iop').exists?
   end
 
   def self.iop_smart_proxy
-    SmartProxy.with_features('iop').first
+    SmartProxy.unscoped.with_features('iop').first
   end
 
   def self.ca_cert

data/lib/foreman_rh_cloud/plugin.rb

@@ -121,6 +121,10 @@ module ForemanRhCloud
 
         register_custom_status InventorySync::InventoryStatus
         register_custom_status InsightsClientReportStatus
+        if ForemanRhCloud.with_iop_smart_proxy?
+          register_ping_extension { ForemanRhCloud::Ping.ping }
+          register_status_extension { ForemanRhCloud::Ping.status }
+        end
 
         describe_host do
           overview_buttons_provider :insights_host_overview_buttons

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '12.2.2'.freeze
+  VERSION = '12.2.4'.freeze
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "12.2.2",
+  "version": "12.2.4",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {

data/test/unit/services/foreman_rh_cloud/insights_api_forwarder_test.rb

@@ -32,7 +32,7 @@ class UIRequestForwarderTest < ActiveSupport::TestCase
     ::ForemanRhCloud::TagsAuth.any_instance.expects(:update_tag)
     @forwarder.expects(:execute_cloud_request).with do |actual_params|
       actual = actual_params[:headers][:params]
-      assert_equal "U:\"#{@user.login}\"O:\"#{@organization.name}\"L:\"#{@location.name}\"", tag_value(actual.find { |param| param[0] == :tag && tag_name(param[1]) =~ /#{ForemanRhCloud::TagsAuth::TAG_NAME}/ }[1])
+      assert_equal "U:\"#{@user.login}\"O:\"#{@organization.name}\"L:\"#{@location.name}\"", tag_value(actual.find { |param| param[0] == :tags && tag_name(param[1]) =~ /#{ForemanRhCloud::TagsAuth::TAG_NAME}/ }[1])
       true
     end
 
@@ -82,7 +82,7 @@ class UIRequestForwarderTest < ActiveSupport::TestCase
     ::ForemanRhCloud::TagsAuth.any_instance.expects(:update_tag)
     @forwarder.expects(:execute_cloud_request).with do |actual_params|
       actual = actual_params[:headers][:params]
-      assert_equal "U:\"#{@user.login}\"O:\"#{@organization.name}\"L:\"#{@location.name}\"", tag_value(actual.find { |param| param[0] == :tag && tag_name(param[1]) =~ /#{ForemanRhCloud::TagsAuth::TAG_NAME}/ }[1])
+      assert_equal "U:\"#{@user.login}\"O:\"#{@organization.name}\"L:\"#{@location.name}\"", tag_value(actual.find { |param| param[0] == :tags && tag_name(param[1]) =~ /#{ForemanRhCloud::TagsAuth::TAG_NAME}/ }[1])
       assert_equal 5, actual.find { |param| param[0] == :page }[1]
       assert_equal 42, actual.find { |param| param[0] == :per_page }[1]
       true
@@ -160,6 +160,47 @@ class UIRequestForwarderTest < ActiveSupport::TestCase
     # This is done by setting the expectation before the actual call.
   end
 
+  test 'scope_request? should return tag_name for scoped requests' do
+    get_req = ActionDispatch::Request.new(
+      'REQUEST_URI' => '/api/vulnerability/v1/vulnerabilities/cves',
+      'REQUEST_METHOD' => 'GET',
+      'rack.input' => ::Puma::NullIO.new
+    )
+
+    result = @forwarder.send(:scope_request?, get_req, 'api/vulnerability/v1/vulnerabilities/cves')
+    assert_equal :tags, result
+  end
+
+  test 'scope_request? should return nil for non-GET requests' do
+    post_req = ActionDispatch::Request.new(
+      'REQUEST_URI' => '/api/vulnerability/v1/cves',
+      'REQUEST_METHOD' => 'POST',
+      'rack.input' => ::Puma::NullIO.new
+    )
+
+    result = @forwarder.send(:scope_request?, post_req, '/api/vulnerability/v1/cves')
+    assert_nil result
+  end
+
+  test 'scope_request? should return nil for unmatched paths' do
+    get_req = ActionDispatch::Request.new(
+      'REQUEST_URI' => '/api/unmatched/path',
+      'REQUEST_METHOD' => 'GET',
+      'rack.input' => ::Puma::NullIO.new
+    )
+
+    result = @forwarder.send(:scope_request?, get_req, '/api/unmatched/path')
+    assert_nil result
+  end
+
+  test 'prepare_tags should use provided tag_name' do
+    result = @forwarder.send(:prepare_tags, @user, @organization, @location, :custom_tag)
+
+    assert_equal 1, result.length
+    assert_equal :custom_tag, result[0][0]
+    assert_equal "U:\"#{@user.login}\"O:\"#{@organization.name}\"L:\"#{@location.name}\"", tag_value(result[0][1])
+  end
+
   def tag_value(param_value)
     return param_value unless param_value.is_a?(String)
 

data/test/unit/services/foreman_rh_cloud/tags_auth_test.rb

@@ -10,7 +10,7 @@ class TagsAuthTest < ActiveSupport::TestCase
     @auth = ::ForemanRhCloud::TagsAuth.new(@user, @org, @loc, @logger)
   end
 
-  test 'Generates tags update request' do
+  test 'Generates tags update request when hosts are present' do
     uuid1 = 'test_uuid1'
     uuid2 = 'test_uuid2'
 
@@ -26,4 +26,18 @@ class TagsAuthTest < ActiveSupport::TestCase
 
     @auth.update_tag
   end
+
+  test 'Should not execute cloud request when no hosts are present' do
+    @auth.expects(:allowed_hosts).returns([])
+    @auth.expects(:execute_cloud_request).never
+
+    @auth.update_tag
+  end
+
+  test 'Should not execute cloud request when allowed_hosts is nil' do
+    @auth.expects(:allowed_hosts).returns(nil)
+    @auth.expects(:execute_cloud_request).never
+
+    @auth.update_tag
+  end
 end

data/test/unit/slice_generator_test.rb

@@ -999,7 +999,6 @@ class SliceGeneratorTest < ActiveSupport::TestCase
   end
 
   test 'reports yum repos' do
-    ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
     FactoryBot.create(:katello_content, cp_content_id: '1', organization: @host.organization, name: 'Test Content', label: 'test-content')
     repo = FactoryBot.build(
       :katello_repository,

data/webpack/ForemanColumnExtensions/index.js

@@ -46,7 +46,7 @@ const RecommendationsCell = hostDetails => {
     hostDetails?.insights_attributes ?? {}
   );
 
-  return insightsAttributes.useLocalAdvisorEngine ? (
+  return insightsAttributes.useIopMode ? (
     <IopRecommendationsCell hostDetails={hostDetails} />
   ) : (
     <HostedRecommendationsCell hostDetails={hostDetails} />

data/webpack/ForemanRhCloudFills.js

@@ -21,7 +21,7 @@ const fills = [
     weight: 400,
     metadata: {
       hideTab: isNotRhelHost,
-      title: __('Insights'),
+      title: __('Recommendations'),
     },
   },
   {

data/webpack/InsightsCloudSync/Components/RemediationModal/RemediationHelpers.js

@@ -3,8 +3,10 @@ import React from 'react';
 import { orderBy } from 'lodash';
 import Resolutions from './Resolutions';
 
-export const getResolutionId = (selectedResolution, id) =>
-  `${id}_${selectedResolution}`;
+export const getResolutionId = (selectedResolution, id, isIop = true) => {
+  if (isIop) return `${id}_${selectedResolution}`;
+  return selectedResolution;
+};
 
 export const modifyRows = (
   remediations,
@@ -25,20 +27,26 @@ export const modifyRows = (
     const selectedResolution = resolutions[0]?.id;
     /* eslint-disable spellcheck/spell-checker */
 
-    // For IoP: {
-    //  hit_id: "c7c6727e-2966-4f7c-87f1-20ef14db7a2d",
+    // For IoP:
+    // All of the values will be plain strings
+    // {
+    //  hit_id: "c7c6727e-2966-4f7c-87f1-20ef14db7a2d", <-- this refers to a host by insights ID
     //  rule_id: "hardening_ssh_client_alive|OPENSSH_HARDENING_CLIENT_ALIVE",
     //  resolution_type: "less_secure",
-    //  resolution_id:"hardening_ssh_client_alive|OPENSSH_HARDENING_CLIENT_ALIVE_less_secure",
+    //  resolution_id:"hardening_ssh_client_alive|OPENSSH_HARDENING_CLIENT_ALIVE_less_secure", <-- joined rule id and resolution type
     // }
-    // for Hosted, hit_id and rule_id will be Foreman database IDs
+    // For non-IoP:
+    // All of the values will be numeric Foreman database IDs
+    // hit_id refers to an InsightsHit
+    // rule_id refers to an InsightsRule
+    // resolution_type and resolution_id both refer to an InsightsResolution (InsightsHit.find(xx).rule.resolutions)
 
     /* eslint-enable spellcheck/spell-checker */
     resolutionToSubmit.push({
       hit_id: isIop ? host_id : id,
       rule_id: id,
       resolution_type: selectedResolution /** defaults to the first resolution if many */,
-      resolution_id: getResolutionId(selectedResolution, id),
+      resolution_id: getResolutionId(selectedResolution, id, isIop),
     });
     return {
       cells: [

data/webpack/InsightsCloudSync/Components/RemediationModal/Resolutions.js

@@ -22,7 +22,7 @@ const Resolutions = ({
           key={resolution_id}
           ouiaId={`resolution-radio-${resolution_id}`}
           className="resolution-radio"
-          id={resolution_id}
+          id={`${hit_id}_${resolution_id}`}
           isChecked={resolution_id === checkedID}
           onChange={() =>
             setResolutions(stateRes =>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 12.2.2
+  version: 12.2.4
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
@@ -121,6 +121,7 @@ files:
 - app/helpers/foreman_inventory_upload_helper.rb
 - app/helpers/foreman_inventory_upload_host_helper.rb
 - app/models/concerns/rh_cloud_host.rb
+- app/models/foreman_rh_cloud/ping.rb
 - app/models/insights_client_report_status.rb
 - app/models/insights_facet.rb
 - app/models/insights_hit.rb