katello 3.3.2 → 3.4.0.rc1

data/app/models/katello/gpg_key.rb

@@ -21,7 +21,7 @@ module Katello
     validates_with Validators::GpgKeyContentValidator, :attributes => :content, :if => proc { SETTINGS[:katello][:gpg_strict_validation] }
 
     scoped_search :on => :name, :complete_value => true
-    scoped_search :on => :organization_id, :complete_value => true, :only_explicit => true
+    scoped_search :on => :organization_id, :complete_value => true, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
 
     def as_json(options = {})
       options ||= {}

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

@@ -5,6 +5,7 @@ module Katello
       include Facets::Base
 
       belongs_to :user, :inverse_of => :subscription_facets, :class_name => "::User"
+      belongs_to :hypervisor_host, :class_name => "::Host::Managed", :foreign_key => "hypervisor_host_id"
 
       has_many :activation_keys, :through => :subscription_facet_activation_keys, :class_name => "Katello::ActivationKey"
       has_many :subscription_facet_activation_keys, :class_name => "Katello::SubscriptionFacetActivationKey", :dependent => :destroy, :inverse_of => :subscription_facet
@@ -23,6 +24,9 @@ module Katello
       end
 
       def import_database_attributes(consumer_params)
+        update_hypervisor(consumer_params)
+        update_guests(consumer_params)
+
         self.autoheal = consumer_params['autoheal'] unless consumer_params['autoheal'].blank?
         self.service_level = consumer_params['serviceLevel'] unless consumer_params['serviceLevel'].blank?
         self.registered_at = consumer_params['created'] unless consumer_params['created'].blank?
@@ -35,6 +39,42 @@ module Katello
         end
       end
 
+      def update_hypervisor(consumer_params = candlepin_consumer.consumer_attributes)
+        if consumer_params.try(:[], 'type').try(:[], 'label') == 'hypervisor'
+          self.hypervisor = true
+        elsif !consumer_params.try(:[], 'guestIds').empty?
+          self.hypervisor = true
+        elsif !candlepin_consumer.virtual_guests.empty?
+          # Check by calling out to Candlepin last for efficiency
+          self.hypervisor = true
+        end
+      end
+
+      def update_guests(consumer_params)
+        if self.hypervisor
+          if !consumer_params.try(:[], 'guestIds').empty?
+            guest_ids = consumer_params['guestIds'].map do |id|
+              if id.is_a?(Hash)
+                id['guestId'].downcase
+              elsif id.is_a?(String)
+                id.downcase
+              end
+            end
+
+            guest_ids = FactValue.where("lower(value) IN (?)", guest_ids).
+                                  where(:fact_name_id => FactName.where(:name => 'virt::uuid')).
+                                  pluck(:host_id)
+          else
+            guest_ids = self.candlepin_consumer.virtual_guests.pluck(:id)
+          end
+
+          subscription_facets = SubscriptionFacet.where(:host_id => guest_ids)
+          subscription_facets.update_all(:hypervisor_host_id => self.host.id)
+        elsif (virtual_host = self.candlepin_consumer.virtual_host)
+          self.hypervisor_host = virtual_host
+        end
+      end
+
       def consumer_attributes
         attrs = {
           :autoheal => autoheal,
@@ -55,7 +95,7 @@ module Katello
             product
           end
         end
-        attrs
+        HashWithIndifferentAccess.new(attrs)
       end
 
       def candlepin_environment_id
@@ -86,8 +126,11 @@ module Katello
       def self.find_or_create_host(organization, rhsm_params)
         host = find_host(rhsm_params[:facts], organization)
         unless host
-          host = Katello::Host::SubscriptionFacet.new_host_from_facts(rhsm_params[:facts], organization,
-                                            Location.default_location)
+          host = Katello::Host::SubscriptionFacet.new_host_from_facts(
+            rhsm_params[:facts],
+            organization,
+            Location.unscoped.find_by_title(::Setting[:default_location_subscribed_hosts])
+          )
         end
         host.organization = organization unless host.organization
         host
@@ -142,7 +185,7 @@ module Katello
       end
 
       def candlepin_consumer
-        @candlepin_consumer ||= Katello::Candlepin::Consumer.new(self.uuid)
+        @candlepin_consumer ||= Katello::Candlepin::Consumer.new(self.uuid, self.host.organization.label)
       end
 
       def backend_update_needed?

data/app/models/katello/host_collection.rb

@@ -26,8 +26,8 @@ module Katello
     validate :max_hosts_not_exceeded, :on => :create
 
     scoped_search :on => :name, :complete_value => true
-    scoped_search :on => :organization_id, :complete_value => true, :only_explicit => true
-    scoped_search :in => :hosts, :on => :name, :rename => :host, :complete_value => true
+    scoped_search :on => :organization_id, :complete_value => true, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
+    scoped_search :relation => :hosts, :on => :name, :rename => :host, :complete_value => true
 
     def max_hosts_check
       if !unlimited_hosts && (hosts.length > 0 && (hosts.length.to_i > max_hosts.to_i)) && max_hosts_changed?

data/app/models/katello/kt_environment.rb

@@ -75,7 +75,7 @@ module Katello
     ERROR_CLASS_NAME = "Environment".freeze
 
     scoped_search :on => :name, :complete_value => true
-    scoped_search :on => :organization_id, :complete_value => true, :only_explicit => true
+    scoped_search :on => :organization_id, :complete_value => true, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
 
     def library?
       self.library

data/app/models/katello/ostree_branch.rb

@@ -10,7 +10,7 @@ module Katello
     scoped_search :on => :commit, :complete_value => true
     scoped_search :on => :uuid, :complete_value => true
     scoped_search :on => :version_date, :complete_value => true, :rename => :created
-    scoped_search :in => :repositories, :on => :name, :rename => :repository, :complete_value => true
+    scoped_search :relation => :repositories, :on => :name, :rename => :repository, :complete_value => true
 
     CONTENT_TYPE = Pulp::OstreeBranch::CONTENT_TYPE
 

data/app/models/katello/package_group.rb

@@ -9,7 +9,7 @@ module Katello
 
     scoped_search :on => :name, :complete_value => true
     scoped_search :on => :uuid, :rename => :id, :complete_value => true
-    scoped_search :in => :repositories, :on => :name, :rename => :repository, :complete_value => true
+    scoped_search :relation => :repositories, :on => :name, :rename => :repository, :complete_value => true
 
     def self.repository_association_class
       RepositoryPackageGroup

data/app/models/katello/pool.rb

@@ -8,9 +8,7 @@ module Katello
     has_many :pool_activation_keys, :class_name => "Katello::PoolActivationKey", :dependent => :destroy, :inverse_of => :pool
 
     scope :in_org, ->(org_id) { joins(:subscription).where("#{Katello::Subscription.table_name}.organization_id = ?", org_id) }
-    scope :for_activation_key, ->(ak) {
-      where(cp_id: ak.get_key_pools.map { |pool| pool['id'] })
-    }
+    scope :for_activation_key, ->(ak) { joins(:activation_keys).where("#{Katello::ActivationKey.table_name}.id" => ak.id) }
 
     self.include_root_in_json = false
 
@@ -18,21 +16,22 @@ module Katello
     include Glue::Candlepin::CandlepinObject
 
     scoped_search :on => :cp_id, :complete_value => true, :rename => :id, :only_explicit => true
-    scoped_search :on => :quantity, :complete_value => true
+    scoped_search :on => :quantity, :complete_value => true, :validator => ScopedSearch::Validators::INTEGER
     scoped_search :on => :start_date, :complete_value => true, :rename => :starts
     scoped_search :on => :end_date, :complete_value => true, :rename => :expires
-    scoped_search :on => :ram, :complete_value => true
+    scoped_search :on => :ram, :complete_value => true, :validator => ScopedSearch::Validators::INTEGER
     scoped_search :on => :multi_entitlement, :complete_value => true
-    scoped_search :on => :consumed, :complete_value => true
-    scoped_search :on => :account_number, :complete_value => true, :rename => :account
-    scoped_search :on => :contract_number, :complete_value => true, :rename => :contract
-    scoped_search :on => :name, :in => :subscription, :complete_value => true, :rename => :name
-    scoped_search :on => :support_level, :in => :subscription, :complete_value => true
-    scoped_search :on => :sockets, :in => :subscription, :complete_value => true
-    scoped_search :on => :cores, :in => :subscription, :complete_value => true
-    scoped_search :on => :product_id, :in => :subscription, :complete_value => true
-    scoped_search :on => :stacking_id, :in => :subscription, :complete_value => true
-    scoped_search :on => :instance_multiplier, :in => :subscription, :complete_value => true
+    scoped_search :on => :consumed, :complete_value => true, :validator => ScopedSearch::Validators::INTEGER
+    scoped_search :on => :account_number, :complete_value => true, :rename => :account, :validator => ScopedSearch::Validators::INTEGER
+    scoped_search :on => :contract_number, :complete_value => true, :rename => :contract, :validator => ScopedSearch::Validators::INTEGER
+    scoped_search :on => :virt_who, :complete_value => true, :only_explicit => true
+    scoped_search :on => :name, :relation => :subscription, :complete_value => true, :rename => :name
+    scoped_search :on => :support_level, :relation => :subscription, :complete_value => true
+    scoped_search :on => :sockets, :relation => :subscription, :complete_value => true, :validator => ScopedSearch::Validators::INTEGER
+    scoped_search :on => :cores, :relation => :subscription, :complete_value => true, :validator => ScopedSearch::Validators::INTEGER
+    scoped_search :on => :product_id, :relation => :subscription, :complete_value => true
+    scoped_search :on => :stacking_id, :relation => :subscription, :complete_value => true, :validator => ScopedSearch::Validators::INTEGER
+    scoped_search :on => :instance_multiplier, :relation => :subscription, :complete_value => true, :validator => ScopedSearch::Validators::INTEGER
 
     validates_lengths_from_database
 

data/app/models/katello/product.rb

@@ -29,10 +29,10 @@ module Katello
     validates_with Validators::ProductUniqueAttributeValidator, :attributes => :label
 
     scoped_search :on => :name, :complete_value => true
-    scoped_search :on => :organization_id, :complete_value => true, :only_explicit => 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 => :description
-    scoped_search :in => :provider, :on => :provider_type, :rename => :redhat,
+    scoped_search :relation => :provider, :on => :provider_type, :rename => :redhat,
                   :complete_value => {:true => Katello::Provider::REDHAT, :false => Katello::Provider::ANONYMOUS }
 
     def library_repositories

data/app/models/katello/provider.rb

@@ -107,34 +107,6 @@ module Katello
       hash
     end
 
-    def available_releases
-      releases = []
-      begin
-        Util::CdnVarSubstitutor.with_cache do
-          self.products.each do |product|
-            cdn_var_substitutor = Resources::CDN::CdnResource.new(product.provider[:repository_url],
-                                                             :ssl_client_cert => OpenSSL::X509::Certificate.new(product.certificate),
-                                                             :ssl_client_key => OpenSSL::PKey::RSA.new(product.key)).substitutor
-            product.productContent.each do |pc|
-              if (url_to_releases = pc.content.contentUrl[/^.*\$releasever/])
-                begin
-                  cdn_var_substitutor.substitute_vars(url_to_releases).each do |(substitutions, _path)|
-                    releases << Resources::CDN::Utils.parse_version(substitutions['releasever'])[:minor]
-                  end
-                rescue Errors::SecurityViolation => e
-                  # Some products may not be accessible but these should not impact available releases available
-                  Rails.logger.info "Skipping unreadable product content: #{e}"
-                end
-              end
-            end
-          end
-        end
-      rescue => e
-        raise _("Unable to retrieve release versions from Repository URL %{url}. Error message: %{error}") % {:url => self.repository_url, :error => e.to_s}
-      end
-      releases.uniq.sort
-    end
-
     def manifest_task
       return task_status
     end

data/app/models/katello/repository.rb

@@ -3,9 +3,13 @@ module Katello
   class Repository < Katello::Model
     self.include_root_in_json = false
 
+    #pulp uses pulp id to sync with 'yum_distributor' on the end
+    PULP_ID_MAX_LENGTH = 220
+
     validates_lengths_from_database :except => [:label]
     before_destroy :assert_deletable
     before_create :downcase_pulp_id
+    before_validation :update_ostree_upstream_sync_policy
 
     include ForemanTasks::Concerns::ActionSubject
     include Glue::Candlepin::Content if (SETTINGS[:katello][:use_cp] && SETTINGS[:katello][:use_pulp])
@@ -26,6 +30,11 @@ module Katello
     CHECKSUM_TYPES = %w(sha1 sha256).freeze
     SUBSCRIBABLE_TYPES = [YUM_TYPE, OSTREE_TYPE].freeze
 
+    OSTREE_UPSTREAM_SYNC_POLICY_LATEST = "latest".freeze
+    OSTREE_UPSTREAM_SYNC_POLICY_ALL = "all".freeze
+    OSTREE_UPSTREAM_SYNC_POLICY_CUSTOM = "custom".freeze
+    OSTREE_UPSTREAM_SYNC_POLICIES = [OSTREE_UPSTREAM_SYNC_POLICY_LATEST, OSTREE_UPSTREAM_SYNC_POLICY_ALL, OSTREE_UPSTREAM_SYNC_POLICY_CUSTOM].freeze
+
     belongs_to :environment, :inverse_of => :repositories, :class_name => "Katello::KTEnvironment"
     belongs_to :product, :inverse_of => :repositories
     belongs_to :gpg_key, :inverse_of => :repositories
@@ -80,11 +89,14 @@ module Katello
     validates :product_id, :presence => true
     validates :pulp_id, :presence => true, :uniqueness => true, :if => proc { |r| r.name.present? }
     validates :checksum_type, :inclusion => {:in => CHECKSUM_TYPES, :allow_blank => true}
-    validates :docker_upstream_name, :allow_blank => true, :if => :docker?, :format => {
-      :with => /\A([a-z0-9\-_]{4,30}\/)?[a-z0-9\-_\.]{3,30}\z/,
+    validates :docker_upstream_name, :allow_blank => true, :if => :docker?, :length => { :maximum => 255 }, :format => {
+      :with => /\A([a-z0-9]+[a-z0-9\-\_\.]*)+(\/[a-z0-9]+[a-z0-9\-\_\.]*)?\z/,
       :message => _("must be a valid docker name")
     }
 
+    validates :ostree_upstream_sync_policy, :inclusion => {:in => OSTREE_UPSTREAM_SYNC_POLICIES, :allow_blank => true}, :if => :ostree?
+    validates :ostree_upstream_sync_depth, :presence => true, :numericality => { :only_integer => true },
+      :if => proc { |r| r.ostree? && r.ostree_upstream_sync_policy == OSTREE_UPSTREAM_SYNC_POLICY_CUSTOM }
     #validates :content_id, :presence => true #add back after fixing add_repo orchestration
     validates_with Validators::KatelloLabelFormatValidator, :attributes => :label
     validates_with Validators::KatelloNameFormatValidator, :attributes => :name
@@ -103,11 +115,15 @@ module Katello
       :message => _("must be one of the following: %s") % ::Runcible::Models::YumImporter::DOWNLOAD_POLICIES.join(', ')
     }, if: :yum?
     validate :ensure_no_download_policy, if: ->(repo) { !repo.yum? }
+    validate :ensure_no_ostree_upstream_sync_policy, if: ->(repo) { !repo.ostree? }
     validate :ensure_valid_docker_attributes, :if => :docker?
     validate :ensure_docker_repo_unprotected, :if => :docker?
     validate :ensure_has_url_for_ostree, :if => :ostree?
     validate :ensure_ostree_repo_protected, :if => :ostree?
 
+    before_validation :set_pulp_id
+    before_validation :set_container_repository_name, :if => :docker?
+
     scope :has_url, -> { where('url IS NOT NULL') }
     scope :in_default_view, -> { joins(:content_view_version => :content_view).where("#{Katello::ContentView.table_name}.default" => true) }
 
@@ -122,11 +138,11 @@ module Katello
     scope :subscribable, -> { where(content_type: SUBSCRIBABLE_TYPES) }
 
     scoped_search :on => :name, :complete_value => true
-    scoped_search :rename => :product, :on => :name, :in => :product, :complete_value => true
+    scoped_search :rename => :product, :on => :name, :relation => :product, :complete_value => true
     scoped_search :on => :content_type, :complete_value => -> do
       Katello::RepositoryTypeManager.repository_types.keys.each_with_object({}) { |value, hash| hash[value.to_sym] = value }
     end
-    scoped_search :on => :content_view_id, :in => :content_view_repositories
+    scoped_search :on => :content_view_id, :relation => :content_view_repositories, :validator => ScopedSearch::Validators::INTEGER
     scoped_search :on => :distribution_version, :complete_value => true
     scoped_search :on => :distribution_arch, :complete_value => true
     scoped_search :on => :distribution_family, :complete_value => true
@@ -142,6 +158,34 @@ module Katello
       end
     end
 
+    def set_pulp_id
+      return if self.pulp_id
+
+      if self.content_view.default?
+        items = [SecureRandom.uuid]
+      elsif self.environment
+        items = [organization.id, content_view.label, environment.label, library_instance.pulp_id]
+      else
+        version = self.content_view_version.version.gsub('.', '_')
+        items = [organization.id, content_view.label, "v#{version}", library_instance.pulp_id]
+      end
+      self.pulp_id = items.join('-')
+      self.pulp_id = SecureRandom.uuid if self.pulp_id.length > PULP_ID_MAX_LENGTH
+    end
+
+    def set_container_repository_name
+      return if container_repository_name
+      if content_view.default?
+        items = [organization.label, product.label, label]
+      elsif environment
+        items = [organization.label, environment.label, content_view.label, product.label, label]
+      else
+        items = [organization.label, content_view.label, content_view_version.version, product.label, label]
+      end
+      # docker repo names need to be in lower case
+      self.container_repository_name = items.compact.join("-").gsub(/[^-\w]/, "_").downcase
+    end
+
     def content_view
       self.content_view_version.content_view
     end
@@ -324,26 +368,6 @@ module Katello
       end
     end
 
-    def self.repo_id(product_label, repo_label, env_label, organization_label,
-                     view_label, version, docker_repo_name = nil)
-      actual_repo_id = [organization_label,
-                        env_label,
-                        view_label,
-                        version,
-                        product_label,
-                        repo_label,
-                        docker_repo_name].compact.join("-").gsub(/[^-\w]/, "_")
-      # docker repo names need to be in lower case
-      actual_repo_id = actual_repo_id.downcase if docker_repo_name
-      actual_repo_id
-    end
-
-    def clone_id(env, content_view, version = nil)
-      Repository.repo_id(self.product.label, self.label, env.try(:label),
-                         organization.label, content_view.label,
-                         version)
-    end
-
     def packages_without_errata
       if errata_filenames.any?
         self.rpms.where("#{Rpm.table_name}.filename NOT in (?)", errata_filenames)
@@ -361,10 +385,6 @@ module Katello
           where("#{RepositoryErratum.table_name}.repository_id" => self.id).pluck("#{Katello::ErratumPackage.table_name}.filename")
     end
 
-    def container_repository_name
-      pulp_id if docker?
-    end
-
     # TODO: break up method
     # rubocop:disable MethodLength
     def build_clone(options)
@@ -415,7 +435,6 @@ module Katello
                      :download_policy => download_policy,
                      :unprotected => self.unprotected) do |clone|
         clone.checksum_type = self.checksum_type
-        clone.pulp_id = clone.clone_id(to_env, content_view, version.try(:version))
         options = {
           :repository => self,
           :environment => to_env,
@@ -512,6 +531,20 @@ module Katello
       self.ostree_branches.map(&:name)
     end
 
+    def compute_ostree_upstream_sync_depth
+      if ostree_upstream_sync_policy == OSTREE_UPSTREAM_SYNC_POLICY_CUSTOM
+        ostree_upstream_sync_depth
+      elsif ostree_upstream_sync_policy == OSTREE_UPSTREAM_SYNC_POLICY_ALL
+        -1
+      else
+        0
+      end
+    end
+
+    def ostree_capsule_sync_depth
+      -1
+    end
+
     def units_for_removal(ids)
       table_name = removable_unit_association.table_name
       is_integer = Integer(ids.first) rescue false #assume all ids are either integers or not
@@ -543,6 +576,17 @@ module Katello
       end
     end
 
+    def distribution_information
+      {
+        distribution_version: self.distribution_version,
+        distribution_arch: self.distribution_arch,
+        distribution_family: self.distribution_family,
+        distribution_variant: self.distribution_variant,
+        distribution_uuid: self.distribution_uuid,
+        distribution_bootable: self.distribution_bootable
+      }
+    end
+
     def check_duplicate_branch_names(branch_names)
       dupe_branch_checker = {}
       dupe_branch_checker.default = 0
@@ -657,5 +701,23 @@ module Katello
         manifest.destroy if manifest.repositories.empty?
       end
     end
+
+    def update_ostree_upstream_sync_policy
+      return unless ostree?
+      if self.ostree_upstream_sync_policy.blank?
+        self.ostree_upstream_sync_policy = OSTREE_UPSTREAM_SYNC_POLICY_LATEST
+      end
+
+      if self.ostree_upstream_sync_policy_changed? &&
+        previous_changes[:ostree_upstream_sync_policy].present?
+        self.ostree_upstream_sync_depth = nil unless self.ostree_upstream_sync_policy == OSTREE_UPSTREAM_SYNC_POLICY_CUSTOM
+      end
+    end
+
+    def ensure_no_ostree_upstream_sync_policy
+      if !ostree? && ostree_upstream_sync_policy.present?
+        errors.add(:ostree_upstream_sync_policy, N_("cannot be set for non-ostree repositories."))
+      end
+    end
   end
 end