katello 3.6.0.1.rc2 → 3.7.0.rc1

data/app/lib/katello/resources/candlepin/upstream_entitlement.rb

@@ -0,0 +1,19 @@
+module Katello
+  module Resources
+    module Candlepin
+      class UpstreamEntitlement < UpstreamCandlepinResource
+        class << self
+          def path(id = nil)
+            "#{self.prefix}/entitlements/#{id}"
+          end
+
+          def update(entitlement_id, quantity)
+            body = {quantity: quantity}.to_json
+
+            self[entitlement_id].put(body)
+          end
+        end
+      end
+    end
+  end
+end

data/app/lib/katello/resources/candlepin/upstream_owner.rb

@@ -0,0 +1,15 @@
+module Katello
+  module Resources
+    module Candlepin
+      class UpstreamOwner < UpstreamCandlepinResource
+        extend OwnerResource
+
+        class << self
+          def path(id = upstream_owner_id)
+            super(id)
+          end
+        end
+      end
+    end
+  end
+end

data/app/lib/katello/resources/candlepin/upstream_pool.rb

@@ -0,0 +1,17 @@
+module Katello
+  module Resources
+    module Candlepin
+      class UpstreamPool < UpstreamCandlepinResource
+        extend PoolResource
+
+        class << self
+          def path(id = nil, owner_label = nil)
+            super(id, owner_label || upstream_owner_id)
+          end
+
+          delegate :get, to: :resource
+        end
+      end
+    end
+  end
+end

data/app/lib/katello/util/data.rb

@@ -5,10 +5,8 @@ module Katello
         variable.map { |x| x.with_indifferent_access }
       end
 
-      def self.md5hash(string)
-        md5 = Digest::MD5.new
-        md5.update(string)
-        md5.hexdigest
+      def self.hexdigest(string)
+        defined?(ActiveSupport::Digest) ? ActiveSupport::Digest.hexdigest(string) : Digest::MD5.hexdigest(string)
       end
 
       def self.ostructize(obj, options = {})

data/app/lib/katello/util/http_proxy.rb

@@ -0,0 +1,29 @@
+module Katello
+  module Util
+    module HttpProxy
+      def proxy_uri
+        URI("#{proxy_scheme}://#{proxy_user_info}@#{proxy_host}:#{proxy_port}").to_s if proxy_host
+      end
+
+      def proxy_user_info
+        "#{proxy_config[:user]}:#{proxy_config[:password]}" if proxy_config && proxy_config[:user]
+      end
+
+      def proxy_config
+        SETTINGS[:katello][:cdn_proxy]
+      end
+
+      def proxy_host
+        proxy_config && URI.parse(proxy_config[:host]).host
+      end
+
+      def proxy_scheme
+        proxy_config && URI.parse(proxy_config[:host]).scheme
+      end
+
+      def proxy_port
+        proxy_config && proxy_config[:port]
+      end
+    end # HttpProxy
+  end # Util
+end # Katello

data/app/lib/katello/util/model.rb

@@ -19,7 +19,7 @@ module Katello
 
       def self.labelize(name)
         if name
-          (name.ascii_only? && name.length <= 128) ? name.gsub(/[^a-z0-9\-_]/i, "_") : uuid
+          (name.ascii_only? && name.length <= 128) ? name.gsub(/[^a-z0-9\-_]+/i, "_") : uuid
         end
       end
 

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

@@ -0,0 +1,18 @@
+module Katello
+  module Validators
+    class ContainerImageNameValidator < ActiveModel::EachValidator
+      def validate_each(record, attribute, value)
+        if value && !ContainerImageNameValidator.validate_name(value)
+          record.errors[attribute] << N_("invalid container image name")
+        end
+      end
+
+      def self.validate_name(name)
+        if name.empty? || name.length > 255 || !/\A([a-z0-9]+[a-z0-9\-\_\.]*)+(\/[a-z0-9]+[a-z0-9\-\_\.]*)*\z/.match?(name)
+          return false
+        end
+        true
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module Katello
+  module Validators
+    class ContentViewEnvironmentOrgValidator < ActiveModel::Validator
+      def validate(record)
+        environment_id = record.respond_to?(:lifecycle_environment_id) ? record.lifecycle_environment_id : record.environment_id
+        view = ContentView.where(:id => record.content_view_id).first
+        environment = KTEnvironment.where(:id => environment_id).first
+        unless view.organization == environment.organization
+          record.errors[:base] << _("%{view_label} could not be promoted to %{environment_label} because the content view and the environment are not in the same organization!") % {:view_label => view.label, :environment_label => environment.label}
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,71 @@
+module Katello
+  module Validators
+    class EnvironmentDockerRepositoriesValidator < ActiveModel::Validator
+      def validate(environment)
+        return true if environment.registry_name_pattern.empty?
+
+        unless ContainerImageNameValidator.validate_name(Katello::Repository.safe_render_container_name(test_repository, environment.registry_name_pattern))
+          environment.errors.add(:registry_name_pattern, N_("Registry name pattern will result in invalid container image name of member repositories"))
+          return false
+        end
+
+        error_messages = EnvironmentDockerRepositoriesValidator.validate_repositories(environment.registry_name_pattern, environment.repositories.docker_type)
+        return true if error_messages.empty?
+
+        error_messages.each do |message|
+          environment.errors.add(:registry_name_pattern, message)
+        end
+        false
+      end
+
+      def self.validate_repositories(registry_name_pattern, repositories)
+        error_messages = []
+        names = []
+        repositories.each do |repository|
+          name = Katello::Repository.safe_render_container_name(repository, registry_name_pattern)
+
+          unless ContainerImageNameValidator.validate_name(name)
+            error_messages << N_("Registry name pattern results in invalid container image name of member repository '%{name}'") % {name: repository.name}
+            return error_messages
+          end
+          names << name
+        end
+
+        if names.length != names.uniq.length
+          error_messages << N_("Registry name pattern results in duplicate container image names")
+          return error_messages
+        end
+
+        []
+      end
+
+      def test_repository
+        Katello::Validators::EnvironmentDockerRepositoriesValidator::RepositoryOpenStruct.new(
+            name: "bad name!", label: "good_label", docker_upstream_name: "image/name", url: "https://registry.example.com",
+            organization: SafeOpenStruct.new(name: "bad name!", label: "good_label"),
+            product: SafeOpenStruct.new(name: "bad name!", label: "good_label"),
+            environment: SafeOpenStruct.new(name: "bad name!", label: "good_label"),
+            content_view_version: OpenStruct.new(content_view: ContentViewOpenStruct.new(name: "bad name!", label: "good_label", version: "1.2"))
+        )
+      end
+
+      class RepositoryOpenStruct < OpenStruct
+        class Jail < ::Safemode::Jail
+          allow :name, :label, :version, :docker_upstream_name, :url
+        end
+      end
+
+      class ContentViewOpenStruct < OpenStruct
+        class Jail < ::Safemode::Jail
+          allow :name, :label, :version
+        end
+      end
+
+      class SafeOpenStruct < OpenStruct
+        class Jail < ::Safemode::Jail
+          allow :name, :label
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+module Katello
+  module Validators
+    class GpgKeyContentTypeValidator < ActiveModel::Validator
+      def validate(record)
+        # need to verify, that gpg_key is of GpgKey.content type "gpg_key" and
+        # ssl_ca_cert, ssl_client_cert, ssl_client_key of GpgKey.content type "cert"
+
+        if !record.gpg_key.blank? && record.gpg_key.content_type != "gpg_key"
+          record.errors[:gpg_key] << _("Wrong content type submitted.")
+        end
+
+        if record.instance_of?(Katello::Product)
+          [:ssl_ca_cert, :ssl_client_cert, :ssl_client_key].each do |cert|
+            if !record.send(cert).blank? && record.send(cert).content_type != "cert"
+              record.errors[cert] << _("Wrong content type submitted.")
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/katello/activation_key.rb

@@ -1,5 +1,6 @@
 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 Katello::Authorization::ActivationKey
@@ -9,7 +10,7 @@ module Katello
     belongs_to :organization, :inverse_of => :activation_keys
     belongs_to :environment, :class_name => "KTEnvironment", :inverse_of => :activation_keys
     belongs_to :user, :inverse_of => :activation_keys, :class_name => "::User"
-    belongs_to :content_view, :inverse_of => :activation_keys
+    belongs_to :content_view, :class_name => "Katello::ContentView", :inverse_of => :activation_keys
 
     has_many :key_host_collections, :class_name => "Katello::KeyHostCollection", :dependent => :destroy
     has_many :host_collections, :through => :key_host_collections
@@ -17,6 +18,7 @@ module Katello
     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 :subscription_facet_activation_keys, :class_name => "Katello::SubscriptionFacetActivationKey", :dependent => :destroy
     has_many :subscription_facets, :through => :subscription_facet_activation_keys
 
@@ -92,7 +94,7 @@ module Katello
     end
 
     def products
-      Katello::Product.joins(:subscriptions => {:pools => :activation_keys}).where("#{Katello::ActivationKey.table_name}.id" => self.id).enabled.uniq
+      Katello::Product.joins(:pools => :activation_keys).where("#{Katello::ActivationKey.table_name}.id" => self.id).enabled.uniq
     end
 
     def valid_content_override_label?(content_label)

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

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

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

@@ -2,8 +2,6 @@ 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,8 +2,6 @@ module Katello
   module Authorization::Repository
     extend ActiveSupport::Concern
 
-    include Authorizable
-
     delegate :editable?, to: :product
 
     def deletable?

data/app/models/katello/capsule_lifecycle_environment.rb

@@ -1,5 +1,7 @@
 module Katello
   class CapsuleLifecycleEnvironment < Katello::Model
+    audited :associated_with => :capsule
+
     validates_lengths_from_database
     validates :lifecycle_environment_id,
               :uniqueness => { :scope => :capsule_id,

data/app/models/katello/compliance_reason.rb

@@ -0,0 +1,5 @@
+module Katello
+  class ComplianceReason < Katello::Model
+    belongs_to :subscription_facet, :inverse_of => :compliance_reasons, :class_name => 'Katello::Host::SubscriptionFacet'
+  end
+end

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

@@ -49,7 +49,11 @@ module Katello
         )
 
         def content_facet_ignore_update?(attributes)
-          self.content_facet.blank? && attributes.values.all?(&:blank?)
+          self.content_facet.blank? && (
+            attributes.values.all?(&:blank?) ||
+            attributes['content_view_id'].blank? ||
+            attributes['lifecycle_environment_id'].blank?
+          )
         end
       end
 

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

@@ -4,6 +4,7 @@ module Katello
       extend ActiveSupport::Concern
 
       included do
+        audited :only => [:manifest_refreshed_at]
         ALLOWED_DEFAULT_INFO_TYPES = %w(system distributor).freeze
 
         include ForemanTasks::Concerns::ActionSubject
@@ -27,6 +28,8 @@ module Katello
         has_many :content_view_environments, :through => :content_views
         has_many :task_statuses, :class_name => "Katello::TaskStatus", :dependent => :destroy, :as => :task_owner
         has_many :subscriptions, :class_name => "Katello::Subscription", :dependent => :destroy, :inverse_of => :organization
+        has_many :pools, :class_name => "Katello::Pool", :dependent => :destroy, :inverse_of => :organization
+        has_many :product_contents, :through => :products
 
         #older association
         has_many :org_tasks, :dependent => :destroy, :class_name => "Katello::TaskStatus", :inverse_of => :organization
@@ -40,6 +43,10 @@ module Katello
         validates_with Validators::KatelloLabelFormatValidator, :attributes => :label
         validates :label, :uniqueness => true
 
+        # intentionally placed this callback here after all associations
+        # so that it will execute after :dependent => :destroy
+        before_destroy :destroy_taxable_taxonomies
+
         def default_content_view
           ContentView.default.where(:organization_id => self.id).first
         end
@@ -179,6 +186,21 @@ module Katello
         def regenerate_ueber_cert
           ::Katello::Resources::Candlepin::Owner.generate_ueber_cert(self.label)
         end
+
+        def expiring_subscriptions
+          subscriptions.select(&:expiring_soon?)
+        end
+
+        def notification_recipients_ids
+          users = User.unscoped.all.find_all do |user|
+            user.can?(:import_manifest) && user.can?(:view_organizations, self)
+          end
+          users.pluck(:id)
+        end
+
+        class Jail < ::Safemode::Jail
+          allow :name, :label
+        end
       end
     end
   end

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

@@ -92,7 +92,8 @@ module Katello
       end
 
       def pulp_url
-        "#{url}/pulp/api/v2/"
+        uri = URI.parse(url)
+        "#{uri.scheme}://#{uri.host}/pulp/api/v2/"
       end
 
       def default_capsule?
@@ -116,7 +117,7 @@ module Katello
       end
 
       def set_default_download_policy
-        self.download_policy ||= ::Setting[:default_proxy_download_policy]
+        self.download_policy ||= ::Setting[:default_proxy_download_policy] || ::Runcible::Models::YumImporter::DOWNLOAD_ON_DEMAND
       end
 
       def associate_lifecycle_environments

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

@@ -4,6 +4,8 @@ module Katello
       extend ActiveSupport::Concern
 
       included do
+        audited :associations => [:pools]
+
         SUBSCRIPTION_STATUS_MAP = {
           :valid => Katello::SubscriptionStatus::VALID,
           :partial => Katello::SubscriptionStatus::PARTIAL,

data/app/models/katello/content.rb

@@ -7,6 +7,11 @@ module Katello
     validates :label, :uniqueness => true
     validates :cp_content_id, :uniqueness => true
 
+    scoped_search :on => :name, :complete_value => true
+    scoped_search :on => :content_type, :complete_value => true
+    scoped_search :on => :label, :complete_value => true
+    scoped_search :relation => :products, :on => :name, :rename => :product_name, :complete_value => true
+
     def self.import_all
       Organization.all.each do |org|
         org.products.each do |product|

data/app/models/katello/content_facet_applicable_rpm.rb

@@ -1,5 +1,6 @@
 module Katello
   class ContentFacetApplicableRpm < Katello::Model
+    # Do not use active record callbacks in this join model.  Direct INSERTs and DELETEs are done
     belongs_to :content_facet, :inverse_of => :content_facet_applicable_rpms, :class_name => 'Katello::Host::ContentFacet'
     belongs_to :rpm, :inverse_of => :content_facet_applicable_rpms, :class_name => 'Katello::Rpm'
   end

data/app/models/katello/content_view.rb

@@ -1,6 +1,8 @@
 module Katello
   # rubocop:disable Metrics/ClassLength
   class ContentView < Katello::Model
+    audited :associations => [:repositories, :environments]
+    has_associated_audits
     include Ext::LabelFromName
     include Katello::Authorization::ContentView
     include ForemanTasks::Concerns::ActionSubject
@@ -27,7 +29,8 @@ module Katello
     has_many :component_composites, :class_name => "Katello::ContentViewComponent",
              :dependent => :destroy, :inverse_of => :content_view, :foreign_key => :content_view_id
 
-    has_many :content_view_repositories, :dependent => :destroy, :inverse_of => :content_view
+    has_many :content_view_repositories, :class_name => 'Katello::ContentViewRepository',
+             :dependent => :destroy, :inverse_of => :content_view
     has_many :repositories, :through => :content_view_repositories, :class_name => "Katello::Repository",
                             :after_remove => :remove_repository
 
@@ -53,6 +56,8 @@ module Katello
     validates :organization_id, :presence => true
     validate :check_non_composite_components
     validate :check_puppet_conflicts
+    validate :check_docker_conflicts
+    validate :check_non_composite_auto_publish
     validates :composite, :inclusion => [true, false]
 
     validates_with Validators::KatelloNameFormatValidator, :attributes => :name
@@ -349,17 +354,7 @@ module Katello
 
     def products(env = nil)
       repos = repos(env)
-      Product.joins(:repositories).where("#{Katello::Repository.table_name}.id" => repos.map(&:id)).uniq
-    end
-
-    def version_products(env)
-      repos = repos(env)
-      Product.joins(:repositories).where("#{Katello::Repository.table_name}.id" => repos.map(&:id)).uniq
-    end
-
-    #list all products associated to this view across all versions
-    def all_version_products
-      Product.joins(:repositories).where("#{Katello::Repository.table_name}.id" => self.all_version_repos).uniq
+      Product.joins(:repositories).where("#{Katello::Repository.table_name}.id" => repos.map(&:id)).distinct
     end
 
     #get the library instances of all repos within this view
@@ -415,12 +410,22 @@ module Katello
       counts.select { |_k, v| v > 1 }.keys
     end
 
+    def duplicate_docker_repos
+      duplicate_repositories.where(:content_type => Katello::Repository::DOCKER_TYPE)
+    end
+
     def check_non_composite_components
       if !composite? && components.present?
         errors.add(:base, _("Cannot add component versions to a non-composite content view"))
       end
     end
 
+    def check_non_composite_auto_publish
+      if !composite? && auto_publish
+        errors.add(:base, _("Cannot set auto publish to a non-composite content view"))
+      end
+    end
+
     def check_puppet_conflicts
       duplicate_puppet_modules.each do |name|
         versions = components.select { |v| v.puppet_modules.map(&:name).include?(name) }
@@ -430,6 +435,13 @@ module Katello
       end
     end
 
+    def check_docker_conflicts
+      duplicate_docker_repos.each do |repo|
+        msg = _("Container Image repo '%{repo}' is present in multiple component content views.") % {repo: repo.name}
+        errors.add(:base, msg)
+      end
+    end
+
     def content_view_environment(environment)
       self.content_view_environments.where(:environment_id => environment.try(:id)).first
     end
@@ -545,6 +557,23 @@ module Katello
       fail _("User must be logged in.") if ::User.current.nil?
       fail _("Cannot publish default content view") if default?
       check_composite_action_allowed!(organization.library)
+      check_docker_repository_names!([organization.library])
+      true
+    end
+
+    def check_docker_repository_names!(environments)
+      environments.each do |environment|
+        repositories = []
+        publish_repositories do |all_repositories|
+          repositories += all_repositories.keep_if { |repository| repository.content_type == Katello::Repository::DOCKER_TYPE }
+        end
+        next if repositories.empty?
+
+        error_messages = ::Katello::Validators::EnvironmentDockerRepositoriesValidator.validate_repositories(environment.registry_name_pattern, repositories)
+        unless error_messages.empty?
+          fail _("Content View publish to environment %{name} will result in invalid container image name of member repositories") % {name: environment.name}
+        end
+      end
       true
     end
 
@@ -609,6 +638,10 @@ module Katello
       content_view_versions.count
     end
 
+    def on_demand_repositories
+      repositories.where(download_policy: ::Runcible::Models::YumImporter::DOWNLOAD_ON_DEMAND)
+    end
+
     protected
 
     def remove_repository(repository)
@@ -638,7 +671,7 @@ module Katello
       # for a default view, the same candlepin environment will be referenced
       # by the kt_environment and content_view_environment.
       value = self.default ? env.organization.label.to_s : [env.organization.label, env.label, self.label].join('-')
-      Katello::Util::Data.md5hash(value)
+      Katello::Util::Data.hexdigest(value)
     end
 
     def confirm_not_promoted
@@ -649,77 +682,12 @@ module Katello
       return true
     end
 
-    def associate_puppet_content(puppet_env)
-      unless content_view_puppet_modules.empty?
-        modules_by_repoid = computed_module_ids_by_repoid
-        async_tasks = []
-        modules_by_repoid.each_pair do |repoid, puppet_module_ids|
-          async_tasks << Katello.pulp_server.extensions.puppet_module.copy(repoid,
-                                                                           puppet_env.pulp_id,
-                                                                           :ids => puppet_module_ids)
-        end
-        PulpTaskStatus.wait_for_tasks(async_tasks)
-      end
-    end
-
-    def associate_yum_content(cloned)
-      # Intended Behaviour
-      # Includes are cumulative -> If you say include errata and include packages, its the sum
-      # Excludes are processed after includes
-      # Excludes dont handle dependency. So if you say Include errata with pkgs P1, P2ve#         and exclude P1  and P1 has a dependency P1d1, what gets copied over is P1d1, P2
-
-      # Another important aspect. PackageGroups & Errata are merely convinient ways to say "copy packages"
-      # Its all about the packages
-
-      # Algorithm:
-      # 1) Compute all the packages to be whitelist/blacklist. In this process grok all the packages
-      #    belonging to Errata/Package  groups etc  (work done by PackageClauseGenerator)
-      # 2) Copy Packages (Whitelist - Blacklist) with their dependencies
-      # 3) Unassociate the blacklisted items from the clone. This is so that if the deps were among
-      #    the blacklisted packages, they would have gotten copied along in the previous step.
-      # 4) Copy all errata and package groups
-      # 5) Prune errata and package groups that have no existing packagea in the cloned repo
-      # 6) Index for search.
-
-      repo = cloned.library_instance_id ? cloned.library_instance : cloned
-      applicable_filters = filters.applicable(repo).yum
-      copy_clauses = nil
-      remove_clauses = nil
-      process_errata_and_groups = false
-
-      if applicable_filters.any?
-        clause_gen = Util::PackageClauseGenerator.new(repo, applicable_filters)
-        clause_gen.generate
-        copy_clauses = clause_gen.copy_clause
-        remove_clauses = clause_gen.remove_clause
-      end
-
-      if applicable_filters.empty? || copy_clauses
-        pulp_task = repo.clone_contents_by_filter(cloned, ContentViewFilter::PACKAGE, copy_clauses)
-        PulpTaskStatus.wait_for_tasks([pulp_task])
-        process_errata_and_groups = true
-      end
-
-      if remove_clauses
-        pulp_task = cloned.unassociate_by_filter(ContentViewFilter::PACKAGE, remove_clauses)
-        PulpTaskStatus.wait_for_tasks([pulp_task])
-        process_errata_and_groups = true
-      end
-
-      if process_errata_and_groups
-        group_tasks = [ContentViewFilter::ERRATA, ContentViewFilter::PACKAGE_GROUP].collect do |content_type|
-          repo.clone_contents_by_filter(cloned, content_type, nil)
-        end
-        PulpTaskStatus.wait_for_tasks(group_tasks)
-        cloned.purge_empty_groups_errata
-      end
-
-      PulpTaskStatus.wait_for_tasks([repo.clone_distribution(cloned)])
-      PulpTaskStatus.wait_for_tasks([repo.clone_file_metadata(cloned)])
-    end
-
     def related_resources
       self.organization
     end
+
+    class Jail < ::Safemode::Jail
+      allow :name, :label
+    end
   end
 end