katello 3.11.0 → 3.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 267be6055b2d210a259cba76847d38cdb98cfbe61c0cc2f0d621fae88f5f8c26
-  data.tar.gz: 7085283452d4f8069e69e0a469b3d3e665133a828d41358f900cd48a64903cc4
+  metadata.gz: b9cf1e3fb4076039f50b51d4f980f244ffb5734c57a81e3333573368e2bd6d3b
+  data.tar.gz: 83cf29642598dca1622d0813e607a377a220ec87f85cc54ff9783b3cec488bbb
 SHA512:
-  metadata.gz: e88f9a1ae89d8f6924c624dca9e251cef617514c0ff5eb60b835b3aa8e8fc82ad2416ed0ae11f4c1c32999f675e1421a4e46d60cc311d087960ee2775e7d0e24
-  data.tar.gz: 7db70cea9f0ee0d5fea237fb50d58b76f76b966eea1c712f20d8f8ccd8d02cd2fd1c5ea8020499be81dfdf4351fb34cfecd05f6ab1c9e58b299f1990ea3479f9
+  metadata.gz: 48c26149a3886a3f02ec6abeda2706c195958254fb4751078fddcf7187613badadfff71328fc19570bae5e79dbf85250978cfca8fb902fd3124bea1071c7e871
+  data.tar.gz: 1b01c2da357fcdf719a6207854df618c1bb7654832a06612abc084a718661e3388e52a27d85a40e730811c7f3f1e100ed2286642c951afbf6faa2e51ec45b0c4

data/app/controllers/katello/api/v2/organizations_controller.rb

@@ -80,7 +80,8 @@ module Katello
       @organization.reload
       respond_for_create :resource => @organization
     rescue => e
-      process_resource_error(message: e.message)
+      ::Foreman::Logging.exception('Could not create organization', e)
+      process_resource_error(message: e.message, resource: @organization)
     end
 
     api :DELETE, '/organizations/:id', N_('Delete an organization')

data/app/controllers/katello/api/v2/products_controller.rb

@@ -33,8 +33,9 @@ module Katello
     param :organization_id, :number, :desc => N_("Filter products by organization"), :required => true
     param :subscription_id, :number, :desc => N_("Filter products by subscription")
     param :name, String, :desc => N_("Filter products by name")
-    param :enabled, :bool, :desc => N_("Filter products by enabled or disabled")
-    param :custom, :bool, :desc => N_("Filter products by custom")
+    param :enabled, :bool, :desc => N_("Return enabled products only")
+    param :custom, :bool, :desc => N_("Return custom products only")
+    param :redhat_only, :bool, :desc => N_("Return Red Hat (non-custom) products only")
     param :include_available_content, :bool, :desc => N_("Whether to include available content attribute in results")
     param :sync_plan_id, :number, :desc => N_("Filter products by sync plan id")
     param :available_for, String, :desc => N_("Interpret specified object to return only Products that can be associated with specified object.  Only 'sync_plan' is supported."),
@@ -47,9 +48,10 @@ module Katello
 
     def index_relation
       query = Product.readable.where(:organization_id => @organization.id)
-      query = query.where(:provider_id => @organization.anonymous_provider.id) if params[:custom]
+      query = query.custom if ::Foreman::Cast.to_bool params[:custom]
+      query = query.redhat if ::Foreman::Cast.to_bool params[:redhat_only]
       query = query.where(:name => params[:name]) if params[:name]
-      query = query.enabled if params[:enabled]
+      query = query.enabled if ::Foreman::Cast.to_bool params[:enabled]
       query = query.where(:id => @activation_key.products) if @activation_key
 
       if params[:subscription_id]

data/app/lib/actions/katello/host/erratum/install.rb

@@ -43,7 +43,7 @@ module Actions
 
           def finalize
             host = ::Host.find_by(:id => input[:host_id])
-            host.update(audit_comment: _("Installation of errata requested: %{errata}") % {errata: input[:errata].join(", ")})
+            host.update(audit_comment: (_("Installation of errata requested: %{errata}") % {errata: input[:errata].join(", ")}).truncate(255))
           end
         end
       end

data/app/lib/actions/katello/host/package/install.rb

@@ -34,7 +34,7 @@ module Actions
 
           def finalize
             host = ::Host.find_by(:id => input[:host_id])
-            host.update(audit_comment: _("Installation of package(s) requested: %{packages}") % {packages: input[:packages].join(", ")})
+            host.update(audit_comment: (_("Installation of package(s) requested: %{packages}") % {packages: input[:packages].join(", ")}).truncate(255))
           end
         end
       end

data/app/lib/actions/katello/host/package/remove.rb

@@ -47,7 +47,7 @@ module Actions
 
           def finalize
             host = ::Host.find_by(:id => input[:host_id])
-            host.update(audit_comment: _("Removal of package(s) requested: %{packages}") % {packages: input[:packages].join(", ")})
+            host.update(audit_comment: (_("Removal of package(s) requested: %{packages}") % {packages: input[:packages].join(", ")}).truncate(255))
           end
         end
       end

data/app/lib/actions/katello/host/package/update.rb

@@ -21,7 +21,7 @@ module Actions
           end
 
           def humanized_input
-            [(input[:packages] && input[:packages].join(", ") || "all packages")] + super
+            [(input[:packages].present? && input[:packages].join(", ") || "all packages")] + super
           end
 
           def presenter
@@ -34,7 +34,15 @@ module Actions
 
           def finalize
             host = ::Host.find_by(:id => input[:host_id])
-            host.update(audit_comment: _("Update of package(s) requested: %{packages}") % {packages: input[:packages].join(", ")})
+            host.update(audit_comment: audit_comment)
+          end
+
+          def audit_comment
+            if input[:packages].present?
+              (_("Update of package(s) requested: %{packages}") % {packages: input[:packages].join(", ")}).truncate(255)
+            else
+              _("Update of all packages requested")
+            end
           end
         end
       end

data/app/lib/actions/katello/host/package_group/install.rb

@@ -34,7 +34,7 @@ module Actions
 
           def finalize
             host = ::Host.find_by(:id => input[:host_id])
-            host.update(audit_comment: _("Installation of package group(s) requested: %{groups}") % {groups: input[:groups].join(", ")})
+            host.update(audit_comment: (_("Installation of package group(s) requested: %{groups}") % {groups: input[:groups].join(", ")}).truncate(255))
           end
         end
       end

data/app/lib/actions/katello/host/package_group/remove.rb

@@ -33,7 +33,7 @@ module Actions
 
           def finalize
             host = ::Host.find_by(:id => input[:host_id])
-            host.update(audit_comment: _("Removal of package group(s) requested: %{groups}") % {groups: input[:groups].join(", ")})
+            host.update(audit_comment: (_("Removal of package group(s) requested: %{groups}") % {groups: input[:groups].join(", ")}).truncate(255))
           end
         end
       end

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

@@ -66,7 +66,7 @@ module Actions
       end
 
       def done?
-        external_task.all? { |task| task[:finish_time] || FINISHED_STATES.include?(task[:state]) }
+        external_task&.all? { |task| task[:finish_time] || FINISHED_STATES.include?(task[:state]) }
       end
 
       def external_task

data/app/lib/actions/pulp/consumer/abstract_content_action.rb

@@ -47,6 +47,8 @@ module Actions
         # by default runcible puts whatever we pass into a hash under the 'name' key
         # here we can make the unit hash more precise
         def parse_units_for_type
+          return unless input[:args]
+
           if input[:type] == 'rpm'
             input[:args].collect do |unit|
               ::Katello::Util::Package.parse_nvrea_nvre(unit) || unit

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

@@ -7,7 +7,7 @@ module Katello
         def kickstart_attributes
           super
 
-          medium_provider = Katello::ManagedContentMediumProvider.new(host.content_facet)
+          medium_provider = Katello::ManagedContentMediumProvider.new(host)
           content_view = host.try(:content_facet).try(:content_view) || host.try(:content_view)
 
           if content_view && host.operatingsystem.is_a?(Redhat) &&

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

@@ -1,8 +1,6 @@
 module Katello
   module Util
     class PathWithSubstitutions
-      ARCHITECTURES = ["x86_64", "s390x", "ppc64le", "aarch64", "multiarch", "ppc64"].freeze
-
       include Comparable
 
       attr_accessor :substitutions
@@ -14,27 +12,12 @@ module Katello
         @substitutions = substitutions
         @path = path
         @resolved = []
-        check_for_subs_in_path if no_base_arch_passed?
-      end
-
-      def no_base_arch_passed?
-        @substitutions.keys.exclude?("basearch") && substitutions_needed.exclude?("basearch")
-      end
-
-      def split_path
-        @split ||= @path.split('/').map(&:downcase).reject(&:blank?)
-      end
-
-      def check_for_subs_in_path
-        arches = split_path & ARCHITECTURES
-        arch = arches.first
-        @substitutions["basearch"] = arch if arch
       end
 
       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
+        path.split('/').map { |word| word.start_with?('$') ? word[1..-1] : nil }.compact
       end
 
       def substitutable?

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

@@ -41,11 +41,7 @@ module Katello
       end
 
       def kickstart_repos(host)
-        distribution_repos = distribution_repositories(host)
-
-        return [] if distribution_repos.empty?
-
-        distros = distribution_repos.where(distribution_bootable: true)
+        distros = distribution_repositories(host).where(distribution_bootable: true)
         if distros && host.content_source
           distros.map { |distro| distro.to_hash(host.content_source) }
         else
@@ -55,7 +51,7 @@ module Katello
 
       def variant_repo(host, variant)
         if variant && host.content_source
-          product_id = host&.content_facet&.kickstart_repository&.product_id
+          product_id = host.try(:content_facet).try(:kickstart_repository).try(:product_id) || host.try(:kickstart_repository).try(:product_id)
           distro = distribution_repositories(host)
             .joins(:product)
             .where(
@@ -76,7 +72,7 @@ module Katello
               where("#{Katello::Repository.table_name}.distribution_version = :release or #{Katello::Repository.table_name}.distribution_version like :match",
                       release: host.os.release, match: "#{host.os.release}.%")
         else
-          []
+          Katello::Repository.none
         end
       end
     end

data/app/models/katello/erratum.rb

@@ -86,7 +86,7 @@ module Katello
     end
 
     def hosts_available(org_id = nil)
-      self.hosts_applicable(org_id).joins("INNER JOIN #{Katello::RepositoryErratum.table_name} on \
+      self.hosts_applicable(org_id).distinct.joins("INNER JOIN #{Katello::RepositoryErratum.table_name} on \
         #{Katello::RepositoryErratum.table_name}.erratum_id = #{self.id}").joins(:content_facet_repositories).
         where("#{Katello::ContentFacetRepository.table_name}.repository_id = #{Katello::RepositoryErratum.table_name}.repository_id")
     end

data/app/models/katello/ostree_branch.rb

@@ -9,7 +9,6 @@ module Katello
     scoped_search :on => :version, :complete_value => true
     scoped_search :on => :commit, :complete_value => true
     scoped_search :on => :pulp_id, :complete_value => true, :rename => :uuid
-    scoped_search :on => :version_date, :complete_value => true, :rename => :created
 
     CONTENT_TYPE = Pulp::OstreeBranch::CONTENT_TYPE
 
@@ -20,8 +19,7 @@ module Katello
     def update_from_json(json)
       update_attributes(:name => json[:branch],
                         :version => json[:metadata][:version],
-                        :commit => json[:commit],
-                        :version_date => json[:_created].to_datetime
+                        :commit => json[:commit]
                        )
     end
   end

data/app/models/katello/ping.rb

@@ -1,5 +1,3 @@
-#:nocov:
-
 module Katello
   class Ping
     OK_RETURN_CODE = 'ok'.freeze
@@ -40,7 +38,8 @@ module Katello
       def ping_candlepin_without_auth(service_result)
         url = SETTINGS[:katello][:candlepin][:url]
         exception_watch(service_result) do
-          backend_status(url, :candlepin)
+          status = backend_status(url, :candlepin)
+          check_candlepin_status(status)
         end
       end
 
@@ -56,7 +55,8 @@ module Katello
 
       def ping_candlepin_with_auth(service_result)
         exception_watch(service_result) do
-          Katello::Resources::Candlepin::CandlepinPing.ping
+          status = Katello::Resources::Candlepin::CandlepinPing.ping
+          check_candlepin_status(status)
         end
       end
 
@@ -77,16 +77,24 @@ module Katello
         end
       end
 
+      def check_candlepin_status(status)
+        if status[:mode] != 'NORMAL'
+          fail _("Candlepin is not running properly")
+        end
+      end
+
       # check for exception - set the result code properly
       def exception_watch(result)
         start = Time.new
         yield
         result[:status] = OK_RETURN_CODE
         result[:duration_ms] = ((Time.new - start) * 1000).round.to_s
+        result
       rescue => e
         Rails.logger.warn(e.backtrace ? [e.message, e.backtrace].join("\n") : e.message)
         result[:status] = FAIL_RETURN_CODE
         result[:message] = e.message
+        result
       end
 
       # get package information for katello and its components
@@ -111,10 +119,9 @@ module Katello
       # because it returns empty string, which is not enough to say
       # pulp is the one that responded
       def pulp_without_auth(url)
-        body = backend_status(url, :pulp)
+        json = backend_status(url, :pulp)
 
-        fail _("Pulp does not appear to be running at %s.") % url if body.empty?
-        json = JSON.parse(body)
+        fail _("Pulp does not appear to be running at %s.") % url if json.empty?
 
         if json['database_connection'] && json['database_connection']['connected'] != true
           fail _("Pulp database connection issue at %s.") % url
@@ -148,10 +155,10 @@ module Katello
         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)
         client = RestClient::Resource.new("#{url}/status", options)
-        client.get
+
+        response = client.get
+        response.empty? ? {} : JSON.parse(response).with_indifferent_access
       end
     end
   end
 end
-
-#:nocov:

data/app/models/katello/root_repository.rb

@@ -50,6 +50,7 @@ module Katello
     validate :ensure_valid_docker_tags_whitelist
     validate :ensure_content_attribute_restrictions
     validate :ensure_valid_upstream_authorization
+    validate :ensure_no_checksum_on_demand
     validates :url, presence: true, if: :ostree?
     validates :checksum_type, :inclusion => {:in => CHECKSUM_TYPES}, :allow_blank => true
     validates :product_id, :presence => true
@@ -129,6 +130,12 @@ module Katello
       end
     end
 
+    def ensure_no_checksum_on_demand
+      if checksum_type.present? && ::Runcible::Models::YumImporter::DOWNLOAD_ON_DEMAND == download_policy
+        errors.add(:checksum_type, _("Checksum type cannot be set for yum repositories with on demand download policy."))
+      end
+    end
+
     def ensure_ostree_repo_protected
       if unprotected
         errors.add(:base, _("OSTree Repositories cannot be unprotected."))
@@ -247,7 +254,8 @@ module Katello
 
     def pulp_update_needed?
       changeable_attributes = %w(url unprotected checksum_type docker_upstream_name download_policy mirror_on_sync verify_ssl_on_sync
-                                 upstream_username upstream_password ostree_upstream_sync_policy ostree_upstream_sync_depth ignore_global_proxy ignorable_content)
+                                 upstream_username upstream_password ostree_upstream_sync_policy ostree_upstream_sync_depth ignore_global_proxy ignorable_content
+                                 ssl_ca_cert_id ssl_client_cert_id ssl_client_key_id)
       changeable_attributes += %w(name container_repository_name docker_tags_whitelist) if docker?
       changeable_attributes += %w(deb_releases deb_components deb_architectures gpg_key_id) if deb?
       changeable_attributes.any? { |key| previous_changes.key?(key) }

data/app/models/katello/sync_plan.rb

@@ -12,8 +12,6 @@ module Katello
     WEEKLY = 'weekly'.freeze
     CUSTOM_CRON = 'custom cron'.freeze
     TYPES = [HOURLY, DAILY, WEEKLY, CUSTOM_CRON].freeze
-    DURATION = {HOURLY => 'T1H', DAILY => 'T24H', WEEKLY => '7D' }.freeze
-    WEEK_DAYS = %w(Sunday Monday Tuesday Wednesday Thursday Friday).collect { |d| N_(d) }
 
     belongs_to :organization, :inverse_of => :sync_plans
     has_many :products, :class_name => "Katello::Product", :dependent => :nullify
@@ -93,39 +91,11 @@ module Katello
       errors.add :base, _("Start Date and Time can't be blank") if self.sync_date.nil?
     end
 
-    def plan_day
-      WEEK_DAYS[self.sync_date.strftime('%A').to_i]
-    end
-
-    def plan_date
-      self.sync_date.strftime('%m/%d/%Y')
-    end
-
-    def plan_time
-      self.sync_date.strftime('%I:%M %p')
-    end
-
-    def plan_date_time
-      self.sync_date.strftime('%Y/%m/%d %H:%M:%S %z')
-    end
-
-    def plan_zone
-      self.sync_date.strftime('%Z')
-    end
-
-    def sync_time
-      self.sync_date.utc.strftime('%H%M%S%N')
-    end
-
-    def next_sync_date
+    def next_sync
       return nil unless self.enabled
       self.foreman_tasks_recurring_logic&.tasks&.order(:start_at)&.last&.start_at
     end
 
-    def next_sync
-      next_sync_date.try(:strftime, '%Y/%m/%d %H:%M:%S %z')
-    end
-
     def self.humanize_class_name(_name = nil)
       _("Sync Plans")
     end

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

@@ -34,9 +34,9 @@ module Katello
           options = {
             protected: true,
             id: yum_dist_id,
-            auto_publish: true,
-            checksum_type: repo.saved_checksum_type || root.checksum_type
+            auto_publish: true
           }
+          options[:checksum_type] = repo.saved_checksum_type || root.checksum_type if smart_proxy.pulp_master?
           distributors = [Runcible::Models::YumDistributor.new(repo.relative_path, root.unprotected, true, options)]
 
           if smart_proxy.pulp_master?

data/app/views/katello/api/v2/ostree_branches/show.json.rabl

@@ -1,5 +1,5 @@
 object @resource
 
 attributes :pulp_id, :id
-attributes :name, :version, :commit, :version_date
+attributes :name, :version, :commit
 attributes :pulp_id => :uuid

data/app/views/katello/api/v2/repositories/base.json.rabl

@@ -13,7 +13,7 @@ glue(@object.root) do
     attributes :id, :cp_id, :name
     attributes :orphaned? => :orphaned
     attributes :redhat? => :redhat
-    node :sync_plan do |_sync_plan|
+    child :sync_plan do |_sync_plan|
       attributes :name, :description, :sync_date, :interval, :next_sync
     end
   end

data/app/views/katello/api/v2/subscriptions/manifest_history.json.rabl

@@ -1,2 +1,2 @@
 collection @manifest_history
-attributes :statusMessage, :status, :created
+attributes :id, :statusMessage, :status, :created