katello 3.5.2 → 3.6.0.rc1

data/app/models/katello/activation_key.rb

@@ -14,9 +14,9 @@ module Katello
     has_many :key_host_collections, :class_name => "Katello::KeyHostCollection", :dependent => :destroy
     has_many :host_collections, :through => :key_host_collections
 
+    has_many :pool_activation_keys, :class_name => "Katello::PoolActivationKey", :dependent => :destroy, :inverse_of => :activation_key
     has_many :pools, :through => :pool_activation_keys, :class_name => "Katello::Pool"
     has_many :subscriptions, :through => :pools
-    has_many :pool_activation_keys, :class_name => "Katello::PoolActivationKey", :dependent => :destroy, :inverse_of => :activation_key
     has_many :subscription_facet_activation_keys, :class_name => "Katello::SubscriptionFacetActivationKey", :dependent => :destroy
     has_many :subscription_facets, :through => :subscription_facet_activation_keys
 

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

@@ -1,6 +1,7 @@
 module Katello
   module Authorization::ContentViewHistory
     extend ActiveSupport::Concern
+    include Authorizable
 
     module ClassMethods
       def readable

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

@@ -11,7 +11,7 @@ module Katello
 
     module ClassMethods
       def readable
-        view_ids = ContentView.readable.collect { |v| v.id }
+        view_ids = ::Katello::ContentView.readable.collect { |v| v.id }
         joins(:content_view).where("#{Katello::ContentView.table_name}.id" => view_ids)
       end
     end

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

@@ -2,6 +2,8 @@ module Katello
   module Authorization::Pool
     extend ActiveSupport::Concern
 
+    include Authorizable
+
     module ClassMethods
       def readable
         where(:subscription_id => Katello::Subscription.authorized(:view_subscriptions))

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

@@ -2,6 +2,8 @@ module Katello
   module Authorization::Repository
     extend ActiveSupport::Concern
 
+    include Authorizable
+
     delegate :editable?, to: :product
 
     def deletable?

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

@@ -0,0 +1,77 @@
+module Katello
+  module Candlepin
+    class DockerRepositoryMapper
+      attr_reader :product, :content
+      attr_accessor :container_registry_name, :registries, :registry_repo
+      def initialize(product, content, container_registry_name = nil)
+        @product = product
+        @content = content
+        @container_registry_name = container_registry_name
+      end
+
+      def registry
+        validate!
+        @registries ||= product.cdn_resource.get_docker_registries(content.content_url)
+        @registry_repo ||= registries.detect do |reg|
+          reg['name'] == @container_registry_name
+        end
+      end
+
+      def find_repository
+        ::Katello::Repository.where(product_id: product.id,
+                                    environment_id: product.organization.library.id,
+                                    docker_upstream_name: container_registry_name).first
+      end
+
+      def build_repository
+        unless registry
+          Rails.logger.error("Docker registry with pulp_id #{container_registry_name} was not found at #{content.content_url}")
+          fail _("Docker repository not found")
+        end
+        ::Katello::Repository.new(:environment => product.organization.library,
+                                 :product => product,
+                                 :cp_label => content.label,
+                                 :content_id => content.cp_content_id,
+                                 :relative_path => relative_path,
+                                 :name => name,
+                                 :docker_upstream_name => registry["name"],
+                                 :label => label,
+                                 :url => feed_url,
+                                 :feed_ca => ::Katello::Repository.feed_ca_cert(feed_url),
+                                 :feed_cert => product.certificate,
+                                 :feed_key => product.key,
+                                 :content_type => ::Katello::Repository::DOCKER_TYPE,
+                                 :preserve_metadata => true, #preserve repo metadata when importing from cp
+                                 :unprotected => true,
+                                 :content_view_version => product.organization.library.default_content_view_version)
+      end
+
+      def validate!
+        fail _("Registry name cannot be blank") if @container_registry_name.blank?
+      end
+
+      def name
+        "#{content.name} - (#{registry['name']})"
+      end
+
+      def feed_url
+        cdn_uri = URI.parse(product.provider.repository_url)
+        docker_repo_uri =  URI.parse(registry["url"])
+        docker_repo_uri =  URI.parse("#{cdn_uri.scheme}://#{registry['url']}") unless docker_repo_uri.host
+        "#{docker_repo_uri.scheme}://#{docker_repo_uri.host}:#{docker_repo_uri.port}"
+      end
+
+      def label
+        ::Katello::Util::Model.labelize(name)
+      end
+
+      def katello_content_type
+        ::Katello::Repository::DOCKER_TYPE
+      end
+
+      def relative_path
+        ::Katello::Glue::Pulp::Repos.repo_path_from_content_path(product.organization.library, content.content_url)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,143 @@
+module Katello
+  module Candlepin
+    class RepositoryMapper
+      attr_reader :product, :content, :substitutions
+
+      def initialize(product, content, substitutions)
+        @product = product
+        @content = content
+        @substitutions = substitutions.try(:with_indifferent_access)
+      end
+
+      def find_repository
+        ::Katello::Repository.where(product_id: product.id,
+                                    content_id: content.cp_content_id,
+                                    environment_id: product.organization.library.id,
+                                    minor: minor,
+                                    arch: arch).first
+      end
+
+      def build_repository
+        certificate_and_key = get_certificate_and_key(product, @content.modified_product_ids(product.organization))
+
+        repository = Repository.new(
+          :environment => product.organization.library,
+          :product => product,
+          :cp_label => content.label,
+          :content_id => content.cp_content_id,
+          :arch => arch,
+          :major => major,
+          :minor => minor,
+          :relative_path => relative_path,
+          :name => name,
+          :label => label,
+          :url => feed_url,
+          :feed_ca => ::Katello::Repository.feed_ca_cert(feed_url),
+          :feed_cert => certificate_and_key[:cert],
+          :feed_key => certificate_and_key[:key],
+          :content_type => katello_content_type,
+          :preserve_metadata => true, #preserve repo metadata when importing from cp
+          :unprotected => unprotected?,
+          :download_policy => download_policy,
+          :mirror_on_sync => true,
+          :content_view_version => product.organization.
+                                  library.default_content_view_version
+        )
+
+        repository
+      end
+
+      def get_certificate_and_key(product, modified_product_ids = [])
+        modified_product_ids.each do |modified_product_id|
+          modified_product = Product.where(:cp_id => modified_product_id).first
+          product = modified_product if modified_product &&
+                                        modified_product.certificate &&
+                                        modified_product.key
+        end
+        {:cert => product.certificate, :key => product.key}
+      end
+
+      def validate!
+        return if katello_content_type == Repository::OSTREE_TYPE
+        substitutor.validate_substitutions(content, substitutions)
+      end
+
+      def substitutor
+        product.cdn_resource.substitutor
+      end
+
+      def name
+        sorted_substitutions = substitutions.sort_by { |k, _| k.to_s }.map(&:last)
+        repo_name_parts = [content.name,
+                           sorted_substitutions].flatten.compact
+        repo_name_parts.join(" ").gsub(/[^a-z0-9\-\._ ]/i, "")
+      end
+
+      def path
+        substitutions.inject(content.content_url) do |url, (key, value)|
+          url.gsub("$#{key}", value)
+        end
+      end
+
+      def relative_path
+        ::Katello::Glue::Pulp::Repos.repo_path_from_content_path(product.organization.library, path)
+      end
+
+      def feed_url
+        product.repo_url(path)
+      end
+
+      def arch
+        substitutions[:basearch] || "noarch"
+      end
+
+      def label
+        ::Katello::Util::Model.labelize(name)
+      end
+
+      def version
+        ::Katello::Resources::CDN::Utils.parse_version(substitutions[:releasever])
+      end
+
+      def major
+        version[:major]
+      end
+
+      def minor
+        version[:minor]
+      end
+
+      def content_type
+        kickstart? ? 'yum' : content.content_type
+      end
+
+      def katello_content_type
+        if content_type == ::Katello::Repository::CANDLEPIN_DOCKER_TYPE
+          ::Katello::Repository::DOCKER_TYPE
+        else
+          content_type
+        end
+      end
+
+      def unprotected?
+        kickstart? || file?
+      end
+
+      def file?
+        content.content_type.downcase == 'file'
+      end
+
+      def kickstart?
+        content.content_type.downcase == 'kickstart'
+      end
+
+      def download_policy
+        if katello_content_type == Repository::YUM_TYPE
+          Setting[:default_download_policy]
+        else
+          ""
+        end
+      end
+    end
+  end
+end

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

@@ -3,21 +3,23 @@ module Katello
     module ContainerExtensions
       extend ActiveSupport::Concern
 
+      module Overrides
+        def repository_pull_url
+          repo_url = super
+          if Repository.where(:container_repository_name => repository_name).count > 0
+            manifest_capsule = self.capsule || CapsuleContent.default_capsule.capsule
+            "#{URI(manifest_capsule.url).hostname}:#{Setting['pulp_docker_registry_port']}/#{repo_url}"
+          else
+            repo_url
+          end
+        end
+      end
+
       included do
+        prepend Overrides
+
         belongs_to :capsule, :inverse_of => :containers, :foreign_key => :capsule_id,
           :class_name => "SmartProxy"
-
-        alias_method_chain :repository_pull_url, :katello
-      end
-
-      def repository_pull_url_with_katello
-        repo_url = repository_pull_url_without_katello
-        if Repository.where(:container_repository_name => repository_name).count > 0
-          manifest_capsule = self.capsule || CapsuleContent.default_capsule.capsule
-          "#{URI(manifest_capsule.url).hostname}:#{Setting['pulp_docker_registry_port']}/#{repo_url}"
-        else
-          repo_url
-        end
       end
     end
   end

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

@@ -17,10 +17,10 @@ module Katello
           :updated => Katello::TraceStatus::UP_TO_DATE
         }.freeze
 
-        has_one :errata_status_object, :class_name => 'Katello::ErrataStatus', :foreign_key => 'host_id'
+        has_one :errata_status_object, :class_name => 'Katello::ErrataStatus', :foreign_key => 'host_id', :dependent => :destroy
         scoped_search :on => :status, :relation => :errata_status_object, :rename => :errata_status,
                      :complete_value => ERRATA_STATUS_MAP
-        has_one :trace_status_object, :class_name => 'Katello::TraceStatus', :foreign_key => 'host_id'
+        has_one :trace_status_object, :class_name => 'Katello::TraceStatus', :foreign_key => 'host_id', :dependent => :destroy
         scoped_search :on => :status, :relation => :trace_status_object, :rename => :trace_status,
                      :complete_value => TRACE_STATUS_MAP
 

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

@@ -3,12 +3,14 @@ module Katello
     module DockerContainerWizardStateExtensions
       extend ActiveSupport::Concern
 
-      included do
-        alias_method_chain :container_attributes, :katello
+      module Overrides
+        def container_attributes
+          super.merge(:capsule_id => self.image.capsule_id)
+        end
       end
 
-      def container_attributes_with_katello
-        container_attributes_without_katello.merge(:capsule_id => self.image.capsule_id)
+      included do
+        prepend Overrides
       end
     end
   end

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

@@ -3,18 +3,20 @@ module Katello
     module DockerContainerWizardStateImageExtensions
       extend ActiveSupport::Concern
 
+      module Overrides
+        def image_exists
+          return true if katello?
+          super
+        end
+      end
+
       included do
-        alias_method_chain :image_exists, :katello
+        prepend Overrides
 
         serialize :katello_content, Hash
         validate :katello_content_completed, :if => :katello?
       end
 
-      def image_exists_with_katello
-        return true if katello?
-        image_exists_without_katello
-      end
-
       def katello_content_completed
         empty_values = katello_content.map do |key, value|
           key if value.blank?

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

@@ -18,8 +18,7 @@ module Katello
       end
 
       included do
-        alias_method_chain :validate_media?, :capsule
-        alias_method_chain :smart_proxy_ids, :katello
+        prepend Overrides
 
         has_many :host_installed_packages, :class_name => "::Katello::HostInstalledPackage", :foreign_key => :host_id, :dependent => :destroy
         has_many :installed_packages, :class_name => "::Katello::InstalledPackage", :through => :host_installed_packages
@@ -39,10 +38,6 @@ module Katello
         scoped_search :relation => :host_traces, :on => :helper, :complete_value => true, :rename => :trace_helper, :only_explicit => true
       end
 
-      def validate_media_with_capsule?
-        (content_source_id.blank? || (content_facet && content_facet.kickstart_repository.blank?)) && validate_media_without_capsule?
-      end
-
       def rhsm_organization_label
         self.organization.label
       end
@@ -51,12 +46,6 @@ module Katello
         [:update]
       end
 
-      def smart_proxy_ids_with_katello
-        ids = smart_proxy_ids_without_katello
-        ids << content_source_id
-        ids.uniq.compact
-      end
-
       def correct_puppet_environment
         if content_and_puppet_matched?
           new_environment = content_facet.content_view.puppet_env(content_facet.lifecycle_environment).try(:puppet_environment)
@@ -81,7 +70,7 @@ module Katello
 
       def import_package_profile_in_bulk(simple_packages)
         nvras = simple_packages.map { |sp| sp.nvra }
-        found = InstalledPackage.where(:nvra => nvras).select(:id, :nvra)
+        found = InstalledPackage.where(:nvra => nvras).select(:id, :nvra).to_a
         found_nvras = found.map(&:nvra)
         new_packages = simple_packages.select { |sp| !found_nvras.include?(sp.nvra) }
 

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

@@ -6,7 +6,7 @@ module Katello
       included do
         after_initialize :set_default_overrides, :if => :new_record?
         after_save :reset_settings
-        before_destroy :deletable?
+        before_destroy :assert_deletable
       end
 
       def set_default_overrides
@@ -25,6 +25,10 @@ module Katello
         end
       end
 
+      def assert_deletable
+        throw :abort unless deletable?
+      end
+
       def deletable?
         if ::Location.unscoped.count == 1
           errors.add(

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

@@ -7,7 +7,7 @@ module Katello
         ALLOWED_DEFAULT_INFO_TYPES = %w(system distributor).freeze
 
         include ForemanTasks::Concerns::ActionSubject
-        include ForemanTasks::Concerns::ActionTriggering
+        prepend ForemanTasks::Concerns::ActionTriggering
         include Glue::Candlepin::Owner if SETTINGS[:katello][:use_cp]
         include Glue if SETTINGS[:katello][:use_cp]
 
@@ -129,6 +129,27 @@ module Katello
           products.any?(&:syncable_content?)
         end
 
+        def enabled_product_content_for(repositories)
+          return [] if repositories.blank?
+          content_ids = repositories.pluck(:content_id)
+
+          filtered_product_content do |pc|
+            content_ids.include?(pc.content.cp_content_id) && pc.product.enabled?
+          end
+        end
+
+        def enabled_product_content
+          Katello::ProductContent.where(:product_id => self.products.enabled.redhat)
+        end
+
+        def filtered_product_content
+          filtered_content = []
+          products.each do |product|
+            filtered_content << product.product_contents.select { |pc| !block_given? || yield(pc) }
+          end
+          filtered_content.flatten.sort_by { |pc| pc.content.name.downcase }
+        end
+
         # overwrite methods generated by ancestry gem for organization.rb
         def parent=(_parent)
           fail ::Foreman::Exception, N_("You cannot set an organization's parent. This feature is disabled.")