katello 3.16.0 → 3.17.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c1b5ae508e6d13abb97dd4fa5dcb3a869b5a8ee2f6a2a2e574bcde16faa1c41
-  data.tar.gz: e5dc1c88a336020bf333e9f781eac5790b588139bd8d813433bea739ee7077ca
+  metadata.gz: bf008f8880960ad2a6cf9b615c0e0801fb38cce104e67001f4d17178cca43ab7
+  data.tar.gz: d2cda17cc4664479ac34f7abd33c08f14ef81f038abb0cfe3d43c9542624c48b
 SHA512:
-  metadata.gz: c6e0279e68e389701bcf84815bd401fe64375259da0ff533e4ae53fbf51f99b93837be754c0fb8d2d0457e6a8d299e4527c26d5c51fb4e81870f78592bbd46bf
-  data.tar.gz: 2296caf477bbb72d78f187e53a493b9e4c8657119424939063a8a6c6c40435d5e9bda70490351101207694cf9511a59de939397c53c623f11a2f30eba564ff91
+  metadata.gz: 27f052edff77986139ef6a82d0cd318c95b90a601a9f42178038896589c1042b1e18d030320173ae2c5a21ac75bfe09b13e7376525574f7dbff9d33b4867b8fa
+  data.tar.gz: 22f05c56710ee8951e1d15d30e5b2d471ab07f17287c51c01b7958e751442197fe89b8d262eb89584e612bba939aad7e8d7ddd407d55937d31a04d00e1df8e10

data/app/assets/stylesheets/katello/katello.scss

@@ -1,10 +1,3 @@
-/**
- * = require "katello/jquery.loadmask.css"
- * = require "katello/jquery-ui-1.8.11.custom.css"
- * = require "katello/jquery.treeTable.css"
- * = require "katello/ui.spinner.css"
- */
-
 @import "katello/overrides";
 @import "katello/katello_base";
 @import "katello/look";
@@ -18,6 +11,9 @@
 @import "katello/generic";
 @import "katello/notifications";
 
+@import "katello/jquery.treeTable";
+@import "katello/jquery-ui-1.8.11.custom.css";
+
 body {
   background-color: white;
 }

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

@@ -1,4 +1,5 @@
 module Katello
+  # rubocop:disable Metrics/ClassLength
   class Api::V2::ActivationKeysController < Api::V2::ApiController
     include Katello::Concerns::FilteredAutoCompleteSearch
     include Katello::Concerns::Api::V2::ContentOverridesController
@@ -11,6 +12,7 @@ module Katello
                                                   :content_override, :add_subscriptions, :remove_subscriptions,
                                                   :subscriptions]
     before_action :authorize
+    before_action :verify_simple_content_access_disabled, :only => [:add_subscriptions]
 
     wrap_parameters :include => (ActivationKey.attribute_names + %w(host_collection_ids service_level auto_attach purpose_role purpose_usage purpose_addons content_view_environment))
 
@@ -348,5 +350,11 @@ module Katello
 
       key_params
     end
+
+    def verify_simple_content_access_disabled
+      if @activation_key.organization.simple_content_access?
+        fail HttpErrors::BadRequest, _("The specified organization is in Simple Content Access mode. Attaching subscriptions is disabled")
+      end
+    end
   end
 end

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

@@ -39,7 +39,9 @@ module Katello
       respond_for_index :collection => @collection
     end
 
-    def index_response
+    def index_response(reload_host = false)
+      # Host needs to be reloaded because of lazy accessor
+      @host.reload if reload_host
       entitlements = @host.subscription_facet.candlepin_consumer.entitlements
       subscriptions = entitlements.map { |entitlement| ::Katello::HostSubscriptionPresenter.new(entitlement) }
       full_result_response(subscriptions)
@@ -53,7 +55,7 @@ module Katello
       end
 
       sync_task(::Actions::Katello::Host::AutoAttachSubscriptions, @host)
-      respond_for_index(:collection => index_response, :template => "index")
+      respond_for_index(:collection => index_response(true), :template => "index")
     end
 
     api :DELETE, "/hosts/:host_id/subscriptions/", N_("Unregister the host as a subscription consumer")
@@ -124,7 +126,7 @@ module Katello
       end
 
       sync_task(::Actions::Katello::Host::RemoveSubscriptions, @host, pool_id_quantities.values)
-      respond_for_index(:collection => index_response, :template => "index")
+      respond_for_index(:collection => index_response(true), :template => "index")
     end
 
     api :PUT, "/hosts/:host_id/subscriptions/add_subscriptions", N_("Add a subscription to a host")
@@ -134,12 +136,16 @@ module Katello
       param :quantity, :number, :desc => N_("Quantity of this subscriptions to add"), :required => true
     end
     def add_subscriptions
+      if @host.organization.simple_content_access?
+        fail ::Katello::HttpErrors::BadRequest, _("This host's organization is in Simple Content Access mode. Attaching subscriptions is disabled.")
+      end
+
       pools_with_quantities = params.require(:subscriptions).map do |sub_params|
         PoolWithQuantities.new(Pool.with_identifier(sub_params['id']), sub_params['quantity'].to_i)
       end
 
       sync_task(::Actions::Katello::Host::AttachSubscriptions, @host, pools_with_quantities)
-      respond_for_index(:collection => index_response, :template => "index")
+      respond_for_index(:collection => index_response(true), :template => "index")
     end
 
     api :PUT, "/hosts/:host_id/subscriptions/content_override", N_("Set content overrides for the host")

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

@@ -10,9 +10,11 @@ module Katello
     before_action :find_deletable_hosts, :only => [:destroy_hosts]
     before_action :find_readable_hosts, :only => [:applicable_errata, :installable_errata, :available_incremental_updates]
     before_action :find_errata, :only => [:available_incremental_updates]
+    before_action :find_organization, :only => [:add_subscriptions]
     before_action :deprecate_katello_agent, :only => [:install_content, :update_content, :remove_content]
 
     before_action :validate_content_action, :only => [:install_content, :update_content, :remove_content]
+    before_action :validate_organization, :only => [:add_subscriptions]
 
     # disable *_count fields on erratum rabl, since they perform N+1 queries
     before_action :disable_erratum_hosts_count
@@ -173,6 +175,10 @@ module Katello
       param :quantity, :number, :desc => N_("Quantity of this subscriptions to add"), :required => true
     end
     def add_subscriptions
+      if @organization.simple_content_access?
+        fail HttpErrors::BadRequest, _("The specified organization is in Simple Content Access mode. Attaching subscriptions is disabled")
+      end
+
       pools_with_quantities = params.require(:subscriptions).map do |sub_params|
         PoolWithQuantities.new(Pool.find(sub_params['id']), sub_params['quantity'])
       end
@@ -295,6 +301,10 @@ module Katello
       find_bulk_hosts(:destroy_hosts, params)
     end
 
+    def validate_organization
+      fail HttpErrors::BadRequest, _("Organization ID is required") if @organization.blank?
+    end
+
     def validate_host_collection_membership_limit
       max_hosts_exceeded = []
       host_ids = @hosts.map(&:id)

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

@@ -57,6 +57,7 @@ module Katello
       param :ansible_collection_requirements, String, :desc => N_("Contents of requirement yaml file to sync from URL")
       param :http_proxy_policy, ::Katello::RootRepository::HTTP_PROXY_POLICIES, :desc => N_("policies for HTTP proxy for content sync")
       param :http_proxy_id, :number, :desc => N_("ID of a HTTP Proxy")
+      param :auto_enabled, :bool, :desc => N_("if true, the repositories will be automatically enabled on a registered host subscribed to this product. Default: true")
     end
 
     def_param_group :repo_create do
@@ -327,6 +328,7 @@ module Katello
     api :PUT, "/repositories/:id", N_("Update a repository")
     param :id, :number, :required => true, :desc => N_("repository ID")
     param :name, String, :required => false
+    param :description, String, :desc => N_("description of the repository"), :required => false
     param_group :repo
     def update
       repo_params = repository_params
@@ -463,7 +465,7 @@ module Katello
 
     def repository_params
       keys = [:download_policy, :mirror_on_sync, :arch, :verify_ssl_on_sync, :upstream_password, :upstream_username,
-              :ostree_upstream_sync_depth, :ostree_upstream_sync_policy,
+              :ostree_upstream_sync_depth, :ostree_upstream_sync_policy, :auto_enabled,
               :deb_releases, :deb_components, :deb_architectures, :description, :http_proxy_policy, :http_proxy_id,
               {:ignorable_content => []}
              ]
@@ -514,6 +516,7 @@ module Katello
       root.ansible_collection_requirements = repo_params[:ansible_collection_requirements] if root.ansible_collection?
       root.http_proxy_policy = repo_params[:http_proxy_policy] if repo_params.key?(:http_proxy_policy)
       root.http_proxy_id = repo_params[:http_proxy_id] if repo_params.key?(:http_proxy_id)
+      root.auto_enabled = repo_params[:auto_enabled] if repo_params.key?(:auto_enabled)
 
       if root.ostree?
         root.ostree_upstream_sync_policy = repo_params[:ostree_upstream_sync_policy]

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

@@ -77,6 +77,22 @@ module Katello
       render json: { status: 'OK' }
     end
 
+    api :PUT, "/organizations/:organization_id/simple_content_access/enable",
+      N_("Enable simple content access for a manifest")
+    param :organization_id, :number, :desc => N_("Organization ID"), :required => true
+    def enable_simple_content_access
+      task = async_task(::Actions::Katello::Organization::SimpleContentAccess::Enable, params[:organization_id])
+      respond_for_async :resource => task
+    end
+
+    api :PUT, "/organizations/:organization_id/simple_content_access/disable",
+      N_("Disable simple content access for a manifest")
+    param :organization_id, :number, :desc => N_("Organization ID"), :required => true
+    def disable_simple_content_access
+      task = async_task(::Actions::Katello::Organization::SimpleContentAccess::Disable, params[:organization_id])
+      respond_for_async :resource => task
+    end
+
     private
 
     def update_params

data/app/controllers/katello/concerns/api/v2/bulk_hosts_extensions.rb

@@ -5,19 +5,19 @@ module Katello
 
       def find_bulk_hosts(permission, bulk_params, restrict_to = nil)
         #works on a structure of param_group bulk_params and transforms it into a list of systems
-        organization = find_organization
+        find_organization
         bulk_params[:included] ||= {}
         bulk_params[:excluded] ||= {}
         @hosts = []
 
         unless bulk_params[:included][:ids].blank?
           @hosts = ::Host::Managed.authorized(permission).where(:id => bulk_params[:included][:ids])
-          @hosts = @hosts.where(:organization_id => organization.id) if organization
+          @hosts = @hosts.where(:organization_id => @organization.id) if @organization
         end
 
         if bulk_params[:included][:search]
           search_hosts = ::Host::Managed.authorized(permission)
-          search_hosts = search_hosts.where(:organization_id => organization_id) if params[:organization_id]
+          search_hosts = search_hosts.where(:organization_id => @organization.id) if @organization
           search_hosts = search_hosts.search_for(bulk_params[:included][:search])
           if @hosts.any?
             @hosts = ::Host.where(id: @hosts).or(::Host.where(id: search_hosts))
@@ -38,7 +38,7 @@ module Katello
       end
 
       def find_organization
-        Organization.find_by_id(params[:organization_id])
+        @organization ||= Organization.find_by_id(params[:organization_id])
       end
     end
   end

data/app/controllers/katello/concerns/api/v2/hostgroups_controller_extensions.rb

@@ -20,7 +20,7 @@ module Katello
         include ApiPieExtensions
 
         def create
-          @hostgroup = Hostgroup.new(hostgroup_params)
+          @hostgroup = ::Hostgroup.new(hostgroup_params)
           process_response @hostgroup.save
         end
 

data/app/helpers/katello/concerns/dashboard_helper_extensions.rb

@@ -28,6 +28,16 @@ module Katello
       def unsubscribed_hypervisor_count
         host_query.search_for("subscription_status = unsubscribed_hypervisor").size
       end
+
+      def removed_widgets
+        widgets = super
+
+        if Organization.current&.simple_content_access?
+          widgets.reject! { |widget| ::Widget.singleton_class::SUBSCRIPTION_TEMPLATES.include? widget[:template] }
+        end
+
+        widgets
+      end
     end
   end
 end

data/app/helpers/katello/hosts_and_hostgroups_helper.rb

@@ -15,7 +15,7 @@ module Katello
     end
 
     def organizations(host)
-      if host.is_a?(Hostgroup)
+      if host.is_a?(::Hostgroup)
         host.organizations
       else
         host.organization ? [host.organization] : []
@@ -29,8 +29,7 @@ module Katello
 
     def host_hostgroup_kickstart_repository_id(host)
       return if host.blank?
-      return host.kickstart_repository_id if host.is_a?(Hostgroup)
-      host.content_facet.kickstart_repository_id if host.try(:content_facet).present?
+      host.content_facet&.kickstart_repository_id
     end
 
     def kickstart_repository_id(host, options = {})
@@ -78,13 +77,13 @@ module Katello
 
     def accessible_lifecycle_environments(org, host)
       selected = host.lifecycle_environment
-      envs = org.kt_environments.readable
+      envs = org.kt_environments.readable.order(:name)
       envs |= [selected] if selected.present? && org == selected.organization
       envs
     end
 
     def accessible_content_proxies(obj)
-      list = accessible_resource_records(:smart_proxy).with_content.to_a
+      list = accessible_resource_records(:smart_proxy).with_content.order(:name).to_a
       current = obj.content_source
       list |= [current] if current.present?
       list
@@ -159,7 +158,7 @@ module Katello
 
       views = []
       if lifecycle_environment
-        views = Katello::ContentView.in_environment(lifecycle_environment).readable
+        views = Katello::ContentView.in_environment(lifecycle_environment).readable.order(:name)
         views |= [content_view] if content_view.present? && content_view.in_environment?(lifecycle_environment)
       elsif content_view
         views = [content_view]
@@ -205,7 +204,7 @@ module Katello
 
         return [] unless new_host.operatingsystem.is_a?(Redhat)
 
-        if (host.is_a? Hostgroup)
+        if (host.is_a? ::Hostgroup)
           new_host.content_facet = ::Katello::Host::ContentFacet.new(:lifecycle_environment_id => host.inherited_lifecycle_environment_id,
                                                           :content_view_id => host.inherited_content_view_id,
                                                           :content_source_id => host.inherited_content_source_id)

data/app/lib/actions/candlepin/product/content_add.rb

@@ -6,11 +6,12 @@ module Actions
           param :product_id
           param :content_id
           param :owner
+          param :enabled
         end
 
         def run
           output[:response] = ::Katello::Resources::Candlepin::Product.
-              add_content(input[:owner], input[:product_id], input[:content_id], true)
+              add_content(input[:owner], input[:product_id], input[:content_id], input[:enabled])
         end
       end
     end

data/app/lib/actions/candlepin/product/content_update_enablement.rb

@@ -0,0 +1,18 @@
+module Actions
+  module Candlepin
+    module Product
+      class ContentUpdateEnablement < Candlepin::Abstract
+        input_format do
+          param :content_enablements
+          param :owner
+          param :product_id
+        end
+
+        def run
+          output[:response] = ::Katello::Resources::Candlepin::Product.
+              update_enabled(input[:owner], input[:product_id], input[:content_enablements])
+        end
+      end
+    end
+  end
+end

data/app/lib/actions/katello/capsule_content/sync.rb

@@ -32,7 +32,7 @@ module Actions
 
           smart_proxy_helper = ::Katello::SmartProxyHelper.new(smart_proxy)
           repositories = smart_proxy_helper.repos_available_to_capsule(environment, content_view, repository)
-          smart_proxy.ping_pulp3 if repositories.any? { |repo| smart_proxy.pulp3_support?(repo) }
+
           smart_proxy.ping_pulp if repositories.any? { |repo| !smart_proxy.pulp3_support?(repo) }
 
           refresh_options = options.merge(content_view: content_view,
@@ -40,6 +40,7 @@ module Actions
                                              repository: repository)
           sequence do
             plan_action(Actions::Pulp::Orchestration::Repository::RefreshRepos, smart_proxy, refresh_options)
+            plan_action(Actions::Pulp3::CapsuleContent::RefreshContentGuard, smart_proxy) if repositories.any? { |repo| smart_proxy.pulp3_support?(repo) }
             plan_action(Actions::Pulp3::Orchestration::Repository::RefreshRepos, smart_proxy, refresh_options) if smart_proxy.pulp3_enabled?
             plan_action(SyncCapsule, smart_proxy, refresh_options)
           end

data/app/lib/actions/katello/organization/simple_content_access/disable.rb

@@ -0,0 +1,17 @@
+module Actions
+  module Katello
+    module Organization
+      module SimpleContentAccess
+        class Disable < Toggle
+          def content_access_mode_value
+            SIMPLE_CONTENT_ACCESS_DISABLED_VALUE
+          end
+
+          def humanized_name
+            N_("Disable Simple Content Access")
+          end
+        end
+      end
+    end
+  end
+end

data/app/lib/actions/katello/organization/simple_content_access/enable.rb

@@ -0,0 +1,17 @@
+module Actions
+  module Katello
+    module Organization
+      module SimpleContentAccess
+        class Enable < Toggle
+          def content_access_mode_value
+            SIMPLE_CONTENT_ACCESS_ENABLED_VALUE
+          end
+
+          def humanized_name
+            N_("Enable Simple Content Access")
+          end
+        end
+      end
+    end
+  end
+end

data/app/lib/actions/katello/organization/simple_content_access/toggle.rb

@@ -0,0 +1,36 @@
+module Actions
+  module Katello
+    module Organization
+      module SimpleContentAccess
+        class Toggle < Actions::AbstractAsyncTask
+          middleware.use Actions::Middleware::PropagateCandlepinErrors
+
+          SIMPLE_CONTENT_ACCESS_DISABLED_VALUE = "entitlement".freeze
+          SIMPLE_CONTENT_ACCESS_ENABLED_VALUE = "org_environment".freeze
+
+          attr_reader :organization
+
+          def plan(organization_id)
+            @organization = ::Organization.find(organization_id)
+
+            ::Katello::Resources::Candlepin::UpstreamConsumer.update(
+              "#{consumer['apiUrl']}#{consumer['uuid']}",
+              consumer['idCert']['cert'],
+              consumer['idCert']['key'],
+              nil,
+              {contentAccessMode: content_access_mode_value}
+            )
+
+            plan_action(::Actions::Katello::Organization::ManifestRefresh, organization)
+          end
+
+          private
+
+          def consumer
+            @consumer ||= ::Katello::Resources::Candlepin::UpstreamCandlepinResource.upstream_consumer
+          end
+        end
+      end
+    end
+  end
+end

data/app/lib/actions/katello/orphan_cleanup/remove_orphans.rb

@@ -13,6 +13,19 @@ module Actions
                 Actions::Pulp3::Orchestration::OrphanCleanup::RemoveOrphans,
                 proxy)
             end
+            plan_self
+          end
+        end
+
+        def run
+          models = []
+          ::Katello::RepositoryTypeManager.repository_types.each_value do |repo_type|
+            indexable_types = repo_type.content_types_to_index
+            models += indexable_types&.map(&:model_class)
+            models.select! { |model| model.many_repository_associations }
+          end
+          models.each do |model|
+            model.joins("left join katello_#{model.repository_association} on #{model.table_name}.id = katello_#{model.repository_association}.#{model.unit_id_field}").where("katello_#{model.repository_association}.#{model.unit_id_field} IS NULL").destroy_all
           end
         end
       end