katello 3.18.0.rc1 → 3.18.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7163fd6dce0ae11188b016225be2effa59131c5bcc4a4b3482a749dfba7ef545
-  data.tar.gz: 202f81621e52adce6d318faa95fa9a527c0e3fc0f25bab3c3cb2ca7133cb12e3
+  metadata.gz: 31984263518369ed740c74cc962e0a3726d173f56f39beeff760737391520ba5
+  data.tar.gz: 87110c33c153b8dbb60062382e4afbe36e72ce826b4655fc64bdce3adf639e2f
 SHA512:
-  metadata.gz: 29f15645418ab0683328f83b804dc3fdf45d7f93ce4d23578a558310e0f1ad3cb7f2d98fe74ba3d16181505df56f081092aacb2bb028364995ac15413674862a
-  data.tar.gz: 99b0a150d0d689951d63b2acb37a0bbab702bfb5a13739572e764f9b49eeda60bb3451b6cc6a7aae4c20886755b499637213afef91eb565a92e2c887a4dcc376
+  metadata.gz: e34e20b1885f1e552101ed27f9a002844ef460213fe6f0b57efb507bae174a84fd1dc04c6b9bd9caac5af2a81c88e60dddd7e135c236e5f8a4bd3b022620596c
+  data.tar.gz: f33c6fd1f711801f238631c3eda95c5d3c2c2305b5f1a6c4de8c15226d5c6cf717e2827a5552723b2d84edf427ee890c7c933c4d8d632686b5e68a2ba5dba230

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

@@ -2,9 +2,9 @@ module Katello
   class Api::V2::ContentViewFiltersController < Api::V2::ApiController
     include Katello::Concerns::FilteredAutoCompleteSearch
 
-    before_action :find_content_view
+    before_action :find_editable_content_view, :only => [:create, :update, :destroy]
+    before_action :find_readable_content_view, :only => [:show, :index, :auto_complete_search]
     before_action :find_filter, :except => [:index, :create, :auto_complete_search]
-
     wrap_parameters :include => (ContentViewFilter.attribute_names + %w(repository_ids))
 
     api :get, "/content_views/:content_view_id/filters", N_("list filters")
@@ -73,7 +73,7 @@ module Katello
       respond :resource => @filter
     end
 
-    api :delete, "/content_views/:content_view_id/filters/:id", N_("delete a filter")
+    api :delefind_filterte, "/content_views/:content_view_id/filters/:id", N_("delete a filter")
     api :delete, "/content_view_filters/:id", N_("delete a filter")
     param :content_view_id, :number, :desc => N_("content view identifier")
     param :id, :number, :desc => N_("filter identifier"), :required => true
@@ -84,18 +84,27 @@ module Katello
 
     private
 
-    def find_content_view
-      @view = ContentView.find(params[:content_view_id]) if params[:content_view_id]
+    def find_readable_content_view
+      @view = ContentView.readable.find_by(id: params[:content_view_id]) if params[:content_view_id]
+      throw_resource_not_found(name: 'content view', id: params[:content_view_id]) if params[:content_view_id] && @view.nil?
+    end
+
+    def find_editable_content_view
+      @view = ContentView.editable.find_by(id: params[:content_view_id]) if params[:content_view_id]
+      throw_resource_not_found(name: 'content view', id: params[:content_view_id]) if params[:content_view_id] && @view.nil?
     end
 
     def find_filter
       if @view
         @filter = @view.filters.find_by(:id => params[:id])
-        fail HttpErrors::NotFound, _("Couldn't find ContentViewFilter with id=%s") % params[:id] unless @filter
+      elsif params[:action] == 'show'
+        @filter = ContentViewFilter.readable.find_by(id: params[:id])
+        @view = @filter&.content_view
       else
-        @filter = ContentViewFilter.find(params[:id])
-        @view = @filter.content_view
+        @filter = ContentViewFilter.editable.find_by(id: params[:id])
+        @view = @filter&.content_view
       end
+      fail HttpErrors::NotFound, _("Couldn't find ContentViewFilter with id=%s") % params[:id] unless @filter
     end
 
     def filter_params

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

@@ -127,7 +127,7 @@ module Katello
     param :path, String, :desc => N_("Directory containing the exported Content View Version"), :required => true
     param :metadata, Hash, :desc => N_("Metadata taken from the upstream export history for this Content View Version"), :required => true
     def import
-      task = async_task(::Actions::Katello::ContentViewVersion::Import, @view, path: params[:path], metadata: metadata_params)
+      task = async_task(::Actions::Katello::ContentViewVersion::Import, @view, path: params[:path], metadata: metadata_params&.to_h)
       respond_for_async :resource => task
     end
 
@@ -355,8 +355,11 @@ module Katello
         fail HttpErrors::BadRequest, _("Destination Server Name required for Pulp3 repositories")
       end
 
+      history = ::Katello::ContentViewVersionExportHistory.find(params[:from_history_id]) unless params[:from_history_id].blank?
+
       async_task(::Actions::Pulp3::Orchestration::ContentViewVersion::Export, @version, destination_server: params[:destination_server],
-                                                                                               chunk_size: params[:chunk_size_mb])
+                                                                                         chunk_size: params[:chunk_size_mb],
+                                                                                         from_history: history)
     end
 
     def metadata_params

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

@@ -21,6 +21,7 @@ module Katello
       param :component_ids, Array, :desc => N_("List of component content view version ids for composite views")
       param :auto_publish, :bool, :desc => N_("Enable/Disable auto publish of composite view")
       param :solve_dependencies, :bool, :desc => N_("Solve RPM dependencies by default on Content View publish, defaults to false")
+      param :import_only, :bool, :desc => N_("Designate this Content View for importing from upstream servers only. Defaults to false") if pulp3_yum?
     end
 
     def filtered_associations
@@ -30,6 +31,10 @@ module Katello
       }
     end
 
+    def self.pulp3_yum?
+      SmartProxy.pulp_primary&.pulp3_repository_type_support?(Katello::Repository::YUM_TYPE)
+    end
+
     api :GET, "/organizations/:organization_id/content_views", N_("List content views")
     api :GET, "/content_views", N_("List content views")
     param :organization_id, :number, :desc => N_("organization identifier")
@@ -67,6 +72,10 @@ module Katello
     param :composite, :bool, :desc => N_("Composite content view")
     param_group :content_view
     def create
+      if ::Foreman::Cast.to_bool(params[:content_view][:import_only])
+        fail HttpErrors::BadRequest, _("Import-only content views will be available in a future version.") unless self.class.pulp3_yum?
+      end
+
       @content_view = ContentView.create!(view_params) do |view|
         view.organization = @organization
         view.label ||= labelize_params(params[:content_view])
@@ -237,7 +246,7 @@ module Katello
     end
 
     def view_params
-      attrs = [:name, :description, :force_puppet_environment, :auto_publish, :solve_dependencies,
+      attrs = [:name, :description, :force_puppet_environment, :auto_publish, :solve_dependencies, :import_only,
                :default, :created_at, :updated_at, :next_version, {:component_ids => []}]
       attrs.push(:label, :composite) if action_name == "create"
       if (!@content_view || !@content_view.composite?)

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

@@ -29,6 +29,7 @@ module Katello
 
     def find_host
       @host = resource_finder(::Host::Managed.authorized(:view_hosts, ::Host::Managed), params[:host_id])
+      throw_resource_not_found(name: 'host', id: params[:host_id]) if @host.nil?
     end
   end
 end

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

@@ -125,13 +125,13 @@ module Katello
 
     def find_host
       @host = resource_finder(::Host::Managed.authorized("view_hosts"), params[:host_id])
-      fail HttpErrors::NotFound, _("Couldn't find host '%s'") % params[:host_id] if @host.nil?
+      throw_resource_not_found(name: 'host', id: params[:host_id]) if @host.nil?
       @host
     end
 
     def find_host_editable
       @host = resource_finder(::Host::Managed.authorized("edit_hosts"), params[:host_id])
-      fail HttpErrors::NotFound, _("Couldn't find host '%s'") % params[:host_id] if @host.nil?
+      throw_resource_not_found(name: 'host', id: params[:host_id]) if @host.nil?
       @host
     end
 

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

@@ -7,11 +7,12 @@ module Katello
     before_action :find_host_collections, :only => [:bulk_add_host_collections, :bulk_remove_host_collections]
     before_action :find_environment, :only => [:environment_content_view]
     before_action :find_content_view, :only => [:environment_content_view]
-    before_action :find_editable_hosts, :except => [:destroy_hosts, :applicable_errata, :installable_errata, :resolve_traces]
+    before_action :find_editable_hosts, :except => [:destroy_hosts, :resolve_traces]
     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 :find_traces, :only => [:resolve_traces]
     before_action :deprecate_katello_agent, :only => [:install_content, :update_content, :remove_content]
 
     before_action :validate_content_action, :only => [:install_content, :update_content, :remove_content]
@@ -241,8 +242,7 @@ module Katello
     param_group :bulk_params
     param :trace_ids, Array, :required => true, :desc => N_("Array of Trace IDs")
     def resolve_traces
-      traces = Katello::HostTracer.resolvable.where(id: params[:trace_ids])
-      result = Katello::HostTraceManager.resolve_traces(traces)
+      result = Katello::HostTraceManager.resolve_traces(@traces)
 
       render json: result
     end
@@ -314,7 +314,9 @@ module Katello
     end
 
     def find_host_collections
-      @host_collections = HostCollection.where(:id => params[:host_collection_ids])
+      throw_resources_not_found(name: 'host collection', expected_ids: params[:host_collection_ids]) do
+        @host_collections = HostCollection.editable.where(id: params[:host_collection_ids])
+      end
     end
 
     def find_readable_hosts
@@ -377,11 +379,21 @@ module Katello
     end
 
     def find_environment
-      @environment = KTEnvironment.find(params[:environment_id])
+      @environment = KTEnvironment.editable.find(params[:environment_id])
+      throw_resource_not_found(name: 'lifecycle environment', id: params[:environment_id]) unless @environment
+      @environment
     end
 
     def find_content_view
-      @view = ContentView.find(params[:content_view_id])
+      @view = ContentView.editable.find(params[:content_view_id])
+      throw_resource_not_found(name: 'content view', id: params[:content_view_id]) unless @view
+      @view
+    end
+
+    def find_traces
+      throw_resources_not_found(name: 'host trace', expected_ids: params[:trace_ids]) do
+        @traces = Katello::HostTracer.resolvable.where(id: params[:trace_ids])
+      end
     end
 
     def disable_erratum_hosts_count

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

@@ -107,7 +107,7 @@ module Katello
 
     def find_products
       params.require(:ids)
-      @products = Product.where(:id => params[:ids])
+      @products = Product.readable.where(:id => params[:ids])
     end
   end
 end

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

@@ -4,7 +4,7 @@ module Katello
 
     before_action :find_activation_key, :only => [:index]
     before_action :find_organization, :only => [:create, :index, :auto_complete_search]
-    before_action :find_product, :only => [:update, :destroy, :sync]
+    before_action :find_authorized_katello_resource, :only => [:update, :destroy, :sync]
     before_action :find_organization_from_product, :only => [:update]
     before_action :authorize_gpg_key, :only => [:update, :create]
     before_action :authorize_ssl_ca_cert, :only => [:update, :create]
@@ -131,14 +131,14 @@ module Katello
     protected
 
     def find_product(options = {})
-      @product = Product.includes(options[:includes] || []).find_by(:id => params[:id])
-      fail HttpErrors::NotFound, _("Couldn't find product '%s'") % params[:id] unless @product
+      @product = Product.includes(options[:includes] || []).readable.find_by(:id => params[:id])
+      throw_resource_not_found(name: 'product', id: params[:id]) if @product.nil?
     end
 
     def find_activation_key
       if params[:activation_key_id]
-        @activation_key = ActivationKey.find_by(:id => params[:activation_key_id])
-        fail HttpErrors::NotFound, _("Couldn't find activation key '%s'") % params[:activation_key_id] if @activation_key.nil?
+        @activation_key = ActivationKey.readable.find_by(:id => params[:activation_key_id])
+        throw_resource_not_found(name: 'Activation Key', id: params[:activation_key_id]) if @activation_key.nil?
         @organization = @activation_key.organization
       end
     end
@@ -151,7 +151,7 @@ module Katello
       gpg_key_id = product_params[:gpg_key_id]
       if gpg_key_id
         gpg_key = GpgKey.readable.where(:id => gpg_key_id, :organization_id => @organization).first
-        fail HttpErrors::NotFound, _("Couldn't find gpg key '%s'") % gpg_key_id if gpg_key.nil?
+        throw_resource_not_found(name: 'gpg key', id: gpg_key_id) if gpg_key.nil?
       end
     end
 
@@ -159,7 +159,7 @@ module Katello
       ssl_ca_cert_id = product_params[:ssl_ca_cert_id]
       if ssl_ca_cert_id
         ssl_ca_cert = GpgKey.readable.where(:id => ssl_ca_cert_id, :organization_id => @organization).first
-        fail HttpErrors::NotFound, _("Couldn't find ssl ca cert '%s'") % ssl_ca_cert_id if ssl_ca_cert.nil?
+        throw_resource_not_found(name: 'ssl ca cert', id: ssl_ca_cert_id) if ssl_ca_cert.nil?
       end
     end
 
@@ -167,7 +167,7 @@ module Katello
       ssl_client_cert_id = product_params[:ssl_client_cert_id]
       if ssl_client_cert_id
         ssl_client_cert = GpgKey.readable.where(:id => ssl_client_cert_id, :organization_id => @organization).first
-        fail HttpErrors::NotFound, _("Couldn't find ssl client cert '%s'") % ssl_client_cert_id if ssl_client_cert.nil?
+        throw_resource_not_found(name: 'ssl client cert', id: ssl_client_cert_id) if ssl_client_cert.nil?
       end
     end
 
@@ -175,7 +175,7 @@ module Katello
       ssl_client_key_id = product_params[:ssl_client_key_id]
       if ssl_client_key_id
         ssl_client_key = GpgKey.readable.where(:id => ssl_client_key_id, :organization_id => @organization).first
-        fail HttpErrors::NotFound, _("Couldn't find ssl client key '%s'") % ssl_client_key_id if ssl_client_key.nil?
+        throw_resource_not_found(name: 'ssl client key', id: ssl_client_key_id) if ssl_client_key.nil?
       end
     end
 

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

@@ -4,8 +4,11 @@ module Katello
 
     include Katello::Concerns::FilteredAutoCompleteSearch
 
-    before_action :find_product_or_organization
+    before_action :set_readable_product_scope, only: [:index, :show, :available_repositories, :auto_complete_search]
+    before_action :set_editable_product_scope, only: [:enable, :disable]
+    before_action :find_product
     before_action :custom_product?
+    before_action :find_organization
     before_action :find_product_content, :except => [:index, :auto_complete_search]
 
     resource_description do
@@ -102,7 +105,8 @@ module Katello
 
     def index_relation
       if @product.nil?
-        relation = @organization.product_contents.displayable
+        authorized_product_contents = Katello::ProductContent.joins(:product).merge(@product_scope)
+        relation = @organization.product_contents.merge(authorized_product_contents).displayable
       else
         relation = @product.displayable_product_contents
       end
@@ -125,25 +129,31 @@ module Katello
       if @product.present?
         @product_content = @product.product_content_by_id(params[:id])
       else
-        content = Katello::Content.find_by(:cp_content_id => params[:id], :organization_id => @organization[:id])
-        @product_content = Katello::ProductContent.find_by(:content_id => content.id)
+        content = Katello::Content.where(cp_content_id: params[:id], organization: @organization)
+        authorized_product_contents = Katello::ProductContent.joins(:product).merge(@product_scope)
+        @product_content = authorized_product_contents.joins(:content).merge(content).first
+        @product = @product_content&.product
       end
-      fail HttpErrors::NotFound, _("Couldn't find repository set with id '%s'.") % params[:id] if @product_content.nil?
-      @product = @product_content.product if @product.nil?
+      throw_resource_not_found(name: 'repository set', id: params[:id]) if @product_content.nil?
     end
 
-    def find_product_or_organization
+    def find_product
       if params[:product_id]
-        find_product
-      else
-        @organization = find_organization
+        @product = @product_scope.find_by(id: params[:product_id])
+        throw_resource_not_found(name: 'product', id: params[:product_id]) if @product.nil?
       end
     end
 
-    def find_product
-      @product = Product.find_by(:id => params[:product_id])
-      fail HttpErrors::NotFound, _("Couldn't find product with id '%s'") % params[:product_id] if @product.nil?
-      @organization = @product.organization
+    def set_readable_product_scope
+      @product_scope = Katello::Product.readable
+    end
+
+    def set_editable_product_scope
+      @product_scope = Katello::Product.editable
+    end
+
+    def find_organization
+      @organization = @product&.organization || super
     end
 
     def custom_product?

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

@@ -42,6 +42,16 @@ module Katello
         fail HttpErrors::NotFound, _("Could not find %{name} resource with id %{id}") % {id: id, name: name}
       end
 
+      def throw_resources_not_found(name:, expected_ids: [])
+        resources = yield
+        found_ids = resources.map(&:id)
+        missing_ids = expected_ids.map(&:to_i) - found_ids
+
+        if missing_ids.any?
+          fail HttpErrors::NotFound, _("Could not find %{name} resources with ids %{ids}") % {ids: missing_ids.join(', '), name: name}
+        end
+      end
+
       def check_association_ids
         if filtered_associations
           wrapped_params = params[self._wrapper_options.name]

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

@@ -3,37 +3,41 @@ module Katello
     module Api::V2::BulkHostsExtensions
       extend ActiveSupport::Concern
 
+      def bulk_hosts_relation(permission, org)
+        relation = ::Host::Managed.authorized(permission)
+        relation = relation.where(organization: org) if org
+        relation
+      end
+
       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
-        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
+        if bulk_params[:included][:ids].blank? && bulk_params[:included][:search].nil?
+          fail HttpErrors::BadRequest, _("No hosts have been specified.")
+        end
+
+        find_organization
+        @hosts = bulk_hosts_relation(permission, @organization)
+
+        if bulk_params[:included][:ids].present?
+          @hosts = @hosts.where(id: bulk_params[:included][:ids])
         end
 
         if bulk_params[:included][:search]
-          search_hosts = ::Host::Managed.authorized(permission)
-          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))
-          else
-            @hosts = search_hosts
-          end
+          search_hosts = bulk_hosts_relation(permission, @organization).search_for(bulk_params[:included][:search])
+          @hosts = @hosts.merge(search_hosts)
         end
 
         @hosts = restrict_to.call(@hosts) if restrict_to
-        @hosts = @hosts.where.not(id: bulk_params[:excluded][:ids]) unless bulk_params[:excluded][:ids].blank?
 
-        if bulk_params[:included][:ids].blank? && bulk_params[:included][:search].nil?
-          fail HttpErrors::BadRequest, _("No hosts have been specified.")
-        elsif @hosts.empty?
-          fail HttpErrors::Forbidden, _("Action unauthorized to be performed on selected hosts.")
+        if bulk_params[:excluded][:ids].present?
+          @hosts = @hosts.where.not(id: bulk_params[:excluded][:ids])
         end
+
+        fail HttpErrors::Forbidden, _("Action unauthorized to be performed on selected hosts.") if @hosts.empty?
+
         @hosts
       end
 

data/app/controllers/katello/concerns/registration_controller_extensions.rb

@@ -0,0 +1,16 @@
+module Katello
+  module Concerns
+    module RegistrationControllerExtensions
+      extend ActiveSupport::Concern
+
+      included do
+        before_action :format_activation_key, only: [:create]
+      end
+
+      def format_activation_key
+        return if params[:activation_key].blank?
+        params[:activation_key] = params[:activation_key].split(',').map(&:strip).reject(&:blank?).join(',')
+      end
+    end
+  end
+end

data/app/lib/actions/helpers/smart_proxy_sync_history_helper.rb

@@ -0,0 +1,24 @@
+module Actions
+  module Helpers
+    module SmartProxySyncHistoryHelper
+      def self.included(base)
+        base.middleware.use ::Actions::Middleware::RecordSmartProxySyncHistory
+      end
+
+      def done?
+        is_done = super
+        if is_done
+          ::Katello::SmartProxySyncHistory.where(:id => output[:smart_proxy_history_id], :finished_at => nil).update_all(finished_at: Time.now)
+        end
+        is_done
+      end
+
+      def rescue_external_task(error)
+        if output[:smart_proxy_history_id]
+          ::Katello::SmartProxySyncHistory.where(:id => output[:smart_proxy_history_id], :finished_at => nil).delete_all
+        end
+        super
+      end
+    end
+  end
+end