katello 3.17.0.rc1 → 3.17.0.rc2

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

@@ -13,7 +13,7 @@ module Actions
 
           output.merge!(contents_changed: false, updated_repositories: [])
           repositories.each do |repo|
-            repo_backend_service = repo.backend_service(SmartProxy.pulp_master)
+            repo_backend_service = repo.backend_service(SmartProxy.pulp_primary)
             if repo.version_href
               # Chop off the version number to compare base repo strings
               unversioned_href = repo.version_href[0..-2].rpartition('/').first

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

@@ -10,7 +10,7 @@ module Actions
 
         def invoke_external_task
           repo = ::Katello::Repository.find(input[:repo_id])
-          output[:pulp_tasks] = repo.backend_service(::SmartProxy.unscoped.find(input[:smart_proxy_id])).sync
+          output[:pulp_tasks] = repo.backend_service(::SmartProxy.unscoped.find(input[:smart_proxy_id])).sync(input[:options])
         end
 
         def external_task=(tasks)

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

@@ -2,13 +2,17 @@ module Actions
   module Pulp3
     module Repository
       class UpdateCVRepositoryCertGuard < Pulp3::Abstract
-        def plan(repository, _smart_proxy)
+        def plan(repository, smart_proxy)
           root = repository.root
           cv_repositories = root.repositories - [root.library_instance]
           cv_repositories.each do |repo|
-            plan_action(::Actions::Pulp3::Repository::RefreshDistribution, repo, SmartProxy.pulp_master)
+            plan_action(::Actions::Pulp3::Repository::RefreshDistribution, repo, smart_proxy)
           end
         end
+
+        def humanized_name
+          _("Updating repository authentication configuration")
+        end
       end
     end
   end

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

@@ -24,8 +24,8 @@ module Actions
                 filechunk.write(chunk)
                 filechunk.flush
                 actual_chunk_size = File.size(filechunk)
-                response = uploads_api.update(upload_href, content_range(offset, offset + actual_chunk_size - 1, total_size), filechunk)
-                offset += actual_chunk_size - 1
+                response = uploads_api.update(content_range(offset, offset + actual_chunk_size - 1, total_size), upload_href, filechunk)
+                offset += actual_chunk_size
               ensure
                 filechunk.close
                 filechunk.unlink

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

@@ -87,7 +87,7 @@ module Katello
       end
 
       # rubocop:disable Metrics/MethodLength
-      def load_errata_applications(filter_errata_type: nil, include_last_reboot: 'yes', since: nil, up_to: nil, status: nil)
+      def load_errata_applications(filter_errata_type: nil, include_last_reboot: 'yes', since: nil, up_to: nil, status: nil, host_filter: nil)
         result = []
 
         filter_errata_type = filter_errata_type.presence || 'all'
@@ -109,6 +109,7 @@ module Katello
                               select: 'foreman_tasks_tasks.*,template_invocations.id AS template_invocation_id',
                               search: search
         )
+        only_host_ids = ::Host.search_for(host_filter).pluck(:id) if host_filter
 
         # batch of 1_000 records
         tasks.each do |batch|
@@ -118,14 +119,15 @@ module Katello
 
           batch.each do |task|
             seen_errata_ids = (seen_errata_ids + parse_errata(task)).uniq
-            seen_host_ids << task.input['host']['id'] if include_last_reboot == 'yes'
+            seen_host_ids << task.input['host']['id'].to_i if include_last_reboot == 'yes'
           end
 
           # preload errata in one query for this batch
           preloaded_errata = Katello::Erratum.where(:errata_id => seen_errata_ids).pluck(:errata_id, :errata_type)
-          preloaded_hosts = ::Host.where(:id => seen_host_ids).includes(:reported_data)
+          preloaded_hosts = ::Host.where(:id => seen_host_ids & only_host_ids).includes(:reported_data)
 
           batch.each do |task|
+            next unless only_host_ids.include?(task.input['host']['id'].to_i)
             parse_errata(task).each do |erratum_id|
               current_erratum_errata_type = preloaded_errata.find { |k, _| k == erratum_id }.last
 

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

@@ -0,0 +1,14 @@
+module Katello
+  module Concerns
+    module PermissionExtensions
+      extend ActiveSupport::Concern
+
+      attr_accessor :finder_scope
+
+      def initialize(name, hash, options)
+        super(name, hash, options)
+        @finder_scope = options[:finder_scope]
+      end
+    end
+  end
+end

data/app/lib/katello/foreman.rb

@@ -21,7 +21,7 @@ module Katello
             foreman_environment.save!
           end
 
-          foreman_smart_proxy = SmartProxy.pulp_master
+          foreman_smart_proxy = SmartProxy.pulp_primary
           if foreman_smart_proxy.has_feature?('Puppet')
             PuppetClassImporter.new(:url => foreman_smart_proxy.url, :env => foreman_environment.name).update_environment
           end

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

@@ -66,17 +66,6 @@ module Katello
             self.post(join_path(path(owner_label, product_id), "content/#{content_id}?enabled=#{enabled}"), nil, self.default_headers).code.to_i
           end
 
-          def update_enabled(owner_label, product_id, contents)
-            options = { id: product_id }
-            options[:productContent] = contents.map do |content|
-              ret = { content: { id: content[:id] } }
-              ret[:enabled] = content[:enabled] if content.key?(:enabled)
-              ret
-            end
-
-            update(owner_label, options)
-          end
-
           def remove_content(owner_label, product_id, content_id)
             self.delete(join_path(path(owner_label, product_id), "content/#{content_id}"), self.default_headers).code.to_i
           end

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

@@ -24,11 +24,11 @@ module Katello
           def load_class
             container_config = SETTINGS.dig(:katello, :container_image_registry)
             registry_url = nil
-            pulp_master = ::SmartProxy.pulp_master
+            pulp_primary = ::SmartProxy.pulp_primary
 
             # Pulp 3 has its own registry
-            if pulp_master&.pulp3_repository_type_support?(::Katello::Repository::DOCKER_TYPE)
-              uri = URI(pulp_master.setting(SmartProxy::PULP3_FEATURE, 'content_app_url'))
+            if pulp_primary&.pulp3_repository_type_support?(::Katello::Repository::DOCKER_TYPE)
+              uri = URI(pulp_primary.setting(SmartProxy::PULP3_FEATURE, 'content_app_url'))
               uri.path = "/pulpcore_registry/"
               registry_url = uri.to_s
 

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

@@ -0,0 +1,11 @@
+module Katello
+  module Authorization::ContentViewVersionExportHistory
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def readable
+        where(:content_view_version_id => Katello::ContentViewVersion.readable)
+      end
+    end
+  end
+end

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

@@ -31,6 +31,10 @@ module Katello
           authorized(:edit_products)
         end
 
+        def exportable
+          authorized(:export_products)
+        end
+
         def deletable
           authorized(:destroy_products)
         end

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

@@ -27,6 +27,10 @@ module Katello
         joins(:root).where("#{Repository.table_name}.id in (?) or #{self.table_name}.id in (?) or #{self.table_name}.id in (?) or #{self.table_name}.id in (?)", in_products, in_content_views, in_versions, in_environments)
       end
 
+      def exportable
+        in_product(Katello::Product.exportable)
+      end
+
       def deletable
         in_product(Katello::Product.authorized(:destroy_products))
       end
@@ -34,6 +38,10 @@ module Katello
       def syncable
         in_product(Katello::Product.authorized(:sync_products))
       end
+
+      def editable
+        in_product(Katello::Product.editable)
+      end
     end
   end
 end

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

@@ -28,7 +28,8 @@ module Katello
         has_one :content_view, :through => :content_facet
         has_one :lifecycle_environment, :through => :content_facet
         has_one :content_source, :through => :content_facet
-        has_many :applicable_errata, :through => :content_facet
+        has_many :content_facet_errata, :through => :content_facet, :class_name => 'Katello::ContentFacetErratum'
+        has_many :applicable_errata, :through => :content_facet_errata, :source => :erratum
         has_many :applicable_rpms, :through => :content_facet
         has_many :applicable_module_streams, :through => :content_facet
 

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

@@ -113,7 +113,7 @@ module Katello
         end
 
         def associate_default_capsule
-          smart_proxy = SmartProxy.pulp_master
+          smart_proxy = SmartProxy.pulp_primary
           smart_proxy.organizations << self if smart_proxy
         end
 
@@ -228,6 +228,11 @@ module Katello
           subscriptions.select(&:expiring_soon?)
         end
 
+        def clear_syspurpose_status
+          host_purpose = HostStatus::Status.where(type: ::Katello::HostStatusManager::PURPOSE_STATUS.map(&:to_s)).where('host_id in (?)', self.hosts.pluck(:id))
+          host_purpose.destroy_all
+        end
+
         def notification_recipients_ids
           users = User.unscoped.all.find_all do |user|
             user.can?(:import_manifest) && user.can?(:view_organizations, self)

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

@@ -87,7 +87,7 @@ module Katello
 
       def import_all(pulp_ids = nil, repository = nil)
         ids_to_associate = []
-        service_class = SmartProxy.pulp_master!.content_service(content_type)
+        service_class = SmartProxy.pulp_primary!.content_service(content_type)
         service_class.pulp_units_batch_all(pulp_ids).each do |units|
           units.each do |unit|
             unit = unit.with_indifferent_access
@@ -105,7 +105,7 @@ module Katello
 
       def import_for_repository(repository)
         pulp_id_href_map = {}
-        service_class = SmartProxy.pulp_master!.content_service(content_type)
+        service_class = SmartProxy.pulp_primary!.content_service(content_type)
         fetch_only_ids = !repository.content_view.default? &&
                          !repository.repository_type.unique_content_per_repo &&
                          service_class.supports_id_fetch?

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

@@ -8,8 +8,10 @@ module Katello
           os_name = construct_name(repo.distribution_family)
           major, minor = repo.distribution_version.split('.')
           minor ||= '' # treat minor versions as empty string to not confuse with nil
-
-          create_os = lambda { ::Redhat.where(:name => os_name, :major => major, :minor => minor).first_or_create! }
+          os = ::Redhat.where(:name => os_name, :major => major, :minor => minor).try(:first)
+          return os if os
+          description = "#{os_name}-#{repo.distribution_version}"
+          create_os = lambda { ::Redhat.create!(:name => os_name, :major => major, :minor => minor, :description => description) }
 
           begin
             create_os.call

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

@@ -64,20 +64,26 @@ module Katello
           where("#{Katello::CapsuleLifecycleEnvironment.table_name}.lifecycle_environment_id" => repo.environment_id)
         end
 
-        def self.pulp_master
-          unscoped.with_features(PULP_FEATURE).first
+        def self.pulp_primary
+          unscoped.with_features(PULP_FEATURE).first || non_mirror_pulp3
         end
 
-        def self.pulp_master!
-          pulp_master || fail(_("Could not find a smart proxy with pulp feature."))
+        def self.non_mirror_pulp3
+          found = unscoped.with_features(PULP3_FEATURE).order(:id).select { |proxy| !proxy.setting(PULP3_FEATURE, 'mirror') }
+          Rails.logger.warn("Found multiple smart proxies with mirror set to false.  This is likely not intentional.") if found.count > 1
+          found.first
+        end
+
+        def self.pulp_primary!
+          pulp_primary || fail(_("Could not find a smart proxy with pulp feature."))
         end
 
         def self.default_capsule
-          pulp_master
+          pulp_primary
         end
 
         def self.default_capsule!
-          pulp_master!
+          pulp_primary!
         end
 
         def self.with_environment(environment, include_default = false)
@@ -121,8 +127,7 @@ module Katello
           uri = pulp3_uri!
           config.host = uri.host
           config.scheme = uri.scheme
-          config.ssl_client_cert = ::Cert::Certs.ssl_client_cert
-          config.ssl_client_key = ::Cert::Certs.ssl_client_key
+          pulp3_ssl_configuration(config)
           config.debugging = true
           config.logger = ::Foreman::Logging.logger('katello/pulp_rest')
           config.username = self.setting(PULP3_FEATURE, 'username')
@@ -130,6 +135,18 @@ module Katello
         end
       end
 
+      def pulp3_ssl_configuration(config)
+        if Faraday.default_adapter == :excon
+          config.ssl_client_cert = ::Cert::Certs.ssl_client_cert_filename
+          config.ssl_client_key = ::Cert::Certs.ssl_client_key_filename
+        elsif Faraday.default_adapter == :net_http
+          config.ssl_client_cert = ::Cert::Certs.ssl_client_cert
+          config.ssl_client_key = ::Cert::Certs.ssl_client_key
+        else
+          fail "Unexpected faraday default_adapter #{Faraday.default_adapter}!  Cannot continue, this is likely a bug."
+        end
+      end
+
       def backend_service_type(repository)
         if pulp3_support?(repository)
           Actions::Pulp3::Abstract::BACKEND_SERVICE_TYPE
@@ -143,7 +160,7 @@ module Katello
       end
 
       def pulp3_support?(repository)
-        pulp3_repository_type_support?(repository.content_type)
+        repository ? pulp3_repository_type_support?(repository.try(:content_type)) : false
       end
 
       def pulp2_preferred_for_type?(repository_type)
@@ -204,11 +221,11 @@ module Katello
       end
 
       def pulp_mirror?
-        self.has_feature? PULP_NODE_FEATURE
+        self.has_feature?(PULP_NODE_FEATURE) || self.setting(SmartProxy::PULP3_FEATURE, 'mirror')
       end
 
-      def pulp_master?
-        self.has_feature? PULP_FEATURE
+      def pulp_primary?
+        self.has_feature?(PULP_FEATURE) || self.setting(SmartProxy::PULP3_FEATURE, 'mirror') == false
       end
 
       def supported_pulp_types
@@ -234,14 +251,14 @@ module Katello
 
       #deprecated methods
       alias_method :pulp_node, :pulp_api
-      alias_method :default_capsule?, :pulp_master?
+      alias_method :default_capsule?, :pulp_primary?
 
       def associate_organizations
-        self.organizations = Organization.all if self.pulp_master?
+        self.organizations = Organization.all if self.pulp_primary?
       end
 
       def associate_default_locations
-        return unless self.pulp_master?
+        return unless self.pulp_primary?
         ['puppet_content', 'subscribed_hosts'].each do |type|
           default_location = ::Location.unscoped.find_by_title(
             ::Setting[:"default_location_#{type}"])
@@ -261,7 +278,7 @@ module Katello
       end
 
       def associate_lifecycle_environments
-        self.lifecycle_environments = Katello::KTEnvironment.all if self.pulp_master?
+        self.lifecycle_environments = Katello::KTEnvironment.all if self.pulp_primary?
       end
 
       def add_lifecycle_environment(environment)

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

@@ -52,7 +52,7 @@ module Katello
         scoped_search :relation => :activation_keys, :on => :name, :rename => :activation_key, :complete_value => true, :ext_method => :find_by_activation_key
         scoped_search :relation => :activation_keys, :on => :id, :rename => :activation_key_id, :complete_value => true, :ext_method => :find_by_activation_key_id,
                       :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
-        scoped_search :on => :hypervisor, :relation => :subscription_facet, :complete_value => { :true => true, :false => false }
+        scoped_search :on => :hypervisor, :relation => :subscription_facet, :complete_value => true
         scoped_search :on => :name, :relation => :hypervisor_host, :complete_value => true, :rename => :hypervisor_host, :ext_method => :find_by_hypervisor_host
         scoped_search :on => :name, :relation => :subscriptions, :rename => :subscription_name, :complete_value => true, :ext_method => :find_by_subscription_name
         scoped_search :on => :id, :relation => :pools, :rename => :subscription_id, :complete_value => true, :ext_method => :find_by_subscription_id, :only_explicit => true

data/app/models/katello/content_view.rb

@@ -79,7 +79,7 @@ module Katello
     scoped_search :on => :name, :complete_value => true
     scoped_search :on => :organization_id, :complete_value => true, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
     scoped_search :on => :label, :complete_value => true
-    scoped_search :on => :composite, :complete_value => {true: true, false: false}
+    scoped_search :on => :composite, :complete_value => true
 
     def self.in_environment(env)
       joins(:content_view_environments).

data/app/models/katello/content_view_package_filter.rb

@@ -37,7 +37,7 @@ module Katello
       self.package_rules.each do |rule|
         package_filenames.concat(query_rpms(repo, rule))
       end
-
+      package_filenames.concat(repo.packages_without_errata.map(&:filename)) if self.original_packages
       rpms = Rpm.in_repositories(repo)
       rpms.where(filename: package_filenames).where(:modular => false).pluck(:pulp_id).flatten.uniq
     end

data/app/models/katello/content_view_puppet_environment.rb

@@ -42,7 +42,7 @@ module Katello
       false
     end
 
-    def master
+    def primary
       true
     end
 

data/app/models/katello/content_view_version.rb

@@ -22,6 +22,9 @@ module Katello
     has_many :triggered_histories, :class_name => "Katello::ContentViewHistory", :dependent => :destroy,
              :inverse_of => :triggered_by, :foreign_key => :triggered_by_id
 
+    has_many :export_histories, :class_name => "Katello::ContentViewVersionExportHistory", :dependent => :destroy,
+             :inverse_of => :content_view_version, :foreign_key => :content_view_version_id
+
     has_many :repositories, :class_name => "Katello::Repository", :dependent => :destroy
     has_many :content_view_puppet_environments, :class_name => "Katello::ContentViewPuppetEnvironment",
                                                 :dependent => :destroy
@@ -41,7 +44,6 @@ module Katello
     has_many :composites, :through => :content_view_version_composites, :source => :composite_version,
              :class_name => "Katello::ContentViewVersion", :inverse_of => :components
     has_many :published_in_composite_content_views, through: :composites, source: :content_view
-
     delegate :default, :default?, to: :content_view
 
     validates_lengths_from_database

data/app/models/katello/content_view_version_export_history.rb

@@ -0,0 +1,22 @@
+module Katello
+  class ContentViewVersionExportHistory < Katello::Model
+    include Authorization::ContentViewVersionExportHistory
+
+    belongs_to :content_view_version, :class_name => "Katello::ContentViewVersion", :inverse_of => :export_histories
+    validates_lengths_from_database
+    validates :content_view_version_id, :presence => true
+    validates :destination_server, :presence => true, :uniqueness => { :scope => [:content_view_version_id, :destination_server, :path] }
+
+    scope :with_organization_id, ->(organization_id) do
+      where(:content_view_version_id => ContentViewVersion.with_organization_id(organization_id))
+    end
+
+    scope :with_content_view_id, ->(cv_id) do
+      where(:content_view_version_id => ContentViewVersion.where(content_view_id: cv_id))
+    end
+
+    scoped_search :on => :content_view_id, :relation => :content_view_version, :validator => ScopedSearch::Validators::INTEGER, :only_explicit => true
+    scoped_search :on => :content_view_version_id, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
+    scoped_search :on => :id, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
+  end
+end