katello 4.14.1 → 4.15.0.rc1

data/app/services/katello/pulp3/content_view_version/metadata_generator.rb

@@ -21,7 +21,7 @@ module Katello
                   content_view: content_view.slice(:name, :label, :description, :generated_for),
                   content_view_version: content_view_version.slice(:major, :minor, :description),
                   incremental: from_content_view_version.present?,
-                  format: export_service.format
+                  format: export_service.format,
           }
           unless from_content_view_version.blank?
             ret[:from_content_view_version] = from_content_view_version.slice(:major, :minor)
@@ -72,7 +72,7 @@ module Katello
                                                                    content_path: content.content_url)
           { id: content.cp_content_id,
             label: content.label,
-            url: content_data[:path]
+            url: content_data[:path],
           }
         end
 

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

@@ -5,6 +5,8 @@ module Katello
       CONTENT_TYPE = "deb".freeze
       PULPCORE_CONTENT_TYPE = "deb.package".freeze
 
+      lazy_accessor :initializer => :backend_data
+
       def self.content_api
         PulpDebClient::ContentPackagesApi.new(Katello::Pulp3::Api::Apt.new(SmartProxy.pulp_primary!).api_client)
       end
@@ -34,9 +36,41 @@ module Katello
           name: unit[:package],
           version: unit[:version],
           description: unit[:description]&.truncate(255),
-          architecture: unit[:architecture]
+          architecture: unit[:architecture],
+          section: unit[:section],
+          maintainer: unit[:maintainer],
+          homepage: unit[:homepage],
+          installed_size: unit[:installed_size],
         }
       end
+
+      def depends
+        Util::Deb.parse_dependencies(backend_data['depends'])
+      end
+
+      def pre_depends
+        Util::Deb.parse_dependencies(backend_data['pre_depends'])
+      end
+
+      def recommends
+        Util::Deb.parse_dependencies(backend_data['recommends'])
+      end
+
+      def suggests
+        Util::Deb.parse_dependencies(backend_data['suggests'])
+      end
+
+      def enhances
+        Util::Deb.parse_dependencies(backend_data['enhances'])
+      end
+
+      def breaks
+        Util::Deb.parse_dependencies(backend_data['breaks'])
+      end
+
+      def conflicts
+        Util::Deb.parse_dependencies(backend_data['conflicts'])
+      end
     end
   end
 end

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

@@ -30,7 +30,7 @@ module Katello
           annotations: unit['annotations'],
           labels: unit['labels'],
           is_bootable: unit['is_bootable'],
-          is_flatpak: unit['is_flatpak']
+          is_flatpak: unit['is_flatpak'],
         }
       end
     end

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

@@ -28,7 +28,11 @@ module Katello
         {
           schema_version: unit['schema_version'],
           digest: unit['digest'],
-          pulp_id: unit[unit_identifier]
+          pulp_id: unit[unit_identifier],
+          annotations: unit['annotations'],
+          labels: unit['labels'],
+          is_bootable: unit['is_bootable'],
+          is_flatpak: unit['is_flatpak'],
         }
       end
 
@@ -40,7 +44,7 @@ module Katello
           manifest_list_manifests += manifest_ids.map do |manifest_id|
             {
               docker_manifest_list_id: katello_id,
-              docker_manifest_id: manifest_id
+              docker_manifest_id: manifest_id,
             }
           end
         end

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

@@ -18,7 +18,7 @@ module Katello
       def self.generate_model_row(unit)
         row = {
           pulp_id: unit[unit_identifier],
-          name: unit['name']
+          name: unit['name'],
         }
 
         taggable = ::Katello::DockerManifest.find_by(:pulp_id => unit['tagged_manifest'])

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

@@ -75,7 +75,7 @@ module Katello
           {
             bug_id: bugzilla[:id],
             href: bugzilla[:href],
-            erratum_id: katello_id
+            erratum_id: katello_id,
           }
         end
       end
@@ -85,7 +85,7 @@ module Katello
           {
             cve_id: cve[:id],
             href: cve[:href],
-            erratum_id: katello_id
+            erratum_id: katello_id,
           }
         end
       end

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

@@ -27,7 +27,7 @@ module Katello
           pulp_id: unit[unit_identifier],
           name: filename,
           path: unit['relative_path'],
-          checksum: unit['sha256']
+          checksum: unit['sha256'],
         }
       end
     end

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

@@ -24,7 +24,7 @@ module Katello
           version: content_type&.model_version&.call(unit),
           filename: content_type&.model_filename&.call(unit),
           additional_metadata: content_type&.model_additional_metadata&.call(unit),
-          content_type: content_type&.label
+          content_type: content_type&.label,
         }
       end
     end

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

@@ -19,7 +19,7 @@ module Katello
         rpms = package_ids.map do |package_id|
           {
             module_stream_id: katello_id,
-            rpm_id: package_id
+            rpm_id: package_id,
           }
         end
         add_timestamps(rpms)
@@ -38,7 +38,7 @@ module Katello
         profiles = profiles_json.map do |profile, _rpms|
           {
             module_stream_id: katello_id,
-            name: profile
+            name: profile,
           }
         end
         add_timestamps(profiles)

data/app/services/katello/pulp3/repository/ansible_collection.rb

@@ -20,7 +20,7 @@ module Katello
           {
             base_path: path,
             repository_version: repo.version_href,
-            name: "#{generate_backend_object_name}"
+            name: "#{generate_backend_object_name}",
           }
         end
 

data/app/services/katello/pulp3/repository/apt.rb

@@ -7,10 +7,18 @@ module Katello
         UNIT_LIMIT = 10_000
         SIGNING_SERVICE_NAME = 'katello_deb_sign'.freeze
 
+        def initialize_empty
+          # For every empty APT library instance repository we must add at least a release component to
+          # ensure we have a publishable repo with consumable metadata. Otherwise smart proxy syncs will
+          # fail, and consuming hosts will choke on empty repos.
+          opts = {:repository => repository_reference.repository_href, :component => "empty", :distribution => "katello"}
+          api.content_release_components_api.create(opts)
+        end
+
         def remote_options
           deb_remote_options = {
             policy: root.download_policy,
-            distributions: root.deb_releases
+            distributions: root.deb_releases,
           }
           deb_remote_options[:components] = root.deb_components.present? ? root.deb_components : nil
           deb_remote_options[:architectures] = root.deb_architectures.present? ? root.deb_architectures : nil
@@ -31,22 +39,20 @@ module Katello
         end
 
         def mirror_remote_options
-          super.merge(
-            {
-              distributions: repo.deb_releases + "#{' default' unless repo.deb_releases.include? 'default'}"
-            }
-          )
+          distributions = if repo.deb_using_structured_apt?
+                            repo.deb_pulp_distributions.join(' ')
+                          else
+                            'default'
+                          end
+
+          super.merge({distributions: distributions})
         end
 
-        def publication_options(repository_version)
+        def publication_options(repository)
           ss = api.signing_services_api.list(name: SIGNING_SERVICE_NAME).results
-          popts = super(repository_version)
-          popts.merge!(
-            {
-              structured: true, # publish real suites (e.g. 'stable')
-              simple: true # publish all into 'default'-suite
-            }
-          )
+          popts = super(repository)
+          popts.merge!({ structured: true })
+          popts.merge!({ simple: true }) unless repository.deb_using_structured_apt?
           popts[:signing_service] = ss[0].pulp_href if ss && ss.length == 1
           popts
         end
@@ -55,7 +61,7 @@ module Katello
           {
             base_path: path,
             publication: repo.publication_href,
-            name: "#{generate_backend_object_name}"
+            name: "#{generate_backend_object_name}",
           }
         end
 
@@ -104,7 +110,7 @@ module Katello
             config_hash = {
               source_repo_version: repo_config[:source_repo_version],
               dest_repo: repo_config[:dest_repo],
-              content: []
+              content: [],
             }
             config_hash[:dest_base_version] = repo_config[:dest_base_version] if repo_config[:dest_base_version]
             data_dup.config << config_hash

data/app/services/katello/pulp3/repository/docker.rb

@@ -39,7 +39,7 @@ module Katello
           super.merge(
             {
               url: "https://#{SmartProxy.pulp_primary.pulp3_host!.downcase}",
-              upstream_name: repo.container_repository_name
+              upstream_name: repo.container_repository_name,
             }
           )
         end
@@ -48,7 +48,7 @@ module Katello
           {
             base_path: path,
             repository_version: repo.version_href,
-            name: "#{generate_backend_object_name}"
+            name: "#{generate_backend_object_name}",
           }
         end
 

data/app/services/katello/pulp3/repository/file.rb

@@ -12,7 +12,7 @@ module Katello
           {
             base_path: path,
             publication: repo.publication_href,
-            name: "#{generate_backend_object_name}"
+            name: "#{generate_backend_object_name}",
           }
         end
 

data/app/services/katello/pulp3/repository/generic.rb

@@ -9,7 +9,7 @@ module Katello
         def distribution_options(path)
           options = {
             base_path: path,
-            name: "#{generate_backend_object_name}"
+            name: "#{generate_backend_object_name}",
           }
 
           if ::Katello::RepositoryTypeManager.find(repo.content_type).pulp3_skip_publication

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

@@ -20,8 +20,8 @@ module Katello
           options.merge!(policy: root.download_policy)
         end
 
-        def publication_options(repository_version)
-          options = super(repository_version)
+        def publication_options(repository)
+          options = super(repository)
           # To work around https://projects.theforeman.org/issues/37715
           checksum_type = if root.checksum_type.nil?
                             'sha256'
@@ -50,7 +50,7 @@ module Katello
           {
             base_path: path,
             publication: repo.publication_href,
-            name: "#{generate_backend_object_name}"
+            name: "#{generate_backend_object_name}",
           }
         end
 
@@ -141,7 +141,7 @@ module Katello
             config_hash = {
               source_repo_version: repo_config[:source_repo_version],
               dest_repo: repo_config[:dest_repo],
-              content: []
+              content: [],
             }
             config_hash[:dest_base_version] = repo_config[:dest_base_version] if repo_config[:dest_base_version]
             data_dup.config << config_hash
@@ -253,7 +253,7 @@ module Katello
               source_repo_ids.each do |repo_id|
                 filter_list_map[:whitelist_ids] += filter.content_unit_pulp_ids(::Katello::Repository.find(repo_id))
               end
-            elsif filter.class == ContentViewErratumFilter
+            elsif filter.instance_of?(ContentViewErratumFilter)
               source_repo_ids.each do |repo_id|
                 filter_list_map[:blacklist_ids] += filter.content_unit_pulp_ids(::Katello::Repository.find(repo_id), additional_included_errata)
               end
@@ -280,7 +280,7 @@ module Katello
           inclusion_modular_filters = modular_filters.select { |filter| filter.inclusion }
           exclusion_modular_filters = modular_filters - inclusion_modular_filters
           if inclusion_modular_filters.empty? &&
-              !(filters.any? { |filter| filter.class == ContentViewErratumFilter && filter.inclusion })
+              !(filters.any? { |filter| filter.instance_of?(ContentViewErratumFilter) && filter.inclusion })
             source_repo_ids.each do |source_repo_id|
               source_repo = ::Katello::Repository.find(source_repo_id)
               filter_list_map[:whitelist_ids] += source_repo.rpms.where(:modular => true).pluck(:pulp_id).sort
@@ -401,7 +401,7 @@ module Katello
           (errata_filters + package_filters).each do |filter|
             if filter.inclusion
               whitelist_ids += filter.content_unit_pulp_ids(source_repository)
-            elsif filter.class == ContentViewErratumFilter
+            elsif filter.instance_of?(ContentViewErratumFilter)
               blacklist_ids += filter.content_unit_pulp_ids(source_repository, additional_included_errata)
             else
               blacklist_ids += filter.content_unit_pulp_ids(source_repository)

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

@@ -181,6 +181,12 @@ module Katello
         end
       end
 
+      def initialize_empty
+        # Can be used to initialize a newly created library instance repository with some initial content.
+        # Currently only used for deb type repositories!
+        fail NotImplementedError
+      end
+
       def update
         api.repositories_api.update(repository_reference.try(:repository_href), create_options)
       end
@@ -211,7 +217,7 @@ module Katello
       end
 
       def create_publication
-        publication_data = api.publication_class.new(publication_options(repo.version_href))
+        publication_data = api.publication_class.new(publication_options(repo))
         api.publications_api.create(publication_data)
       end
 
@@ -219,9 +225,9 @@ module Katello
         ignore_404_exception { api.publications_api.delete(repo.publication_href) } if repo.publication_href
       end
 
-      def publication_options(repository_version)
+      def publication_options(repository)
         {
-          repository_version: repository_version
+          repository_version: repository.version_href,
         }
       end
 
@@ -319,7 +325,7 @@ module Katello
           data = api.class.copy_class.new
           data.config = [{
             source_repo_version: source_repository.version_href,
-            dest_repo: repository_reference.repository_href
+            dest_repo: repository_reference.repository_href,
           }]
           tasks << api.copy_api.copy_content(data)
           tasks
@@ -400,7 +406,7 @@ module Katello
           connect_timeout: Setting[:sync_connect_timeout_v2],
           sock_connect_timeout: Setting[:sync_sock_connect_timeout],
           sock_read_timeout: Setting[:sync_sock_read_timeout],
-          rate_limit: Setting[:download_rate_limit]
+          rate_limit: Setting[:download_rate_limit],
         }
         remote_options[:url] = root.url unless root.url.blank?
         remote_options[:download_concurrency] = root.download_concurrency unless root.download_concurrency.blank?
@@ -446,23 +452,23 @@ module Katello
           options = {
             client_cert: root.product.certificate,
             client_key: root.product.key,
-            ca_cert: Katello::Repository.feed_ca_cert(root.url)
+            ca_cert: Katello::Repository.feed_ca_cert(root.url),
           }
         elsif root.redhat? && root.cdn_configuration.custom_cdn?
           options = {
-            ca_cert: root.cdn_configuration.ssl_ca
+            ca_cert: root.cdn_configuration.ssl_ca,
           }
         elsif root.redhat? && root.cdn_configuration.network_sync?
           options = {
             client_cert: root.cdn_configuration.ssl_cert,
             client_key: root.cdn_configuration.ssl_key,
-            ca_cert: root.cdn_configuration.ssl_ca
+            ca_cert: root.cdn_configuration.ssl_ca,
           }
         elsif root.custom?
           options = {
             client_cert: root.ssl_client_cert&.content,
             client_key: root.ssl_client_key&.content,
-            ca_cert: root.ssl_ca_cert&.content
+            ca_cert: root.ssl_ca_cert&.content,
           }
         end
         append_proxy_cacert(options) if options.key?(:cacert)

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

@@ -92,7 +92,7 @@ module Katello
       def distribution_options(path, options = {})
         ret = {
           base_path: path,
-          name: "#{backend_object_name}"
+          name: "#{backend_object_name}",
         }
         ret[:content_guard] = repo.unprotected ? nil : content_guard_href
         ret[:publication] = options[:publication] if options.key? :publication
@@ -145,7 +145,7 @@ module Katello
           connect_timeout: Setting[:sync_connect_timeout_v2],
           sock_connect_timeout: Setting[:sync_sock_connect_timeout],
           sock_read_timeout: Setting[:sync_sock_read_timeout],
-          rate_limit: Setting[:download_rate_limit]
+          rate_limit: Setting[:download_rate_limit],
         }
         remote_options.merge!({download_concurrency: repo.download_concurrency}) if repo.download_concurrency
         remote_options.merge!(ssl_remote_options)
@@ -157,7 +157,7 @@ module Katello
           client_cert: ueber_cert[:cert],
           client_key: ueber_cert[:key],
           ca_cert: ::Cert::Certs.ca_cert,
-          tls_validation: true
+          tls_validation: true,
         }
       end
 

data/app/services/katello/registration_manager.rb

@@ -154,19 +154,24 @@ module Katello
         end
       end
 
+      # rubocop:disable Metrics/MethodLength
       def register_host(host, consumer_params, content_view_environments, activation_keys = [])
         new_host = host.new_record?
         unless new_host
           host.save!
           # Keep the kickstart repository ID so the host's Medium isn't unset
           # Important for registering a host during provisioning
-          unregister_host(host, :unregistering => true, :keep_kickstart_repository => true)
+          begin
+            unregister_host(host, :unregistering => true, :keep_kickstart_repository => true)
+          rescue RestClient::Gone
+            Rails.logger.debug("Host %s has been removed in preparation for reregistration" % host&.name)
+          end
           host.reload
         end
 
         if activation_keys.present?
           if content_view_environments.blank?
-            content_view_environments = [lookup_content_view_environment(activation_keys)]
+            content_view_environments = lookup_content_view_environments(activation_keys)
           end
           set_host_collections(host, activation_keys)
         end
@@ -194,6 +199,7 @@ module Katello
           finalize_registration(host)
         end
       end
+      # rubocop:enable Metrics/MethodLength
 
       def check_registration_services
         ping_results = {}
@@ -246,7 +252,7 @@ module Katello
         host.subscription_facet.save!
         host.refresh_statuses([
                                 ::Katello::ErrataStatus,
-                                ::Katello::RhelLifecycleStatus
+                                ::Katello::RhelLifecycleStatus,
                               ])
       end
 
@@ -264,12 +270,23 @@ module Katello
         host.host_collection_ids = host_collection_ids
       end
 
-      def lookup_content_view_environment(activation_keys)
+      def lookup_content_view_environments(activation_keys)
+        # If the setting is on, we combine all CVEs from all AKs
+        if Setting['allow_multiple_content_views']
+          cves = activation_keys.map do |act_key|
+            act_key.content_view_environments
+          end
+          cves = cves.flatten.uniq
+          fail _('At least one activation key must have a lifecycle environment and content view assigned to it') if cves.blank?
+          return cves
+        end
+
+        # If the setting is off, we stick with the previous behavior (the last AK with a valid cv/lce wins).
         activation_key = activation_keys.reverse.detect do |act_key|
-          act_key.environment && act_key.content_view
+          act_key.content_view_environments.any?
         end
         if activation_key
-          ::Katello::ContentViewEnvironment.where(:content_view_id => activation_key.content_view, :environment_id => activation_key.environment).first
+          ::Katello::ContentViewEnvironment.where(:content_view_id => activation_key.content_view, :environment_id => activation_key.environment)
         else
           fail _('At least one activation key must have a lifecycle environment and content view assigned to it')
         end

data/app/services/katello/repository_type.rb

@@ -123,7 +123,7 @@ module Katello
         :generic_remote_options => translated_generic_remote_options,
         :import_attributes => translated_import_attributes,
         :url_description => _(@url_description),
-        :content_types => content_types.as_json
+        :content_types => content_types.as_json,
       }
     end
 
@@ -170,7 +170,7 @@ module Katello
           generic: false,
           removable: removable,
           uploadable: uploadable,
-          indexed: index
+          indexed: index,
         }
       end
 
@@ -220,7 +220,7 @@ module Katello
             :generic => true,
             :pluralized_label => content_type.pluralize,
             :pluralized_name => pluralized_name,
-            :details_columns => details_columns
+            :details_columns => details_columns,
           }
         )
       end

data/app/services/katello/smart_proxy_helper.rb

@@ -47,9 +47,9 @@ module Katello
 
     def repositories_available_to_capsule(environments = nil, content_view = nil)
       environments = @smart_proxy.lifecycle_environments if environments.nil?
-      yum_repos = Katello::Repository.in_environment(environments)
-      yum_repos = yum_repos.in_content_views([content_view]) if content_view
-      yum_repos.smart_proxy_syncable
+      repos = Katello::Repository.in_environment(environments)
+      repos = repos.in_content_views([content_view]) if content_view
+      repos.smart_proxy_syncable
     end
 
     def unsyncable_content_types

data/app/services/katello/ui_notifications/content_view/delete_latest_version_failure.rb

@@ -1,7 +1,7 @@
 module Katello
   module UINotifications
     module ContentView
-      class DelelteLatestVersionFailure < ::UINotifications::Base
+      class DeleteLatestVersionFailure < ::UINotifications::Base
         private
 
         def create

data/app/services/katello/ui_notifications/subscriptions/expire_soon.rb

@@ -48,9 +48,9 @@ module Katello
                 {
                   :href => "/subscriptions?search=expires<\"#{Setting[:expire_soon_days]} days from now\"",
                   :title => _('Subscriptions'),
-                  :external => true
-                }
-              ]
+                  :external => true,
+                },
+              ],
             }
           end
 

data/app/services/katello/ui_notifications/subscriptions/manifest_expire_soon_warning.rb

@@ -58,9 +58,9 @@ module Katello
                 {
                   :href => "/subscriptions",
                   :title => _('Subscriptions'),
-                  :external => false
-                }
-              ]
+                  :external => false,
+                },
+              ],
             }
           end
 

data/app/services/katello/ui_notifications/task_notification.rb

@@ -16,8 +16,8 @@ module Katello
           :links => [
             {
               :path_method => :foreman_tasks_task_path,
-              :title => _('Task detail')
-            }
+              :title => _('Task detail'),
+            },
           ]
         ).actions
       end

data/app/services/katello/upstream_connection_checker.rb

@@ -5,7 +5,7 @@ module Katello
       Katello::Errors::ManifestExpired,
       Katello::Errors::UpstreamConsumerGone,
       Katello::Errors::UpstreamConsumerNotFound,
-      Katello::Errors::NoManifestImported
+      Katello::Errors::NoManifestImported,
     ].freeze
 
     def initialize(organization)