katello 3.6.0.1.rc2 → 3.7.0.rc1

data/app/models/katello/installed_package.rb

@@ -5,5 +5,9 @@ module Katello
 
     scoped_search :on => :name, :complete_value => true
     scoped_search :on => :nvra
+
+    def nvrea
+      nvra
+    end
   end
 end

data/app/models/katello/installed_product.rb

@@ -0,0 +1,33 @@
+module Katello
+  class InstalledProduct < Katello::Model
+    has_many :subscription_facet_installed_products, :class_name => "Katello::SubscriptionFacetInstalledProduct", :dependent => :destroy, :inverse_of => :installed_product
+    has_many :subscription_facets, :through => :subscription_facet_installed_products, :class_name => "Katello::Host::SubscriptionFacet"
+
+    alias_attribute :product_id, :cp_product_id
+    alias_attribute :product_name, :name
+
+    def self.find_or_create_from_consumer(consumer_attributes)
+      attributes = {
+        :arch => consumer_attributes['arch'],
+        :version => consumer_attributes['version'],
+        :name => consumer_attributes['productName'],
+        :cp_product_id => consumer_attributes['productId']
+      }
+      Katello::Util::Support.active_record_retry do
+        unless self.where(attributes).exists?
+          self.create!(attributes)
+        end
+      end
+      self.where(attributes).first
+    end
+
+    def consumer_attributes
+      {
+        :arch => arch,
+        :version => version,
+        :productName => name,
+        :productId => cp_product_id
+      }
+    end
+  end
+end

data/app/models/katello/key_host_collection.rb

@@ -1,7 +1,7 @@
 module Katello
   class KeyHostCollection < Katello::Model
-    belongs_to :activation_key, :inverse_of => :key_host_collections
-    belongs_to :host_collection, :inverse_of => :key_host_collections
+    belongs_to :activation_key, :inverse_of => :key_host_collections, :class_name => "Katello::ActivationKey"
+    belongs_to :host_collection, :inverse_of => :key_host_collections, :class_name => "Katello::HostCollection"
     validates_lengths_from_database
   end
 end

data/app/models/katello/kt_environment.rb

@@ -1,5 +1,7 @@
 module Katello
   class KTEnvironment < Katello::Model
+    audited
+    has_associated_audits
     include ForemanTasks::Concerns::ActionSubject
     include Authorization::LifecycleEnvironment
 
@@ -54,6 +56,8 @@ module Katello
     validates_with Validators::PriorValidator
     validates_with Validators::PathDescendentsValidator
 
+    validates_with Katello::Validators::EnvironmentDockerRepositoriesValidator
+
     has_many :capsule_lifecycle_environments, :foreign_key => :lifecycle_environment_id,
                                               :dependent => :destroy, :inverse_of => :lifecycle_environment
 
@@ -254,5 +258,9 @@ module Katello
     def self.permission_name
       'lifecycle_environments'
     end
+
+    class Jail < ::Safemode::Jail
+      allow :name, :label
+    end
   end
 end

data/app/models/katello/ostree_branch.rb

@@ -2,7 +2,7 @@ module Katello
   class OstreeBranch < Katello::Model
     include Concerns::PulpDatabaseUnit
 
-    has_many :repository_ostree_branches, :dependent => :destroy
+    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

data/app/models/katello/ping.rb

@@ -146,6 +146,7 @@ module Katello
         ca_file = SETTINGS[:katello][backend][:ca_cert_file]
         options = {}
         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
       end

data/app/models/katello/pool.rb

@@ -3,13 +3,18 @@ module Katello
     include Katello::Authorization::Pool
     belongs_to :subscription, :inverse_of => :pools, :class_name => "Katello::Subscription"
 
+    has_many :pool_products, :class_name => "Katello::PoolProduct", :dependent => :destroy, :inverse_of => :pool
+    has_many :products, :through => :pool_products, :class_name => "Katello::Product"
+
     has_many :pool_activation_keys, :class_name => "Katello::PoolActivationKey", :dependent => :destroy, :inverse_of => :pool
     has_many :activation_keys, :through => :pool_activation_keys, :class_name => "Katello::ActivationKey"
 
     has_many :subscription_facet_pools, :class_name => "Katello::SubscriptionFacetPool", :dependent => :destroy
     has_many :subscription_facets, :through => :subscription_facet_pools
 
-    scope :in_organization, ->(org_id) { joins(:subscription).where("#{Katello::Subscription.table_name}.organization_id = ?", org_id) }
+    belongs_to :organization, :class_name => "Organization", :inverse_of => :pools
+
+    scope :in_organization, ->(org_id) { where(:organization_id => org_id) }
     scope :for_activation_key, ->(ak) { joins(:activation_keys).where("#{Katello::ActivationKey.table_name}.id" => ak.id) }
 
     include Glue::Candlepin::Pool
@@ -29,14 +34,14 @@ module Katello
     scoped_search :on => :support_level, :relation => :subscription, :complete_value => true
     scoped_search :on => :sockets, :relation => :subscription, :complete_value => true, :validator => ScopedSearch::Validators::INTEGER, :only_explicit => true
     scoped_search :on => :cores, :relation => :subscription, :complete_value => true, :validator => ScopedSearch::Validators::INTEGER, :only_explicit => true
-    scoped_search :on => :product_id, :relation => :subscription, :complete_value => true, :only_explicit => true
-    scoped_search :on => :stacking_id, :relation => :subscription, :complete_value => true, :validator => ScopedSearch::Validators::INTEGER, :only_explicit => true
+    scoped_search :on => :cp_id, :relation => :subscription, :complete_value => true, :only_explicit => true, :rename => :product_id
+
+    scoped_search :on => :stacking_id, :complete_value => true, :only_explicit => true
     scoped_search :on => :instance_multiplier, :relation => :subscription, :complete_value => true, :validator => ScopedSearch::Validators::INTEGER, :only_explicit => true
     scoped_search :on => :pool_type, :complete_value => true, :rename => :type
 
     validates_lengths_from_database
 
-    DAYS_EXPIRING_SOON = 120
     DAYS_RECENTLY_EXPIRED = 30
 
     def active?
@@ -44,7 +49,7 @@ module Katello
     end
 
     def expiring_soon?
-      (end_date.to_date - Date.today) <= DAYS_EXPIRING_SOON
+      (end_date.to_date - Date.today) <= Setting[:expire_soon_days]
     end
 
     def recently_expired?
@@ -52,6 +57,7 @@ module Katello
     end
 
     def quantity_available
+      return -1 if self.quantity == -1
       return 0 unless self.quantity && self.consumed
       self.quantity - self.consumed
     end
@@ -60,8 +66,8 @@ module Katello
       self.pool_type
     end
 
-    def products
-      self.subscription.products if self.subscription
+    def upstream?
+      subscription.present? && subscription.redhat?
     end
 
     private

data/app/models/katello/pool_product.rb

@@ -0,0 +1,6 @@
+module Katello
+  class PoolProduct < Katello::Model
+    belongs_to :product, :inverse_of => :pool_products, :class_name => 'Katello::Product'
+    belongs_to :pool, :inverse_of => :pool_products, :class_name => 'Katello::Pool'
+  end
+end

data/app/models/katello/product.rb

@@ -1,5 +1,7 @@
 module Katello
   class Product < Katello::Model
+    audited
+
     include ForemanTasks::Concerns::ActionSubject
     include Glue::Candlepin::Product if SETTINGS[:katello][:use_cp]
     include Glue::Pulp::Repos if SETTINGS[:katello][:use_pulp]
@@ -10,16 +12,19 @@ module Katello
     include Ext::LabelFromName
 
     belongs_to :organization, :inverse_of => :products
-    belongs_to :provider, :inverse_of => :products
+    belongs_to :provider, :inverse_of => :products, :class_name => 'Katello::Provider'
     belongs_to :sync_plan, :inverse_of => :products, :class_name => 'Katello::SyncPlan'
-    belongs_to :gpg_key, :inverse_of => :products
+    belongs_to :gpg_key, :inverse_of => :products, :class_name => "Katello::GpgKey"
     has_many :product_contents, :foreign_key => 'product_id', :class_name => "Katello::ProductContent", :dependent => :destroy
     has_many :displayable_product_contents, -> { displayable }, :foreign_key => 'product_id', :class_name => "Katello::ProductContent", :dependent => :destroy
+    belongs_to :ssl_ca_cert, :class_name => "Katello::GpgKey", :inverse_of => :ssl_ca_products
+    belongs_to :ssl_client_cert, :class_name => "Katello::GpgKey", :inverse_of => :ssl_client_products
+    belongs_to :ssl_client_key, :class_name => "Katello::GpgKey", :inverse_of => :ssl_key_products
     has_many :repositories, :class_name => "Katello::Repository", :dependent => :restrict_with_exception
 
-    has_many :subscription_products, :class_name => "Katello::SubscriptionProduct", :dependent => :destroy
-    has_many :subscriptions, :through => :subscription_products
-    has_many :pools, :through => :subscriptions
+    has_many :pool_products, :class_name => "Katello::PoolProduct", :dependent => :destroy
+    has_many :pools, :through => :pool_products
+    has_many :subscriptions, :through => :pools, :dependent => :destroy
 
     validates_lengths_from_database :except => [:label]
     validates :provider_id, :presence => true
@@ -27,6 +32,7 @@ module Katello
     validates_with Validators::KatelloLabelFormatValidator, :attributes => :label
     validates_with Validators::ProductUniqueAttributeValidator, :attributes => :name
     validates_with Validators::ProductUniqueAttributeValidator, :attributes => :label
+    validates_with Validators::GpgKeyContentTypeValidator
 
     scoped_search :on => :name, :complete_value => true
     scoped_search :on => :organization_id, :complete_value => true, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
@@ -146,7 +152,7 @@ module Katello
     end
 
     def custom?
-      provider.custom_provider?
+      !redhat?
     end
 
     def published_content_views
@@ -264,5 +270,9 @@ module Katello
         id
       end
     end
+
+    class Jail < ::Safemode::Jail
+      allow :name, :label
+    end
   end
 end

data/app/models/katello/product_content.rb

@@ -15,6 +15,10 @@ module Katello
       .order("LOWER(#{content_table_name}.name) ASC")
     }
 
+    scope :redhat, -> {
+      where(:product_id => Product.redhat.select(:id))
+    }
+
     scoped_search :on => :name, :relation => :content
     scoped_search :on => :content_type, :relation => :content
     scoped_search :on => :label, :relation => :content

data/app/models/katello/pulp_task_status.rb

@@ -21,31 +21,6 @@ module Katello
       self.result[:errors][0] if self.error? && self.result[:errors]
     end
 
-    def self.wait_for_tasks(async_tasks)
-      async_tasks = async_tasks.collect do |t|
-        unless t.nil?
-          PulpTaskStatus.using_pulp_task(t)
-        end
-      end
-
-      timeout_count = 0
-      attempts = 0
-      loop do
-        begin
-          break unless any_task_running(async_tasks)
-          timeout_count = 0
-          attempts += 1
-        rescue RestClient::RequestTimeout => e
-          timeout_count += 1
-          Rails.logger.error "Timeout in pulp occurred: #{timeout_count}"
-          raise e if timeout_count >= 10 #10 timeouts in a row, lets bail
-          sleep 50 #if we got a timeout, lets backoff and let it catchup
-        end
-        sleep poll_wait_time(attempts)
-      end
-      async_tasks
-    end
-
     def self.using_pulp_task(pulp_status)
       if pulp_status.is_a? TaskStatus
         pulp_status
@@ -84,26 +59,5 @@ module Katello
       task_status.after_refresh
       task_status
     end
-
-    def self.any_task_running(async_tasks)
-      async_tasks.each do |t|
-        t.refresh
-        sleep 0.5 # do not overload backend engines
-        if !t.finished?
-          return true
-        elsif t.error?
-          fail t.as_json
-        end
-      end
-      return false
-    end
-
-    def self.poll_wait_time(attempts)
-      if attempts >= WAIT_TIMES.length * WAIT_TIME_STEP
-        WAIT_TIMES.last
-      else
-        WAIT_TIMES[(attempts.to_i / WAIT_TIME_STEP)]
-      end
-    end
   end
 end

data/app/models/katello/repository.rb

@@ -1,6 +1,7 @@
 module Katello
   # rubocop:disable Metrics/ClassLength
   class Repository < Katello::Model
+    audited
     #pulp uses pulp id to sync with 'yum_distributor' on the end
     PULP_ID_MAX_LENGTH = 220
 
@@ -8,6 +9,7 @@ module Katello
     before_destroy :assert_deletable
     before_create :downcase_pulp_id
     before_validation :update_ostree_upstream_sync_policy
+    serialize :ignorable_content
 
     include ForemanTasks::Concerns::ActionSubject
     include Glue::Candlepin::Repository
@@ -19,6 +21,8 @@ module Katello
     include Ext::LabelFromName
     include Katello::Engine.routes.url_helpers
 
+    include ERB::Util
+
     DEB_TYPE = 'deb'.freeze
     YUM_TYPE = 'yum'.freeze
     FILE_TYPE = 'file'.freeze
@@ -26,6 +30,7 @@ module Katello
     DOCKER_TYPE = 'docker'.freeze
     OSTREE_TYPE = 'ostree'.freeze
 
+    IGNORABLE_CONTENT_UNIT_TYPES = %w(rpm drpm srpm distribution erratum).freeze
     CHECKSUM_TYPES = %w(sha1 sha256).freeze
     SUBSCRIBABLE_TYPES = [YUM_TYPE, OSTREE_TYPE, DEB_TYPE].freeze
 
@@ -34,9 +39,14 @@ module Katello
     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
 
+    define_model_callbacks :sync, :only => :after
+
     belongs_to :environment, :inverse_of => :repositories, :class_name => "Katello::KTEnvironment"
-    belongs_to :product, :inverse_of => :repositories
-    belongs_to :gpg_key, :inverse_of => :repositories
+    belongs_to :product, :inverse_of => :repositories, :class_name => "Katello::Product"
+    belongs_to :gpg_key, :inverse_of => :repositories, :class_name => "Katello::GpgKey"
+    belongs_to :ssl_ca_cert, :class_name => "Katello::GpgKey", :inverse_of => :ssl_ca_repos
+    belongs_to :ssl_client_cert, :class_name => "Katello::GpgKey", :inverse_of => :ssl_client_repos
+    belongs_to :ssl_client_key, :class_name => "Katello::GpgKey", :inverse_of => :ssl_key_repos
     belongs_to :library_instance, :class_name => "Katello::Repository", :inverse_of => :library_instances_inverse
     has_many :library_instances_inverse, # TODO: what is the proper name?
              :class_name  => 'Katello::Repository',
@@ -99,10 +109,10 @@ 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?, :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_with Validators::ContainerImageNameValidator, :attributes => :docker_upstream_name, :allow_blank => true, :if => :docker?
+    validates_with Validators::ContainerImageNameValidator, :attributes => :container_repository_name, :allow_blank => false, :if => :docker?
+    validates :container_repository_name, :uniqueness => true, :if => :docker?
 
     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 },
@@ -130,6 +140,8 @@ module Katello
     validate :ensure_docker_repo_unprotected, :if => :docker?
     validate :ensure_has_url_for_ostree, :if => :ostree?
     validate :ensure_ostree_repo_protected, :if => :ostree?
+    validate :ensure_compatible_download_policy, :if => :yum?
+    validate :ensure_valid_ignorable_content
 
     before_validation :set_pulp_id
     before_validation :set_container_repository_name, :if => :docker?
@@ -162,6 +174,7 @@ module Katello
     scoped_search :on => :distribution_bootable, :complete_value => true
     scoped_search :on => :distribution_uuid, :complete_value => true
     scoped_search :on => :ignore_global_proxy, :complete_value => true
+    scoped_search :on => :redhat, :complete_value => { :true => true, :false => false }, :ext_method => :search_by_redhat
 
     def organization
       if self.environment
@@ -187,16 +200,7 @@ module Katello
     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
+      self.container_repository_name = Repository.safe_render_container_name(self)
     end
 
     def content_view
@@ -464,6 +468,7 @@ module Katello
                      :content_id => self.content_id,
                      :content_view_version => to_version,
                      :content_type => self.content_type,
+                     :docker_upstream_name => self.docker_upstream_name,
                      :download_policy => download_policy,
                      :unprotected => self.unprotected) do |clone|
         clone.checksum_type = self.checksum_type
@@ -681,6 +686,17 @@ module Katello
       return true
     end
 
+    def sync_hook
+      run_callbacks :sync do
+        logger.debug "custom hook after_sync on #{name} will be executed if defined."
+        true
+      end
+    end
+
+    def rabl_path
+      "katello/api/v2/#{self.class.to_s.demodulize.tableize}/show"
+    end
+
     def assert_deletable
       throw :abort unless destroyable?
     end
@@ -739,6 +755,44 @@ module Katello
       to_return
     end
 
+    def self.search_by_redhat(_key, operator, value)
+      value = value == 'true'
+      value = !value if operator == '<>'
+
+      product_ids = Katello::Product.redhat.pluck(:id)
+      if product_ids.empty?
+        {:conditions => "1=0"}
+      else
+        operator = value ? 'IN' : 'NOT IN'
+        {:conditions => "#{Katello::Repository.table_name}.product_id #{operator} (#{product_ids.join(',')})"}
+      end
+    end
+
+    def self.safe_render_container_name(repository, pattern = nil)
+      if pattern || (repository.environment && !repository.environment.registry_name_pattern.empty?)
+        pattern ||= repository.environment.registry_name_pattern
+        allowed_methods = {}
+        allowed_vars = {}
+        scope_variables = {repository: repository, organization: repository.organization, product: repository.product,
+                           lifecycle_environment: repository.environment, content_view: repository.content_view_version.content_view}
+        box = Safemode::Box.new(repository, allowed_methods)
+        erb = ERB.new(pattern)
+        pattern = box.eval(erb.src, allowed_vars, scope_variables)
+        return Repository.clean_container_name(pattern)
+      elsif repository.content_view.default?
+        items = [repository.organization.label, repository.product.label, repository.label]
+      elsif repository.environment
+        items = [repository.organization.label, repository.environment.label, repository.content_view.label, repository.product.label, repository.label]
+      else
+        items = [repository.organization.label, repository.content_view.label, repository.content_view_version.version, repository.product.label, repository.label]
+      end
+      Repository.clean_container_name(items.compact.join("-"))
+    end
+
+    def self.clean_container_name(name)
+      name.gsub(/[^-\/\w]/, "_").gsub(/_{3,}/, "_").gsub(/-_|^_+|_+$/, "").downcase.strip
+    end
+
     protected
 
     def removable_unit_association
@@ -767,15 +821,23 @@ module Katello
       end
     end
 
+    def ensure_compatible_download_policy
+      if library_instance? && !url.blank? && URI(url).scheme == 'file' &&
+          [::Runcible::Models::YumImporter::DOWNLOAD_ON_DEMAND, ::Runcible::Models::YumImporter::DOWNLOAD_BACKGROUND].include?(download_policy)
+        errors.add(:download_policy, N_("Cannot sync file:// repositories with On Demand or Background Download Policies"))
+      end
+    end
+
     def ensure_valid_docker_attributes
-      if library_instance? && (url.blank? || docker_upstream_name.blank?)
-        errors.add(:base, N_("Repository URL or Upstream Name is empty. Both are required for syncing from the upstream."))
+      if library_instance? && (!url.blank? && docker_upstream_name.blank?)
+        errors.add(:docker_upstream_name, N_("cannot be blank when Repository URL is provided."))
+        errors.add(:base, N_("Upstream Name cannot be blank when Repository URL is provided."))
       end
     end
 
     def ensure_docker_repo_unprotected
       unless unprotected
-        errors.add(:base, N_("Docker Repositories are not protected at this time. " \
+        errors.add(:base, N_("Container Image Repositories are not protected at this time. " \
                              "They need to be published via http to be available to containers."))
       end
     end
@@ -826,5 +888,20 @@ module Katello
         errors.add(:ostree_upstream_sync_policy, N_("cannot be set for non-ostree repositories."))
       end
     end
+
+    def ensure_valid_ignorable_content
+      return if ignorable_content.blank?
+      if !yum?
+        errors.add(:ignorable_content, N_("Ignorable content can be only set for Yum repositories."))
+      elsif !ignorable_content.is_a?(Array)
+        errors.add(:ignorable_content, N_("Invalid value specified for ignorable content."))
+      elsif ignorable_content.any? { |item| !IGNORABLE_CONTENT_UNIT_TYPES.include?(item) }
+        errors.add(:ignorable_content, N_("Invalid value specified for ignorable content. Permissible values %s") % IGNORABLE_CONTENT_UNIT_TYPES.join(","))
+      end
+    end
+
+    class Jail < ::Safemode::Jail
+      allow :name, :label, :docker_upstream_name, :url
+    end
   end
 end