katello 4.14.1 → 4.15.0.rc2

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

@@ -1,5 +1,6 @@
 module Katello
   module Host
+    # rubocop:disable Metrics/ClassLength
     class ContentFacet < Katello::Model
       audited :associated_with => :host
       self.table_name = 'katello_content_facets'
@@ -46,6 +47,23 @@ module Katello
       validates_with Katello::Validators::GeneratedContentViewValidator
       validates_associated :content_view_environment_content_facets, :message => _("invalid: The content source must sync the lifecycle environment assigned to the host. See the logs for more information.")
       validates :host, :presence => true, :allow_blank => false
+      validates :bootc_booted_digest, :bootc_available_digest, :bootc_staged_digest, :bootc_rollback_digest,
+                format: { with: /\Asha256:[A-Fa-f0-9]{64}\z/, message: "must be a valid sha256 digest", allow_nil: true }
+
+      scope :with_environments, ->(lifecycle_environments) do
+        joins(:content_view_environment_content_facets => :content_view_environment).
+          where("#{::Katello::ContentViewEnvironment.table_name}.environment_id" => lifecycle_environments)
+      end
+
+      scope :with_content_views, ->(content_views) do
+        joins(:content_view_environment_content_facets => :content_view_environment).
+          where("#{::Katello::ContentViewEnvironment.table_name}.content_view_id" => content_views)
+      end
+
+      scope :with_content_view_environments, ->(content_view_environments) do
+        joins(:content_view_environment_content_facets => :content_view_environment).
+          where("#{::Katello::ContentViewEnvironment.table_name}.id" => content_view_environments)
+      end
 
       attr_accessor :cves_changed
 
@@ -72,6 +90,10 @@ module Katello
         self.cves_changed = false
       end
 
+      def image_mode_host?
+        bootc_booted_image.present?
+      end
+
       def cves_changed?
         cves_changed
       end
@@ -111,6 +133,10 @@ module Katello
         self.host&.update_candlepin_associations unless self.host&.new_record?
       end
 
+      def content_view_environment_labels
+        content_view_environments.map(&:label).join(',')
+      end
+
       # rubocop:disable Metrics/CyclomaticComplexity
       def assign_single_environment(
         content_view_id: nil, lifecycle_environment_id: nil, environment_id: nil,
@@ -148,10 +174,12 @@ module Katello
         prefixes = %w(/pulp/deb/ /pulp/repos/ /pulp/content/)
         relative_paths = []
 
-        # paths == ["/pulp/content/Default_Organization/Library/custom/Test_product/test2"]
+        # paths == ["/pulp/content/Default_Organization/Library/custom/Test_product/test2",
+        #           "/pulp/content/Org/Library/custom/Test_product/test2/%3Fcomp%3Dmain%26rel%3Dstable"]
         paths.each do |path|
           if (prefix = prefixes.find { |pre| path.start_with?(pre) })
-            relative_paths << path.gsub(prefix, '')
+            # strip prefix and structured_apt postfix before adding to relative_paths
+            relative_paths << path.sub(prefix, '').sub(%r{/?(%3F|\?).*}, '')
           else
             Rails.logger.warn("System #{self.host.name} (#{self.host.id}) requested binding to repo with unknown prefix. #{path}")
           end
@@ -193,7 +221,7 @@ module Katello
         installable_hash = {
           :security => installable_security_errata_count,
           :bugfix => installable_bugfix_errata_count,
-          :enhancement => installable_enhancement_errata_count
+          :enhancement => installable_enhancement_errata_count,
         }
         installable_hash[:total] = installable_hash.values.inject(:+)
         # same for applicable, but we need to get the counts from the db
@@ -201,13 +229,13 @@ module Katello
         applicable_hash = {
           :bugfix => applicable_errata_counts.values_at(*Katello::Erratum::BUGZILLA).compact.sum,
           :security => applicable_errata_counts.values_at(*Katello::Erratum::SECURITY).compact.sum,
-          :enhancement => applicable_errata_counts.values_at(*Katello::Erratum::ENHANCEMENT).compact.sum
+          :enhancement => applicable_errata_counts.values_at(*Katello::Erratum::ENHANCEMENT).compact.sum,
         }
         applicable_hash[:total] = applicable_errata_counts.values.sum
 
         # keeping installable at the top level for backward compatibility
         installable_hash.merge({
-                                 :applicable => applicable_hash
+                                 :applicable => applicable_hash,
                                })
       end
 
@@ -257,13 +285,6 @@ module Katello
         relation.where(queries.join(" OR "))
       end
 
-      def self.in_content_views_and_environments(content_views: nil, lifecycle_environments: nil)
-        relation = self.joins(:content_view_environment_content_facets => :content_view_environment)
-        relation = relation.where("#{::Katello::ContentViewEnvironment.table_name}.content_view_id" => content_views) if content_views
-        relation = relation.where("#{::Katello::ContentViewEnvironment.table_name}.environment_id" => lifecycle_environments) if lifecycle_environments
-        relation
-      end
-
       def self.with_non_installable_errata(errata, hosts = nil)
         content_facets = Katello::Host::ContentFacet.select(:id).where(:host_id => hosts)
         reachable_repos = ::Katello::ContentFacetRepository.where(content_facet_id: content_facets).distinct.pluck(:repository_id)
@@ -348,11 +369,6 @@ module Katello
         host.refresh_global_status!
       end
 
-      # TODO: uncomment when we need to display multiple CVE names in the UI
-      # def content_view_environment_names
-      #   content_view_environments.map(&:candlepin_name).join(', ')
-      # end
-
       def self.joins_installable_relation(content_model, facet_join_model)
         facet_repository = Katello::ContentFacetRepository.table_name
         content_table = content_model.table_name

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

@@ -1,12 +1,10 @@
-require 'host_info'
-
 module Katello
   module Host
     class InfoProvider < ::HostInfo::Provider
       def host_info
         info = {}
         info['parameters'] = {
-          'foreman_host_collections' => host.host_collections.map(&:name)
+          'foreman_host_collections' => host.host_collections.map(&:name),
         }
 
         if host.content_facet.present?
@@ -45,7 +43,7 @@ module Katello
           'latest-version' => content_view.try(:latest_version),
           'version' => content_version(content_view_environment).try(:version),
           'published' => content_version(content_view_environment).try(:created_at).try(:time).to_s,
-          'components' => content_view_components(content_view_environment)
+          'components' => content_view_components(content_view_environment),
         }
       end
 

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

@@ -146,7 +146,7 @@ module Katello
           :releaseVer => release_version,
           :environments => self.candlepin_environments,
           :installedProducts => self.installed_products.map(&:consumer_attributes),
-          :guestIds => virtual_guest_uuids
+          :guestIds => virtual_guest_uuids,
         }
         attrs[:facts] = facts if facts
         HashWithIndifferentAccess.new(attrs)
@@ -305,7 +305,7 @@ module Katello
         # might make you think it was converted2rhel but not with satellite, that is why I have the tenary below.
         facet = host.subscription_facet || host.build_subscription_facet
         facet.attributes = {
-          convert2rhel_through_foreman: has_convert2rhel ? ::Foreman::Cast.to_bool(parser.facts['conversions.env.CONVERT2RHEL_THROUGH_FOREMAN']) : nil
+          convert2rhel_through_foreman: has_convert2rhel ? ::Foreman::Cast.to_bool(parser.facts['conversions.env.CONVERT2RHEL_THROUGH_FOREMAN']) : nil,
         }.compact
         facet.save unless facet.new_record?
       end

data/app/models/katello/host_available_module_stream.rb

@@ -22,7 +22,7 @@ module Katello
       DISABLED => :disabled,
       UNKNOWN => :unknown,
       INSTALLED => :installed,
-      UPGRADABLE => :upgradable
+      UPGRADABLE => :upgradable,
     }.with_indifferent_access
 
     scoped_search :on => :name, :relation => :available_module_stream, :complete_value => true

data/app/models/katello/installed_product.rb

@@ -11,7 +11,7 @@ module Katello
         :arch => consumer_attributes['arch'],
         :version => consumer_attributes['version'],
         :name => consumer_attributes['productName'],
-        :cp_product_id => consumer_attributes['productId']
+        :cp_product_id => consumer_attributes['productId'],
       }
       Katello::Util::Support.active_record_retry do
         unless self.where(attributes).exists?
@@ -26,7 +26,7 @@ module Katello
         :arch => arch,
         :version => version,
         :productName => name,
-        :productId => cp_product_id
+        :productId => cp_product_id,
       }
     end
   end

data/app/models/katello/kt_environment.rb

@@ -8,8 +8,6 @@ module Katello
     include Ext::LabelFromName
 
     belongs_to :organization, :class_name => "Organization", :inverse_of => :kt_environments
-    has_many :activation_keys, :class_name => "Katello::ActivationKey",
-                               :dependent => :restrict_with_exception, :foreign_key => :environment_id
 
     has_many :env_priors, :class_name => "Katello::EnvironmentPrior", :foreign_key => :environment_id, :dependent => :destroy
     has_many :priors, :class_name => "Katello::KTEnvironment", :through => :env_priors, :source => :env_prior
@@ -30,14 +28,21 @@ module Katello
     has_many :content_view_environments, :class_name => "Katello::ContentViewEnvironment",
              :foreign_key => :environment_id, :inverse_of => :environment, :dependent => :destroy
     has_many :content_view_environment_content_facets, :through => :content_view_environments,
-                          :class_name => "Katello::ContentViewEnvironmentContentFacet",
-                          :inverse_of => :lifecycle_environment
+                          :class_name => "Katello::ContentViewEnvironmentContentFacet"
+
     has_many :content_facets, :through => :content_view_environment_content_facets,
-                          :class_name => "Katello::Host::ContentFacet",
-                          :inverse_of => :lifecycle_environments
+                          :class_name => "Katello::Host::ContentFacet"
+
     has_many :content_views, :through => :content_view_environments
     has_many :content_view_versions, :through => :content_view_environments, :inverse_of => :environments
 
+    has_many :content_view_environment_activation_keys, :through => :content_view_environments,
+                          :class_name => "Katello::ContentViewEnvironmentActivationKey",
+                          :dependent => :restrict_with_exception
+
+    has_many :activation_keys, :through => :content_view_environment_activation_keys,
+                          :class_name => "Katello::ActivationKey"
+
     has_many :hosts,      :class_name => "::Host::Managed", :through => :content_facets,
                           :inverse_of => :lifecycle_environments
     has_many :hostgroup_content_facets, :class_name => "Katello::Hostgroup::ContentFacet", :foreign_key => :lifecycle_environment_id,

data/app/models/katello/ping.rb

@@ -34,7 +34,7 @@ module Katello
       def status
         {
           version: Katello::VERSION,
-          timeUTC: Time.now.getutc
+          timeUTC: Time.now.getutc,
         }
       end
 
@@ -252,12 +252,11 @@ module Katello
       end
 
       def backend_status(url, backend)
-        ca_file = SETTINGS[:katello][backend][:ca_cert_file]
+        ca_file = ::Cert::Certs.backend_ca_cert_file(backend)
         request_id = ::Logging.mdc['request']
 
         options = {}
         options[:ssl_ca_file] = ca_file unless ca_file.nil?
-        options[:verify_ssl] = SETTINGS[:katello][backend][:verify_ssl] if SETTINGS[:katello][backend].key?(:verify_ssl)
         options[:headers] = { 'Correlation-ID' => request_id } if request_id
         client = RestClient::Resource.new("#{url}/status/", options)
 

data/app/models/katello/repository.rb

@@ -172,7 +172,7 @@ module Katello
     scoped_search :on => :label, :relation => :root, :complete_value => true, :only_explicit => true
     scoped_search :on => :content_label, :ext_method => :search_by_content_label, :default_operator => :like
 
-    delegate :product, :redhat?, :custom?, :to => :root
+    delegate :product, :redhat?, :custom?, :deb_using_structured_apt?, :to => :root
     delegate :yum?, :docker?, :deb?, :file?, :ostree?, :ansible_collection?, :generic?, :to => :root
     delegate :name, :label, :docker_upstream_name, :url, :download_concurrency, :to => :root
 
@@ -185,7 +185,6 @@ module Katello
              :ansible_collection_requirements, :ansible_collection_auth_url, :ansible_collection_auth_token,
              :http_proxy_policy, :http_proxy_id, :prevent_updates, :to => :root
 
-    delegate :content_id, to: :root, allow_nil: true
     delegate :repository_type, to: :root
 
     def self.exportable_types(format: ::Katello::Pulp3::ContentViewVersion::Export::IMPORTABLE)
@@ -211,6 +210,16 @@ module Katello
       "#{path_prefix}/#{path}"
     end
 
+    def content_id
+      # Currently deb content will store a content_id on each Repository, while all other content
+      # types will store one on the RootRepository.
+      self[:content_id] || root.content_id
+    end
+
+    def content
+      Katello::Content.find_by(:cp_content_id => self.content_id, :organization_id => self.product.organization_id)
+    end
+
     def to_label
       name
     end
@@ -272,6 +281,10 @@ module Katello
       self.content_view_version.content_view
     end
 
+    def content_view_environment
+      self.content_view.content_view_environment(self.environment)
+    end
+
     # Skip setting container name if the repository is not container type or
     # if it's a library instance of a container-push repo, indicating that the container name is set by the user.
     def skip_container_name?
@@ -634,7 +647,7 @@ module Katello
       sp_history_args = {
         :smart_proxy_id => smart_proxy.id,
         :repository_id => self.id,
-        :started_at => Time.now
+        :started_at => Time.now,
       }
       sp_history = ::Katello::SmartProxySyncHistory.create sp_history_args
       sp_history.save!
@@ -667,7 +680,7 @@ module Katello
         ::Actions::Katello::Repository::Sync.name,
         ::Actions::Katello::Repository::UploadFiles.name,
         ::Actions::Katello::Repository::RemoveContent.name,
-        ::Actions::Katello::Repository::MetadataGenerate.name
+        ::Actions::Katello::Repository::MetadataGenerate.name,
       ]
       ForemanTasks::Task::DynflowTask.where(:label => blocking_task_labels)
                                      .where.not(state: 'stopped')
@@ -785,7 +798,7 @@ module Katello
         distribution_arch: self.distribution_arch,
         distribution_family: self.distribution_family,
         distribution_variant: self.distribution_variant,
-        distribution_bootable: self.distribution_bootable
+        distribution_bootable: self.distribution_bootable,
       }
     end
 
@@ -941,7 +954,7 @@ module Katello
           product: repository.product,
           lifecycle_environment: repository.environment,
           content_view: repository.content_view_version.content_view,
-          content_view_version: repository.content_view_version
+          content_view_version: repository.content_view_version,
         }
         box = Safemode::Box.new(repository, allowed_methods)
         erb = ERB.new(pattern)
@@ -1024,6 +1037,27 @@ module Katello
       content_view.repositories.include? self
     end
 
+    def deb_content_url_options
+      return '' unless version_href
+
+      components = deb_pulp_components.join(',')
+      distributions = deb_pulp_distributions.join(',')
+      "/?comp=#{components}&rel=#{distributions}"
+    end
+
+    def deb_pulp_components(version_href = self.version_href)
+      return [] if version_href.blank?
+
+      pulp_api = Katello::Pulp3::Repository.instance_for_type(self, SmartProxy.pulp_primary).api.content_release_components_api
+      pulp_api.list({:repository_version => version_href}).results.map { |x| x.component }.uniq
+    end
+
+    def deb_pulp_distributions(version_href = self.version_href)
+      return [] if version_href.blank?
+      pulp_api = Katello::Pulp3::Repository.instance_for_type(self, SmartProxy.pulp_primary).api.content_release_components_api
+      pulp_api.list({:repository_version => version_href}).results.map { |x| x.distribution }.uniq
+    end
+
     def sync_status
       return latest_dynflow_sync
     end

data/app/models/katello/rhel_lifecycle_status.rb

@@ -16,40 +16,40 @@ module Katello
       'RHEL9' => {
         'full_support' => end_of_day('2027-05-31'),
         'maintenance_support' => end_of_day('2032-05-31'),
-        'extended_support' => end_of_day('2035-05-31')
+        'extended_support' => end_of_day('2035-05-31'),
       },
       'RHEL8' => {
         'full_support' => end_of_day('2024-05-31'),
         'maintenance_support' => end_of_day('2029-05-31'),
-        'extended_support' => end_of_day('2032-05-31')
+        'extended_support' => end_of_day('2032-05-31'),
       },
       'RHEL7' => {
         'full_support' => end_of_day('2019-08-06'),
         'maintenance_support' => end_of_day('2024-06-30'),
-        'extended_support' => end_of_day('2028-06-30')
+        'extended_support' => end_of_day('2028-06-30'),
       },
       'RHEL7 (System z (Structure A))' => {
         'full_support' => end_of_day('2019-08-06'),
-        'maintenance_support' => end_of_day('2021-05-31')
+        'maintenance_support' => end_of_day('2021-05-31'),
       },
       'RHEL7 (ARM)' => {
         'full_support' => end_of_day('2019-08-06'),
-        'maintenance_support' => end_of_day('2020-11-30')
+        'maintenance_support' => end_of_day('2020-11-30'),
       },
       'RHEL7 (POWER9)' => {
         'full_support' => end_of_day('2019-08-06'),
-        'maintenance_support' => end_of_day('2021-05-31')
+        'maintenance_support' => end_of_day('2021-05-31'),
       },
       'RHEL6' => {
         'full_support' => end_of_day('2016-05-10'),
         'maintenance_support' => end_of_day('2020-11-30'),
-        'extended_support' => end_of_day('2024-06-30')
+        'extended_support' => end_of_day('2024-06-30'),
       },
       'RHEL5' => {
         'full_support' => end_of_day('2013-01-08'),
         'maintenance_support' => end_of_day('2017-03-31'),
-        'extended_support' => end_of_day('2020-11-30')
-      }
+        'extended_support' => end_of_day('2020-11-30'),
+      },
     }.freeze
 
     EOS_WARNING_THRESHOLD = 1.year
@@ -61,7 +61,7 @@ module Katello
         approaching_end_of_maintenance: APPROACHING_END_OF_MAINTENANCE,
         extended_support: EXTENDED_SUPPORT,
         approaching_end_of_support: APPROACHING_END_OF_SUPPORT,
-        support_ended: SUPPORT_ENDED
+        support_ended: SUPPORT_ENDED,
       }
 
       map.default = UNKNOWN

data/app/models/katello/root_repository.rb

@@ -23,7 +23,7 @@ module Katello
     SKIPABLE_METADATA_TYPES = [Repository::YUM_TYPE, Repository::DEB_TYPE].freeze
 
     CONTENT_ATTRIBUTE_RESTRICTIONS = {
-      :download_policy => [Repository::YUM_TYPE, Repository::DEB_TYPE, Repository::DOCKER_TYPE]
+      :download_policy => [Repository::YUM_TYPE, Repository::DEB_TYPE, Repository::DOCKER_TYPE],
     }.freeze
 
     MAX_EXPIRE_TIME = 7 * 24 * 60 * 60
@@ -67,7 +67,7 @@ module Katello
     validates_lengths_from_database :except => [:label]
     validates_with Validators::KatelloLabelFormatValidator, :attributes => :label
     validates_with Validators::KatelloNameFormatValidator, :attributes => :name
-    validates_with Validators::KatelloUrlFormatValidator, :attributes => :url,
+    validates_with Validators::KatelloURLFormatValidator, :attributes => :url,
                    :nil_allowed => proc { |repo| repo.custom? || repo.organization.cdn_configuration.export_sync? },
                    :field_name => :url
     validates_with Validators::RootRepositoryUniqueAttributeValidator, :attributes => :name
@@ -96,15 +96,15 @@ module Katello
     validates :content_type, :inclusion => {
       :in => ->(_) { Katello::RepositoryTypeManager.enabled_repository_types.keys },
       :allow_blank => false,
-      :message => ->(_, _) { _("is not enabled. must be one of the following: %s") % Katello::RepositoryTypeManager.enabled_repository_types.keys.join(', ') }
+      :message => ->(_, _) { _("is not enabled. must be one of the following: %s") % Katello::RepositoryTypeManager.enabled_repository_types.keys.join(', ') },
     }
     validates :download_policy, inclusion: {
       :in => DOWNLOAD_POLICIES,
-      :message => _("must be one of the following: %s") % DOWNLOAD_POLICIES.join(', ')
+      :message => _("must be one of the following: %s") % DOWNLOAD_POLICIES.join(', '),
     }, if: :yum?
     validates :http_proxy_policy, inclusion: {
       :in => HTTP_PROXY_POLICIES,
-      :message => _("must be one of the following: %s") % HTTP_PROXY_POLICIES.join(', ')
+      :message => _("must be one of the following: %s") % HTTP_PROXY_POLICIES.join(', '),
     }
 
     validates :metadata_expire,
@@ -113,7 +113,7 @@ module Katello
         less_than_or_equal_to: MAX_EXPIRE_TIME,
         greater_than: 0,
         allow_nil: true,
-        only_integer: true
+        only_integer: true,
       }
 
     validates :container_push_name_format, inclusion: { in: ['label', 'id'].freeze, allow_nil: true}
@@ -296,7 +296,7 @@ module Katello
       if self.upstream_username.blank? && self.upstream_password.blank?
         self.upstream_username = nil
         self.upstream_password = nil
-        if !self.url.blank? && self.url.start_with?('uln') && !self.content
+        if !self.url.blank? && self.url.start_with?('uln')
           errors.add(:base, N_("Upstream username and upstream password cannot be blank for ULN repositories"))
         end
         return
@@ -333,7 +333,7 @@ module Katello
       return if self.deb_releases.blank? && self.url.blank?
       if self.deb_releases.blank?
         errors.add(:base, N_("When \"Upstream URL\" is set, \"Releases/Distributions\" must also be set!"))
-      elsif self.url.blank? && !self.content
+      elsif self.url.blank?
         errors.add(:base, N_("When \"Releases/Distributions\" is set, \"Upstream URL\" must also be set!"))
       end
     end
@@ -370,10 +370,6 @@ module Katello
       "#{organization.label} #{product.label} #{label}".gsub(/\s/, "_")
     end
 
-    def content
-      Katello::Content.find_by(:cp_content_id => self.content_id, :organization_id => self.product.organization_id)
-    end
-
     def docker?
       self.content_type == Repository::DOCKER_TYPE
     end
@@ -394,6 +390,10 @@ module Katello
       self.content_type == Repository::DEB_TYPE
     end
 
+    def deb_using_structured_apt?
+      self.deb? && !self.content_id
+    end
+
     def ansible_collection?
       self.content_type == Repository::ANSIBLE_COLLECTION_TYPE
     end
@@ -420,12 +420,8 @@ module Katello
       changeable_attributes.any? { |key| previous_changes.key?(key) }
     end
 
-    def raw_content_path
-      self.content.content_url
-    end
-
     def repo_mapper
-      @repo_mapper ||= Katello::Candlepin::RepositoryMapper.new(self.product, self.content, self.substitutions)
+      @repo_mapper ||= Katello::Candlepin::RepositoryMapper.new(self.product, self.library_instance.content, self.substitutions)
     end
 
     def calculate_updated_name
@@ -436,7 +432,7 @@ module Katello
     def substitutions
       {
         :releasever => self.minor,
-        :basearch => self.arch
+        :basearch => self.arch,
       }.compact
     end
 

data/app/models/katello/task_status.rb

@@ -247,7 +247,7 @@ module Katello
       # Handle not very friendly Pulp message
       case errors
       when /^\(.*\)$/
-        if stacktrace.class == Array
+        if stacktrace.instance_of?(Array)
           stacktrace.last.split(":").first
         else
           stacktrace.split("(").first

data/app/models/katello/upstream_pool.rb

@@ -24,7 +24,7 @@ module Katello
         {
           pools: pools,
           total: total,
-          subtotal: pools.count
+          subtotal: pools.count,
         }
       end
 
@@ -59,7 +59,7 @@ module Katello
           consumed: 'consumed',
           product_name: 'productName',
           product_id: 'productId',
-          subscription_id: 'subscriptionId'
+          subscription_id: 'subscriptionId',
         }
       end
 

data/app/presenters/katello/product_content_presenter.rb

@@ -29,12 +29,12 @@ module Katello
       if overidden_value.nil?
         {
           status: enabled ? "enabled" : "disabled",
-          overridden: false
+          overridden: false,
         }
       else
         {
           status: overidden_value ? "enabled" : "disabled",
-          overridden: true
+          overridden: true,
         }
       end
     end

data/app/presenters/katello/repository_presenter.rb

@@ -14,12 +14,12 @@ module Katello
           {
             :content_view_version => {
               :id => repository.content_view_version.id,
-              :name => repository.content_view_version.name
+              :name => repository.content_view_version.name,
             },
             :environment => {
               :id => repository.environment.id,
-              :name => repository.environment.name
-            }
+              :name => repository.environment.name,
+            },
           }
         end
       end

data/app/presenters/katello/sync_status_presenter.rb

@@ -8,7 +8,7 @@ module Katello
       :never_synced => _("Never Synced"),
       :running => _("Running"),
       :canceled => _("Canceled"),
-      :paused => _("Paused")
+      :paused => _("Paused"),
     }.with_indifferent_access
 
     def initialize(repo, task)
@@ -34,7 +34,7 @@ module Katello
         :display_size => display_output,
         :size => display_output,
         :is_running => @task.pending && @task.state != 'paused',
-        :error_details => @task.errors
+        :error_details => @task.errors,
       }
     end
 
@@ -47,7 +47,7 @@ module Katello
         :product_id => repo.product.id,
         :progress => {},
         :state => format_state(OpenStruct.new(:state => state)),
-        :raw_state => state
+        :raw_state => state,
       }
     end
 

data/app/services/cert/certs.rb

@@ -9,7 +9,7 @@ module Cert
     end
 
     def self.candlepin_client_ca_cert
-      File.read(SETTINGS[:katello][:candlepin][:ca_cert_file])
+      File.read(backend_ca_cert_file(:candlepin))
     end
 
     def self.ssl_client_cert
@@ -28,10 +28,14 @@ module Cert
       Setting[:ssl_priv_key]
     end
 
+    def self.backend_ca_cert_file(backend)
+      SETTINGS.dig(:katello, backend, :ca_cert_file) || Setting[:ssl_ca_file]
+    end
+
     def self.verify_ueber_cert(organization)
       ueber_cert = OpenSSL::X509::Certificate.new(self.ueber_cert(organization)[:cert])
       cert_store = OpenSSL::X509::Store.new
-      cert_store.add_file SETTINGS[:katello][:candlepin][:ca_cert_file]
+      cert_store.add_file backend_ca_cert_file(:candlepin)
       organization.regenerate_ueber_cert unless cert_store.verify ueber_cert
     end
   end

data/app/services/katello/candlepin_event_listener.rb

@@ -40,7 +40,7 @@ module Katello
       {
         processed_count: @processed_count,
         failed_count: @failed_count,
-        running: running?
+        running: running?,
       }
     end
 

data/app/services/katello/event_monitor/poller_thread.rb

@@ -46,7 +46,7 @@ module Katello
         {
           processed_count: @processed_count,
           failed_count: @failed_count,
-          running: running?
+          running: running?,
         }
       end
 

data/app/services/katello/event_queue.rb

@@ -53,7 +53,7 @@ module Katello
     def self.push_event(event_type, id)
       attrs = {
         event_type: event_type,
-        object_id: id
+        object_id: id,
       }
 
       yield(attrs) if block_given?