katello 4.0.2.1 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60cb9d2337d887d068fbe7f6886e157de5c3c35518a2ad3ef78e9a384ed8cb50
-  data.tar.gz: 34cb737891925c363205d7464793bedf3cc8f80a8ed5778c056962d0f3f9a46f
+  metadata.gz: bce7f44a7f2b8e7a0eda1ca43fc7835ff63a4e13f37dc989b34e5902a1aed53a
+  data.tar.gz: 9347b0be58ab615b998c47b00ec3db414e21a0802072c1abd1b0d09ebe45b46d
 SHA512:
-  metadata.gz: fbb101788bbe74c6829b244b9e3f48ef9f04b7c059b3410d9ab563c1b44ee4d35aa1e76579f99a605bd122005f9b1112ccbf3e9a85c3d018e72a7a184ddd7476
-  data.tar.gz: e48ae02b0e60e82a9b8b27e56662940728de4f8c564492bd0e4681e39824d42934ce16a38c1ca2cdfe69e4da19ca3b19081723805464a1873cf898c6b40a8893
+  metadata.gz: 302db8a69576d6ede5e7b76a2a68d1ec255490bfe6d08748f503b43b3b57d2930ab872e7cb5f2bc26330fd08781650eab35e05bf1adab85505090f471886cc32
+  data.tar.gz: ca2ec5c259ed700896a7509da48bf7ccb814e273e9391210d96473c7ae37563904a1291062e2b04adb1afe1bbf8f50394d4d05edc199a5843148612e8a5c57f3

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

@@ -74,11 +74,13 @@ module Katello
       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.peer_authentication(::Qpid::Proton::SSLDomain::VERIFY_PEER_NAME)
         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'
+          sasl_allowed_mechs: 'external',
+          virtual_host: URI.parse(url).host
         }
       end
 

data/app/models/katello/concerns/host_managed_extensions.rb

@@ -233,10 +233,15 @@ module Katello
         new_ids = new_available_module_streams.keys - old_associated_ids
         new_ids.each do |new_id|
           module_stream = new_available_module_streams[new_id]
+          status = module_stream["status"]
+          # Set status to "unknown" only if the active field is in use and set to false and the module is enabled
+          if enabled_module_stream_inactive?(module_stream)
+            status = "unknown"
+          end
           self.host_available_module_streams.create!(host_id: self.id,
                                                      available_module_stream_id: new_id,
                                                      installed_profiles: module_stream["installed_profiles"],
-                                                     status: module_stream["status"])
+                                                     status: status)
         end
 
         upgradable_streams.each do |hams|
@@ -246,6 +251,10 @@ module Katello
           if hams.attributes.slice(*shared_keys) != module_stream_data
             hams.update!(module_stream_data)
           end
+          # Set status to "unknown" only if the active field is in use and set to false and the module is enabled
+          if enabled_module_stream_inactive?(module_stream)
+            hams.update!(status: "unknown")
+          end
         end
       end
 
@@ -365,6 +374,10 @@ module Katello
         self.get_status(::Katello::TraceStatus).refresh!
         self.refresh_global_status!
       end
+
+      def enabled_module_stream_inactive?(module_stream)
+        !module_stream["active"].nil? && module_stream["active"] == false && module_stream["status"] == "enabled"
+      end
     end
   end
 end

data/app/services/katello/applicability/applicable_content_helper.rb

@@ -92,7 +92,8 @@ module Katello
         ::Katello::ModuleStream.
           joins("inner join katello_available_module_streams on
             katello_module_streams.name = katello_available_module_streams.name and
-            katello_module_streams.stream = katello_available_module_streams.stream").
+            katello_module_streams.stream = katello_available_module_streams.stream and
+            katello_module_streams.context = katello_available_module_streams.context").
           joins("inner join katello_host_available_module_streams on
             katello_available_module_streams.id = katello_host_available_module_streams.available_module_stream_id").
           where("katello_host_available_module_streams.host_id = :content_facet_id and

data/app/services/katello/pulp3/migration.rb

@@ -204,7 +204,7 @@ module Katello
 
           if to_find
             found = migrated_repo_items.find { |migrated_repo| migrated_repo.pulp2_repo_id == to_find.pulp_id }
-            import_repo(yum_repo, found)
+            import_repo(yum_repo, found) if found
           end
         end
       end

data/app/services/katello/pulp3/migration_plan.rb

@@ -64,6 +64,8 @@ module Katello
       def library_migration_for(root)
         repo = root.library_instance
 
+        return nil unless library_repo_safe_to_migrate?(repo)
+
         migration = {
           name: repo.pulp_id,
           repository_versions: [
@@ -77,10 +79,49 @@ module Katello
         migration
       end
 
+      def library_repo_safe_to_migrate?(repo)
+        publish_tasks = ForemanTasks::Task.where(label: 'Actions::Katello::ContentView::Publish')
+        publishing_repo_ids = publish_tasks.where(state: ['scheduled', 'running']).collect do |task|
+          ::Katello::ContentViewVersion.find(task.input[:content_view_version_id]).library_repos.pluck(:id)
+        end
+        publishing_repo_ids = publishing_repo_ids.flatten
+
+        if publishing_repo_ids.include?(repo.id)
+          warn_string = "Library repository with ID #{repo.id} and name #{repo.name} unmigrated due to being "\
+            "associated with an actively-publishing content view.  The migration will need to be run again."
+          Rails.logger.warn(warn_string)
+          return false
+        end
+
+        create_root_tasks = ForemanTasks::Task.where(label: 'Actions::Katello::Repository::CreateRoot')
+        active_creation_task = create_root_tasks.where(state: ['scheduled', 'running']).detect do |task|
+          task.input[:repository][:id] == repo.id
+        end
+
+        if active_creation_task.present?
+          warn_string = "Repository with ID #{repo.id} and name #{repo.name} unmigrated due to being "\
+            "created during the Pulp 3 migration.  The migration will need to be run again."
+          Rails.logger.warn(warn_string)
+          return false
+        end
+        true
+      end
+
       def content_view_migrations_for(root)
+        publish_tasks = ForemanTasks::Task.where(label: 'Actions::Katello::ContentView::Publish')
+        publishing_cv_ids = publish_tasks.where(state: ['scheduled', 'running']).collect do |task|
+          task.input[:content_view_id]
+        end
+
         plans = []
         ContentView.non_default.published_with_repositories(root).sort_by(&:label).each do |cv|
-          plans << content_view_migration(cv, root)
+          if publishing_cv_ids.include?(cv.id)
+            warn_string = "Repositories belonging to Content View with ID #{cv.id} and name #{cv.name} unmigrated "\
+              "due to being created during the Pulp 3 migration.  The migration will need to be run again."
+            Rails.logger.warn(warn_string)
+          else
+            plans << content_view_migration(cv, root)
+          end
         end
         plans
       end

data/db/migrate/20210119162528_delete_puppet_and_ostree_repos.rb

@@ -39,13 +39,23 @@ class DeletePuppetAndOstreeRepos < ActiveRecord::Migration[6.0]
     FakeContentViewPuppetEnvironment.delete_all
     FakePuppetModule.delete_all
 
-    ::Katello::Repository.delete(puppet_repositories) if puppet_repositories.any?
+    if puppet_repositories.any?
+      User.as_anonymous_admin do
+        ::Katello::Repository.delete(puppet_repositories)
+        ::Katello::RootRepository.where(content_type: 'puppet').destroy_all
+      end
+    end
 
     FakeRepositoryOstreeBranch.delete_all
     FakeOstreeBranch.delete_all
-    Katello::Repository.ostree_type.where.not(:library_instance_id => nil, :environment_id => nil).destroy_all #CV LCE repos
-    Katello::Repository.ostree_type.where.not(:library_instance_id => nil).destroy_all # archive repos
-    Katello::Repository.ostree_type.destroy_all #all the rest (should just be library repos)
+
+    if Katello::Repository.ostree_type.any?
+      User.as_anonymous_admin do
+        Katello::Repository.ostree_type.where.not(:library_instance_id => nil, :environment_id => nil).destroy_all #CV LCE repos
+        Katello::Repository.ostree_type.where.not(:library_instance_id => nil).destroy_all # archive repos
+        Katello::Repository.ostree_type.destroy_all #all the rest (should just be library repos)
+      end
+    end
 
     Katello::ContentViewVersion.where.not(:content_counts => nil).each do |version|
       version.content_counts.except!('ostree', 'puppet_module')

data/lib/katello/tasks/upgrades/4.0/remove_ostree_puppet_content.rake

@@ -5,11 +5,13 @@ namespace :katello do
       task :remove_ostree_puppet_content => ["environment", "check_ping"] do
         contents = Katello::Content.where(content_type: ['ostree', 'puppet'])
         contents.each do |content|
-          Katello::Resources::Candlepin::Content.destroy(content.organization.label, content.cp_content_id)
+          unless content.products.any?(&:redhat?)
+            Katello::Resources::Candlepin::Content.destroy(content.organization.label, content.cp_content_id)
+            content.destroy
+          end
         rescue RestClient::NotFound
           #skip content not found
         end
-        contents.destroy_all
       end
     end
   end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.0.2.1".freeze
+  VERSION = "4.0.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.0.2.1
+  version: 4.0.3
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-03 00:00:00.000000000 Z
+date: 2021-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -129,6 +129,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -136,6 +139,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: activerecord-import
   requirement: !ruby/object:Gem::Requirement