katello 3.16.0.rc3.1 → 3.16.0

data/app/lib/katello/concerns/base_template_scope_extensions.rb

@@ -3,20 +3,6 @@ module Katello
     module BaseTemplateScopeExtensions
       extend ActiveSupport::Concern
 
-      module Overrides
-        def allowed_helpers
-          super + [:errata, :host_subscriptions, :host_applicable_errata_ids, :host_applicable_errata_filtered,
-                   :host_latest_applicable_rpm_version, :load_pools, :load_errata_applications, :host_content_facet,
-                   :host_sla, :host_products, :sub_name, :sub_sku, :registered_through, :last_checkin, :host_collections,
-                   :host_subscriptions_names, :host_subscriptions, :host_products_names, :host_collections_names,
-                   :host_redhat_subscription_names, :registered_at]
-        end
-      end
-
-      included do
-        prepend Overrides
-      end
-
       def errata(id)
         Katello::Erratum.in_repositories(Katello::Repository.readable).with_identifiers(id).map(&:attributes).first.slice!('created_at', 'updated_at')
       end

data/app/lib/katello/errors.rb

@@ -39,6 +39,12 @@ module Katello
       end
     end
 
+    class HostRegisteredException < StandardError
+      def message
+        _("Content host must be unregistered before performing this action.")
+      end
+    end
+
     class EmptyBulkActionException < StandardError
       def message
         _("No hosts registered with subscription-manager found in selection.")
@@ -106,21 +112,7 @@ module Katello
       end
     end
 
-    class Pulp3Error < StandardError
-      def self.from_task(task)
-        if task[:state] == 'canceled'
-          self.new(_("Task canceled"))
-        elsif task[:state] == 'failed'
-          message = if task[:error][:description].blank?
-                      _("Pulp task error")
-                    else
-                      task[:error][:description]
-                    end
-          self.new(message)
-        end
-      end
-    end
-
+    class Pulp3Error < StandardError; end
     class Pulp3MigrationError < StandardError; end
 
     class PulpError < StandardError
@@ -154,5 +146,24 @@ module Katello
         _("No URL found for a container registry. Please check the configuration.")
       end
     end
+
+    class DisconnectedMode < StandardError
+      def message
+        _("You are currently operating in disconnected mode where access to Red Hat Subcription Management " \
+        "is prohibited. If you would like to change this, please update the content setting 'Disconnected mode'.")
+      end
+    end
+
+    class NoManifestImported < StandardError
+      def message
+        _("Current organization has no manifest imported.")
+      end
+    end
+
+    class ManifestExpired < StandardError
+      def message
+        _("This Organization's subscription manifest has expired. Please import a new manifest.")
+      end
+    end
   end
 end

data/app/lib/katello/resources/candlepin.rb

@@ -142,7 +142,7 @@ module Katello
           def upstream_consumer
             fail _("Current organization not set.") unless Organization.current
             upstream_consumer = Organization.current.owner_details['upstreamConsumer']
-            fail _("Current organization has no manifest imported.") unless upstream_consumer
+            fail Katello::Errors::NoManifestImported unless upstream_consumer
 
             upstream_consumer
           end

data/app/lib/katello/resources/candlepin/upstream_consumer.rb

@@ -9,6 +9,12 @@ module Katello
             super(id)
           end
 
+          def ping
+            resource.head
+          rescue RestClient::Unauthorized, RestClient::Gone
+            raise ::Katello::Errors::UpstreamConsumerGone
+          end
+
           # Overrides the HttpResource get method to check if the upstream
           # consumer exists.
           def get(params)

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

@@ -50,6 +50,7 @@ module Katello
 
         before_save :correct_puppet_environment
         before_validation :correct_kickstart_repository
+        before_update :check_host_registration, :if => proc { organization_id_changed? }
 
         scope :with_pools_expiring_in_days, ->(days) { joins(:pools).merge(Katello::Pool.expiring_in_days(days)).distinct }
 
@@ -76,6 +77,12 @@ module Katello
         end
       end
 
+      def check_host_registration
+        if subscription_facet
+          fail ::Katello::Errors::HostRegisteredException
+        end
+      end
+
       def correct_kickstart_repository
         return unless content_facet
 

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

@@ -82,6 +82,20 @@ module Katello
           self.providers.anonymous.first
         end
 
+        def manifest_imported?
+          owner_details['upstreamConsumer'].present?
+        end
+
+        def manifest_expired?
+          manifest_expiry = owner_details.dig(:upstreamConsumer, :idCert, :serial, :expiration)
+
+          if manifest_expiry
+            DateTime.parse(manifest_expiry) < DateTime.now
+          else
+            false
+          end
+        end
+
         def manifest_history
           imports.map { |i| OpenStruct.new(i) }
         end

data/app/models/katello/content_view.rb

@@ -289,9 +289,21 @@ module Katello
         where("#{Katello::ContentViewVersion.table_name}.content_view_id" => self.id)
     end
 
-    def repositories_to_publish
+    def repositories_to_publish(override_components = nil)
       if composite?
-        ids = components.flat_map { |version| version.repositories.archived }.map(&:id)
+        components_to_publish = []
+        components.each do |component|
+          override_component = override_components&.detect do |override_cvv|
+            override_cvv.content_view == component.content_view
+          end
+
+          if override_component
+            components_to_publish << override_component
+          else
+            components_to_publish << component
+          end
+        end
+        ids = components_to_publish.flat_map { |version| version.repositories.archived }.map(&:id)
         Repository.where(:id => ids)
       else
         repositories
@@ -302,11 +314,11 @@ module Katello
       composite? ? repositories_to_publish.pluck(&:id) : repository_ids
     end
 
-    def repositories_to_publish_by_library_instance
+    def repositories_to_publish_by_library_instance(override_components = nil)
       # retrieve the list of repositories in a hash, where the key
       # is the library instance id, and the value is an array
       # of the repositories for that instance.
-      repositories_to_publish.inject({}) do |result, repo|
+      repositories_to_publish(override_components).inject({}) do |result, repo|
         result[repo.library_instance] ||= []
         result[repo.library_instance] << repo
         result
@@ -326,8 +338,8 @@ module Katello
       component_composites.where(latest: true).joins(:composite_content_view).where(self.class.table_name => {auto_publish: true})
     end
 
-    def publish_repositories
-      repositories = composite? ? repositories_to_publish_by_library_instance.values : repositories_to_publish
+    def publish_repositories(override_components = nil)
+      repositories = composite? ? repositories_to_publish_by_library_instance(override_components).values : repositories_to_publish
       repositories.each do |repos|
         if repos.is_a? Array
           yield repos

data/app/models/katello/content_view_erratum_filter.rb

@@ -30,6 +30,7 @@ module Katello
       if filter_by_id?
         errata_ids = erratum_rules.map(&:errata_id)
         errata_pulp_ids = errata_package_pulp_ids_from_errata_ids(repo, errata_ids)
+        errata_pulp_ids += errata_module_stream_pulp_ids_from_errata_ids(errata_ids)
       else
         clauses = []
         clauses << errata_from
@@ -37,7 +38,9 @@ module Katello
         clauses << types_clause
         package_filenames = Erratum.list_filenames_by_clauses(repo, clauses.compact)
         errata_pulp_ids = errata_package_pulp_ids_from_package_filenames(repo, package_filenames)
+        errata_pulp_ids += errata_module_stream_pulp_ids_from_clauses(repo, clauses.compact)
       end
+
       errata_pulp_ids
     end
 
@@ -48,10 +51,20 @@ module Katello
       repo.rpms.where("filename ILIKE ANY ( array[?] )", query_params)
     end
 
+    def errata_module_stream_pulp_ids_from_clauses(repo, clauses)
+      module_streams = Erratum.list_modular_streams_by_clauses(repo, clauses)
+      module_streams.pluck(:pulp_id)
+    end
+
     def errata_package_pulp_ids_from_package_filenames(repo, package_filenames)
       rpms_by_filename(repo, package_filenames).pluck(:pulp_id)
     end
 
+    def errata_module_stream_pulp_ids_from_errata_ids(errata_ids)
+      module_streams = Katello::Erratum.where(:errata_id => errata_ids).map(&:module_streams).compact.flatten
+      module_streams.pluck(:pulp_id)
+    end
+
     def errata_package_pulp_ids_from_errata_ids(repo, errata_ids)
       package_filenames = Katello::ErratumPackage.joins(:erratum).where("#{Erratum.table_name}.errata_id" => errata_ids).pluck(:filename)
       rpms_by_filename(repo, package_filenames).pluck(:pulp_id)

data/app/models/katello/content_view_filter.rb

@@ -182,6 +182,10 @@ module Katello
       fail "setting original_packages not supported for #{self.class.name}"
     end
 
+    def original_module_streams=(_include_original)
+      fail "setting original_module_streams not supported for #{self.class.name}"
+    end
+
     protected
 
     def validate_repos

data/app/models/katello/content_view_module_stream_filter.rb

@@ -6,9 +6,36 @@ module Katello
 
     validates_lengths_from_database
 
-    def generate_clauses(_repo)
-      return if module_stream_rules.blank?
-      module_stream_rules.map(&:module_stream_id)
+    def generate_clauses(repo)
+      rules = module_stream_rules || []
+      ids = rules.map(&:module_stream_id)
+      if self.original_module_streams
+        ids.concat(repo.module_streams_without_errata.map(&:id))
+      end
+      ids
+    end
+
+    def original_module_streams=(value)
+      self[:original_module_streams] = value
+    end
+
+    def content_unit_pulp_ids(repo, dependents = false)
+      content_unit_ids = []
+      module_ids = []
+
+      self.module_stream_rules.each do |rule|
+        module_ids << rule.module_stream_id
+      end
+      if self.original_module_streams
+        module_ids.concat(repo.module_streams_without_errata.map(&:id))
+      end
+      modules_streams = ModuleStream.where(id: module_ids).includes(:rpms)
+      content_unit_ids += modules_streams.pluck(:pulp_id).flatten.uniq
+      if dependents && !modules_streams.empty?
+        rpms = modules_streams.map(&:rpms).flatten
+        content_unit_ids += rpms.pluck(:pulp_id).flatten.uniq
+      end
+      content_unit_ids.uniq
     end
   end
 end

data/app/models/katello/glue/pulp/repo.rb

@@ -90,6 +90,7 @@ module Katello
       def pulp_counts_differ?
         pulp_counts = pulp_repo_facts[:content_unit_counts]
         rpms.count != pulp_counts['rpm'].to_i ||
+          srpms.count != pulp_counts['srpm'].to_i ||
           errata.count != pulp_counts['erratum'].to_i ||
           package_groups.count != pulp_counts['package_group'].to_i ||
           puppet_modules.count != pulp_counts['puppet_module'].to_i ||

data/app/models/katello/host/content_facet.rb

@@ -47,11 +47,13 @@ module Katello
         bindable_paths = bindable_types
         relative_paths = []
 
-        paths.each do |path|
+        # paths == ["/pulp/repos/Default_Organization/Library/custom/Test_product/test2",
+        # "/pulp/repos/Default_Organization/Library/custom/Test_product/My_repo"]
+        paths.each do |absolute_path|
           bindable_paths.each do |supported|
-            relative_path = path.gsub(supported[:matcher], '')
-            relative_paths << relative_path
-            if path.starts_with?(supported[:matcher])
+            relative_path = absolute_path.gsub(supported[:matcher], '') # remove e.g. '/pulp/repos/' from beginning of string
+            relative_paths << relative_path unless relative_path == absolute_path
+            if absolute_path.starts_with?(supported[:matcher])
               supported[:paths] << relative_path
               break
             end
@@ -60,10 +62,12 @@ module Katello
 
         repos = bindable_paths.flat_map do |supported|
           repos = Repository.joins(:root).where(RootRepository.table_name => {content_type: supported[:type]}, relative_path: supported[:paths])
-          relative_paths -= repos.pluck(:relative_path)
+          relative_paths -= repos.pluck(:relative_path) # remove relative paths that match our repos
           repos
         end
 
+        # Any leftover relative paths do not match the repos we've just retrieved from the db,
+        # so we should log warnings about them.
         relative_paths.each do |repo_path|
           Rails.logger.warn("System #{self.host.name} (#{self.host.id}) requested binding to unknown repo #{repo_path}")
         end
@@ -121,6 +125,7 @@ module Katello
         ::Katello::Applicability::ApplicableContentHelper.new(self, ::Katello::Rpm, bound_repos).calculate_and_import
         ::Katello::Applicability::ApplicableContentHelper.new(self, ::Katello::Erratum, bound_repos).calculate_and_import
         ::Katello::Applicability::ApplicableContentHelper.new(self, ::Katello::ModuleStream, bound_repos).calculate_and_import
+        update_applicability_counts
       end
 
       def import_applicability(partial = false)

data/app/models/katello/module_stream.rb

@@ -65,7 +65,7 @@ module Katello
     end
 
     def module_spec_hash
-      {:name => name, :stream => stream, :version => version, :context => context, :arch => arch, :id => id}.compact
+      {:name => name, :stream => stream, :version => version, :context => context, :arch => arch, :pulp_id => pulp_id, :id => id}.compact
     end
 
     def self.parse_module_spec(module_spec)

data/app/models/katello/pulp3/content_guard.rb

@@ -5,7 +5,7 @@ module Katello
         return unless (count == 0 || force)
         content_guard_api = Katello::Pulp3::Api::ContentGuard.new(smart_proxy)
         content_guard = content_guard_api.list&.results&.first
-        fail _("No Content Guard configured!") unless content_guard
+        return unless content_guard
         katello_content_guard = self.new(name: content_guard.name, pulp_href: content_guard.pulp_href)
         katello_content_guard.save!
       end

data/app/models/katello/repository.rb

@@ -469,6 +469,17 @@ module Katello
       end
     end
 
+    def module_streams_without_errata
+      module_stream_errata = Katello::ModuleStreamErratumPackage.joins(:erratum_package => {:erratum => :repository_errata})
+                              .where("#{RepositoryErratum.table_name}.repository_id" => self.id)
+                              .pluck("#{Katello::ModuleStreamErratumPackage.table_name}.module_stream_id")
+      if module_stream_errata.any?
+        self.module_streams.where("#{ModuleStream.table_name}.id NOT in (?)", module_stream_errata)
+      else
+        self.module_streams
+      end
+    end
+
     def self.with_errata(errata)
       joins(:repository_errata).where("#{Katello::RepositoryErratum.table_name}.erratum_id" => errata)
     end

data/app/models/setting/content.rb

@@ -2,7 +2,7 @@ class Setting::Content < Setting
   #rubocop:disable Metrics/MethodLength
   #rubocop:disable Metrics/AbcSize
 
-  validate :content_default_http_proxy, if: proc { |s| s.name == 'content_default_http_proxy' }
+  validate :content_default_http_proxy, if: proc { |s| s.name == 'content_default_http_proxy' && HttpProxy.table_exists? }
 
   after_save :add_organizations_and_locations_if_global_http_proxy
 
@@ -91,6 +91,8 @@ class Setting::Content < Setting
                false, N_('Restrict Composite Content View promotion')),
       self.set('check_services_before_actions', N_("Whether or not to check the status of backend services such as pulp and candlepin prior to performing some actions."),
                true, N_('Check services before actions')),
+      self.set('foreman_proxy_content_batch_size', N_("How many repositories should be synced concurrently on the capsule.  A smaller number may lead to longer sync times.  A larger number will increase dynflow load."),
+               25, N_('Batch size to sync repositories in.')),
       self.set('foreman_proxy_content_auto_sync', N_("Whether or not to auto sync the Smart Proxies after a Content View promotion."),
                true, N_('Sync Smart Proxies after Content View promotion')),
       self.set('default_download_policy', N_("Default download policy for custom repositories (either 'immediate', 'on_demand', or 'background')"), "immediate",

data/app/presenters/katello/sync_status_presenter.rb

@@ -19,6 +19,8 @@ module Katello
     def sync_progress
       return {:state => nil} unless @repo
       return empty_task(@repo) unless @task
+      display_output = @task.humanized[:output]
+      display_output = display_output.split("\n")[0] if (display_output && @repo.version_href)
       {
         :id => @repo.id,
         :product_id => @repo.product.id,
@@ -29,8 +31,8 @@ module Katello
         :start_time => format_date(@task.started_at),
         :finish_time => format_date(@task.ended_at),
         :duration => format_duration(@task.ended_at, @task.started_at),
-        :display_size => @task.humanized[:output],
-        :size => @task.humanized[:output],
+        :display_size => display_output,
+        :size => display_output,
         :is_running => @task.pending && @task.state != 'paused',
         :error_details => @task.errors
       }

data/app/services/katello/candlepin/message_handler.rb

@@ -81,9 +81,8 @@ module Katello
       end
 
       def delete_pool
-        if pool
-          Rails.logger.info "deleting pool #{pool.id} from Katello"
-          pool.destroy!
+        if Katello::Pool.where(:cp_id => pool_id).destroy_all.any?
+          Rails.logger.info "deleted pool #{pool_id} from Katello"
         end
       end
     end

data/app/services/katello/pulp/repository/yum.rb

@@ -246,7 +246,8 @@ module Katello
             remove = clause_gen.remove_clause
             remove_clauses = {filters: {unit: remove}} if remove
           else
-            copy_clauses = {}
+            non_modular_rpms = ::Katello::Rpm.in_repositories(repo).non_modular.pluck(:filename)
+            copy_clauses = non_modular_rpms.blank? ? nil : {filters: {unit: ContentViewPackageFilter.generate_rpm_clauses(non_modular_rpms)}}
             remove_clauses = nil
           end
 

data/app/services/katello/pulp3/api/core.rb

@@ -74,6 +74,10 @@ module Katello
           PulpcoreClient::TasksApi.new(core_api_client)
         end
 
+        def task_groups_api
+          PulpcoreClient::TaskGroupsApi.new(core_api_client)
+        end
+
         def upload_class
           PulpcoreClient::Upload
         end