katello 4.13.1 → 4.14.0.rc1.1

data/app/lib/actions/katello/repository/import_upload.rb

@@ -58,8 +58,8 @@ module Actions
 
         def run
           repository = ::Katello::Repository.find(input[:repository_id])
-          if input[:sync_capsule]
-            ForemanTasks.async_task(Katello::Repository::CapsuleSync, repository) if Setting[:foreman_proxy_content_auto_sync]
+          if input[:sync_capsule] && (Setting[:foreman_proxy_content_auto_sync])
+            ForemanTasks.async_task(Katello::Repository::CapsuleSync, repository)
           end
           output[:upload_results] = results_to_json(input[:upload_results])
         rescue ::Katello::Errors::CapsuleCannotBeReached # skip any capsules that cannot be connected to
@@ -92,10 +92,8 @@ module Actions
                 json_results << {:type => 'file'}
               end
             end
-            unless json_results.size
-              if result[:content_unit_href]
-                json_results << {:type => 'file'}
-              end
+            if !json_results.size && (result[:content_unit_href])
+              json_results << {:type => 'file'}
             end
           end
           json_results

data/app/lib/actions/katello/repository/metadata_generate.rb

@@ -3,6 +3,7 @@ module Actions
     module Repository
       class MetadataGenerate < Actions::EntryAction
         def plan(repository, options = {})
+          return if repository.root.is_container_push && repository.library_instance?
           action_subject(repository)
           repository.check_ready_to_act!
           source_repository = options.fetch(:source_repository, nil)

data/app/lib/actions/katello/repository/update.rb

@@ -92,7 +92,7 @@ module Actions
           # match the ACS content type and have a non-nil URL
           product = repository.product
           repo_content_types = Set.new
-          product.repositories.each do |test_repo|
+          product.acs_compatible_repositories.each do |test_repo|
             # we need to check id because test_repo will still contain the old, non-nil url
             repo_content_types.add(test_repo.content_type) if (repository.id != test_repo.id) && test_repo.url.present?
           end
@@ -110,11 +110,11 @@ module Actions
         end
 
         def create_acs?(old_url, new_url)
-          old_url.nil? && new_url.present?
+          (old_url.nil? || old_url.start_with?('uln')) && new_url.present? && !new_url.start_with?('uln')
         end
 
         def delete_acs?(old_url, new_url)
-          old_url.present? && new_url.nil?
+          old_url.present? && (new_url.nil? || new_url.start_with?('uln'))
         end
       end
     end

data/app/lib/actions/katello/repository_set/enable_repository.rb

@@ -6,8 +6,7 @@ module Actions
           _("Enable")
         end
 
-        def plan(product, content, substitutions, override_url: nil,
-                 override_arch: nil)
+        def plan(product, content, substitutions, opts = {})
           mapper = ::Katello::Candlepin::RepositoryMapper.new(product,
                                                                content,
                                                                substitutions)
@@ -16,10 +15,10 @@ module Actions
             fail ::Katello::Errors::ConflictException, _("The repository is already enabled")
           end
           repository = mapper.build_repository
-          repository.root.arch = override_arch if override_arch.present?
-          if override_url
-            repository.root.url = override_url
-            repository.root.download_policy = ::Katello::RootRepository::DOWNLOAD_IMMEDIATE if URI(override_url).scheme == 'file'
+          repository.root.arch = opts[:override_arch] if opts[:override_arch].present?
+          if opts[:override_url]
+            repository.root.url = opts[:override_url]
+            repository.root.download_policy = ::Katello::RootRepository::DOWNLOAD_IMMEDIATE if URI(opts[:override_url]).scheme == 'file'
           end
           plan_action(Repository::Create, repository, clone: false)
           action_subject(repository)

data/app/lib/actions/middleware/backend_services_check.rb

@@ -28,9 +28,10 @@ module Actions
       def capsule_id(args)
         capsule_id = nil
         args.each do |arg|
-          if arg.is_a? SmartProxy
+          case arg
+          when SmartProxy
             capsule_id = arg.id
-          elsif arg.is_a? Hash
+          when Hash
             capsule_id = arg[:capsule_id] || arg[:smart_proxy_id]
           end
           break if capsule_id

data/app/lib/actions/pulp3/abstract_async_task.rb

@@ -96,10 +96,9 @@ module Actions
       def transform_task_response(response)
         response = [] if response.nil?
         response = [response] unless response.is_a?(Array)
-        response = response.map do |task|
+        response.map do |task|
           task.as_json
         end
-        response
       end
 
       def check_for_errors
@@ -166,8 +165,7 @@ module Actions
       def get_task_label(name, href)
         name = name.split('.').last if name
         href = href.split('-').last[0...-1] if href
-        label = "%s (ID: %s)" % [name, href]
-        label
+        "%s (ID: %s)" % [name, href]
       end
     end
   end

data/app/lib/actions/pulp3/capsule_content/verify_checksum.rb

@@ -17,8 +17,7 @@ module Actions
           if repository
             [repository]
           else
-            repositories = smart_proxy_helper.repositories_available_to_capsule(environment, content_view).by_rpm_count
-            repositories
+            smart_proxy_helper.repositories_available_to_capsule(environment, content_view).by_rpm_count
           end
         end
       end

data/app/lib/actions/pulp3/orchestration/repository/copy_all_units.rb

@@ -23,7 +23,7 @@ module Actions
                   plan_action(Actions::Pulp3::Repository::SaveVersion, target_repo, tasks: action.output[:pulp_tasks])
                   copy_actions = []
                   #since we're creating a new version from the first repo, start copying at the 2nd
-                  source_repositories[1..-1].each do |source_repo|
+                  source_repositories[1..].each do |source_repo|
                     # TODO: In a future refactor, can :copy_all be utilized?  Filters should not be needed in this code segment.
                     copy_actions << plan_action(Actions::Pulp3::Repository::CopyContent, source_repo, smart_proxy, target_repo,
                                                 filter_ids: filter_ids, solve_dependencies: solve_dependencies,
@@ -32,6 +32,10 @@ module Actions
                   plan_action(Actions::Pulp3::Repository::SaveVersion, target_repo, tasks: copy_actions.last.output[:pulp_tasks])
                 end
               end
+            elsif source_repositories.first.root.is_container_push
+              copy_action = plan_action(Actions::Pulp3::Repository::CopyContent, source_repositories.first, smart_proxy, target_repo,
+                                        copy_all: true)
+              plan_action(Actions::Pulp3::Repository::SaveVersion, target_repo, tasks: copy_action.output[:pulp_tasks])
             else
               plan_self(source_version_repo_id: source_repositories.first.id,
                         target_repo_id: target_repo.id)

data/app/lib/actions/pulp3/orchestration/repository/delete.rb

@@ -9,10 +9,13 @@ module Actions
               plan_action(Actions::Pulp3::Repository::DeleteDistributions, repository.id, smart_proxy)
 
               if repository.content_view.default?
-                #we're deleting the library instance, so just delete the whole pulp3 repo
+                # Container push repositories must be deleted through the distribution
+                return if repository.root.is_container_push
+
+                # We're deleting the library instance, so just delete the whole pulp3 repo
                 plan_action(Actions::Pulp3::Repository::Delete, repository.id, smart_proxy)
               elsif repository.environment.nil?
-                #we're deleting the archived instance, so delete the version
+                # We're deleting the archived instance, so delete the version
                 plan_action(Actions::Pulp3::Repository::DeleteVersion, repository, smart_proxy)
               end
             end

data/app/lib/actions/pulp3/repository/save_version.rb

@@ -20,11 +20,9 @@ module Actions
           end
 
           output[:publication_provided] = false
-          if input[:tasks].present?
-            if (publication_href = ::Katello::Pulp3::Task.publication_href(input[:tasks]))
-              repo.update(:publication_href => publication_href)
-              output[:publication_provided] = true
-            end
+          if input[:tasks].present? && (publication_href = ::Katello::Pulp3::Task.publication_href(input[:tasks]))
+            repo.update(:publication_href => publication_href)
+            output[:publication_provided] = true
           end
 
           if version_href

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

@@ -259,13 +259,9 @@ module Katello
         labels = 'label ^ (Actions::Katello::Host::Erratum::Install, Actions::Katello::Host::Erratum::ApplicableErrataInstall)'
         select = 'foreman_tasks_tasks.*'
 
-        if Katello.with_remote_execution?
-          new_labels = 'label = Actions::RemoteExecution::RunHostJob AND remote_execution_feature.label ^ (katello_errata_install, katello_errata_install_by_search)'
-          labels = [labels, new_labels].map { |label| "(#{label})" }.join(' OR ')
-          select += ',template_invocations.id AS template_invocation_id'
-        else
-          select += ',NULL AS template_invocation_id'
-        end
+        new_labels = 'label = Actions::RemoteExecution::RunHostJob AND remote_execution_feature.label ^ (katello_errata_install, katello_errata_install_by_search)'
+        labels = [labels, new_labels].map { |label| "(#{label})" }.join(' OR ')
+        select += ',template_invocations.id AS template_invocation_id'
 
         search = [search_up_to, search_since, search_result, "state = stopped", labels].compact.join(' and ')
 
@@ -302,8 +298,8 @@ module Katello
               current_erratum_errata_type = current_erratum[1]
               current_erratum_issued = current_erratum.last
 
-              if filter_errata_type != 'all'
-                next unless filter_errata_type == current_erratum_errata_type
+              if filter_errata_type != 'all' && !(filter_errata_type == current_erratum_errata_type)
+                next
               end
 
               hash = {

data/app/lib/katello/errors.rb

@@ -134,6 +134,7 @@ module Katello
     end
 
     class UpstreamCandlepinError < CandlepinError; end
+
     class UpstreamConsumerGone < StandardError
       def message
         _("The manifest doesn't exist on console.redhat.com. " \

data/app/lib/katello/http_resource.rb

@@ -8,6 +8,7 @@ module Katello
 
     class RestClientException < StandardError
       attr_reader :service_code, :code
+
       def initialize(params)
         super params[:message]
         @service_code = params[:service_code]

data/app/lib/katello/lazy_accessor.rb

@@ -24,7 +24,7 @@ module Katello
       def lazy_accessor(*args)
         options = args.extract_options!
         @lazy_attributes = [] if @lazy_attributes.nil?
-        @lazy_attributes = @lazy_attributes.concat args
+        @lazy_attributes.concat args
         @lazy_attributes_options ||= {}
         fail ArgumentError, "Attribute names must be symbols" if args.any? { |attribute| !attribute.is_a?(Symbol) }
         redefined_attr = args.find { |attribute| instance_methods.include?(attribute.to_s) }

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

@@ -7,11 +7,6 @@ module Katello
             response = get('/candlepin/status').body
             JSON.parse(response).with_indifferent_access
           end
-
-          def distributor_versions
-            response = get("/candlepin/distributor_versions").body
-            JSON.parse(response)
-          end
         end
       end
     end

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

@@ -65,7 +65,7 @@ module Katello
             response = JSON.parse(response_json).with_indifferent_access
             if wait_until_complete && response['state'] == 'CREATED'
               while !response['state'].nil? && response['state'] != 'FINISHED' && response['state'] != 'ERROR'
-                path = join_path('candlepin', response['statusPath'][1..-1])
+                path = join_path('candlepin', response['statusPath'][1..])
                 response_json = self.get(path, self.default_headers)
                 response = JSON.parse(response_json).with_indifferent_access
               end

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

@@ -13,8 +13,7 @@ module Katello
           end
 
           def create(owner_key, attrs)
-            pool = self.post("/candlepin/owners/#{owner_key}/pools", attrs.to_json, self.default_headers).body
-            pool
+            self.post("/candlepin/owners/#{owner_key}/pools", attrs.to_json, self.default_headers).body
           end
 
           def find(pool_id)

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

@@ -11,7 +11,7 @@ module Katello
           end
 
           def get(id, upstream)
-            url = API_URL
+            url = ENV['REDHAT_RHSM_API_URL'] || API_URL
             response = Resources::Candlepin::UpstreamConsumer.start_upstream_export("#{url}#{path(id)}", upstream['idCert']['cert'],
               upstream['idCert']['key'], nil)
             job = JSON.parse(response)

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

@@ -104,9 +104,10 @@ module Katello
           # very old infrastructure for now, but that was considered better than having an insecure default.
           net.min_version = OpenSSL::SSL::TLS1_2_VERSION
 
-          if (@options[:verify_ssl] == false) || (@options[:verify_ssl] == OpenSSL::SSL::VERIFY_NONE)
+          case @options[:verify_ssl]
+          when false, OpenSSL::SSL::VERIFY_NONE
             net.verify_mode = OpenSSL::SSL::VERIFY_NONE
-          elsif @options[:verify_ssl].is_a? Integer
+          when Integer
             net.verify_mode = @options[:verify_ssl]
             net.verify_callback = lambda do |preverify_ok, ssl_context|
               if !preverify_ok || ssl_context.error != 0

data/app/lib/katello/resources/discovery/yum.rb

@@ -22,7 +22,7 @@ module Katello
           if @uri.scheme == 'file'
             crawl_file_path(uri(resume_point))
           elsif %w(http https).include?(@uri.scheme)
-            spidr_crawl_pages(resume_point)
+            spidr_crawl_pages(uri(resume_point))
           end
         end
 
@@ -54,6 +54,7 @@ module Katello
         end
 
         def spidr_crawl_pages(url)
+          url = url.to_s
           user, password = @upstream_username, @upstream_password
           Spidr.site(url, proxy: spidr_proxy_details) do |spider|
             spider.authorized.add(url, user, password) if user && password
@@ -85,8 +86,7 @@ module Katello
           # * link ends with '/' so it should be a directory
           # * link doesn't end with '/Packages/', as this increases
           #       processing time and memory usage considerably
-
-          return url.hostname == @uri.hostname && !@crawled.include?(url.to_s) &&
+          return url.path.starts_with?(@uri.path) && url.hostname == @uri.hostname && !@crawled.include?(url.to_s) &&
             url.path.ends_with?('/') && !url.path.ends_with?('/Packages/')
         end
       end

data/app/lib/katello/util/cdn_var_substitutor.rb

@@ -1,8 +1,8 @@
 module Katello
   module Util
     class CdnVarSubstitutor
-      attr_reader :good_listings
-      attr_reader :bad_listings
+      attr_reader :good_listings, :bad_listings
+
       # cdn_resource - an object providing access to CDN. It has to
       # provide a get method that takes a path (e.g.
       # /content/rhel/6.2/listing) and returns the body response)
@@ -68,7 +68,9 @@ module Katello
 
           futures.each do |future|
             resolved << future.value
-            Rails.logger.error("Failed at scanning for repository: #{future.reason}") if future.rejected?
+            if future.rejected?
+              fail Errors::CdnSubstitutionError, "Failed at scanning for repository: #{future.reason}"
+            end
           end
         end
 

data/app/lib/katello/util/data.rb

@@ -13,7 +13,8 @@ module Katello
         options[:prefix_keys] ||= []
         options[:prefix] ||= '_'
 
-        if obj.is_a? Hash
+        case obj
+        when Hash
 
           ostructized_hash = {}
           obj.each do |key, value|
@@ -31,7 +32,7 @@ module Katello
           end
           return OpenStruct.new ostructized_hash
 
-        elsif obj.is_a? Array
+        when Array
 
           return obj.map { |r| ostructize(r, options) }
 

data/app/lib/katello/util/errata.rb

@@ -29,11 +29,12 @@ module Katello
 
       def get_pulp_filter_type(type)
         filter_type = type.downcase
-        if filter_type == "bugfix"
+        case filter_type
+        when "bugfix"
           return ::Katello::Erratum::BUGZILLA
-        elsif filter_type == "enhancement"
+        when "enhancement"
           return ::Katello::Erratum::ENHANCEMENT
-        elsif filter_type == "security"
+        when "security"
           return ::Katello::Erratum::SECURITY
         end
       end

data/app/lib/katello/util/package.rb

@@ -75,8 +75,8 @@ module Katello
         vrea =  [package[:version], package[:release]].compact.join('-')
         vrea = vrea + '.' + package[:arch] unless package[:arch].nil?
         vrea = vrea + '.' + package[:suffix] unless package[:suffix].nil?
-        unless package[:epoch].nil?
-          vrea = package[:epoch] + ':' + vrea if package[:epoch].to_i != 0 || include_zero_epoch
+        if !package[:epoch].nil? && (package[:epoch].to_i != 0 || include_zero_epoch)
+          vrea = package[:epoch] + ':' + vrea
         end
         vrea
       end
@@ -135,7 +135,7 @@ module Katello
       end
 
       def self.valid_package_characters
-        /[^abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\-\.\_\+\,]+/
+        /[^abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\-._+,]+/
       end
 
       def self.setup_shared_unique_filter(repoids, search_mode, search_results)

data/app/lib/katello/util/path_with_substitutions.rb

@@ -25,7 +25,7 @@ module Katello
       def substitutions_needed
         # e.g. if content_url = "/content/dist/rhel/server/7/$releasever/$basearch/kickstart"
         #      return ['releasever', 'basearch']
-        split_path.map { |word| word.start_with?('$') ? word[1..-1] : nil }.compact
+        split_path.map { |word| word.start_with?('$') ? word[1..] : nil }.compact
       end
 
       def substitutable?

data/app/lib/katello/util/report_table.rb

@@ -19,9 +19,10 @@ module Katello
       end
 
       def as(type)
-        if type == :csv
+        case type
+        when :csv
           as_csv(transform_data)
-        elsif type == :text
+        when :text
           as_text(transform_data)
         end
       end

data/app/lib/katello/util/url_matcher.rb

@@ -63,7 +63,7 @@ module Katello
           self.parts.each_with_index do |part, i|
             a << @match.parts[i] if part[0] == ':'
           end
-          a << @match.ext[1..-1] if self.ext[1] == ':'
+          a << @match.ext[1..] if self.ext[1] == ':'
           a
         end
         alias_method :vars, :variables

data/app/lib/katello/validators/alternate_content_source_path_validator.rb

@@ -3,11 +3,12 @@ module Katello
     class AlternateContentSourcePathValidator < ActiveModel::EachValidator
       def validate_each(record, attribute, value)
         if value
-          if attribute == :base_url
+          case attribute
+          when :base_url
             unless AlternateContentSourcePathValidator.validate_base_url(value)
               record.errors[attribute] << N_("%s is not a valid path") % value
             end
-          elsif attribute == :subpaths
+          when :subpaths
             unless AlternateContentSourcePathValidator.validate_subpaths(value)
               record.errors[attribute] << N_('All subpaths must have a slash at the end and none at the front')
             end
@@ -16,7 +17,7 @@ module Katello
       end
 
       def self.validate_base_url(base_url)
-        base_url =~ /\A#{URI::DEFAULT_PARSER.make_regexp}\z/
+        base_url =~ /\A(?!uln:\/\/)(#{URI::DEFAULT_PARSER.make_regexp})\z/
       end
 
       # Subpaths must have a slash at the end and none at the front: 'path/'

data/app/lib/katello/validators/alternate_content_source_products_validator.rb

@@ -2,13 +2,11 @@ module Katello
   module Validators
     class AlternateContentSourceProductsValidator < ActiveModel::EachValidator
       def validate_each(record, attribute, value)
-        if value
-          if attribute == :product_id
-            product = ::Katello::Product.find(value)
-            content_type = record.alternate_content_source.content_type
-            if product.repositories.with_type(content_type).has_url.empty?
-              record.errors.add(attribute, _("%{name} has no %{type} repositories with upstream URLs to add to the alternate content source.") % { name: product.name, type: content_type })
-            end
+        if value && (attribute == :product_id)
+          product = ::Katello::Product.find(value)
+          content_type = record.alternate_content_source.content_type
+          if product.acs_compatible_repositories.with_type(content_type).empty?
+            record.errors.add(attribute, _("%{name} has no %{type} repositories with upstream URLs to add to the alternate content source.") % { name: product.name, type: content_type })
           end
         end
       end

data/app/lib/katello/validators/container_image_name_validator.rb

@@ -8,7 +8,7 @@ module Katello
       end
 
       def self.validate_name(name)
-        if name.empty? || name.length > 255 || !/\A([a-z0-9]+[a-z0-9\-\_\.]*)+(\/[a-z0-9]+[a-z0-9\-\_\.]*)*\z/.match?(name)
+        if name.empty? || name.length > 255 || !/\A([a-z0-9]+[a-z0-9\-_.]*)+(\/[a-z0-9]+[a-z0-9\-_.]*)*\z/.match?(name)
           return false
         end
         true

data/app/lib/katello/validators/katello_name_format_validator.rb

@@ -13,8 +13,8 @@ module Katello
       end
 
       def self.validate_length(record, attribute, value, min_length = 1)
-        if value
-          record.errors[attribute] << _("must contain at least %s character") % min_length unless value.length >= min_length
+        if value && !(value.length >= min_length)
+          record.errors[attribute] << _("must contain at least %s character") % min_length
         end
       end
     end

data/app/lib/katello/validators/no_trailing_space_validator.rb

@@ -6,8 +6,8 @@ module Katello
       end
 
       def self.validate_trailing_space(record, attribute, value)
-        if value
-          record.errors[attribute] << _("must not contain leading or trailing white spaces.") unless value.strip == value
+        if value && !(value.strip == value)
+          record.errors[attribute] << _("must not contain leading or trailing white spaces.")
         end
       end
     end

data/app/lib/katello/validators/prior_validator.rb

@@ -7,8 +7,8 @@ module Katello
         # this is because in v1.0 we want
         # prior to have only one child (unless its the Library)
         ancestor = record.prior
-        if ancestor && !ancestor.library?
-          record.errors[:prior] << _("prior environment can only have one child") if ancestor.successors.count == 1 && !ancestor.successors.include?(record)
+        if ancestor && !ancestor.library? && (ancestor.successors.count == 1 && !ancestor.successors.include?(record))
+          record.errors[:prior] << _("prior environment can only have one child")
         end
       end
     end

data/app/lib/katello/validators/product_unique_attribute_validator.rb

@@ -12,10 +12,8 @@ module Katello
       def unique_attribute?(record, attribute, value)
         unique = true
 
-        if record.provider && !record.provider.redhat_provider? && record.send("#{attribute}_changed?")
-          if Product.in_org(record.provider.organization).where(attribute => value).exists?
-            unique = false
-          end
+        if record.provider && !record.provider.redhat_provider? && record.send("#{attribute}_changed?") && Product.in_org(record.provider.organization).where(attribute => value).exists?
+          unique = false
         end
 
         unique

data/app/models/katello/activation_key.rb

@@ -182,12 +182,10 @@ module Katello
     end
 
     def validate_destroyable!
-      unless organization.being_deleted?
-        if Parameter.where(name: 'kt_activation_keys').pluck(:value).any? { |value| value.split(",").include?(name) }
-          fail _("This activation key is associated to one or more Hosts/Hostgroups. "\
-                  "Search and unassociate Hosts/Hostgroups using params.kt_activation_keys ~ \"%{name}\" "\
-                  "before deleting." % {name: name})
-        end
+      if !organization.being_deleted? && Parameter.where(name: 'kt_activation_keys').pluck(:value).any? { |value| value.split(",").include?(name) }
+        fail _("This activation key is associated to one or more Hosts/Hostgroups. "\
+                "Search and unassociate Hosts/Hostgroups using params.kt_activation_keys ~ \"%{name}\" "\
+                "before deleting." % {name: name})
       end
       true
     end

data/app/models/katello/alternate_content_source.rb

@@ -54,7 +54,7 @@ module Katello
     validates :content_type, inclusion: {
       in: ->(_) { RepositoryTypeManager.defined_repository_types.keys & CONTENT_TYPES },
       allow_blank: false,
-      message: ->(_, _) { _("is not allowed for ACS. Must be one of the following: %s") % (RepositoryTypeManager.defined_repository_types.keys & CONTENT_TYPES).join(',') }
+      message: ->(_, _) { _("is not allowed for ACS. Must be one of the following: %s") % (RepositoryTypeManager.defined_repository_types.keys & CONTENT_TYPES).sort.join(',') }
     }
     validates :content_type, if: -> { rhui? }, inclusion: {
       in: [::Katello::Repository::YUM_TYPE],

data/app/models/katello/authorization/host_tracer.rb

@@ -6,8 +6,7 @@ module Katello
 
     module ClassMethods
       def resolvable
-        relation = joins_authorized(::Host::Managed, :edit_hosts)
-        relation
+        joins_authorized(::Host::Managed, :edit_hosts)
       end
     end
   end

data/app/models/katello/authorization/product.rb

@@ -19,7 +19,7 @@ module Katello
 
       def deletable?
         promoted_repos = repositories.select { |repo| repo.promoted? }
-        authorized?(:destroy_products) && promoted_repos.empty?
+        authorized?(:destroy_products) && (promoted_repos.empty? || Setting[:delete_repo_across_cv])
       end
 
       module ClassMethods

data/app/models/katello/candlepin/repository_mapper.rb

@@ -64,7 +64,7 @@ module Katello
         sorted_substitutions = substitutions.sort_by { |k, _| k.to_s }.map(&:last)
         repo_name_parts = [content.name,
                            sorted_substitutions].flatten.compact
-        repo_name_parts.join(" ").gsub(/[^a-z0-9\-\._ ]/i, "")
+        repo_name_parts.join(" ").gsub(/[^a-z0-9\-._ ]/i, "")
       end
 
       def path
@@ -83,7 +83,7 @@ module Katello
 
       def feed_url
         return if product.organization.cdn_configuration.export_sync?
-        @feed_url ||= if product.cdn_resource&.respond_to?(:repository_url)
+        @feed_url ||= if product.cdn_resource.respond_to?(:repository_url)
                         product.cdn_resource.repository_url(content_label: content.label, arch: arch, major: version[:major], minor: version[:minor])
                       else
                         product.repo_url(path)