katello 3.1.0.1 → 3.2.0.rc1

data/app/lib/actions/katello/repository_set/scan_cdn.rb

@@ -86,7 +86,7 @@ module Actions
 
         def content
           return @content if defined? @content
-          if product_content = product.product_content_by_id(input[:content_id])
+          if (product_content = product.product_content_by_id(input[:content_id]))
             @content = product_content.content
           else
             fail "Couldn't find content '%s'" % input[:content_id]

data/app/lib/actions/pulp/abstract_async_task.rb

@@ -117,7 +117,7 @@ module Actions
           task["task_id"].nil? || (task["tags"] && (task["tags"] & ignored_tags).present?)
         end
         output[:pulp_tasks].each do |pulp_task|
-          if pulp_exception = ::Katello::Errors::PulpError.from_task(pulp_task)
+          if (pulp_exception = ::Katello::Errors::PulpError.from_task(pulp_task))
             fail pulp_exception
           end
         end

data/app/lib/actions/pulp/consumer/unassociate_units.rb

@@ -0,0 +1,20 @@
+module Actions
+  module Pulp
+    module Consumer
+      class UnassociateUnits < ::Actions::Pulp::AbstractAsyncTask
+        input_format do
+          param :capsule_id, Integer
+          param :repo_pulp_id, String
+        end
+
+        def humanized_name
+          _("Unassociate units in repository")
+        end
+
+        def invoke_external_task
+          pulp_resources.repository.unassociate_units(input[:repo_pulp_id])
+        end
+      end
+    end
+  end
+end

data/app/lib/actions/pulp/repository/copy_files.rb

@@ -0,0 +1,11 @@
+module Actions
+  module Pulp
+    module Repository
+      class CopyFiles < Pulp::Repository::AbstractCopyContent
+        def content_extension
+          pulp_extensions.file
+        end
+      end
+    end
+  end
+end

data/app/lib/actions/pulp/repository/create.rb

@@ -20,6 +20,7 @@ module Actions
           param :download_policy
           param :capsule_id
           param :mirror_on_sync
+          param :ssl_validation
         end
 
         def run
@@ -56,6 +57,7 @@ module Actions
           importer.ssl_ca_cert     = input[:ssl_ca_cert]
           importer.ssl_client_cert = input[:ssl_client_cert]
           importer.ssl_client_key  = input[:ssl_client_key]
+          importer.ssl_validation  = input[:ssl_validation]
           importer.download_policy = input[:download_policy] if input[:content_type] == ::Katello::Repository::YUM_TYPE
           importer.remove_missing  = input[:mirror_on_sync] if input[:content_type] == ::Katello::Repository::YUM_TYPE
           importer
@@ -67,6 +69,7 @@ module Actions
           importer.ssl_ca_cert     = input[:ssl_ca_cert]
           importer.ssl_client_cert = input[:ssl_client_cert]
           importer.ssl_client_key  = input[:ssl_client_key]
+          importer.ssl_validation  = input[:ssl_validation]
           importer
         end
 
@@ -76,7 +79,7 @@ module Actions
           importer.ssl_ca_cert     = input[:ssl_ca_cert]
           importer.ssl_client_cert = input[:ssl_client_cert]
           importer.ssl_client_key  = input[:ssl_client_key]
-
+          importer.ssl_validation  = input[:ssl_validation]
           importer
         end
 
@@ -85,6 +88,7 @@ module Actions
           importer.upstream_name   = input[:docker_upstream_name] if input[:docker_upstream_name]
           importer.feed            = input[:feed]
           importer.enable_v1       = false
+          importer.ssl_validation  = input[:ssl_validation]
           importer
         end
 

data/app/lib/actions/pulp/repository/presenters/file_presenter.rb

@@ -2,7 +2,7 @@ module Actions
   module Pulp
     module Repository
       module Presenters
-        class FilePresenter < AbstractSyncPresenter
+        class FileUnitPresenter < AbstractSyncPresenter
           def progress
             total_bytes == 0 ? 0.01 : finished_bytes.to_f / total_bytes
           end

data/app/lib/actions/pulp/repository/refresh.rb

@@ -39,7 +39,8 @@ module Actions
         def update_or_associate_distributors(capsule_id, repository, repository_details)
           concurrence do
             existing_distributors = repository_details["distributors"]
-            repository.generate_distributors(capsule_id.present?).each do |distributor|
+            capsule = capsule_id ? SmartProxy.find(capsule_id) : nil
+            repository.generate_distributors(capsule).each do |distributor|
               found = existing_distributors.find { |i| i['distributor_type_id'] == distributor.type_id }
               if found
                 plan_action(::Actions::Pulp::Repository::RefreshDistributor,
@@ -64,7 +65,8 @@ module Actions
         def remove_unnecessary_distributors(capsule_id, repository, repository_details)
           concurrence do
             existing_distributors = repository_details["distributors"]
-            generated_distributors = repository.generate_distributors(capsule_id.present?)
+            capsule = capsule_id ? SmartProxy.find(capsule_id) : nil
+            generated_distributors = repository.generate_distributors(capsule)
             existing_distributors.each do |distributor|
               found = generated_distributors.find { |dist| dist.type_id == distributor['distributor_type_id'] }
               unless found

data/app/lib/actions/pulp/repository/remove_file.rb

@@ -0,0 +1,15 @@
+module Actions
+  module Pulp
+    module Repository
+      class RemoveFile < Pulp::Repository::AbstractRemoveContent
+        def content_extension
+          pulp_extensions.file
+        end
+
+        def criteria
+          super.merge(fields: { :unit => ::Katello::Pulp::FileUnit::PULP_SELECT_FIELDS})
+        end
+      end
+    end
+  end
+end

data/app/lib/actions/pulp/repository/sync.rb

@@ -28,6 +28,8 @@ module Actions
 
             sync_options[:feed] = input[:source_url] if input[:source_url]
 
+            sync_options[:remove_missing] = input[:remove_missing] if input.key? :remove_missing
+
             sync_options[:validate] = !(SETTINGS[:katello][:pulp][:skip_checksum_validation])
 
             output[:pulp_tasks] = pulp_tasks =
@@ -86,7 +88,7 @@ module Actions
           elsif repo.try(:yum?)
             Presenters::YumPresenter.new(self)
           elsif repo.try(:file?)
-            Presenters::FilePresenter.new(self)
+            Presenters::FileUnitPresenter.new(self)
           elsif repo.try(:docker?)
             Presenters::DockerPresenter.new(self)
           elsif repo.try(:ostree?)

data/app/lib/actions/pulp/repository_group/export.rb

@@ -13,7 +13,7 @@ module Actions
         end
 
         def invoke_external_task
-          override_config = {}
+          override_config = { :incremental_export_repomd => true }
 
           if input[:start_date]
             override_config[:start_date] = input[:start_date]

data/app/lib/katello/errors.rb

@@ -92,7 +92,7 @@ module Katello
       # as the message set it
       def self.from_exception(exception)
         error_data = MultiJson.load(exception.response)
-        if display_message = error_data["displayMessage"]
+        if (display_message = error_data["displayMessage"])
           self.new(display_message).tap { |e| exception.set_backtrace(e.backtrace) }
         end
       rescue StandardError

data/app/lib/katello/lazy_accessor.rb

@@ -77,7 +77,7 @@ module Katello
       end
 
       def save(*)
-        if status = super
+        if (status = super)
           changed_remote_attributes.clear
         end
         status

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

@@ -518,6 +518,11 @@ module Katello
             self.delete(path(id), self.default_headers).code.to_i
           end
 
+          def entitlements(pool_id)
+            entitlement_json = self.get("#{path(pool_id)}/entitlements", self.default_headers).body
+            JSON.parse(entitlement_json)
+          end
+
           def path(id = nil)
             "/candlepin/pools/#{id}"
           end
@@ -614,6 +619,15 @@ module Katello
             JSON.parse(Candlepin::CandlepinResource.get(path, self.default_headers).body)
           end
 
+          def find_for_stacking_id(owner_key, stacking_id)
+            Subscription.get_for_owner(owner_key).each do |subscription|
+              if subscription['product']['attributes'].any? { |attr| attr['name'] == 'stacking_id' && attr['value'] == stacking_id }
+                return subscription['product']
+              end
+            end
+            nil
+          end
+
           def create(attr)
             JSON.parse(self.post(path, attr.to_json, self.default_headers).body).with_indifferent_access
           end

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

@@ -100,8 +100,7 @@ module Katello
               { substitutions: substitutions_needed(real_path).join(', '),
                 content_url: real_path }
         else
-          is_valid = valid_path?(real_path, 'repodata/repomd.xml') || valid_path?(real_path, 'PULP_MANIFEST')
-          unless is_valid
+          unless any_valid_metadata_file?(real_path)
             @resource.log :error, "No valid metadata files found for #{real_path}"
             fail Errors::CdnSubstitutionError, _("%{substitutions} are not valid substitutions for %{content_url}."\
                    " No valid metadata files found for %{real_path}") %
@@ -110,6 +109,10 @@ module Katello
         end
       end
 
+      def any_valid_metadata_file?(repo_path)
+        ['repodata/repomd.xml', 'PULP_MANIFEST', '.treeinfo', 'treeinfo'].any? { |filename| valid_path?(repo_path, filename) }
+      end
+
       protected
 
       def substitutions_needed(content_url)

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

@@ -29,8 +29,7 @@ module Katello
 
       def self.controller_path_to_model_hash
         {
-          "katello/environments"  => "Katello::KTEnvironment",
-          "katello/content_hosts" => "Katello::System"
+          "katello/environments" => "Katello::KTEnvironment"
         }
       end
 

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

@@ -14,7 +14,7 @@ module Katello
         name, arch = extract_arch(name)
         return unless arch
 
-        if nvre = parse_nvre(name)
+        if (nvre = parse_nvre(name))
           nvre.merge(:suffix => suffix, :arch => arch).delete_if { |_k, v| v.nil? }
         end
       end
@@ -24,7 +24,7 @@ module Katello
       def self.parse_nvre(name)
         name, suffix = extract_suffix(name)
 
-        if match = NVRE_RE.match(name)
+        if (match = NVRE_RE.match(name))
           {:suffix => suffix,
            :epoch => match[1],
            :name => match[2],

data/app/models/katello/activation_key.rb

@@ -15,9 +15,6 @@ module Katello
     has_many :key_host_collections, :class_name => "Katello::KeyHostCollection", :dependent => :destroy
     has_many :host_collections, :through => :key_host_collections
 
-    has_many :system_activation_keys, :class_name => "Katello::SystemActivationKey", :dependent => :destroy
-    has_many :systems, :through => :system_activation_keys
-
     has_many :pools, :through => :pool_activation_keys, :class_name => "Katello::Pool"
     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
@@ -129,52 +126,6 @@ module Katello
       return consumption
     end
 
-    # subscribe to each product according the entitlements remaining
-    # TODO: break up method
-    # rubocop:disable MethodLength
-    def subscribe_system(system)
-      already_subscribed = []
-      begin
-        # sanity check before we start subscribing
-        self.pools.each do |pool|
-          fail _("Pool %s has no product associated") % pool.cp_id unless pool.product_id
-          fail _("Unable to determine quantity for pool %s") % pool.cp_id unless pool.quantity
-        end
-
-        allocate = system.sockets.to_i
-        Rails.logger.debug "Number of sockets for registration: #{allocate}"
-        fail _("Number of sockets must be higher than 0 for system %s") % system.name if allocate <= 0
-
-        # we sort just to make the order deterministig.
-        self.pools.group_by(&:product_id).sort_by(&:first).each do |product_id, pools|
-          product = Product.find_by_cp_id(product_id, self.organization)
-          consumption = calculate_consumption(product, pools, allocate)
-
-          Rails.logger.debug "Autosubscribing pools: #{consumption.map { |pool, amount| "#{pool.cp_id} => #{amount}" }.join(", ")}"
-          consumption.each do |pool, amount|
-            Rails.logger.debug "Subscribing #{system.name} to product: #{product_id}, consuming pool #{pool.cp_id} of amount: #{amount}"
-            if entitlements_array = system.subscribe(pool.cp_id, amount)
-              # store for possible rollback
-              entitlements_array.each do |ent|
-                already_subscribed << ent['id']
-              end
-            end
-          end
-        end
-      rescue => e
-        Rails.logger.error "Autosubscription failed, rolling back: #{already_subscribed.inspect}"
-        already_subscribed.each do |entitlement_id|
-          begin
-            Rails.logger.debug "Rolling back: #{entitlement_id}"
-            system.unsubscribe(entitlement_id)
-          rescue => re
-            Rails.logger.fatal "Rollback failed, skipping: #{re.message}"
-          end
-        end
-        raise e
-      end
-    end
-
     def copy(new_name)
       new_key = ActivationKey.new
       new_key.name = new_name

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

@@ -2,6 +2,13 @@ module Katello
   module Authorization::ContentViewVersion
     extend ActiveSupport::Concern
 
+    def all_hosts_editable?(lifecycle_environment)
+      total_hosts = ::Host.in_content_view_environment(:content_view => self.content_view, :lifecycle_environment => lifecycle_environment)
+      authorized_hosts = ::Host.authorized("view_hosts").in_content_view_environment(:content_view => self.content_view,
+                                                                                     :lifecycle_environment => lifecycle_environment)
+      total_hosts.count == authorized_hosts.count
+    end
+
     module ClassMethods
       def readable
         view_ids = ContentView.readable.collect { |v| v.id }

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

@@ -1,6 +1,6 @@
 module Katello
   class Candlepin::Content
-    attr_accessor :name, :id, :type, :label, :vendor, :contentUrl, :gpgUrl
+    attr_accessor :name, :id, :type, :label, :vendor, :contentUrl, :gpgUrl, :modifiedProductIds
 
     def initialize(params = {})
       load_attributes(params)
@@ -51,6 +51,8 @@ module Katello
       end
 
       def build_repository
+        certificate_and_key = get_certificate_and_key(product, @content.modifiedProductIds)
+
         repository = Repository.new(
           :environment => product.organization.library,
           :product => product,
@@ -65,8 +67,8 @@ module Katello
           :label => label,
           :url => feed_url,
           :feed_ca => ca,
-          :feed_cert => product.certificate,
-          :feed_key => product.key,
+          :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?,
@@ -79,6 +81,16 @@ module Katello
         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.valid_substitutions(content, substitutions)

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

@@ -6,7 +6,6 @@ module Katello
       included do
         belongs_to :capsule, :inverse_of => :containers, :foreign_key => :capsule_id,
           :class_name => "SmartProxy"
-        attr_accessible :capsule_id
 
         alias_method_chain :repository_pull_url, :katello
       end
@@ -15,7 +14,7 @@ module Katello
         repo_url = repository_pull_url_without_katello
         if Repository.where(:pulp_id => repository_name).count > 0
           manifest_capsule = self.capsule || CapsuleContent.default_capsule.capsule
-          "#{URI(manifest_capsule.url).hostname}:5000/#{repo_url}"
+          "#{URI(manifest_capsule.url).hostname}:#{Setting['pulp_docker_registry_port']}/#{repo_url}"
         else
           repo_url
         end

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

@@ -30,7 +30,6 @@ module Katello
         scoped_search :in => :applicable_errata, :on => :errata_id, :rename => :installable_errata, :complete_value => true, :ext_method => :find_by_installable_errata
 
         accepts_nested_attributes_for :content_facet, :reject_if => proc { |attributes| attributes['content_view_id'].blank? && attributes['lifecycle_environment_id'].blank? }
-        attr_accessible :content_facet_attributes
       end
 
       module ClassMethods
@@ -53,6 +52,17 @@ module Katello
             { :conditions => "#{::Host::Managed.table_name}.id IN (#{facets.pluck(:host_id).join(',')})" }
           end
         end
+
+        def in_content_view_environment(content_view: nil, lifecycle_environment: nil)
+          relation = self.joins(:content_facet)
+          relation = relation.where("#{::Katello::Host::ContentFacet.table_name}.content_view_id" => content_view) if content_view
+          relation = relation.where("#{::Katello::Host::ContentFacet.table_name}.lifecycle_environment_id" => lifecycle_environment) if lifecycle_environment
+          relation
+        end
+
+        def in_environment(lifecycle_environment)
+          in_content_view_environment(:lifecycle_environment => lifecycle_environment)
+        end
       end
     end
   end

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

@@ -7,11 +7,9 @@ module Katello
 
       included do
         alias_method_chain :validate_media?, :capsule
-        alias_method_chain :set_hostgroup_defaults, :katello_attributes
+        alias_method_chain :inherited_attributes, :katello
         alias_method_chain :info, :katello
         alias_method_chain :smart_proxy_ids, :katello
-        has_one :content_host, :class_name => "Katello::System", :foreign_key => :host_id,
-                               :dependent => :destroy, :inverse_of => :foreman_host
         belongs_to :content_source, :class_name => "::SmartProxy", :foreign_key => :content_source_id, :inverse_of => :hosts
 
         has_many :host_installed_packages, :class_name => "::Katello::HostInstalledPackage", :foreign_key => :host_id, :dependent => :destroy
@@ -27,8 +25,6 @@ module Katello
         scoped_search :in => :host_collections, :on => :name, :complete_value => true, :rename => :host_collection
         scoped_search :in => :installed_packages, :on => :nvra, :complete_value => true, :rename => :installed_package
         scoped_search :in => :installed_packages, :on => :name, :complete_value => true, :rename => :installed_package_name
-
-        attr_accessible :content_source_id, :host_collection_ids
       end
 
       def validate_media_with_capsule?
@@ -78,14 +74,9 @@ module Katello
             content_facet.lifecycle_environment_id == self.environment.try(:lifecycle_environment).try(:id)
       end
 
-      def set_hostgroup_defaults_with_katello_attributes
-        if hostgroup.present?
-          if content_facet.present?
-            self.content_facet.kickstart_repository_id ||= hostgroup.inherited_kickstart_repository_id
-          end
-          assign_hostgroup_attributes(%w(content_source_id content_view_id lifecycle_environment_id environment_id))
-        end
-        set_hostgroup_defaults_without_katello_attributes
+      def inherited_attributes_with_katello
+        self.content_facet.kickstart_repository_id ||= hostgroup.inherited_kickstart_repository_id if content_facet.present?
+        inherited_attributes_without_katello.concat(%w(content_source_id content_view_id lifecycle_environment_id))
       end
 
       def import_package_profile(simple_packages)