katello 3.13.0 → 3.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f961beeeec312626ba251c4117d82ed9452aac09675bca3dffebd8b678fb144b
-  data.tar.gz: ba3994e7202a712f93bfcbab5078abd3f4e78700586415c99e1251bcb1ad4dcd
+  metadata.gz: fffaa8a0526b0aebf3579586d7b093f10024d6f9db1f181d26eba976d2a08dbd
+  data.tar.gz: 804ff8b52e48b758f7da0980e3b7409a05ccbf372b9feab000917c9f5c0830f2
 SHA512:
-  metadata.gz: 24d89c99f0f85417717c8a3bab52579d71eb159d760331cb2b8f347a113fd21ca86004ecbf5c3d356f810729d2fa0c5e58a29e345a2d86d0c1723218ec0a6e76
-  data.tar.gz: 7b07f9577131a54a5c72cd1ee4139d722f6ed46250269bbd4acb27d9d0f036740847a84da0bf196eada80ef63309f34b3598a55bbca254fcac6f3d35669f3b9e
+  metadata.gz: 37bee683b2faa62bd1c3b47f7f0b8f1023293aa5dd3d1b1f4cfb4a451551184e6553730f38dffa47d2cc003e508453197d81f792c8adc6c9d682c718f884bbcb
+  data.tar.gz: 3a82db81d710266ead4f21fc725acf782cbb0b43b9e3a6c2c5ca04e32a826316225a2af5145153edc1277e920f5b366def5a55184ed9ae296f8d2e66d22728fe

data/app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb

@@ -198,10 +198,8 @@ module Katello
 
     #api :POST, "/environments/:environment_id/consumers", N_("Register a consumer in environment")
     def consumer_create
-      content_view_environment = find_content_view_environment
-      host = Katello::Host::SubscriptionFacet.find_or_create_host(content_view_environment.environment.organization, rhsm_params)
+      host = Katello::RegistrationManager.process_registration(rhsm_params, find_content_view_environment)
 
-      Katello::RegistrationManager.register_host(host, rhsm_params, content_view_environment)
       host.reload
 
       update_host_registered_through(host, request.headers)
@@ -227,9 +225,8 @@ module Katello
       User.current = User.anonymous_admin
       additional_set_taxonomy
       activation_keys = find_activation_keys
-      host = Katello::Host::SubscriptionFacet.find_or_create_host(activation_keys.first.organization, rhsm_params)
 
-      Katello::RegistrationManager.register_host(host, rhsm_params, nil, activation_keys)
+      host = Katello::RegistrationManager.process_registration(rhsm_params, nil, activation_keys)
 
       update_host_registered_through(host, request.headers)
       host.reload

data/app/controllers/katello/api/v2/content_view_puppet_modules_controller.rb

@@ -59,7 +59,7 @@ module Katello
     def index_relation
       puppet_modules = ContentViewPuppetModule.where(:content_view_id => @view)
       puppet_modules = puppet_modules.where(:name => params[:name]) if params[:name]
-      puppet_modules = puppet_modules.where(:pulp_id => params[:uuid]) if params[:uuid]
+      puppet_modules = puppet_modules.where(:uuid => params[:uuid]) if params[:uuid]
       puppet_modules = puppet_modules.where(:author => params[:author]) if params[:author]
       puppet_modules
     end

data/app/controllers/katello/api/v2/host_subscriptions_controller.rb

@@ -82,8 +82,7 @@ module Katello
     def create
       rhsm_params = params_to_rhsm_params
 
-      host = Katello::Host::SubscriptionFacet.find_or_create_host(@content_view_environment.environment.organization, rhsm_params)
-      Katello::RegistrationManager.register_host(host, rhsm_params, @content_view_environment)
+      host = Katello::RegistrationManager.process_registration(rhsm_params, @content_view_environment)
       host.reload
       ::Katello::Host::SubscriptionFacet.update_facts(host, rhsm_params[:facts]) unless rhsm_params[:facts].blank?
 

data/app/lib/actions/katello/content_view_environment/destroy.rb

@@ -3,7 +3,6 @@ module Actions
     module ContentViewEnvironment
       class Destroy < Actions::Base
         def plan(cv_env, options = {})
-          skip_cp_update = options.fetch(:skip_candlepin_update, false)
           skip_repo_destroy = options.fetch(:skip_repo_destroy, false)
           organization_destroy = options.fetch(:organization_destroy, false)
           content_view = cv_env.content_view
@@ -25,7 +24,7 @@ module Actions
                 plan_action(ContentViewPuppetEnvironment::Destroy, puppet_env) unless organization_destroy
               end
             end
-            plan_action(Candlepin::Environment::Destroy, cp_id: cv_env.cp_id) unless skip_cp_update
+            plan_action(Candlepin::Environment::Destroy, cp_id: cv_env.cp_id) unless organization_destroy
             plan_self(:id => cv_env.id)
           end
         end

data/app/lib/actions/katello/host/update.rb

@@ -18,6 +18,15 @@ module Actions
 
             if host.subscription_facet
               consumer_params ||= host.subscription_facet.consumer_attributes
+
+              host_uuid = consumer_params.dig(:facts, 'dmi.system.uuid')
+              if ::Katello::Host::SubscriptionFacet.override_dmi_uuid?(host_uuid)
+                # if host reported a dmi uuid to treat as a duplicate, override it with the stored host param
+                override_value = host.subscription_facet.dmi_uuid_override&.value
+                override_value ||= host.subscription_facet.update_dmi_uuid_override&.value
+                consumer_params[:facts]['dmi.system.uuid'] = override_value
+              end
+
               cp_update = plan_action(::Actions::Candlepin::Consumer::Update, host.subscription_facet.uuid, consumer_params)
             end
 

data/app/lib/actions/katello/organization/destroy.rb

@@ -65,7 +65,7 @@ module Actions
         end
 
         def remove_content_view_environment(cv_env)
-          plan_action(ContentViewEnvironment::Destroy, cv_env, :skip_repo_destroy => true, :skip_candlepin_update => true, :organization_destroy => true)
+          plan_action(ContentViewEnvironment::Destroy, cv_env, :skip_repo_destroy => true, :organization_destroy => true)
         end
 
         def remove_content_views(organization)

data/app/lib/actions/katello/repository/metadata_generate.rb

@@ -10,6 +10,7 @@ module Actions
           repository_creation = options.fetch(:repository_creation, false)
           source_repository = options.fetch(:source_repository, nil)
           source_repository ||= repository.target_repository if repository.link?
+          smart_proxy_id = options.fetch(:capsule_id, SmartProxy.pulp_master.id)
           if repository_creation
             matching_content = false
           else
@@ -17,7 +18,7 @@ module Actions
           end
 
           plan_pulp_action([Pulp::Repository::DistributorPublish, Pulp3::Orchestration::Repository::GenerateMetadata],
-                        repository, SmartProxy.pulp_master,
+                        repository, SmartProxy.find(smart_proxy_id),
                         :force => force,
                         :source_repository => source_repository,
                         :matching_content => matching_content,

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

@@ -34,6 +34,7 @@ module Katello
       attr_accessor :facts
 
       DMI_UUID_ALLOWED_DUPS = ['', 'Not Settable', 'Not Present'].freeze
+      DMI_UUID_OVERRIDE_PARAM = 'dmi_uuid_override'.freeze
 
       def host_type
         host_facts = self.host.facts
@@ -169,6 +170,17 @@ module Katello
         self.host.organization
       end
 
+      def dmi_uuid_override
+        HostParameter.find_by(name: DMI_UUID_OVERRIDE_PARAM, host: host)
+      end
+
+      def update_dmi_uuid_override(host_uuid = nil)
+        host_uuid ||= SecureRandom.uuid
+        param = HostParameter.find_or_create_by(name: DMI_UUID_OVERRIDE_PARAM, host: host)
+        param.update_attributes!(value: host_uuid)
+        param
+      end
+
       def update_subscription_status(status_override = nil)
         update_status(::Katello::SubscriptionStatus, status_override: status_override)
 
@@ -187,6 +199,10 @@ module Katello
         host.refresh_global_status!
       end
 
+      def self.override_dmi_uuid?(host_uuid)
+        Setting[:host_dmi_uuid_duplicates].include?(host_uuid)
+      end
+
       def self.new_host_from_facts(facts, org, location)
         name = propose_name_from_facts(facts)
         ::Host::Managed.new(:name => name, :organization => org, :location => location, :managed => false)
@@ -199,17 +215,6 @@ module Katello
         host.import_facts(rhsm_facts)
       end
 
-      def self.find_or_create_host(organization, rhsm_params)
-        host = find_host(rhsm_params[:facts], organization)
-        host ||= Katello::Host::SubscriptionFacet.new_host_from_facts(
-          rhsm_params[:facts],
-          organization,
-          Location.default_host_subscribe_location!
-        )
-        host.organization = organization unless host.organization
-        host
-      end
-
       def self.propose_name_from_facts(facts)
         setting_fact = Setting[:register_hostname_fact]
         if !setting_fact.blank? && facts[setting_fact] && facts[setting_fact] != 'localhost'
@@ -255,45 +260,6 @@ module Katello
         ForemanTasks.sync_task(Actions::Katello::Host::RemoveSubscriptions, self.host, pools_with_quantities)
       end
 
-      def self.find_host(facts, organization)
-        host_name = propose_existing_hostname(facts)
-        host_uuid = facts['dmi.system.uuid']
-        uuid_fact_id = RhsmFactName.find_by(name: 'dmi::system::uuid')&.id || -1
-
-        hosts = ::Host.unscoped.distinct.left_outer_joins(:fact_values)
-                .where("#{::Host.table_name}.name = ? OR (#{FactValue.table_name}.fact_name_id = ?
-               AND #{FactValue.table_name}.value = ? AND #{FactValue.table_name}.value NOT IN (?))", host_name, uuid_fact_id, host_uuid, DMI_UUID_ALLOWED_DUPS)
-
-        return if hosts.empty?
-
-        hosts = hosts.where(organization_id: [organization.id, nil])
-        hosts_size = hosts.size
-
-        if hosts_size == 0 # not in the correct org
-          #TODO: http://projects.theforeman.org/issues/11532
-          fail Katello::Errors::RegistrationError, _("Host with name %{host_name} is currently registered to a different org, please migrate host to %{org_name}.") %
-                   {:org_name => organization.name, :host_name => host_name }
-        end
-
-        if hosts_size == 1
-          host = hosts.first
-
-          if host.name == host_name
-            unless host.build
-              found_uuid = host.fact_values.where(fact_name_id: uuid_fact_id).first
-              if found_uuid && found_uuid.value != host_uuid
-                fail Katello::Errors::RegistrationError, _("This host is reporting a DMI UUID that differs from the existing registration.")
-              end
-            end
-
-            return host
-          end
-        end
-
-        hostnames = hosts.pluck(:name).sort.join(', ')
-        fail Katello::Errors::RegistrationError, _("Please unregister or remove hosts which match this host before registering: %{existing}") % {existing: hostnames}
-      end
-
       def self.sanitize_name(name)
         name.gsub('_', '-').chomp('.').downcase
       end

data/app/models/setting/content.rb

@@ -12,7 +12,7 @@ class Setting::Content < Setting
     return unless super
 
     BLANK_ATTRS.concat %w(register_hostname_fact default_location_subscribed_hosts
-                          default_location_puppet_content content_default_http_proxy)
+                          default_location_puppet_content content_default_http_proxy host_dmi_uuid_duplicates)
 
     download_policies = proc { hashify_parameters(::Runcible::Models::YumImporter::DOWNLOAD_POLICIES) }
     proxy_download_policies = proc { hashify_parameters(::SmartProxy::DOWNLOAD_POLICIES) }
@@ -133,6 +133,15 @@ class Setting::Content < Setting
                  "latest package to solve a dependency even if it already does exist in the repository."),
                  'conservative', N_('Content View Dependency Solving Algorithm'), nil,
                  :collection => dependency_solving_options),
+        self.set('host_tasks_workers_pool_size', N_("Amount of workers in the pool to handle the execution of host-related tasks. When set to 0, the default queue will be used instead. Restart of the dynflowd/foreman-tasks service is required."),
+                 5, N_('Host Tasks Workers Pool Size')),
+        self.set('host_dmi_uuid_duplicates',
+                 N_("If hosts fail to register because of duplicate DMI UUIDs " \
+                    "add their comma-separated values here. Subsequent registrations will generate a unique DMI UUID for the affected hosts."),
+                 [], N_('Host Duplicate DMI UUIDs')),
+        self.set('host_profile_assume', N_("Allow new Host registrations to assume registered profiles with matching hostname " \
+                    "as long as the registering DMI UUID is not used by another host."),
+                 true, N_('Host Profile Assume')),
         self.set('host_tasks_workers_pool_size', N_("Amount of workers in the pool to handle the execution of host-related tasks. When set to 0, the default queue will be used instead. Restart of the dynflowd/foreman-tasks service is required."),
                  5, N_('Host Tasks Workers Pool Size'))
       ].each { |s| self.create! s.update(:category => "Setting::Content") }

data/app/services/katello/candlepin/consumer.rb

@@ -44,10 +44,6 @@ module Katello
         consumer_attributes[:entitlementStatus]
       end
 
-      def update(params)
-        ::Katello::Resources::Candlepin::Consumer.update(uuid, params)
-      end
-
       def filtered_pools(match_attached, match_host, match_installed, no_overlap)
         if match_host
           pools = self.available_pools

data/app/services/katello/registration_manager.rb

@@ -2,6 +2,102 @@ module Katello
   class RegistrationManager
     class << self
       private :new
+      delegate :propose_existing_hostname, :new_host_from_facts, to: Katello::Host::SubscriptionFacet
+
+      def determine_organization(content_view_environment, activation_key)
+        content_view_environment.try(:environment).try(:organization) || activation_key.try(:organization)
+      end
+
+      def determine_host_dmi_uuid(rhsm_params)
+        host_uuid = rhsm_params.dig(:facts, 'dmi.system.uuid')
+
+        if Katello::Host::SubscriptionFacet.override_dmi_uuid?(host_uuid)
+          return [SecureRandom.uuid, true]
+        end
+
+        [host_uuid, false]
+      end
+
+      def process_registration(rhsm_params, content_view_environment, activation_keys = [])
+        host_name = propose_existing_hostname(rhsm_params[:facts])
+        host_uuid, host_uuid_overridden = determine_host_dmi_uuid(rhsm_params)
+
+        rhsm_params[:facts]['dmi.system.uuid'] = host_uuid # ensure we find & validate against a potentially overridden UUID
+
+        organization = determine_organization(content_view_environment, activation_keys.first)
+
+        hosts = find_existing_hosts(host_name, host_uuid)
+
+        validate_hosts(hosts, organization, host_name, host_uuid, host_uuid_overridden)
+
+        host = hosts.first || new_host_from_facts(
+          rhsm_params[:facts],
+          organization,
+          Location.default_host_subscribe_location!
+        )
+        host.organization = organization unless host.organization
+
+        register_host(host, rhsm_params, content_view_environment, activation_keys)
+
+        if host_uuid_overridden
+          host.subscription_facet.update_dmi_uuid_override(host_uuid)
+        end
+
+        host
+      end
+
+      def dmi_uuid_fact_id
+        RhsmFactName.find_or_create_by(name: 'dmi::system::uuid').id
+      end
+
+      def dmi_uuid_allowed_dups
+        Katello::Host::SubscriptionFacet::DMI_UUID_ALLOWED_DUPS
+      end
+
+      def find_existing_hosts(host_name, host_uuid)
+        ::Host.unscoped.distinct.left_outer_joins(:fact_values)
+          .where("#{::Host.table_name}.name = ? OR (#{FactValue.table_name}.fact_name_id = ?
+          AND #{FactValue.table_name}.value = ? AND #{FactValue.table_name}.value NOT IN (?))", host_name, dmi_uuid_fact_id, host_uuid, dmi_uuid_allowed_dups)
+      end
+
+      def validate_hosts(hosts, organization, host_name, host_uuid, host_uuid_overridden = false)
+        return if hosts.empty?
+
+        hosts = hosts.where(organization_id: [organization.id, nil])
+        hosts_size = hosts.size
+
+        if hosts_size == 0 # not in the correct org
+          #TODO: http://projects.theforeman.org/issues/11532
+          registration_error("Host with name %{host_name} is currently registered to a different org, please migrate host to %{org_name}.",
+                             org_name: organization.name, host_name: host_name)
+        end
+
+        if hosts_size == 1
+          host = hosts.first
+
+          if host.name == host_name
+            unless Setting[:host_profile_assume] || host.subscription_facet.nil? || host.build || host_uuid_overridden
+              found_uuid = host.fact_values.where(fact_name_id: dmi_uuid_fact_id).first
+              if found_uuid && found_uuid.value != host_uuid
+                registration_error("This host is reporting a DMI UUID that differs from the existing registration.")
+              end
+            end
+
+            return true
+          end
+        end
+
+        hosts = hosts.where.not(name: host_name)
+        registration_error("The DMI UUID of this host (%{uuid}) matches other registered hosts: %{existing}", uuid: host_uuid, existing: joined_hostnames(hosts))
+      end
+
+      def registration_error(message, meta = {})
+        fail(Katello::Errors::RegistrationError, _(message) % meta)
+      end
+
+      def joined_hostnames(hosts)
+        hosts.pluck(:name).sort.join(', ')
+      end
 
       # options:
       #  * organization_destroy: destroy some data associated with host, but

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/host-collection-details.controller.js

@@ -38,7 +38,8 @@ angular.module('Bastion.host-collections').controller('HostCollectionDetailsCont
         $scope.getHostIds = function() {
             return {
                 included: {
-                    search: 'host_collection_id = %s'.replace('%s', $scope.$stateParams.hostCollectionId)
+                    search: 'host_collection_id = %s'.replace('%s', $scope.$stateParams.hostCollectionId),
+                    ids: $scope.hostCollection ? $scope.hostCollection.host_ids : []
                 }
             };
         };

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.13.0".freeze
+  VERSION = "3.13.1".freeze
 end

data/webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsTableSchema.js

@@ -1,7 +1,6 @@
 import React from 'react';
 import { FormGroup, FormControl, ControlLabel, HelpBlock } from 'react-bootstrap';
 import { translate as __ } from 'foremanReact/common/I18n';
-import { urlBuilder } from 'foremanReact/common/urlHelpers';
 import {
   headerFormatter,
   cellFormatter,
@@ -32,7 +31,7 @@ export const columns = (controller, selectionController) => [
       formatters: [
         (value, { rowData }) => (
           <td>
-            <a href={urlBuilder('subscriptions', '', rowData.id)}>
+            <a href={`https://access.redhat.com/management/subscriptions/${rowData.subscription_id}`} rel="noopener noreferrer" target="_blank">
               {rowData.product_name}
             </a>
           </td>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.13.0
+  version: 3.13.1
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-04 00:00:00.000000000 Z
+date: 2019-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -649,7 +649,6 @@ files:
 - app/lib/actions/candlepin/candlepin_listening_service.rb
 - app/lib/actions/candlepin/consumer/attach_subscription.rb
 - app/lib/actions/candlepin/consumer/auto_attach_subscriptions.rb
-- app/lib/actions/candlepin/consumer/create.rb
 - app/lib/actions/candlepin/consumer/hypervisors.rb
 - app/lib/actions/candlepin/consumer/remove_subscription.rb
 - app/lib/actions/candlepin/consumer/update.rb

data/app/lib/actions/candlepin/consumer/create.rb

@@ -1,32 +0,0 @@
-module Actions
-  module Candlepin
-    module Consumer
-      class Create < Candlepin::Abstract
-        input_format do
-          param :cp_environment_id
-          param :consumer_parameters
-          param :activation_keys
-        end
-
-        # We need to call this in plan phase as this can lean to error responses
-        # when the activation key fails to subscribe to the products
-        def plan(input)
-          response = ::Katello::Resources::Candlepin::Consumer.create(input[:cp_environment_id],
-                     input[:consumer_parameters], input[:activation_keys])
-          plan_self(input.merge(response: response.slice(:uuid, :name)))
-        end
-
-        def run
-          # we still keep the output interface the same for case there is other
-          # way how to check the ability to subscribe the system with the activation key
-          # or we have better support for rolling back in Dynflow
-          output[:response] = input[:response]
-        end
-
-        def finalize
-          input[:consumer_parameters][:facts] = 'TRIMMED'
-        end
-      end
-    end
-  end
-end