katello 3.17.0 → 3.18.0

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

@@ -37,7 +37,7 @@ module Katello
     before_action :find_organization, :only => [:create, :paths, :auto_complete_search]
     before_action :find_optional_organization, :only => [:index, :show, :update, :destroy]
     before_action :find_prior, :only => [:create]
-    before_action :find_environment, :only => [:show, :update, :destroy, :repositories]
+    before_action :find_authorized_katello_resource, :only => [:show, :update, :destroy, :repositories]
     before_action :find_content_view, :only => [:repositories]
     before_action :find_path, :only => [:create]
 
@@ -154,16 +154,16 @@ module Katello
       respond_for_index(:collection => collection, :template => :paths)
     end
 
-    protected
+    def resource_name
+      'environment'
+    end
 
-    def find_environment
-      identifier = params.require(:id) || params.require(:environment).require(:id)
-      @environment = KTEnvironment.find(identifier)
-      fail HttpErrors::NotFound, _("Couldn't find environment '%s'") % identifier.to_s if @environment.nil?
-      @organization = @environment.organization
-      @environment
+    def resource_class
+      Katello::KTEnvironment
     end
 
+    protected
+
     def find_prior
       prior = params[:environment][:prior] || params.require(:environment).require(:prior_id)
       @prior = KTEnvironment.readable.find(prior)

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

@@ -52,13 +52,13 @@ module Katello
       respond_for_create(:resource => gpg_key)
     end
 
-    api :GET, "/gpg_keys/:id", N_("Show a gpg key")
+    api :GET, "/gpg_keys/:id", N_("Show a gpg key"), :deprecated => true
     param :id, :number, :desc => N_("gpg key numeric identifier"), :required => true
     def show
       respond_for_show(:resource => @gpg_key)
     end
 
-    api :PUT, "/gpg_keys/:id", N_("Update a repository")
+    api :PUT, "/gpg_keys/:id", N_("Update a repository"), :deprecated => true
     param :id, :number, :desc => N_("gpg key numeric identifier"), :required => true
     param_group :gpg_key
     def update
@@ -67,20 +67,20 @@ module Katello
       respond_for_show(:resource => @gpg_key)
     end
 
-    api :DELETE, "/gpg_keys/:id", N_("Destroy a gpg key")
+    api :DELETE, "/gpg_keys/:id", N_("Destroy a gpg key"), :deprecated => true
     param :id, :number, :desc => N_("gpg key numeric identifier"), :required => true
     def destroy
       @gpg_key.destroy
       respond_for_destroy
     end
 
-    api :GET, "/gpg_keys/:id/content", N_("Return the content of a gpg key, used directly by yum")
+    api :GET, "/gpg_keys/:id/content", N_("Return the content of a gpg key, used directly by yum"), :deprecated => true
     param :id, :number, :required => true
     def content
       render(:plain => @gpg_key.content, :layout => false)
     end
 
-    api :POST, "/gpg_keys/:id/content", N_("Upload gpg key contents")
+    api :POST, "/gpg_keys/:id/content", N_("Upload gpg key contents"), :deprecated => true
     param :id, :number, :desc => N_("gpg key numeric identifier"), :required => true
     param :content, File, :desc => N_("file contents"), :required => true
     def set_content

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

@@ -1,10 +1,17 @@
 module Katello
   class Api::V2::HostCollectionsController < Api::V2::ApiController
     include Katello::Concerns::FilteredAutoCompleteSearch
-    before_action :find_host_collection, :only => [:copy, :show, :update, :destroy,
-                                                   :add_hosts, :remove_hosts, :hosts]
-    before_action :find_activation_key
-    before_action :find_host
+    before_action :find_authorized_katello_resource, :only => [
+      :copy,
+      :show,
+      :update,
+      :destroy,
+      :add_hosts,
+      :remove_hosts,
+      :hosts
+    ]
+    before_action :find_readable_activation_key, :only => [:index]
+    before_action :find_editable_host, :only => [:index]
     before_action :find_optional_organization, :only => [:index]
     before_action :find_organization, :only => [:create, :auto_complete_search]
 
@@ -175,14 +182,6 @@ module Katello
 
     private
 
-    def find_host_collection
-      @organization = @host.organization if @host
-      @organization = @activation_key.organization if @activation_key
-      id = params[:host_collection_id] || params[:id]
-      @host_collection = HostCollection.where(:id => id).first
-      fail HttpErrors::NotFound, _("Couldn't find host collection '%s'") % id if @host_collection.nil?
-    end
-
     def host_collection_params
       attrs = [:name,
                :description,
@@ -199,14 +198,18 @@ module Katello
       result
     end
 
-    def find_host
+    def find_editable_host
       @host = resource_finder(::Host::Managed.authorized("edit_hosts"), params[:host_id]) if params[:host_id]
       @organization = @host.organization if @host
     end
 
-    def find_activation_key
-      @activation_key = ActivationKey.find_by!(:id => params[:activation_key_id]) if params[:activation_key_id]
-      @organization = @activation_key.organization if @activation_key
+    def find_readable_activation_key
+      @activation_key = ActivationKey.readable.find_by(:id => params[:activation_key_id]) if params[:activation_key_id]
+      if params[:activation_key_id] && @activation_key.nil?
+        throw_resource_not_found(name: 'activation_key', id: params[:activation_key_id])
+      else
+        @organization = @activation_key&.organization
+      end
     end
   end
 end

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,12 +242,28 @@ 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
 
+    api :PUT, "/hosts/bulk/system_purpose", N_("Assign system purpose attributes on one or more hosts")
+    param_group :bulk_params
+    param :service_level, String, :desc => N_("Service level of host")
+    param :purpose_role, String, :desc => N_("Role of host")
+    param :purpose_usage, String, :desc => N_("Usage of host")
+    param :purpose_addons, Array, :desc => N_("Sets the system add-ons")
+    def system_purpose
+      task = async_task(::Actions::BulkAction, ::Actions::Katello::Host::UpdateSystemPurpose,
+        @hosts,
+        params[:service_level],
+        params[:purpose_role],
+        params[:purpose_usage],
+        params[:purpose_addons])
+
+      respond_for_async :resource => task
+    end
+
     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
@@ -297,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
@@ -360,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/repositories_bulk_actions_controller.rb

@@ -62,7 +62,7 @@ module Katello
 
     def find_repositories
       params.require(:ids)
-      @repositories = Repository.where(:id => params[:ids])
+      @repositories = Repository.readable.where(:id => params[:ids])
     end
   end
 end

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

@@ -35,6 +35,8 @@ module Katello
 
     def_param_group :repo do
       param :url, String, :desc => N_("repository source url")
+      param :os_versions, Array,
+            :desc => N_("Identifies whether the repository should be disabled on a client with a non-matching OS version. Pass [] to enable regardless of OS version. Maximum length 1; allowed tags are: %s") % Katello::RootRepository::ALLOWED_OS_VERSIONS.join(', ')
       param :gpg_key_id, :number, :desc => N_("id of the gpg key that will be assigned to the new repository")
       param :ssl_ca_cert_id, :number, :desc => N_("Identifier of the content credential containing the SSL CA Cert")
       param :ssl_client_cert_id, :number, :desc => N_("Identifier of the content credential containing the SSL Client Cert")
@@ -42,7 +44,7 @@ module Katello
       param :unprotected, :bool, :desc => N_("true if this repository can be published via HTTP")
       param :checksum_type, String, :desc => N_("Checksum of the repository, currently 'sha1' & 'sha256' are supported")
       param :docker_upstream_name, String, :desc => N_("Name of the upstream docker repository")
-      param :docker_tags_whitelist, Array, :desc => N_("Comma separated list of tags to sync for Container Image repository")
+      param :docker_tags_whitelist, Array, :desc => N_("Comma-separated list of tags to sync for Container Image repository")
       param :download_policy, ["immediate", "on_demand", "background"], :desc => N_("download policy for yum repos (either 'immediate', 'on_demand', or 'background (deprecated)')")
       param :download_concurrency, :number, :desc => N_("Used to determine download concurrency of the repository in pulp3. Use value less than 20. Defaults to 10")
       param :mirror_on_sync, :bool, :desc => N_("true if this repository when synced has to be mirrored from the source and stale rpms removed")
@@ -51,9 +53,9 @@ module Katello
       param :upstream_password, String, :desc => N_("Password of the upstream repository user used for authentication")
       param :ostree_upstream_sync_policy, ::Katello::RootRepository::OSTREE_UPSTREAM_SYNC_POLICIES, :desc => N_("policies for syncing upstream ostree repositories")
       param :ostree_upstream_sync_depth, :number, :desc => N_("if a custom sync policy is chosen for ostree repositories then a 'depth' value must be provided")
-      param :deb_releases, String, :desc => N_("comma separated list of releases to be synched from deb-archive")
-      param :deb_components, String, :desc => N_("comma separated list of repo components to be synched from deb-archive")
-      param :deb_architectures, String, :desc => N_("comma separated list of architectures to be synched from deb-archive")
+      param :deb_releases, String, :desc => N_("comma-separated list of releases to be synced from deb-archive")
+      param :deb_components, String, :desc => N_("comma-separated list of repo components to be synced from deb-archive")
+      param :deb_architectures, String, :desc => N_("comma-separated list of architectures to be synced from deb-archive")
       param :ignore_global_proxy, :bool, :desc => N_("if true, will ignore the globally configured proxy when syncing"), :deprecated => true
       param :ignorable_content, Array, :desc => N_("List of content units to ignore while syncing a yum repository. Must be subset of %s") % RootRepository::IGNORABLE_CONTENT_UNIT_TYPES.join(",")
       param :ansible_collection_requirements, String, :desc => N_("Contents of requirement yaml file to sync from URL")
@@ -93,6 +95,7 @@ module Katello
     param :available_for, String, :desc => N_("interpret specified object to return only Repositories that can be associated with specified object.  Only 'content_view' & 'content_view_version' are supported."),
           :required => false
     param :with_content, RepositoryTypeManager.enabled_content_types, :desc => N_("only repositories having at least one of the specified content type ex: rpm , erratum")
+    param :download_policy, ::Runcible::Models::YumImporter::DOWNLOAD_POLICIES, :desc => N_("limit to only repositories with this download policy")
     param_group :search, Api::V2::ApiController
     add_scoped_search_description_for(Repository)
     def index
@@ -136,6 +139,7 @@ module Katello
     def index_relation_product(query)
       query = query.joins(:root => :product).where("#{Product.table_name}.organization_id" => @organization) if @organization
       query = query.joins(:root).where("#{RootRepository.table_name}.product_id" => @product.id) if @product
+      query = query.joins(:root).where("#{RootRepository.table_name}.download_policy" => params[:download_policy]) if params[:download_policy]
       query
     end
 
@@ -476,7 +480,7 @@ module Katello
 
     def repository_params
       keys = [:download_policy, :mirror_on_sync, :arch, :verify_ssl_on_sync, :upstream_password, :upstream_username, :download_concurrency,
-              :ostree_upstream_sync_depth, :ostree_upstream_sync_policy,
+              :ostree_upstream_sync_depth, :ostree_upstream_sync_policy, {:os_versions => []},
               :deb_releases, :deb_components, :deb_architectures, :description, :http_proxy_policy, :http_proxy_id,
               {:ignorable_content => []}
              ]
@@ -527,6 +531,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.os_versions = repo_params.fetch(:os_versions, []) if root.yum?
 
       if root.ostree?
         root.ostree_upstream_sync_policy = repo_params[:ostree_upstream_sync_policy]

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/api/v2/subscriptions_controller.rb

@@ -19,7 +19,7 @@ module Katello
 
     api :GET, "/organizations/:organization_id/subscriptions", N_("List organization subscriptions")
     api :GET, "/activation_keys/:activation_key_id/subscriptions", N_("List an activation key's subscriptions")
-    api :GET, "/subscriptions"
+    api :GET, "/subscriptions", N_("List subscriptions")
     param_group :search, Api::V2::ApiController
     param :organization_id, :number, :desc => N_("Organization ID"), :required => false
     param :host_id, String, :desc => N_("id of a host"), :required => false