foreman_rh_cloud 2.0.11 → 2.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: beb9afa713376417b3673803766cb7502efeabb52640e5d4a392eadf75b0f1b3
-  data.tar.gz: 1ee3c8b02c4748412ebdbc1547278460d19ced4fddfb55c913ecc38e07e71d2b
+  metadata.gz: 32e82a148a80e18485bbcc80e69715ad4cbda072aaf6e011e18030212461aa4e
+  data.tar.gz: 9294a0e1779a60bfa568c0413f9f3c84ab464a563cb36060798637b97f2adcff
 SHA512:
-  metadata.gz: 650e22398af35c4cc866c53d33988ca02d1c30909e62b6b9b6839c0c354d6d2ab56c6928b839b490119c350246520f9c8ca3d2aacc6c05d23bf7fbd22d6fd8e5
-  data.tar.gz: 8a501092f95cbb44def78a581fa70fff1d245b72af0332362c5efe3de2f3cc3db70e4842111644d0ed27c0e96a9458e28e0fbc8850e810efe4660a9bce39cb0c
+  metadata.gz: 5652f82aaf2127c5eba23bc81e92959a665993ea329a8462c4078b946f840cf06f9c6f385b18cfce494be83df376ed9d697f15691929b297133994edab745569
+  data.tar.gz: 71fcfbb4dff6cb22e1078c732c42a0ffe99ec14e865ec88a9668c53fc9f91919661a1d406cc34b45cbd59c8bf058803d3ec3b5aa23b1127cf759c708fc3c3bc2

data/lib/foreman_inventory_upload/async/upload_report_job.rb

@@ -47,6 +47,8 @@ module ForemanInventoryUpload
           'FILES' => @filename,
           'CER_PATH' => @cer_path
         )
+
+        http_proxy_string = ForemanRhCloud.http_proxy_string(logger: logger)
         if http_proxy_string
           env_vars['http_proxy'] = http_proxy_string
           env_vars['https_proxy'] = http_proxy_string
@@ -54,13 +56,6 @@ module ForemanInventoryUpload
         env_vars
       end
 
-      def http_proxy_string
-        @http_proxy_string ||=
-          HttpProxy.default_global_content_proxy&.full_url ||
-          cdn_proxy ||
-          global_foreman_proxy
-      end
-
       def rh_credentials
         @rh_credentials ||= begin
           candlepin_id_certificate = @organization.owner_details['upstreamConsumer']['idCert']
@@ -70,31 +65,6 @@ module ForemanInventoryUpload
           }
         end
       end
-
-      def cdn_proxy
-        cdn_settings = SETTINGS[:katello][:cdn_proxy] || {}
-
-        return nil unless cdn_settings[:host]
-
-        proxy_uri = URI('')
-
-        original_uri = URI.parse(cdn_settings[:host])
-
-        proxy_uri.scheme = original_uri.scheme || 'http'
-        proxy_uri.host = original_uri.host || original_uri.path
-        proxy_uri.port = cdn_settings[:port]
-        proxy_uri.user = cdn_settings[:user]
-        proxy_uri.password = cdn_settings[:password]
-
-        proxy_uri.to_s
-      rescue URI::Error => e
-        logger.warn("cdn_proxy parsing failed: #{e}")
-        nil
-      end
-
-      def global_foreman_proxy
-        Setting[:http_proxy]
-      end
     end
   end
 end

data/lib/foreman_rh_cloud.rb

@@ -1,4 +1,6 @@
 require 'foreman_rh_cloud/engine.rb'
+require 'cgi'
+require 'uri'
 
 module ForemanRhCloud
   def self.base_url
@@ -14,4 +16,56 @@ module ForemanRhCloud
   def self.verify_ssl_method
     @verify_ssl_method ||= ENV['SATELLITE_RH_CLOUD_URL'] ? OpenSSL::SSL::VERIFY_NONE : OpenSSL::SSL::VERIFY_PEER
   end
+
+  def self.http_proxy_string(logger: Foreman::Logging.logger('background'))
+    ForemanRhCloud.proxy_setting(logger: logger)
+  end
+
+  def self.transformed_http_proxy_string(logger: Foreman::Logging.logger('background'))
+    ForemanRhCloud.transform_scheme(ForemanRhCloud.proxy_setting(logger: logger))
+  end
+
+  def self.proxy_setting(logger: Foreman::Logging.logger('background'))
+    HttpProxy.default_global_content_proxy&.full_url ||
+    ForemanRhCloud.cdn_proxy(logger: logger) ||
+    ForemanRhCloud.global_foreman_proxy
+  end
+
+  def self.cdn_proxy(logger: Foreman::Logging.logger('app'))
+    proxy_config = SETTINGS[:katello][:cdn_proxy]
+    return nil unless proxy_config
+
+    uri = URI('')
+    uri.host = proxy_config[:host]
+    uri.port = proxy_config[:port]
+    uri.scheme = proxy_config[:scheme] || 'http'
+
+    if proxy_config[:user]
+      uri.user = CGI.escape(proxy_config[:user])
+      uri.password = CGI.escape(proxy_config[:password])
+    end
+    uri.to_s
+  rescue URI::Error => e
+    logger.warn("cdn_proxy parsing failed: #{e}")
+    nil
+  end
+
+  def self.global_foreman_proxy
+    Setting[:http_proxy]
+  end
+
+  # This method assumes uri_string contains uri-encoded username and p@$$word:
+  # http://user:p%40%24%24word@localhost:8888
+  def self.transform_scheme(uri_string)
+    transformed_uri = URI.parse(uri_string)
+
+    case transformed_uri.scheme
+    when "http"
+      transformed_uri.scheme = 'proxy'
+    when "https"
+      transformed_uri.scheme = 'proxys'
+    end
+
+    transformed_uri.to_s
+  end
 end

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '2.0.11'.freeze
+  VERSION = '2.0.12'.freeze
 end

data/lib/insights_cloud/async/insights_full_sync.rb

@@ -27,6 +27,7 @@ module InsightsCloud
           method: :get,
           url: InsightsCloud.hits_export_url,
           verify_ssl: ForemanRhCloud.verify_ssl_method,
+          proxy: ForemanRhCloud.transformed_http_proxy_string(logger: logger),
           headers: {
             Authorization: "Bearer #{rh_credentials}",
           }
@@ -40,6 +41,7 @@ module InsightsCloud
           method: :post,
           url: ForemanRhCloud.authentication_url,
           verify_ssl: ForemanRhCloud.verify_ssl_method,
+          proxy: ForemanRhCloud.transformed_http_proxy_string(logger: logger),
           payload: {
             grant_type: 'refresh_token',
             client_id: 'rhsm-api',

data/lib/inventory_sync/async/inventory_full_sync.rb

@@ -65,6 +65,7 @@ module InventorySync
           method: :get,
           url: ForemanInventoryUpload.inventory_export_url,
           verify_ssl: ForemanRhCloud.verify_ssl_method,
+          proxy: ForemanRhCloud.transformed_http_proxy_string(logger: logger),
           headers: {
             Authorization: "Bearer #{rh_credentials}",
             params: {
@@ -82,6 +83,7 @@ module InventorySync
           method: :post,
           url: ForemanRhCloud.authentication_url,
           verify_ssl: ForemanRhCloud.verify_ssl_method,
+          proxy: ForemanRhCloud.transformed_http_proxy_string(logger: logger),
           payload: {
             grant_type: 'refresh_token',
             client_id: 'rhsm-api',

data/lib/tasks/rh_cloud_inventory.rake

@@ -12,17 +12,19 @@ namespace :rh_cloud_inventory do
         puts "Must specify either portal_user or organization_id"
       end
 
-      if portal_user
-        puts "Generating report for all organizations associated with #{portal_user}"
-        base_folder = File.join(base_folder, portal_user)
-        organizations = ForemanInventoryUpload::Generators::Queries.organizations_for_user(portal_user).pluck(:id)
-      end
+      User.as_anonymous_admin do
+        if portal_user
+          puts "Generating report for all organizations associated with #{portal_user}"
+          base_folder = File.join(base_folder, portal_user)
+          organizations = ForemanInventoryUpload::Generators::Queries.organizations_for_user(portal_user).pluck(:id)
+        end
 
-      organizations.each do |organization|
-        target = File.join(base_folder, ForemanInventoryUpload.facts_archive_name(organization))
-        archived_report_generator = ForemanInventoryUpload::Generators::ArchivedReport.new(target, Logger.new(STDOUT))
-        archived_report_generator.render(organization: organization)
-        puts "Successfully generated #{target} for organization id #{organization}"
+        organizations.each do |organization|
+          target = File.join(base_folder, ForemanInventoryUpload.facts_archive_name(organization))
+          archived_report_generator = ForemanInventoryUpload::Generators::ArchivedReport.new(target, Logger.new(STDOUT))
+          archived_report_generator.render(organization: organization)
+          puts "Successfully generated #{target} for organization id #{organization}"
+        end
       end
     end
   end

data/package.json

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

data/test/unit/rh_cloud_http_proxy_test.rb

@@ -0,0 +1,65 @@
+require 'test_plugin_helper'
+
+class RhCloudHttpProxyTest < ActiveSupport::TestCase
+  setup do
+    @global_content_proxy_mock = 'http://global:content@localhost:8888'
+    @global_foreman_proxy_mock = 'http://global:foreman@localhost:8888'
+    @katello_cdn_proxy_mock = {
+      host: 'localhost',
+      port: '8888',
+      user: 'katello',
+      password: 'cdn',
+      scheme: 'http',
+    }
+    @katello_cdn_proxy_string_mock = 'http://katello:cdn@localhost:8888'
+  end
+
+  test 'selects global content proxy' do
+    setup_global_content_proxy
+    setup_global_foreman_proxy
+    setup_cdn_proxy do
+      assert_equal @global_content_proxy_mock, ForemanRhCloud.proxy_setting
+    end
+  end
+
+  test 'selects cdn proxy' do
+    setup_global_foreman_proxy
+    setup_cdn_proxy do
+      assert_equal @katello_cdn_proxy_string_mock, ForemanRhCloud.proxy_setting
+    end
+  end
+
+  test 'selects global foreman proxy' do
+    setup_global_foreman_proxy
+
+    assert_equal @global_foreman_proxy_mock, ForemanRhCloud.proxy_setting
+  end
+
+  def setup_global_content_proxy
+    http_proxy = FactoryBot.create(:http_proxy, url: @global_content_proxy_mock)
+    HttpProxy.stubs(:default_global_content_proxy).returns(http_proxy)
+  end
+
+  def setup_global_foreman_proxy
+    FactoryBot.create(:setting, :name => 'http_proxy', :value => @global_foreman_proxy_mock)
+  end
+
+  def setup_cdn_proxy
+    old_cdn_setting = SETTINGS[:katello][:cdn_proxy]
+    SETTINGS[:katello][:cdn_proxy] = @katello_cdn_proxy_mock
+    yield
+  ensure
+    SETTINGS[:katello][:cdn_proxy] = old_cdn_setting
+  end
+
+  test 'transform proxy scheme test' do
+    mock_http_proxy = 'http://user:password@localhost:8888'
+    mock_https_proxy = 'https://user:password@localhost:8888'
+
+    transformed_http_uri = URI.parse(ForemanRhCloud.transform_scheme(mock_http_proxy))
+    transformed_https_uri = URI.parse(ForemanRhCloud.transform_scheme(mock_https_proxy))
+
+    assert_equal 'proxy', transformed_http_uri.scheme
+    assert_equal 'proxys', transformed_https_uri.scheme
+  end
+end

data/test/unit/slice_generator_test.rb

@@ -147,6 +147,10 @@ class ReportGeneratorTest < ActiveSupport::TestCase
   end
 
   test 'generates a report with satellite facts' do
+    hostgroup = FactoryBot.create(:hostgroup)
+    @host.hostgroup = hostgroup
+    @host.save!
+
     Foreman.expects(:instance_id).twice.returns('satellite-id')
     batch = Host.where(id: @host.id).in_batches.first
     generator = create_generator(batch)
@@ -166,6 +170,7 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     assert_tag(@host.content_view.name, actual_host, 'content_view')
     assert_tag(@host.location.name, actual_host, 'location')
     assert_tag(@host.organization.name, actual_host, 'organization')
+    assert_tag(@host.hostgroup.name, actual_host, 'hostgroup')
 
     assert_equal false, satellite_facts['is_hostname_obfuscated']
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 2.0.11
+  version: 2.0.12
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-16 00:00:00.000000000 Z
+date: 2020-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -174,6 +174,7 @@ files:
 - test/unit/fact_helpers_test.rb
 - test/unit/insights_facet_test.rb
 - test/unit/metadata_generator_test.rb
+- test/unit/rh_cloud_http_proxy_test.rb
 - test/unit/shell_process_job_test.rb
 - test/unit/slice_generator_test.rb
 - webpack/ForemanInventoryUpload/Components/AccountList/AccountList.fixtures.js
@@ -515,24 +516,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Summary of ForemanRhCloud.
 test_files:
+- test/controllers/uploads_controller_test.rb
+- test/controllers/insights_sync/settings_controller_test.rb
+- test/controllers/accounts_controller_test.rb
+- test/controllers/reports_controller_test.rb
 - test/test_plugin_helper.rb
+- test/jobs/upload_report_job_test.rb
+- test/jobs/insights_full_sync_test.rb
+- test/jobs/inventory_full_sync_test.rb
 - test/factories/inventory_upload_factories.rb
 - test/factories/insights_factories.rb
-- test/controllers/reports_controller_test.rb
-- test/controllers/uploads_controller_test.rb
-- test/controllers/accounts_controller_test.rb
-- test/controllers/insights_sync/settings_controller_test.rb
-- test/unit/slice_generator_test.rb
-- test/unit/metadata_generator_test.rb
 - test/unit/shell_process_job_test.rb
+- test/unit/metadata_generator_test.rb
 - test/unit/insights_facet_test.rb
-- test/unit/archived_report_generator_test.rb
+- test/unit/rh_cloud_http_proxy_test.rb
 - test/unit/fact_helpers_test.rb
-- test/jobs/inventory_full_sync_test.rb
-- test/jobs/insights_full_sync_test.rb
-- test/jobs/upload_report_job_test.rb
+- test/unit/archived_report_generator_test.rb
+- test/unit/slice_generator_test.rb