katello 3.18.0.rc1 → 4.0.0.rc1

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")
@@ -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

@@ -1,11 +1,13 @@
 module Katello
-  # rubocop:disable Metrics/ClassLength
   class Api::V2::ContentViewVersionsController < Api::V2::ApiController
     include Concerns::Api::V2::BulkHostsExtensions
     include Katello::Concerns::FilteredAutoCompleteSearch
 
-    before_action :find_content_view_version, :only => [:show, :update, :promote, :destroy, :export, :republish_repositories]
-    before_action :find_content_view, :except => [:incremental_update]
+    before_action :find_authorized_katello_resource, :only => [:show, :update, :promote, :destroy, :export, :republish_repositories]
+    before_action :find_content_view_from_version, :only => [:show, :update, :promote, :destroy, :export, :republish_repositories]
+    before_action :find_optional_readable_content_view, :only => [:index]
+    before_action :find_publishable_content_view, :only => [:import]
+
     before_action :find_environment, :only => [:index]
     before_action :find_environments, :only => [:promote]
     before_action :validate_promotable, :only => [:promote]
@@ -47,7 +49,7 @@ module Katello
     api :GET, "/content_view_versions/:id", N_("Show content view version")
     param :id, :number, :desc => N_("Content view version identifier"), :required => true
     def show
-      respond :resource => @version
+      respond :resource => @content_view_version
     end
 
     api :POST, "/content_view_versions/:id/promote", N_("Promote a content view version")
@@ -58,7 +60,7 @@ module Katello
     def promote
       is_force = ::Foreman::Cast.to_bool(params[:force])
       task = async_task(::Actions::Katello::ContentView::Promote,
-                        @version, @environments, is_force, params[:description])
+                        @content_view_version, @environments, is_force, params[:description])
       respond_for_async :resource => task
     end
 
@@ -66,59 +68,54 @@ module Katello
     param :id, :number, :desc => N_("Content view version identifier"), :required => true
     param :description, String, :desc => N_("The description for the content view version"), :required => true
     def update
-      history = @version.history.publish.successful.first
+      history = @content_view_version.history.publish.successful.first
       if history.blank?
         fail HttpErrors::BadRequest, _("This content view version doesn't have a history.")
       else
         history.notes = params[:description]
         history.save!
-        respond_for_show(:resource => @version)
+        respond_for_show(:resource => @content_view_version)
       end
     end
 
     api :PUT, "/content_view_versions/:id/republish_repositories", N_("Forces a republish of the version's repositories' metadata")
     param :id, :number, :desc => N_("Content view version identifier"), :required => true
     def republish_repositories
-      task = async_task(::Actions::Katello::ContentViewVersion::RepublishRepositories, @version)
+      task = async_task(::Actions::Katello::ContentViewVersion::RepublishRepositories, @content_view_version)
       respond_for_async :resource => task
     end
 
-    api :GET, "/content_view_versions/export_histories", N_("Show the export history for a content view version")
-    param :content_view_version_id, :number, :desc => N_("Content view version identifier"), :required => false
-    param :content_view_id, :number, :desc => N_("Content view identifier"), :required => false
-    param :destination_server, String, :desc => N_("Destination Server name"), :required => false
-    param :organization_id, :number, :desc => N_("Organization identifier"), :required => false
-    param_group :search, Api::V2::ApiController
-    add_scoped_search_description_for(ContentViewVersionExportHistory)
-    def export_histories
-      history = ContentViewVersionExportHistory.readable
-      history = history.where(:content_view_version_id => params[:content_view_version_id]) unless params[:content_view_version_id].blank?
-      history = history.where(:destination_server => params[:destination_server]) unless params[:destination_server].blank?
-      history = history.with_organization_id(params[:organization_id]) unless params[:organization_id].blank?
-      history = history.with_content_view_id(params[:content_view_id]) unless params[:content_view_id].blank?
-      respond_for_index(:collection => scoped_search(history, 'id', 'asc', resource_class: ContentViewVersionExportHistory),
-                        :template => '../../../api/v2/content_view_version_export_histories/index')
-    end
-
-    api :GET, "/content_view_versions/export_api_status", N_("true if the export api is pulp3 ready and usable. This API is intended for use by hammer-cli only.")
-    def export_api_status
-      ::Foreman::Deprecation.api_deprecation_warning("export_api_status is being deprecated and will be removed in a future version of Katello.")
-      render json: { api_usable: SmartProxy.pulp_primary.pulp3_repository_type_support?(Katello::Repository::YUM_TYPE) }, status: :ok
-    end
-
-    api :POST, "/content_view_versions/:id/export", N_("Export a content view version")
+    api :POST, "/content_view_versions/:id/export", N_("Export a content view version.  Relevant only for Pulp 2 repositories.")
     param :id, :number, :desc => N_("Content view version identifier"), :required => true
-    param :destination_server, String, :desc => N_("Destination Server name, required for Pulp3")
-    param :chunk_size_mb, :number, :desc => N_("Chunk export-tarfile into pieces of chunk_size mega bytes. Relevant only for Pulp 3 repositories"), :required => false
-    param :export_to_iso, :bool, :desc => N_("Export to ISO format. Relevant only for Pulp 2 repositories"), :required => false
+    param :export_to_iso, :bool, :desc => N_("Export to ISO format."), :required => false
     param :iso_mb_size, :number, :desc => N_("maximum size of each ISO in MB. Relevant only for Pulp 2 repositories"), :required => false
     param :since, Date, :desc => N_("Optional date of last export (ex: 2010-01-01T12:00:00Z). Relevant only for Pulp 2 repositories"), :required => false
     def export
-      task = if SmartProxy.pulp_primary.pulp3_repository_type_support?(Katello::Repository::YUM_TYPE)
-               export_pulp_v3
-             else
-               export_pulp_v2
-             end
+      if SmartProxy.pulp_primary.pulp3_repository_type_support?(Katello::Repository::YUM_TYPE)
+        fail HttpErrors::BadRequest, _("Invalid usage for Pulp 3 repositories. "\
+                                       "Use hammer content-export for Yum repositories")
+      end
+      ::Foreman::Deprecation.api_deprecation_warning("Export is being deprecated and will be removed in a future version of Katello. Use hammer content-view version export instead.")
+      if params[:export_to_iso].blank? && params[:iso_mb_size].present?
+        fail HttpErrors::BadRequest, _("ISO export must be enabled when specifying ISO size")
+      end
+
+      if (repos = @content_view_version.content_view.on_demand_repositories).any?
+        fail HttpErrors::BadRequest, _("This content view has on demand repositories that cannot be exported: %{repos}" % {repos: repos.pluck(:label).join(", ")})
+      end
+
+      if params[:since].present?
+        begin
+          params[:since].to_datetime
+        rescue
+          raise HttpErrors::BadRequest, _("Invalid date provided.")
+        end
+      end
+      task = async_task(::Actions::Katello::ContentViewVersion::Export, @content_view_version,
+                        ::Foreman::Cast.to_bool(params[:export_to_iso]),
+                        params[:since].try(:to_datetime),
+                        params[:iso_mb_size])
+
       respond_for_async :resource => task
     end
 
@@ -127,14 +124,14 @@ 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
 
     api :DELETE, "/content_view_versions/:id", N_("Remove content view version")
     param :id, :number, :desc => N_("Content view version identifier"), :required => true
     def destroy
-      task = async_task(::Actions::Katello::ContentViewVersion::Destroy, @version)
+      task = async_task(::Actions::Katello::ContentViewVersion::Destroy, @content_view_version)
       respond_for_async :resource => task
     end
 
@@ -174,7 +171,7 @@ module Katello
 
       validate_content(params[:add_content])
       resolve_dependencies = params.fetch(:resolve_dependencies, true)
-      task = async_task(::Actions::Katello::ContentView::IncrementalUpdates, @version_environments, @composite_version_environments,
+      task = async_task(::Actions::Katello::ContentView::IncrementalUpdates, @content_view_version_environments, @composite_version_environments,
                         params[:add_content], resolve_dependencies, hosts, params[:description])
       respond_for_async :resource => task
     end
@@ -200,17 +197,22 @@ module Katello
       find_bulk_hosts(:edit_hosts, params[:update_hosts], restrict_hosts)
     end
 
-    def find_content_view_version
-      @version = ContentViewVersion.find(params[:id])
-    end
-
-    def find_content_view
-      @view = @version ? @version.content_view : ContentView.where(:id => params[:content_view_id]).first
+    def find_content_view_from_version
+      @view = @content_view_version.content_view
       if @view&.default? && params[:action] == "promote"
         fail HttpErrors::BadRequest, _("The default content view cannot be promoted")
       end
     end
 
+    def find_optional_readable_content_view
+      @view = ContentView.readable.find_by(:id => params[:content_view_id])
+    end
+
+    def find_publishable_content_view
+      @view = ContentView.publishable.find_by(:id => params[:content_view_id])
+      throw_resource_not_found(name: 'product', id: params[:product_id]) if @view.nil?
+    end
+
     def find_version_environments
       #Generates a data structure for incremental update:
       # [{:content_view_version => ContentViewVersion, :environments => [KTEnvironment]}]
@@ -218,7 +220,7 @@ module Katello
       list = params[:content_view_version_environments]
       fail _("At least one Content View Version must be specified") if list.empty?
 
-      @version_environments = []
+      @content_view_version_environments = []
       @composite_version_environments = []
       list.each do |combination|
         version_environment = {
@@ -242,7 +244,7 @@ module Katello
         if view.composite?
           @composite_version_environments << version_environment
         else
-          @version_environments << version_environment
+          @content_view_version_environments << version_environment
           @composite_version_environments += lookup_all_composites(version_environment[:content_view_version]) if params[:propagate_all_composites]
         end
       end
@@ -261,7 +263,7 @@ module Katello
     def find_version_environments_for_hosts(include_composites)
       if include_composites
         version_environments_for_systems_map = {}
-        @version_environments.each do |version_environment|
+        @content_view_version_environments.each do |version_environment|
           version_environment[:content_view_version].composites.each do |composite_version|
             version_environments_for_systems_map[composite_version.id] ||= {:content_view_version => composite_version,
                                                                             :environments => composite_version.environments}
@@ -270,7 +272,7 @@ module Katello
 
         version_environments_for_systems_map.values
       else
-        @version_environments.select { |ve| !ve[:environments].blank? }
+        @content_view_version_environments.select { |ve| !ve[:environments].blank? }
       end
     end
 
@@ -313,52 +315,15 @@ module Katello
 
     def validate_promotable
       fail HttpErrors::BadRequest, _("Could not find environments for promotion") if @environments.blank?
-      return deny_access unless @environments.all?(&:promotable_or_removable?) && @version.content_view.promotable_or_removable?
+      return deny_access unless @environments.all?(&:promotable_or_removable?) && @content_view_version.content_view.promotable_or_removable?
       true
     end
 
     def authorize_destroy
-      return deny_access unless @version.content_view.deletable?
+      return deny_access unless @content_view_version.content_view.deletable?
       true
     end
 
-    def export_pulp_v2
-      ::Foreman::Deprecation.api_deprecation_warning("Export is being deprecated and will be removed in a future version of Katello. Use hammer content-view version export instead.")
-      if params[:export_to_iso].blank? && params[:iso_mb_size].present?
-        fail HttpErrors::BadRequest, _("ISO export must be enabled when specifying ISO size")
-      end
-
-      if (repos = @version.content_view.on_demand_repositories).any?
-        fail HttpErrors::BadRequest, _("This content view has on demand repositories that cannot be exported: %{repos}" % {repos: repos.pluck(:label).join(", ")})
-      end
-
-      if params[:since].present?
-        begin
-          params[:since].to_datetime
-        rescue
-          raise HttpErrors::BadRequest, _("Invalid date provided.")
-        end
-      end
-      async_task(::Actions::Katello::ContentViewVersion::Export, @version,
-                        ::Foreman::Cast.to_bool(params[:export_to_iso]),
-                        params[:since].try(:to_datetime),
-                        params[:iso_mb_size])
-    end
-
-    def export_pulp_v3
-      invalid_params = [:export_to_iso, :iso_mb_size, :since].reject { |param| params[param].blank? }
-      unless invalid_params.empty?
-        fail HttpErrors::BadRequest, _("Invalid parameters provided - %{params}. These are only relevant for Pulp 2 repositories" % { params: invalid_params.join(', ')})
-      end
-
-      if params[:destination_server].blank?
-        fail HttpErrors::BadRequest, _("Destination Server Name required for Pulp3 repositories")
-      end
-
-      async_task(::Actions::Pulp3::Orchestration::ContentViewVersion::Export, @version, destination_server: params[:destination_server],
-                                                                                               chunk_size: params[:chunk_size_mb])
-    end
-
     def metadata_params
       params.require(:metadata).permit(
         :organization,

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])
@@ -181,8 +190,8 @@ module Katello
 
     api :PUT, "/content_views/:id/remove", N_("Remove versions and/or environments from a content view and reassign systems and keys")
     param :id, :number, :desc => N_("content view numeric identifier"), :required => true
-    param :environment_ids, :number, :desc => N_("environment numeric identifiers to be removed")
-    param :content_view_version_ids, :number, :desc => N_("content view version identifiers to be deleted")
+    param :environment_ids, Array, of: :number, :desc => N_("environment numeric identifiers to be removed")
+    param :content_view_version_ids, Array, of: :number, :desc => N_("content view version identifiers to be deleted")
     param :system_content_view_id, :number, :desc => N_("content view to reassign orphaned systems to")
     param :system_environment_id, :number, :desc => N_("environment to reassign orphaned systems to")
     param :key_content_view_id, :number, :desc => N_("content view to reassign orphaned activation keys to")
@@ -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/host_subscriptions_controller.rb

@@ -42,9 +42,8 @@ module Katello
     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)
+      presenter = ::Katello::HostSubscriptionsPresenter.new(@host)
+      full_result_response(presenter.subscriptions)
     end
 
     api :PUT, "/hosts/:host_id/subscriptions/auto_attach", N_("Trigger an auto-attach of subscriptions")

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
@@ -267,8 +267,9 @@ module Katello
     api :POST, "/hosts/bulk/available_incremental_updates", N_("Given a set of hosts and errata, lists the content view versions" \
                                                                  " and environments that need updating.")
     param_group :bulk_params
-    param :errata_ids, Array, :desc => N_("List of Errata ids")
+    param :errata_ids, Array, :desc => N_("List of Errata ids"), :required => true
     def available_incremental_updates
+      fail HttpErrors::BadRequest, _("errata_ids is a required parameter") if params[:errata_ids].empty?
       version_environments = {}
       content_facets = Katello::Host::ContentFacet.with_non_installable_errata(@errata, @hosts)
 
@@ -314,7 +315,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 +380,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