katello 4.0.0.rc3 → 4.0.0.rc3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25c755b23475d0447099ee99388c1d900ae9815b1e4be88ab5d13afeb7d044d2
-  data.tar.gz: 4482488f5ff9186dfe7f7db25901b2afa00b979c2fbf926ccfc329983a122661
+  metadata.gz: 4b1f2f557b3626c3063d82e67d89ad487eb532ceae69ebd8b3d17a5e6c1d1f58
+  data.tar.gz: 4740bb46003409a84d0e3ff4d83d265e872c59744afd996c7d930e41978c8ec7
 SHA512:
-  metadata.gz: 464106f37ffb3915d1029ea95f9ecdc8d6c985fde7d0a40826dc111aefb1e621c17a79d478ef6538be9f485c35fec13cc1af6ad47a3b30485183a381af71828a
-  data.tar.gz: 1da0019879786addea556e156ae5b187df06170a0718eff50580d4e9bb8579b9c897fd7729c893bf414068d89813a5f9614d799e7b0584852c6c890ffac8660e
+  metadata.gz: d2b588283c5bfc2f7ffe233be131fc45579531bee31b5202216e20be8f7fd4178a9080b34262dbfe46c25d463f9638c10f1c9820f5c6ecdb6fdcd1b73e1ad64a
+  data.tar.gz: 63fe08f466e464a3e628ca3e44dec60a46f2480bb88598798511175e05afdf43becbdfb8586edf5ca3ec13e37c67c3bf5b3ddb0315cd604ed5d82b315d3b6632

data/app/lib/katello/agent/connection.rb

@@ -1,24 +1,38 @@
 module Katello
   module Agent
     class Connection
+      def initialize
+        @connection = ::Katello::Qpid::Connection.new(
+          url: settings[:broker_url],
+          ssl_cert_file: settings[:broker_ssl_cert_file],
+          ssl_key_file: settings[:broker_ssl_key_file],
+          ssl_ca_file: settings[:broker_ssl_ca_file]
+        )
+      end
+
       def send_messages(messages)
-        connection = ::Katello::Qpid::Connection.new(settings[:broker_url])
-        connection.send_messages(messages)
+        @connection.send_messages(messages)
       end
 
       def fetch_agent_messages(handler = ClientMessageHandler)
-        connection = ::Katello::Qpid::Connection.new(settings[:broker_url])
-        connection.receive_messages(address: settings[:event_queue_name], handler: handler)
+        @connection.receive_messages(address: settings[:event_queue_name], handler: handler)
       end
 
       def delete_client_queue(queue_name)
-        connection = ::Katello::Qpid::Connection.new(settings[:broker_url])
-        connection.delete_queue(queue_name)
+        @connection.delete_queue(queue_name)
       end
 
       def settings
         SETTINGS[:katello][:agent]
       end
+
+      def open?
+        @connection.open?
+      end
+
+      def close
+        @connection.close
+      end
     end
   end
 end

data/app/lib/katello/event_daemon/services/agent_event_receiver.rb

@@ -34,17 +34,18 @@ module Katello
 
           @thread = Thread.new do
             @handler = Handler.new
-            agent_connection = ::Katello::Agent::Connection.new
-            agent_connection.fetch_agent_messages(@handler)
+            @agent_connection = ::Katello::Agent::Connection.new
+            @agent_connection.fetch_agent_messages(@handler)
           end
         end
 
         def self.close
-          @thread&.kill
+          @agent_connection&.close
+          @thread&.join
         end
 
         def self.running?
-          @thread&.status.present?
+          @agent_connection&.open? && @thread&.status.present?
         end
 
         def self.status(refresh: true)

data/app/lib/katello/qpid/connection.rb

@@ -4,9 +4,10 @@ module Katello
   module Qpid
     class Connection
       class Sender < ::Qpid::Proton::MessagingHandler
-        def initialize(url, address, messages)
+        def initialize(url, connection_options, address, messages)
           super()
           @url = url
+          @connection_options = connection_options
           @address = address
           @messages = messages
           @sent = 0
@@ -14,7 +15,7 @@ module Katello
         end
 
         def on_container_start(container)
-          c = container.connect(@url)
+          c = container.connect(@url, @connection_options)
           c.open_sender
           @receiver = c.open_receiver(@address) if @address
         end
@@ -40,7 +41,7 @@ module Katello
           opcode = message.properties['qmf.opcode']
           if opcode == '_exception'
             error_code = message.body.dig('_values', 'error_code')
-            if error_code != '7' # not found
+            if error_code != 7 # not found
               error_message = message.body.dig('_values', 'error_text')
               fail(error_message)
             end
@@ -49,17 +50,18 @@ module Katello
       end
 
       class Receiver < ::Qpid::Proton::MessagingHandler
-        def initialize(url, address, handler)
+        def initialize(url, connection_options, address, handler)
           super()
           @url = url
+          @connection_options = connection_options.merge(
+            idle_timeout: 30
+          )
           @address = address
           @handler = handler
         end
 
         def on_container_start(container)
-          c = container.connect(@url,
-            idle_timeout: 4
-          )
+          c = container.connect(@url, @connection_options)
           c.open_receiver(@address)
         end
 
@@ -69,8 +71,15 @@ module Katello
         end
       end
 
-      def initialize(url)
+      def initialize(url:, ssl_cert_file:, ssl_key_file:, ssl_ca_file:)
         @url = url
+        ssl_domain = ::Qpid::Proton::SSLDomain.new(::Qpid::Proton::SSLDomain::MODE_CLIENT)
+        ssl_domain.credentials(ssl_cert_file, ssl_key_file, nil) if ssl_cert_file && ssl_key_file
+        ssl_domain.trusted_ca_db(ssl_ca_file) if ssl_ca_file
+        @connection_options = {
+          ssl_domain: ssl_domain,
+          sasl_allowed_mechs: 'external'
+        }
       end
 
       def delete_queue(queue_name)
@@ -97,7 +106,7 @@ module Katello
           'method' => 'request'
         }
 
-        sender = Sender.new(@url, address, [message])
+        sender = Sender.new(@url, @connection_options, address, [message])
         with_connection(sender)
       end
 
@@ -108,22 +117,30 @@ module Katello
           msg.address = message.recipient_address
           msg
         end
-        sender = Sender.new(@url, nil, qpid_messages)
+        sender = Sender.new(@url, @connection_options, nil, qpid_messages)
         with_connection(sender)
       end
 
       def receive_messages(address:, handler:)
-        receiver = Receiver.new(@url, address, handler)
+        receiver = Receiver.new(@url, @connection_options, address, handler)
         with_connection(receiver)
       end
 
+      def close
+        @container&.stop
+      end
+
+      def open?
+        (@container&.running || 0) > 0
+      end
+
       private
 
       def with_connection(handler)
-        container = ::Qpid::Proton::Container.new(handler)
-        container.run
+        @container = ::Qpid::Proton::Container.new(handler)
+        @container.run
       ensure
-        container&.stop
+        close
       end
     end
   end

data/db/seeds.d/111-upgrade_tasks.rb

@@ -3,18 +3,6 @@ UpgradeTask.define_tasks(:katello) do
     {:name => 'katello:correct_repositories', :long_running => true, :skip_failure => true, :always_run => true},
     {:name => 'katello:correct_puppet_environments', :long_running => true, :skip_failure => true, :always_run => true},
     {:name => 'katello:clean_backend_objects', :long_running => true, :skip_failure => true, :always_run => true},
-    {:name => 'katello:upgrades:3.8:clear_checksum_type'},
-    {:name => 'katello:upgrades:3.10:clear_invalid_repo_credentials'},
-    {:name => 'katello:upgrades:3.10:update_gpg_key_urls'},
-    {:name => 'katello:upgrades:3.11:import_yum_metadata'},
-    {:name => 'katello:upgrades:3.11:update_puppet_repos'},
-    {:name => 'katello:upgrades:3.11:clear_checksum_type', :task_name => 'katello:upgrades:3.8:clear_checksum_type'},
-    {:name => 'katello:upgrades:3.12:remove_pulp2_notifier'},
-    {:name => 'katello:upgrades:3.13:republish_deb_metadata'},
-    {:name => 'katello:upgrades:3.15:set_sub_facet_dmi_uuid'},
-    {:name => 'katello:upgrades:3.15:reindex_rpm_modular'},
-    {:name => 'katello:upgrades:3.16:update_applicable_el8_hosts'},
-    {:name => 'katello:upgrades:3.18:add_cvv_export_history_metadata'},
     {:name => 'katello:upgrades:4.0:remove_ostree_puppet_content'}
   ]
 end

data/lib/katello/engine.rb

@@ -58,8 +58,11 @@ module Katello
         },
         :agent => {
           :client_queue_format => 'pulp.agent.%s',
-          :broker_url => 'amqp:ssl:localhost:5671',
-          :event_queue_name => 'katello.agent'
+          :event_queue_name => 'katello.agent',
+          :broker_url => 'amqps://localhost:5671',
+          :broker_ssl_cert_file => SETTINGS[:ssl_certificate],
+          :broker_ssl_key_file => SETTINGS[:ssl_priv_key],
+          :broker_ssl_ca_file => SETTINGS[:ssl_ca_file]
         }
       }
 

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.0.0.rc3".freeze
+  VERSION = "4.0.0.rc3.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc3
+  version: 4.0.0.rc3.1
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-16 00:00:00.000000000 Z
+date: 2021-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -4539,16 +4539,6 @@ files:
 - lib/katello/tasks/update_content_default_http_proxy.rake
 - lib/katello/tasks/update_subscription_facet_backend_data.rake
 - lib/katello/tasks/upgrade_check.rake
-- lib/katello/tasks/upgrades/3.10/clear_invalid_repo_credentials.rake
-- lib/katello/tasks/upgrades/3.11/import_yum_metadata_file.rake
-- lib/katello/tasks/upgrades/3.11/update_puppet_repos.rake
-- lib/katello/tasks/upgrades/3.12/remove_pulp2_notifier.rake
-- lib/katello/tasks/upgrades/3.13/republish_deb_metadata.rake
-- lib/katello/tasks/upgrades/3.15/reindex_rpm_modular.rake
-- lib/katello/tasks/upgrades/3.15/set_sub_facet_dmi_uuid.rake
-- lib/katello/tasks/upgrades/3.16/update_applicable_el8_hosts.rake
-- lib/katello/tasks/upgrades/3.18/add_cvv_export_history_metadata.rb
-- lib/katello/tasks/upgrades/3.8/clear_checksum_type.rake
 - lib/katello/tasks/upgrades/4.0/remove_ostree_puppet_content.rake
 - lib/katello/tasks/virt_who_report.rake
 - lib/katello/url_constrained_cookie_store.rb

data/lib/katello/tasks/upgrades/3.10/clear_invalid_repo_credentials.rake

@@ -1,27 +0,0 @@
-# Before 3.8, you could successfully edit only the username, or only the
-# password, but since we added a validation now those old repos are now
-# invalid.  This finds those repos and clears their credentials.
-
-namespace :katello do
-  namespace :upgrades do
-    namespace '3.10' do
-      desc "Clear invalid credentials for repositories"
-      task :clear_invalid_repo_credentials => %w(environment) do
-        User.current = User.anonymous_admin
-
-        # Where one, but not both, is set
-        root_repos = Katello::RootRepository.where('(upstream_username IS NULL AND upstream_password is NOT NULL) OR (upstream_username IS NOT NULL AND upstream_password is NULL)')
-
-        root_repos.each do |root_repo|
-          puts "Clearing invalid credentials for #{root_repo.label} (#{root_repo.id})"
-          root_repo.update(upstream_username: nil, upstream_password: nil)
-
-          root_repo.repositories.each do |repo|
-            puts "Refreshing repository #{repo.label} (#{repo.id})"
-            ForemanTasks.sync_task(::Actions::Pulp::Repository::Refresh, repo)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/katello/tasks/upgrades/3.11/import_yum_metadata_file.rake

@@ -1,12 +0,0 @@
-namespace :katello do
-  namespace :upgrades do
-    namespace '3.11' do
-      desc "Import yum metadata file units from pulp"
-      task :import_yum_metadata => ["environment"] do
-        User.current = User.anonymous_api_admin
-        puts _("Importing Yum Metadata Files")
-        Katello::YumMetadataFile.import_all
-      end
-    end
-  end
-end

data/lib/katello/tasks/upgrades/3.11/update_puppet_repos.rake

@@ -1,29 +0,0 @@
-namespace :katello do
-  namespace :upgrades do
-    namespace '3.11' do
-      def wait_on_task(task, time = 0.1)
-        task = SmartProxy.pulp_primary.pulp_api.resources.task.poll(task['task_id'])
-        return if Actions::Pulp::AbstractAsyncTask::FINISHED_STATES.include?(task['state'])
-        sleep time
-        wait_on_task(task, time + 0.2)
-      end
-
-      desc "update puppet repos to regenerate pulp configuration"
-      task :update_puppet_repos => %w(environment) do
-        User.current = User.anonymous_admin
-        Katello::Repository.puppet_type.each do |repo|
-          puts "Refreshing repository #{repo.label} (#{repo.id})"
-          install_dist = repo.backend_service(SmartProxy.pulp_primary).backend_data['distributors'].find { |dist| dist['distributor_type_id'] == 'puppet_install_distributor' }
-          if install_dist
-            response = SmartProxy.pulp_primary.pulp_api.resources.repository.delete_distributor(repo.pulp_id, install_dist['id'])
-            wait_on_task('task_id' => response['spawned_tasks'][0]['task_id'])
-          end
-          ForemanTasks.sync_task(::Actions::Pulp::Repository::Refresh, repo)
-        rescue RestClient::ResourceNotFound
-          Rails.logger.warn("Recieved 404 on repository: #{repo.id} - #{repo.name}")
-          next
-        end
-      end
-    end
-  end
-end

data/lib/katello/tasks/upgrades/3.12/remove_pulp2_notifier.rake

@@ -1,13 +0,0 @@
-namespace :katello do
-  namespace :upgrades do
-    namespace '3.12' do
-      desc "removes the unused pulp2 notifier"
-      task :remove_pulp2_notifier => %w(environment) do
-        SmartProxy.pulp_primary!.pulp_api.resources.event_notifier.list.each do |notifier|
-          Rails.logger.info("Deleting notifier #{notifier['id']}")
-          SmartProxy.pulp_primary!.pulp_api.resources.event_notifier.delete(notifier['id'])
-        end
-      end
-    end
-  end
-end

data/lib/katello/tasks/upgrades/3.13/republish_deb_metadata.rake

@@ -1,22 +0,0 @@
-namespace :katello do
-  namespace :upgrades do
-    namespace '3.13' do
-      desc "Regenerate the metadata for repositories affected by pulp_deb migration 0004"
-      task :republish_deb_metadata, [:input_file] => ["environment"] do |task, args|
-        User.current = User.anonymous_api_admin
-        input_file = args[:input_file] || "/var/lib/pulp/0004_deb_repo_republish_candidates.txt"
-        if File.readable?(input_file)
-          pulp_ids = File.read(input_file).each_line.map(&:strip) || []
-          repos = Katello::Repository.where(:pulp_id => pulp_ids)
-          puts _("Starting BulkMetadataGenerate task.")
-          task = ForemanTasks.async_task(Actions::Katello::Repository::BulkMetadataGenerate, repos, :force => true)
-          puts _("Please check that the task #{task.id} completes successfully.")
-          puts _('You can manually re-trigger this task by running "foreman-rake katello:upgrades:3.13:republish_deb_metadata"')
-        else
-          puts _("Input file #{input_file} was not readable.")
-          puts _('You can manually use an alternate input file by running "foreman-rake katello:upgrades:3.13:republish_deb_metadata[<path>]"')
-        end
-      end
-    end
-  end
-end

data/lib/katello/tasks/upgrades/3.15/reindex_rpm_modular.rake

@@ -1,23 +0,0 @@
-namespace :katello do
-  namespace :upgrades do
-    namespace '3.15' do
-      desc "Reindex the is_modular attribute of an rpm"
-      task :reindex_rpm_modular, [:input_file] => ["environment"] do
-        User.current = User.anonymous_api_admin
-        criteria = { :fields => [],
-                     :limit => SETTINGS[:katello][:pulp][:bulk_load_size],
-                     :skip => 0,
-                     :filters => {'is_modular' => {'$eq' => true}}
-                   }
-        content_type = Katello.pulp_server.extensions.rpm.content_type
-        batch = ::Katello::Pulp::PulpContentUnit.pulp_units_batch(criteria, criteria[:limit]) do
-          Katello.pulp_server.resources.unit.search(content_type, criteria)
-        end
-        pulp_modular_ids = batch.map { |response| response.pluck("_id") }.flatten
-        db_modular_ids = ::Katello::Rpm.modular.pluck(:pulp_id)
-        ::Katello::Rpm.where(pulp_id: db_modular_ids - pulp_modular_ids).update_all(modular: false)
-        ::Katello::Rpm.where(pulp_id: pulp_modular_ids - db_modular_ids).update_all(modular: true)
-      end
-    end
-  end
-end

data/lib/katello/tasks/upgrades/3.15/set_sub_facet_dmi_uuid.rake

@@ -1,16 +0,0 @@
-namespace :katello do
-  namespace :upgrades do
-    namespace '3.15' do
-      desc "Set the DMI UUID on Host::SubscriptionFacet from facts"
-      task :set_sub_facet_dmi_uuid, [:input_file] => ["environment"] do
-        User.current = User.anonymous_api_admin
-        dmi_uuid_fact_name = Katello::RhsmFactName.find_by_name('dmi::system::uuid') || -1
-
-        fact_values = ::FactValue.where(fact_name: dmi_uuid_fact_name).where.not(value: nil)
-        fact_values.each do |fv|
-          fv.host.subscription_facet&.update(dmi_uuid: fv.value)
-        end
-      end
-    end
-  end
-end

data/lib/katello/tasks/upgrades/3.16/update_applicable_el8_hosts.rake

@@ -1,29 +0,0 @@
-namespace :katello do
-  namespace :upgrades do
-    namespace '3.16' do
-      desc <<-DESCRIPTION
-      Update the applicability calculations for Rhel8 hosts.
-      This migration is to be run to address -> https://bugzilla.redhat.com/show_bug.cgi?id=1814095
-      DESCRIPTION
-      task :update_applicable_el8_hosts, [:input_file] => ["environment"] do
-        User.current = User.anonymous_api_admin
-
-        # Find me only those hosts that follow ALL the conditions below
-        # 1) Have a module stream enabled.
-        # 2) Bound to Non Library repositories. (i.e must belong to a CV thats not the default)
-        # 3) Bound repositories must have module streams in them
-        hosts = Host.joins(:content_facet => :content_facet_repositories).
-                 where("#{Host.table_name}.id" => ::Katello::HostAvailableModuleStream.enabled.select(:host_id)).
-                 where("#{Katello::ContentFacetRepository.table_name}.repository_id" =>
-                        ::Katello::Repository.joins(:repository_module_streams).
-                                          in_non_default_view.
-                                          non_archived)
-        hosts.each do |host|
-          available_streams = ::Katello::HostAvailableModuleStream.joins(:available_module_stream).
-                                                enabled.where(:host_id => host).select(:name, :stream)
-          ::Actions::Katello::Host::UploadProfiles.upload_modules_to_pulp(available_streams, host)
-        end
-      end
-    end
-  end
-end

data/lib/katello/tasks/upgrades/3.18/add_cvv_export_history_metadata.rb

@@ -1,18 +0,0 @@
-namespace :katello do
-  namespace :upgrades do
-    namespace '3.18' do
-      task :add_cvv_export_history_metadata => ['environment', 'check_ping'] do
-        smart_proxy = SmartProxy.pulp_primary!
-
-        Katello::ContentViewVersionExportHistory.includes(:content_view_version).where(metadata: nil).find_each do |export_history|
-          export = ::Katello::Pulp3::ContentViewVersion::Export.new(
-            content_view_version: export_history.content_view_version,
-            smart_proxy: smart_proxy
-          )
-
-          export_history.update(metadata: export.generate_metadata)
-        end
-      end
-    end
-  end
-end

data/lib/katello/tasks/upgrades/3.8/clear_checksum_type.rake

@@ -1,41 +0,0 @@
-namespace :katello do
-  namespace :upgrades do
-    namespace '3.8' do
-      desc "Clear checksum type for on-demand repositories"
-      task :clear_checksum_type => %w(environment) do
-        User.current = User.anonymous_admin
-
-        Katello::RootRepository.yum_type.find_each do |root_repo|
-          root_repo.transaction do
-            if [::Runcible::Models::YumImporter::DOWNLOAD_ON_DEMAND, ::Runcible::Models::YumImporter::DOWNLOAD_BACKGROUND].include?(root_repo.download_policy) && root_repo.url.present? && URI(root_repo.url).scheme == 'file'
-              root_repo.update_attribute(:download_policy, ::Runcible::Models::YumImporter::DOWNLOAD_IMMEDIATE)
-              root_repo.repositories.each do |repo|
-                importer = repo.importers[0]
-                config = {
-                  :download_policy => ::Runcible::Models::YumImporter::DOWNLOAD_IMMEDIATE
-                }
-
-                SmartProxy.pulp_primary.pulp_api.resources.repository.update_importer(repo.pulp_id, importer[:id], config) if (importer && importer[:id])
-              end
-            end
-
-            if root_repo.on_demand? && root_repo.url.present?
-              root_repo.update_attribute(:checksum_type, nil)
-
-              root_repo.repositories.each do |repo|
-                repo.update_attribute(:saved_checksum_type, nil)
-
-                if repo.find_distributor[:config]&.delete(:checksum_type)
-                  SmartProxy.pulp_primary.pulp_api.resources.repository.update_distributor(
-                    repo.pulp_id, repo.find_distributor[:id], repo.find_distributor[:config])
-                end
-              # rubocop:disable Lint/SuppressedException
-              rescue RestClient::ResourceNotFound
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end