katello 3.13.4 → 3.14.0.rc1

data/app/models/katello/erratum.rb

@@ -12,10 +12,6 @@ module Katello
     has_many :content_facet_errata, :class_name => "Katello::ContentFacetErratum", :dependent => :destroy, :inverse_of => :content_facet
     has_many :content_facets, :through => :content_facet_errata, :class_name => "Katello::Host::ContentFacet", :source => :content_facet
     has_many :content_facets_applicable, :through => :content_facet_errata, :class_name => "Katello::Host::ContentFacet", :source => :content_facet
-
-    has_many :repository_errata, :class_name => "Katello::RepositoryErratum", :dependent => :destroy, :inverse_of => :erratum
-    has_many :repositories, :through => :repository_errata, :class_name => "Katello::Repository"
-
     has_many :bugzillas, :class_name => "Katello::ErratumBugzilla", :dependent => :destroy, :inverse_of => :erratum
     has_many :cves, :class_name => "Katello::ErratumCve", :dependent => :destroy, :inverse_of => :erratum
     has_many :packages, :class_name => "Katello::ErratumPackage", :dependent => :destroy, :inverse_of => :erratum
@@ -54,10 +50,6 @@ module Katello
     scope :modular, -> { where(:id => Erratum.joins(:packages => :module_stream_errata_packages)) }
     scope :non_modular, -> { where.not(:id => modular) }
 
-    def self.repository_association_class
-      RepositoryErratum
-    end
-
     def self.content_facet_association_class
       ContentFacetErratum
     end
@@ -120,6 +112,16 @@ module Katello
           where(statement).pluck(:filename)
     end
 
+    def self.list_modular_streams_by_clauses(repo, clauses)
+      query_clauses = clauses.map do |clause|
+        "(#{clause.to_sql})"
+      end
+      statement = query_clauses.join(" OR ")
+      ModuleStream.where(:id => ModuleStreamErratumPackage.joins(:erratum_package => {:erratum => :repository_errata}).
+          where("#{RepositoryErratum.table_name}.repository_id" => repo.id).
+          where(statement).select("#{ModuleStreamErratumPackage.table_name}.module_stream_id"))
+    end
+
     def module_streams
       # return something like
       # {module_stream => [packages]}

data/app/models/katello/file_unit.rb

@@ -1,14 +1,10 @@
 module Katello
   class FileUnit < Katello::Model
-    include Concerns::PulpDatabaseUnit
-
     self.table_name = 'katello_files'
+    include Concerns::PulpDatabaseUnit
 
     CONTENT_TYPE = 'file'.freeze
 
-    has_many :repository_files, :class_name => "Katello::RepositoryFile", :dependent => :destroy, :inverse_of => :file, :foreign_key => :file_id
-    has_many :repositories, :through => :repository_files, :class_name => "Katello::Repository"
-
     scoped_search :on => :name, :complete_value => true
     scoped_search :on => :path, :complete_value => true
     scoped_search :on => :checksum
@@ -17,14 +13,6 @@ module Katello
       order(:name)
     end
 
-    def self.repository_association_class
-      RepositoryFile
-    end
-
-    def self.unit_id_field
-      'file_id'
-    end
-
     def self.total_for_repositories(repos)
       self.in_repositories(repos).count
     end

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

@@ -9,7 +9,6 @@ module Katello
             :presence => true,
             :format => { :with => /\A[\w-]*\z/ }
 
-        lazy_accessor :events, :initializer => lambda { |_s| Resources::Candlepin::Owner.events(label) }
         lazy_accessor :service_levels, :initializer => lambda { |_s| Resources::Candlepin::Owner.service_levels(label) }
         lazy_accessor :system_purposes, :initializer => lambda { |_s| Resources::Candlepin::Owner.system_purpose(label) }
         lazy_accessor :debug_cert, :initializer => lambda { |_s| load_debug_cert }
@@ -17,10 +16,6 @@ module Katello
     end
 
     module InstanceMethods
-      def owner_info
-        Glue::Candlepin::OwnerInfo.new(self)
-      end
-
       def owner_details
         @owner_details ||= Resources::Candlepin::Owner.find self.label
         @owner_details['virt_who'] ||= self.subscriptions.using_virt_who.any?

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

@@ -28,10 +28,6 @@ module Katello
       end
     end
 
-    def self.validate_name(name)
-      name.gsub(/[^a-z0-9\-_ ]/i, "")
-    end
-
     def self.engineering_product_id?(id)
       id.match(/^\d+$/) #engineering products are numeric
     end
@@ -39,7 +35,7 @@ module Katello
     def self.import_from_cp(attrs, organization)
       import_logger = attrs[:import_logger]
 
-      product_attrs = {'name' => validate_name(attrs['name']),
+      product_attrs = {'name' => attrs['name'],
                        'cp_id' => attrs['id'],
                        'label' => Util::Model.labelize(attrs['name']),
                        'multiplier' => attrs['multiplier'],

data/app/models/katello/glue/pulp/repo.rb

@@ -47,7 +47,7 @@ module Katello
 
         def self.build_override_config(options)
           config = {}
-          if options[:solve_dependencies] || options[:resolve_dependencies]
+          if options[:filters].present? && (options[:solve_dependencies] || options[:resolve_dependencies])
             if Setting[:dependency_solving_algorithm] == 'greedy'
               config[:recursive] = true
             else

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

@@ -223,6 +223,12 @@ module Katello
         facet_attributes[:content_source_id] ||= hostgroup.inherited_content_source_id
         facet_attributes
       end
+
+      class Jail < ::Safemode::Jail
+        allow :applicable_module_stream_count, :applicable_rpm_count, :content_source, :content_source_id, :content_source_name, :content_view_id,
+              :content_view_name, :errata_counts, :id, :kickstart_repository, :kickstart_repository_id, :kickstart_repository_name,
+              :lifecycle_environment_id, :lifecycle_environment_name, :upgradable_module_stream_count, :upgradable_rpm_count, :uuid
+      end
     end
   end
 end

data/app/models/katello/host_collection.rb

@@ -101,5 +101,9 @@ module Katello
     def self.humanize_class_name(_name = nil)
       _("Host Collections")
     end
+
+    class Jail < ::Safemode::Jail
+      allow :name
+    end
   end
 end

data/app/models/katello/installed_package.rb

@@ -1,5 +1,9 @@
 module Katello
   class InstalledPackage < Katello::Model
+    class Jail < Safemode::Jail
+      allow :nvra, :nvrea, :name
+    end
+
     has_many :hosts, :through => :host_installed_packages, :class_name => "::Host"
     has_many :host_installed_packages, :class_name => "Katello::HostInstalledPackage", :dependent => :destroy, :inverse_of => :installed_package
 

data/app/models/katello/module_stream.rb

@@ -2,9 +2,6 @@ module Katello
   class ModuleStream < Katello::Model
     include Concerns::PulpDatabaseUnit
     include ScopedSearchExtensions
-    has_many :repository_module_streams, class_name: "Katello::RepositoryModuleStream",
-      dependent: :destroy, inverse_of: :module_stream
-    has_many :repositories, through: :repository_module_streams, class_name: "Katello::Repository"
     has_many :profiles, class_name: "Katello::ModuleProfile", dependent: :destroy, inverse_of: :module_stream
     has_many :artifacts, class_name: "Katello::ModuleStreamArtifact", dependent: :destroy, inverse_of: :module_stream
     has_many :module_stream_errata_packages, class_name: "Katello::ModuleStreamErratumPackage", dependent: :destroy, inverse_of: :module_stream
@@ -13,7 +10,7 @@ module Katello
     has_many :content_facet_applicable_module_streams, :class_name => "Katello::ContentFacetApplicableModuleStream",
              :dependent => :destroy, :inverse_of => :module_stream
     has_many :content_facets, :through => :content_facet_applicable_module_streams, :class_name => "Katello::Host::ContentFacet"
-
+    has_many :rules, :class_name => "Katello::ContentViewModuleStreamFilterRule", :inverse_of => :module_stream, dependent: :destroy
     scoped_search on: :name, complete_value: true
     scoped_search on: :pulp_id, complete_value: true, rename: :uuid
     scoped_search on: :stream, complete_value: true
@@ -38,10 +35,6 @@ module Katello
       order(:name)
     end
 
-    def self.repository_association_class
-      RepositoryModuleStream
-    end
-
     def self.content_facet_association_class
       ContentFacetApplicableModuleStream
     end
@@ -50,10 +43,6 @@ module Katello
       ApplicableContentHelper.new(ModuleStream).installable_for_hosts(hosts)
     end
 
-    def library_repositories
-      self.repositories.where(library_instance: nil)
-    end
-
     def self.available_for_hosts(hosts)
       where("#{table_name}.id" => ::Katello::ModuleStream.joins(repositories: :content_facets).
             select("#{table_name}.id").

data/app/models/katello/ostree_branch.rb

@@ -2,18 +2,11 @@ module Katello
   class OstreeBranch < Katello::Model
     include Concerns::PulpDatabaseUnit
 
-    has_many :repository_ostree_branches, :dependent => :destroy, :class_name => 'Katello::RepositoryOstreeBranch'
-    has_many :repositories, :through => :repository_ostree_branches, :inverse_of => :ostree_branches
-
     scoped_search :on => :name, :complete_value => true
     scoped_search :on => :version, :complete_value => true
     scoped_search :on => :commit, :complete_value => true
     scoped_search :on => :pulp_id, :complete_value => true, :rename => :uuid
 
     CONTENT_TYPE = "ostree".freeze
-
-    def self.repository_association_class
-      RepositoryOstreeBranch
-    end
   end
 end

data/app/models/katello/package_group.rb

@@ -3,18 +3,11 @@ module Katello
     include Concerns::PulpDatabaseUnit
 
     CONTENT_TYPE = "package_group".freeze
-
-    has_many :repository_package_groups, :class_name => "Katello::RepositoryPackageGroup", :dependent => :destroy, :inverse_of => :package_group
-    has_many :repositories, :through => :repository_package_groups, :class_name => "Katello::Repository"
     has_many :roots, :through => :repositories, :class_name => "Katello::RootRepository"
 
     scoped_search :on => :name, :complete_value => true
     scoped_search :on => :pulp_id, :rename => :id, :complete_value => true
 
-    def self.repository_association_class
-      RepositoryPackageGroup
-    end
-
     def repository
       self.repositories.first
     end

data/app/models/katello/ping.rb

@@ -34,15 +34,22 @@ module Katello
         result
       end
 
+      def status
+        {
+          version: Katello::VERSION,
+          timeUTC: Time.now.getutc
+        }
+      end
+
       def ping_pulp3_without_auth(service_result, capsule_id)
         exception_watch(service_result) do
-          Ping.pulp3_without_auth(fetch_proxy(capsule_id).pulp3_url("api/v3"))
+          Katello::Ping.pulp3_without_auth(fetch_proxy(capsule_id).pulp3_url("api/v3"))
         end
       end
 
       def ping_pulp_without_auth(service_result, capsule_id)
         exception_watch(service_result) do
-          Ping.pulp_without_auth(pulp_url(capsule_id))
+          Katello::Ping.pulp_without_auth(pulp_url(capsule_id))
         end
       end
 
@@ -180,7 +187,7 @@ module Katello
       private
 
       def fetch_proxy(capsule_id)
-        capsule_id ? SmartProxy.find(capsule_id) : SmartProxy.pulp_master
+        capsule_id ? SmartProxy.unscoped.find(capsule_id) : SmartProxy.pulp_master
       end
 
       def backend_status(url, backend)

data/app/models/katello/pool.rb

@@ -84,6 +84,16 @@ module Katello
       ).save!
     end
 
+    # Note - Audit hook added to find records based on column except associations to display audit information
+    def self.audit_hook_to_find_records(keyname, change, _audit)
+      if keyname =~ /_ids$/
+        case keyname
+        when 'host_ids'
+          ::Host.where(:id => change)&.index_by(&:id)
+        end
+      end
+    end
+
     private
 
     def default_sort
@@ -91,7 +101,7 @@ module Katello
     end
 
     class Jail < ::Safemode::Jail
-      allow :id, :name, :available, :quantity, :product_id, :contract_number
+      allow :id, :name, :available, :quantity, :product_id, :contract_number, :type, :account_number, :start_date, :end_date
     end
   end
 end

data/app/models/katello/puppet_module.rb

@@ -7,9 +7,6 @@ module Katello
 
     CONTENT_TYPE = "puppet_module".freeze
 
-    has_many :repository_puppet_modules, :class_name => "Katello::RepositoryPuppetModule", :dependent => :destroy, :inverse_of => :puppet_module
-    has_many :repositories, :through => :repository_puppet_modules, :class_name => "Katello::Repository"
-
     has_many :content_view_puppet_environment_puppet_modules,
              :class_name => "Katello::ContentViewPuppetEnvironmentPuppetModule",
              :dependent => :destroy,
@@ -35,10 +32,6 @@ module Katello
         order(:sortable_version => :desc).first
     end
 
-    def self.repository_association_class
-      RepositoryPuppetModule
-    end
-
     def self.parse_metadata(filepath)
       metadata = nil
 

data/app/models/katello/repository.rb

@@ -52,8 +52,8 @@ module Katello
     has_many :repository_srpms, :class_name => "Katello::RepositorySrpm", :dependent => :delete_all
     has_many :srpms, :through => :repository_srpms
 
-    has_many :repository_files, :class_name => "Katello::RepositoryFile", :dependent => :destroy
-    has_many :files, :through => :repository_files
+    has_many :repository_file_units, :class_name => "Katello::RepositoryFileUnit", :dependent => :destroy
+    has_many :files, :through => :repository_file_units, :source => :file_unit
 
     has_many :repository_puppet_modules, :class_name => "Katello::RepositoryPuppetModule", :dependent => :delete_all
     has_many :puppet_modules, :through => :repository_puppet_modules
@@ -66,9 +66,11 @@ module Katello
 
     has_many :yum_metadata_files, :dependent => :destroy, :class_name => "Katello::YumMetadataFile"
 
-    has_many :docker_tags, :dependent => :destroy, :class_name => "Katello::DockerTag"
+    has_many :repository_docker_tags, :class_name => "Katello::RepositoryDockerTag", :dependent => :delete_all
+    has_many :docker_tags, :through => :repository_docker_tags
 
-    has_many :docker_meta_tags, :dependent => :destroy, :class_name => "Katello::DockerMetaTag"
+    has_many :repository_docker_meta_tags, :class_name => "Katello::RepositoryDockerMetaTag", :dependent => :delete_all
+    has_many :docker_meta_tags, :through => :repository_docker_meta_tags
 
     has_many :repository_ostree_branches, :class_name => "Katello::RepositoryOstreeBranch", :dependent => :delete_all
     has_many :ostree_branches, :through => :repository_ostree_branches
@@ -123,6 +125,7 @@ module Katello
     scope :archived, -> { where('environment_id is NULL') }
     scope :in_published_environments, -> { in_content_views(Katello::ContentView.non_default).where.not(:environment_id => nil) }
     scope :order_by_root, ->(attr) { joins(:root).order("#{Katello::RootRepository.table_name}.#{attr}") }
+    scope :with_content, ->(content) { joins(Katello::RepositoryTypeManager.find_content_type(content).model_class.repository_association_class.name.demodulize.underscore.pluralize.to_sym).distinct }
 
     scoped_search :on => :name, :relation => :root, :complete_value => true
     scoped_search :rename => :product, :on => :name, :relation => :product, :complete_value => true
@@ -150,12 +153,14 @@ module Katello
     delegate :yum?, :docker?, :puppet?, :deb?, :file?, :ostree?, :ansible_collection?, :to => :root
     delegate :name, :label, :docker_upstream_name, :url, :to => :root
 
-    delegate :name, :created_at, :updated_at, :major, :minor, :gpg_key_id, :gpg_key, :content_id, :arch, :label, :url, :unprotected,
+    delegate :name, :created_at, :updated_at, :major, :minor, :gpg_key_id, :gpg_key, :arch, :label, :url, :unprotected,
              :content_type, :product_id, :checksum_type, :docker_upstream_name, :mirror_on_sync, :"mirror_on_sync?",
              :download_policy, :verify_ssl_on_sync, :"verify_ssl_on_sync?", :upstream_username, :upstream_password,
              :ostree_upstream_sync_policy, :ostree_upstream_sync_depth, :deb_releases, :deb_components, :deb_architectures,
              :ignore_global_proxy, :ssl_ca_cert_id, :ssl_ca_cert, :ssl_client_cert, :ssl_client_cert_id, :ssl_client_key_id,
-             :ssl_client_key, :ignorable_content, :description, :docker_tags_whitelist, :ansible_collection_whitelist, :http_proxy_policy, :http_proxy_id, :to => :root
+             :ssl_client_key, :ignorable_content, :description, :docker_tags_whitelist, :ansible_collection_requirements, :http_proxy_policy, :http_proxy_id, :to => :root
+
+    delegate :content_id, to: :root, allow_nil: true
 
     def self.with_type(content_type)
       joins(:root).where("#{RootRepository.table_name}.content_type" => content_type)
@@ -173,6 +178,10 @@ module Katello
       backend_service(smart_proxy).content_service
     end
 
+    def backend_content_unit_service(smart_proxy, content_unit_type)
+      backend_service(smart_proxy).content_service(content_unit_type)
+    end
+
     def organization
       if self.environment
         self.environment.organization

data/app/models/katello/repository_docker_meta_tag.rb

@@ -0,0 +1,7 @@
+module Katello
+  class RepositoryDockerMetaTag < Katello::Model
+    # Do not use active record callbacks in this join model.  Direct INSERTs and DELETEs are done
+    belongs_to :repository, :inverse_of => :repository_docker_meta_tags, :class_name => 'Katello::Repository'
+    belongs_to :docker_meta_tag, :inverse_of => :repository_docker_meta_tags, :class_name => 'Katello::DockerMetaTag'
+  end
+end

data/app/models/katello/repository_docker_tag.rb

@@ -0,0 +1,7 @@
+module Katello
+  class RepositoryDockerTag < Katello::Model
+    # Do not use active record callbacks in this join model.  Direct INSERTs and DELETEs are done
+    belongs_to :repository, :inverse_of => :repository_docker_tags, :class_name => 'Katello::Repository'
+    belongs_to :docker_tag, :inverse_of => :repository_docker_tags, :class_name => 'Katello::DockerTag'
+  end
+end

data/app/models/katello/repository_file_unit.rb

@@ -0,0 +1,7 @@
+module Katello
+  class RepositoryFileUnit < Katello::Model
+    # Do not use active record callbacks in this join model.  Direct INSERTs and DELETEs are done
+    belongs_to :repository, :inverse_of => :repository_file_units, :class_name => 'Katello::Repository'
+    belongs_to :file_unit, :inverse_of => :repository_file_units, :class_name => 'Katello::FileUnit'
+  end
+end

data/app/models/katello/rhsm_fact_name.rb

@@ -7,7 +7,11 @@ module Katello
     end
 
     def origin
-      'Redhat'
+      'RHSM'
+    end
+
+    def icon_path
+      "icons16x16/redhat.png"
     end
   end
 end

data/app/models/katello/rhsm_fact_parser.rb

@@ -67,7 +67,7 @@ module Katello
 
     def os_release_name(os_name)
       if os_name.match(::Operatingsystem::FAMILIES['Debian'])
-        facts['distribution.id']
+        facts['distribution.id']&.split&.first&.downcase
       end
     end
 
@@ -85,6 +85,22 @@ module Katello
       facts['proc_stat.btime']&.to_i
     end
 
+    def virtual
+      facts['virt.is_guest']
+    end
+
+    def ram
+      facts['memory.memtotal'].to_i / 1024 if facts['memory.memtotal']
+    end
+
+    def sockets
+      facts['cpu.cpu_socket(s)']
+    end
+
+    def cores
+      facts['cpu.core(s)_per_socket']
+    end
+
     private
 
     def get_rhsm_ip(interface)