katello 3.18.0.rc2.1 → 4.0.0.rc2

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

@@ -1,7 +1,7 @@
 module Katello
   module Validators
     class ContentViewPuppetModuleValidator < ActiveModel::Validator
-      def validate(record)
+      def validate(record) # rubocop:disable Metrics/CyclomaticComplexity
         if record.uuid.blank? && (record.name.blank? || record.author.blank?)
           record.errors[:base] << _("Invalid puppet module parameters specified. \
                                     Either 'uuid' or 'name' and 'author' must be specified.")

data/app/models/katello/activation_key.rb

@@ -1,8 +1,8 @@
 module Katello
   class ActivationKey < Katello::Model
     audited :except => [:cp_id], :associations => [:host_collections]
-    include Glue::Candlepin::ActivationKey if SETTINGS[:katello][:use_cp]
-    include Glue if SETTINGS[:katello][:use_cp]
+    include Glue::Candlepin::ActivationKey
+    include Glue
     include Katello::Authorization::ActivationKey
     include ForemanTasks::Concerns::ActionSubject
     include ScopedSearchExtensions

data/app/models/katello/agent/dispatch_history.rb

@@ -0,0 +1,17 @@
+module Katello
+  module Agent
+    class DispatchHistory < Katello::Model
+      self.table_name = 'katello_agent_dispatch_histories'
+
+      serialize :result, Hash
+
+      def accepted?
+        accepted_at.present?
+      end
+
+      def finished?
+        result.present?
+      end
+    end
+  end
+end

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

@@ -10,9 +10,32 @@ module Katello
     end
 
     module ClassMethods
+      def with_content_view_scope(scope)
+        joins(:content_view).merge(Katello::ContentView.send(scope))
+      end
+
       def readable
-        view_ids = ::Katello::ContentView.readable.collect { |v| v.id }
-        joins(:content_view).where("#{Katello::ContentView.table_name}.id" => view_ids)
+        with_content_view_scope(:readable)
+      end
+
+      def exportable
+        with_content_view_scope(:exportable)
+      end
+
+      def editable
+        with_content_view_scope(:editable)
+      end
+
+      def publishable
+        with_content_view_scope(:publishable)
+      end
+
+      def deletable
+        with_content_view_scope(:deletable)
+      end
+
+      def promotable_or_removable
+        with_content_view_scope(:promotable_or_removable)
       end
     end
   end

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

@@ -4,7 +4,7 @@ module Katello
 
     module ClassMethods
       def readable
-        where(:content_view_version_id => Katello::ContentViewVersion.readable)
+        joins(:content_view_version).merge(Katello::ContentViewVersion.readable)
       end
     end
   end

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

@@ -12,6 +12,14 @@ module Katello
       authorized?(:import_manifest)
     end
 
+    def can_import_library_content?
+      authorized?(:import_library_content)
+    end
+
+    def can_export_library_content?
+      authorized?(:export_library_content)
+    end
+
     def readable_promotion_paths
       permissible_promotion_paths(KTEnvironment.readable)
     end

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

@@ -114,7 +114,7 @@ module Katello
       end
 
       def suse?
-        content.content_type == Repository::YUM_TYPE && !!path.downcase.match(/suse/) # rubocop:disable Style/DoubleNegation
+        content.content_type == Repository::YUM_TYPE && !!path.downcase.match(/suse/)
       end
 
       def file?

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

@@ -33,6 +33,8 @@ module Katello
       included do
         prepend Overrides
 
+        has_many :dispatch_histories, :class_name => "::Katello::Agent::DispatchHistory", :foreign_key => :host_id, :dependent => :delete_all
+
         has_many :host_installed_packages, :class_name => "::Katello::HostInstalledPackage", :foreign_key => :host_id, :dependent => :delete_all
         has_many :installed_packages, :class_name => "::Katello::InstalledPackage", :through => :host_installed_packages
 
@@ -212,6 +214,7 @@ module Katello
         streams = {}
         module_streams.each do |module_stream|
           stream = AvailableModuleStream.where(name: module_stream["name"],
+                                               context: module_stream["context"],
                                                stream: module_stream["stream"]).first_or_create!
           streams[stream.id] = module_stream
         end

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

@@ -17,6 +17,8 @@ module Katello
           TemplateKind.all.each do |kind|
             if name == ::Operatingsystem::REDHAT_ATOMIC_HOST_OS && kind.name == "provision"
               provisioning_template_name = Setting["katello_default_atomic_provision"]
+            elsif kind.name == 'registration'
+              provisioning_template_name = 'Linux registration default'
             else
               provisioning_template_name = Setting["katello_default_#{kind.name}"]
             end

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

@@ -9,8 +9,8 @@ module Katello
 
         include ForemanTasks::Concerns::ActionSubject
         prepend ForemanTasks::Concerns::ActionTriggering
-        include Glue::Candlepin::Owner if SETTINGS[:katello][:use_cp]
-        include Glue if SETTINGS[:katello][:use_cp]
+        include Glue::Candlepin::Owner
+        include Glue
 
         include Katello::Authorization::Organization
         include Ext::LabelFromName

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

@@ -91,6 +91,13 @@ module Katello
         service_class.pulp_units_batch_all(pulp_ids).each do |units|
           units.each do |unit|
             unit = unit.with_indifferent_access
+            if content_type == 'rpm' && repository
+              rpms_to_disassociate = ::Katello::Rpm.where(name: unit[:name], version: unit[:version], release: unit[:release],
+                                                          epoch: unit[:epoch], arch: unit[:arch]).select(:id)
+              if rpms_to_disassociate.any?
+                ::Katello::RepositoryRpm.where(rpm_id: rpms_to_disassociate, repository_id: repository.id).destroy_all
+              end
+            end
             model = Katello::Util::Support.active_record_retry do
               self.where(:pulp_id => unit[service_class.unit_identifier]).first_or_create
             end

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

@@ -44,8 +44,8 @@ module Katello
 
       def kickstart_repos(host)
         distros = distribution_repositories(host).where(distribution_bootable: true)
-        if distros && host.content_source
-          distros.map { |distro| distro.to_hash(host.content_source) }
+        if distros && host&.content_facet&.content_source
+          distros.map { |distro| distro.to_hash(host.content_facet.content_source) }
         else
           []
         end

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

@@ -97,19 +97,23 @@ module Katello
         end
 
         def self.sync_needed?(environment)
-          unscoped.with_environment(environment).any?
+          Setting[:foreman_proxy_content_auto_sync] && unscoped.with_environment(environment).any?
         end
       end
 
+      def update_unauthenticated_repo_list(repo_names)
+        ProxyAPI::ContainerGateway.new(url: self.url).unauthenticated_repository_list("repositories": repo_names)
+      end
+
       def puppet_path
         self[:puppet_path] || update_puppet_path
       end
 
       def update_puppet_path
         if has_feature?(PULP_FEATURE)
-          path = ProxyAPI::Pulp.new(:url => self.url).capsule_puppet_path['puppet_content_dir']
+          path = ::ProxyAPI::Pulp.new(:url => self.url).capsule_puppet_path['puppet_content_dir']
         elsif has_feature?(PULP_NODE_FEATURE)
-          path = ProxyAPI::PulpNode.new(:url => self.url).capsule_puppet_path['puppet_content_dir']
+          path = ::ProxyAPI::PulpNode.new(:url => self.url).capsule_puppet_path['puppet_content_dir']
         end
         self.update_attribute(:puppet_path, path || '') if persisted?
         path
@@ -130,7 +134,7 @@ module Katello
           config.host = uri.host
           config.scheme = uri.scheme
           pulp3_ssl_configuration(config)
-          config.debugging = true
+          config.debugging = false
           config.logger = ::Foreman::Logging.logger('katello/pulp_rest')
           config.username = self.setting(PULP3_FEATURE, 'username')
           config.password = self.setting(PULP3_FEATURE, 'password')
@@ -179,7 +183,9 @@ module Katello
       end
 
       def fix_pulp3_capabilities(type)
-        if missing_pulp3_capabilities? && !pulp2_preferred_for_type?(type)
+        repository_type_obj = type.is_a?(String) ||  type.is_a?(Symbol) ? Katello::RepositoryTypeManager.repository_types[type] : type
+
+        if missing_pulp3_capabilities? && repository_type_obj.pulp3_plugin && !pulp2_preferred_for_type?(repository_type_obj.id)
           self.refresh
           if self.capabilities(::SmartProxy::PULP3_FEATURE).empty?
             fail Katello::Errors::PulpcoreMissingCapabilities
@@ -346,6 +352,26 @@ module Katello
         end
       end
 
+      def repos_in_env_cv(environment = nil, content_view = nil)
+        repos = Katello::Repository
+        repos = repos.in_environment(environment) if environment
+        repos = repos.in_content_views([content_view]) if content_view
+        repos
+      end
+
+      def repos_in_sync_history
+        smart_proxy_sync_histories.map { |sync_history| sync_history.repository }
+      end
+
+      def current_repositories_data(environment = nil, content_view = nil)
+        return repos_in_sync_history unless (environment || content_view)
+        repos_in_sync_history & repos_in_env_cv(environment, content_view)
+      end
+
+      def repos_pending_sync(environment = nil, content_view = nil)
+        repos_in_env_cv(environment, content_view) - repos_in_sync_history
+      end
+
       def smart_proxy_service
         @smart_proxy_service ||= Pulp::SmartProxyRepository.new(self)
       end

data/app/models/katello/content_migration_progress.rb

@@ -0,0 +1,4 @@
+module Katello
+  class ContentMigrationProgress < Katello::Model
+  end
+end

data/app/models/katello/content_view.rb

@@ -8,6 +8,7 @@ module Katello
     include ForemanTasks::Concerns::ActionSubject
 
     CONTENT_DIR = "content_views".freeze
+    IMPORT_LIBRARY = "Import-Library".freeze
 
     belongs_to :organization, :inverse_of => :content_views, :class_name => "::Organization"
 
@@ -102,6 +103,10 @@ module Katello
       name
     end
 
+    def library_import?
+      name == IMPORT_LIBRARY
+    end
+
     def content_host_count
       hosts.count
     end
@@ -236,6 +241,10 @@ module Katello
       environments.include?(env)
     end
 
+    apipie :method, 'Returns the Katello::ContentViewVersion for a given Lifecycle Environment' do
+      required :env, 'Katello::KTEnvironment', desc: 'a __Katello::KTEnvironment__ object for which we load the __Katello::ContentViewVersion__ object'
+      returns 'Katello::ContentViewVersion'
+    end
     def version(env)
       self.versions.in_environment(env).order("#{Katello::ContentViewVersion.table_name}.id ASC").readonly(false).last
     end
@@ -755,7 +764,7 @@ module Katello
       prop_group :katello_basic_props, Katello::Model, meta: { friendly_name: 'Content View' }
     end
     class Jail < ::Safemode::Jail
-      allow :name, :label
+      allow :name, :label, :version
     end
   end
 end

data/app/models/katello/content_view_environment.rb

@@ -2,8 +2,8 @@ module Katello
   class ContentViewEnvironment < Katello::Model
     audited :associated_with => :content_view
     include ForemanTasks::Concerns::ActionSubject
-    include Glue::Candlepin::Environment if SETTINGS[:katello][:use_cp]
-    include Glue if SETTINGS[:katello][:use_cp]
+    include Glue::Candlepin::Environment
+    include Glue
     include Authorization::ContentViewEnvironment
 
     belongs_to :content_view, :class_name => "Katello::ContentView", :inverse_of => :content_view_environments

data/app/models/katello/content_view_history.rb

@@ -32,7 +32,8 @@ module Katello
       publish: 1,
       promotion: 2,
       removal: 3,
-      export: 4
+      export: 4,
+      importing: 5
     }
 
     def content_view

data/app/models/katello/content_view_package_filter.rb

@@ -43,7 +43,7 @@ module Katello
     end
 
     def self.generate_rpm_clauses(package_filenames = [])
-      { 'filename' => { "$in" => package_filenames } } unless package_filenames.empty?
+      { 'filename' => { "$in" => package_filenames.sort } } unless package_filenames.empty?
     end
 
     def applicable_rpms

data/app/models/katello/content_view_puppet_environment.rb

@@ -1,8 +1,8 @@
 module Katello
   class ContentViewPuppetEnvironment < Katello::Model
     include ForemanTasks::Concerns::ActionSubject
-    include Glue::Pulp::Repo if SETTINGS[:katello][:use_pulp]
-    include Glue if SETTINGS[:katello][:use_pulp]
+    include Glue::Pulp::Repo
+    include Glue
 
     belongs_to :environment, :class_name => "Katello::KTEnvironment",
                              :inverse_of => :content_view_puppet_environments

data/app/models/katello/content_view_version.rb

@@ -322,7 +322,8 @@ module Katello
     end
 
     def content_counts_map
-      return {} if content_counts.blank?
+      # if its empty, calculate it on demand
+      update_content_counts! if content_counts.blank?
       counts = Hash[content_counts.map { |key, value| ["#{key}_count", value] }]
       counts.merge("module_stream_count" => counts["modulemd_count"],
                    "package_count" => counts["rpm_count"],

data/app/models/katello/content_view_version_export_history.rb

@@ -2,13 +2,24 @@ module Katello
   class ContentViewVersionExportHistory < Katello::Model
     include Authorization::ContentViewVersionExportHistory
 
+    COMPLETE = "complete".freeze
+    INCREMENTAL = "incremental".freeze
+    EXPORT_TYPES = [COMPLETE, INCREMENTAL].freeze
+
     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] }
+    validates :destination_server, :uniqueness => { :scope => [:content_view_version_id, :destination_server, :path] }
+    validates :export_type, :inclusion => { :in => EXPORT_TYPES,
+                                            :allow_blank => false,
+                                            :message => _("Invalid export_type from one of the following: %s" % EXPORT_TYPES.join(', '))
+                                          }
+
     validates :metadata, :presence => true
     serialize :metadata, Hash
 
+    before_validation :set_export_type, :if => -> { export_type.blank? }
+
     scope :with_organization_id, ->(organization_id) do
       where(:content_view_version_id => ContentViewVersion.with_organization_id(organization_id))
     end
@@ -20,5 +31,19 @@ module Katello
     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
+    scoped_search :on => :export_type, :rename => :type, :complete_value => EXPORT_TYPES
+
+    def self.latest(content_view, destination_server: nil)
+      where(content_view_version: content_view.versions,
+            destination_server: destination_server).order(:created_at).last
+    end
+
+    def export_type_from_metadata
+      cvve.metadata[:incremental] ? INCREMENTAL : COMPLETE
+    end
+
+    def set_export_type
+      self.export_type = export_type_from_metadata
+    end
   end
 end

data/app/models/katello/erratum.rb

@@ -173,9 +173,11 @@ module Katello
       property :package_names, array_of: String, desc: 'Returns names of packages the errata can be applied to'
       property :cves, array_of: 'ErratumCve', desc: 'Returns CVEs associated with the errata'
       property :reboot_suggested, one_of: [true, false], desc: 'Returns true if reboot is suggested after errata applying, false otherwise'
+      property :title, String, desc: 'Returns the errata title, e.g. "Important: net-snmp security update"'
+      property :summary, String, desc: 'Returns the errata summary, the length can very, it is usually in range of 60 to 1000 characters. It can include empty line characters.'
     end
     class Jail < ::Safemode::Jail
-      allow :errata_id, :errata_type, :issued, :created_at, :severity, :package_names, :cves, :reboot_suggested
+      allow :errata_id, :errata_type, :issued, :created_at, :severity, :package_names, :cves, :reboot_suggested, :title, :summary
     end
   end
 end

data/app/models/katello/events/delete_host_agent_queue.rb

@@ -0,0 +1,19 @@
+module Katello
+  module Events
+    class DeleteHostAgentQueue
+      EVENT_TYPE = 'delete_host_agent_queue'.freeze
+
+      attr_accessor :metadata
+
+      def initialize(_host_id)
+        yield(self) if block_given?
+      end
+
+      def run
+        if metadata[:queue_name]
+          Katello::Agent::Dispatcher.delete_client_queue(queue_name: metadata[:queue_name])
+        end
+      end
+    end
+  end
+end

data/app/models/katello/glue/candlepin/pool.rb

@@ -92,6 +92,8 @@ module Katello
       end
 
       # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
+      # rubocop:disable Metrics/CyclomaticComplexity
+      # rubocop:disable Metrics/PerceivedComplexity
       def import_data(index_hosts_and_activation_keys = false)
         pool_attributes = {}.with_indifferent_access
         pool_json = self.backend_data