katello 3.15.1 → 3.16.0.rc2.1

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

@@ -99,7 +99,6 @@ module Katello
         N_("Fetch applicable errata for one or more hosts.")
     param_group :bulk_params
     def applicable_errata
-      ::Foreman::Deprecation.api_deprecation_warning("The 'applicable_hosts' field will be removed from this API in Katello 2.0")
       respond_for_index(:collection => scoped_search(Katello::Erratum.applicable_to_hosts(@hosts), 'updated', 'desc',
                                                      :resource_class => Erratum))
     end
@@ -108,7 +107,6 @@ module Katello
         N_("Fetch installable errata for one or more hosts.")
     param_group :bulk_params
     def installable_errata
-      ::Foreman::Deprecation.api_deprecation_warning("The 'applicable_hosts' field will be removed from this API in Katello 2.0")
       respond_for_index(:collection => scoped_search(Katello::Erratum.installable_for_hosts(@hosts), 'updated', 'desc',
                                                      :resource_class => Erratum))
     end
@@ -225,6 +223,13 @@ module Katello
       respond_for_async :resource => task
     end
 
+    api :POST, "/hosts/bulk/traces", N_("Fetch traces for one or more hosts")
+    param_group :bulk_params
+    def traces
+      collection = scoped_search(Katello::HostTracer.where(host_id: @hosts.pluck(:id)), 'application', 'desc', resource_class: Katello::HostTracer)
+      respond_for_index(:collection => collection, :template => '../../../api/v2/host_tracer/index')
+    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

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

@@ -7,8 +7,7 @@ module Katello
 
     before_action :local_find_taxonomy, :only => %w(repo_discover cancel_repo_discover
                                                     download_debug_certificate
-                                                    redhat_provider update releases
-                                                    autoattach_subscriptions)
+                                                    redhat_provider update releases)
 
     resource_description do
       api_version 'v2'
@@ -32,6 +31,7 @@ module Katello
         param :environment_ids, Array, N_("Environment IDs"), :required => false
         param :subnet_ids, Array, N_("Subnet IDs"), :required => false
         param :label, String, :required => false
+        param :location_ids, Array, N_("Associated location IDs"), :required => false
       end
     end
 
@@ -55,13 +55,9 @@ module Katello
     end
 
     api :PUT, '/organizations/:id', N_('Update organization')
-    # The organization param hash below is redefined from foreman's ::Api::V2::TaxonomiesController
-    # resource param_group instead of reusing the param_group :resource scoped from TaxonomiesController.
-    # This is because name substitutions of the param group's name from :resource to :organization are limited
-    # to the inclusion of a modules.
     param :id, :number, :desc => N_("organization ID"), :required => true
     param :redhat_repository_url, String, :desc => N_("Red Hat CDN URL")
-    param_group :resource, ::Api::V2::TaxonomiesController
+    param_group :resource
     def update
       if params.key?(:redhat_repository_url)
         org_params = params.permit(:redhat_repository_url).to_h
@@ -76,6 +72,9 @@ module Katello
       @organization = Organization.new(resource_params)
       sync_task(::Actions::Katello::Organization::Create, @organization)
       @organization.reload
+      # @taxonomy instance variable is necessary for foreman side
+      # app/views/api/v2/taxonomies/show.json.rabl is using it.
+      @taxonomy = @organization
       respond_for_create :resource => @organization
     rescue => e
       ::Foreman::Logging.exception('Could not create organization', e)
@@ -134,12 +133,6 @@ module Katello
       respond_for_index :collection => response
     end
 
-    api :POST, "/organizations/:id/autoattach_subscriptions", N_("Auto-attach available subscriptions to all hosts within an organization. Asynchronous operation."), :deprecated => true
-    def autoattach_subscriptions
-      task = async_task(::Actions::Katello::Organization::AutoAttachSubscriptions, @organization)
-      respond_for_async :resource => task
-    end
-
     api :GET, '/organizations/:id/redhat_provider', N_('List all :resource_id')
     def redhat_provider
       respond_for_show(:resource => @organization.redhat_provider,
@@ -150,7 +143,7 @@ module Katello
 
     def action_permission
       if %w(download_debug_certificate redhat_provider repo_discover
-            cancel_repo_discover autoattach_subscriptions).include?(params[:action])
+            cancel_repo_discover).include?(params[:action])
         :edit
       elsif params[:action] == "releases"
         :view

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

@@ -4,7 +4,7 @@ module Katello
     include Katello::Concerns::Api::V2::RepositoryContentController
 
     before_action :find_repositories, :only => [:auto_complete_name, :auto_complete_arch]
-    before_action :find_host, :only => :index
+    before_action :find_hosts, :only => :index
 
     def auto_complete_name
       page_size = Katello::Concerns::FilteredAutoCompleteSearch::PAGE_SIZE
@@ -51,17 +51,15 @@ module Katello
     end
 
     def custom_index_relation(collection)
-      applicable = ::Foreman::Cast.to_bool(params[:packages_restrict_applicable]) || @host
+      applicable = ::Foreman::Cast.to_bool(params[:packages_restrict_applicable]) || params[:host_id]
       upgradable = ::Foreman::Cast.to_bool(params[:packages_restrict_upgradable])
-      if applicable || upgradable
-        hosts = @host ? [@host] : ::Host::Managed.authorized("view_hosts")
-        hosts = hosts.where(:organization_id => params[:organization_id]) if params[:organization_id]
-        if upgradable
-          collection = collection.installable_for_hosts(hosts)
-        elsif applicable
-          collection = collection.applicable_to_hosts(hosts)
-        end
+
+      if upgradable
+        collection = collection.installable_for_hosts(@hosts)
+      elsif applicable
+        collection = collection.applicable_to_hosts(@hosts)
       end
+
       collection
     end
 
@@ -93,11 +91,13 @@ module Katello
 
     private
 
-    def find_host
+    def find_hosts
+      @hosts = ::Host::Managed.authorized("view_hosts")
       if params[:host_id]
-        @host = ::Host::Managed.authorized("view_hosts").find_by(:id => params[:host_id])
-        fail HttpErrors::NotFound, _('Could not find a host with id %s') % params[:host_id] unless @host
+        @hosts = @hosts.where(:id => params[:host_id])
+        fail HttpErrors::NotFound, _('Could not find a host with id %s') % params[:host_id] if @hosts.empty?
       end
+      @hosts = @hosts.where(:organization_id => params[:organization_id]) if params[:organization_id]
     end
 
     def find_repositories

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

@@ -87,6 +87,7 @@ module Katello
     end
 
     api :GET, "/products/:id", N_("Show a product")
+    param :organization_id, :number, :desc => N_("Organization ID")
     param :id, :number, :desc => N_("product numeric identifier"), :required => true
     def show
       find_product(:includes => [{:root_repositories => {:repositories => :environment}}])
@@ -180,7 +181,7 @@ module Katello
 
     def product_params
       # only allow sync plan id to be updated if the product is a Red Hat product
-      if @product && @product.redhat?
+      if @product&.redhat?
         params.require(:product).permit(:sync_plan_id)
       else
         params.require(:product).permit(:name, :label, :description, :provider_id, :gpg_key_id, :ssl_ca_cert_id, :ssl_client_cert_id, :ssl_client_key_id, :sync_plan_id)

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

@@ -42,7 +42,7 @@ module Katello
       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 :download_policy, ["immediate", "on_demand", "background"], :desc => N_("download policy for yum repos (either 'immediate', 'on_demand', or 'background')")
+      param :download_policy, ["immediate", "on_demand", "background"], :desc => N_("download policy for yum repos (either 'immediate', 'on_demand', or 'background (deprecated)')")
       param :mirror_on_sync, :bool, :desc => N_("true if this repository when synced has to be mirrored from the source and stale rpms removed")
       param :verify_ssl_on_sync, :bool, :desc => N_("if true, Katello will verify the upstream url's SSL certifcates are signed by a trusted CA")
       param :upstream_username, String, :desc => N_("Username of the upstream repository user used for authentication")
@@ -209,7 +209,8 @@ module Katello
     end
 
     api :POST, "/repositories", N_("Create a custom repository")
-    param :name, String, :required => true
+    param :name, String, :desc => N_("Name of the repository"), :required => true
+    param :description, String, :desc => N_("Description of the repository"), :required => false
     param_group :repo_create
     param_group :repo
     def create
@@ -220,7 +221,7 @@ module Katello
       end
 
       if repo_params['content_type'] == "puppet" || repo_params['content_type'] == "ostree"
-        ::Foreman::Deprecation.api_deprecation_warning("Puppet and OSTree will no longer be supported in Katello 3.16")
+        ::Foreman::Deprecation.api_deprecation_warning("Puppet and OSTree will no longer be supported in Katello 4.0")
       end
 
       gpg_key = get_content_credential(repo_params, CONTENT_CREDENTIAL_GPG_KEY_TYPE)
@@ -260,6 +261,7 @@ module Katello
 
     api :GET, "/repositories/:id", N_("Show a repository")
     param :id, :number, :required => true, :desc => N_("repository ID")
+    param :organization_id, :number, :desc => N_("Organization ID")
     def show
       respond_for_show(:resource => @repository)
     end
@@ -384,7 +386,6 @@ module Katello
 
     api :PUT, "/repositories/:id/import_uploads", N_("Import uploads into a repository")
     param :id, :number, :required => true, :desc => N_("Repository id")
-    param :upload_ids, Array, :desc => N_("Array of upload ids to import"), :deprecated => true
     param :async, :bool, desc: N_("Do not wait for the ImportUpload action to finish. Default: false")
     param 'publish_repository', :bool, :desc => N_("Whether or not to regenerate the repository on disk. Default: true")
     param 'sync_capsule', :bool, :desc => N_("Whether or not to sync an external capsule after upload. Default: true")
@@ -401,19 +402,14 @@ module Katello
       generate_metadata = ::Foreman::Cast.to_bool(params.fetch(:publish_repository, true))
       sync_capsule = ::Foreman::Cast.to_bool(params.fetch(:sync_capsule, true))
       async = ::Foreman::Cast.to_bool(params.fetch(:async, false))
-      if params['upload_ids'].empty? && params['uploads'].empty?
-        fail HttpErrors::BadRequest, _('No upload param specified. Either uploads or upload_ids (deprecated) is required.')
+      if params['uploads'].empty?
+        fail HttpErrors::BadRequest, _('No uploads param specified. An array of uploads to import is required.')
       end
 
       uploads = (params[:uploads] || []).map do |upload|
         upload.permit(:id, :content_unit_id, :size, :checksum, :name, :digest).to_h
       end
 
-      if params.key?(:upload_ids)
-        ::Foreman::Deprecation.api_deprecation_warning("The parameter upload_ids will be removed in Katello 3.3. Please update to use the uploads parameter.")
-        params[:upload_ids].each { |upload_id| uploads << {'id' => upload_id} }
-      end
-
       begin
         respond_for_async(resource: send(
           async ? :async_task : :sync_task,

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

@@ -147,7 +147,7 @@ module Katello
     end
 
     def custom_product?
-      fail _('Repository sets are not available for custom products.') if @product && @product.custom?
+      fail _('Repository sets are not available for custom products.') if @product&.custom?
     end
 
     def substitutions

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

@@ -9,7 +9,6 @@ module Katello
                                                 :refresh_manifest, :manifest_history]
     before_action :check_disconnected, only: [:refresh_manifest]
     before_action :find_provider
-    before_action :deprecated, :only => [:create, :destroy]
 
     skip_before_action :check_content_type, :only => [:upload]
 
@@ -76,34 +75,14 @@ module Katello
     param :id, :number, :desc => N_("Subscription identifier"), :required => true
     def show
       @resource = Katello::Pool.with_identifier(params[:id])
-      fail ActiveRecord::RecordNotFound, N_('Subscription not found') unless @resource
-      unless @resource.readable?
-        fail ActiveRecord::RecordNotFound, N_('This subscription is not relevant to the current user and organization.')
-      end
-      respond(:resource => @resource)
-    end
 
-    api :POST, "/activation_keys/:activation_key_id/subscriptions", N_("Add a subscription to an activation key"), :deprecated => true
-    param :id, String, :desc => N_("Subscription Pool uuid"), :required => false
-    param :activation_key_id, String, :desc => N_("ID of the activation key"), :required => false
-    param :quantity, :number, :desc => N_("Quantity of this subscriptions to add"), :required => false
-    param :subscriptions, Array, :desc => N_("Array of subscriptions to add"), :required => false do
-      param :id, String, :desc => N_("Subscription Pool uuid"), :required => true
-      param :quantity, :number, :desc => N_("Quantity of this subscriptions to add"), :required => true
-    end
-    def create
-      if params[:subscriptions]
-        params[:subscriptions].each do |sub|
-          subscription = Pool.find(sub[:id])
-          @activation_key.subscribe(subscription.cp_id, subscription[:quantity])
-        end
-      elsif params[:id] && params.key?(:quantity)
-        sub = subscription.find(params[:id])
-        @activation_key.subscribe(sub.cp_id, params[:quantity])
+      fail ActiveRecord::RecordNotFound, N_('Subscription not found') unless @resource&.readable?
+
+      if params[:organization_id] && @resource.organization_id != params[:organization_id].to_i
+        fail HttpErrors::BadRequest, N_('This subscription is not relevant to the current organization.')
       end
 
-      subscriptions = index_activation_key
-      respond_for_index(:collection => subscriptions, :template => 'index')
+      respond(:resource => @resource)
     end
 
     api :POST, "/organizations/:organization_id/subscriptions/upload", N_("Upload a subscription manifest")
@@ -198,10 +177,5 @@ module Katello
     def available_for_activation_key
       @activation_key.available_subscriptions
     end
-
-    def deprecated
-      ::Foreman::Deprecation.api_deprecation_warning("it will be removed in Katello 2.6, Please see /api/v2/activation_keys/:id/add_subscriptions and \
-          /api/v2/activation_keys/:id/remove_subscriptions")
-    end
   end
 end

data/app/controllers/katello/application_controller.rb

@@ -108,7 +108,7 @@ module Katello
       exception = args.find { |o| o.is_a? Exception }
       message   = args.find { |o| o.is_a? String } || exception.try(:message) || default_message
 
-      status = if exception && exception.respond_to?(:status_code)
+      status = if exception&.respond_to?(:status_code)
                  exception.status_code
                else
                  400

data/app/controllers/katello/concerns/api/api_controller.rb

@@ -2,6 +2,7 @@ module Katello
   module Concerns
     module Api::ApiController
       extend ActiveSupport::Concern
+      include Katello::Concerns::FilterSensitiveData
 
       included do
         include ForemanTasks::Triggers
@@ -37,7 +38,7 @@ module Katello
 
       def process_action(method_name, *args)
         super(method_name, *args)
-        Rails.logger.debug "With body: #{response.body}\n"
+        Rails.logger.debug "With body: #{filter_sensitive_data(response.body)}\n"
       end
 
       def split_order(order)

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

@@ -25,7 +25,7 @@ module Katello
         end
 
         def update
-          process_response @hostgroup.update_attributes(hostgroup_params)
+          process_response @hostgroup.update(hostgroup_params)
         end
 
         def show

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

@@ -7,7 +7,7 @@ module Katello
         include Katello::Concerns::FilteredAutoCompleteSearch
 
         before_action :find_repository
-        before_action :find_optional_organization, :only => [:index, :auto_complete_search]
+        before_action :find_optional_organization, :only => [:index, :show, :auto_complete_search]
         before_action :find_environment, :only => [:index, :auto_complete_search]
         before_action :find_content_view_version, :only => [:index, :auto_complete_search]
         before_action :find_filter, :find_filter_rule, :only => [:index, :auto_complete_search]
@@ -36,6 +36,7 @@ module Katello
       api :GET, "/:resource_id/:id", N_("Show :a_resource")
       api :GET, "/repositories/:repository_id/:resource_id/:id", N_("Show :a_resource")
       param :repository_id, :number, :desc => N_("repository identifier")
+      param :organization_id, :number, :desc => N_("organization identifier")
       param :id, String, :desc => N_(":a_resource identifier"), :required => true
       def show
         respond :resource => @resource
@@ -160,6 +161,10 @@ module Katello
           fail HttpErrors::NotFound, _("Could not find %{content} with id '%{id}' in repository.") %
             {content: resource_name, id: params[:id]}
         end
+
+        if params[:organization_id] && !@resource.repositories.any? { |repo| repo.organization_id == params[:organization_id].to_i }
+          fail HttpErrors::BadRequest, _("The requested resource does not belong to the specified organization")
+        end
       end
 
       def filter_by_ids(ids, collection)

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

@@ -23,7 +23,7 @@ module Katello
         end
 
         def update
-          process_response @smart_proxy.update_attributes(smart_proxy_params)
+          process_response @smart_proxy.update(smart_proxy_params)
         end
       end
     end

data/app/controllers/katello/remote_execution_controller.rb

@@ -42,9 +42,17 @@ module Katello
         find_bulk_hosts('edit_hosts', bulk_params)
       end
 
+      def errata_inputs
+        if ::Foreman::Cast.to_bool(params[:install_all])
+          Erratum.installable_for_hosts(hosts).pluck(:errata_id).join(',')
+        else
+          params[:name]
+        end
+      end
+
       def inputs
         if feature_name == 'katello_errata_install'
-          { :errata => params[:name] }
+          { :errata => errata_inputs }
         elsif feature_name == 'katello_service_restart'
           { :helper => params[:name] }
         elsif feature_name == 'katello_module_stream_action'

data/app/controllers/katello/sync_management_controller.rb

@@ -44,7 +44,7 @@ module Katello
 
     def destroy
       repo = Repository.where(:id => params[:id]).syncable.first
-      repo.cancel_dynflow_sync if repo
+      repo&.cancel_dynflow_sync
       render :plain => ""
     end
 

data/app/helpers/katello/hosts_and_hostgroups_helper.rb

@@ -23,7 +23,7 @@ module Katello
     end
 
     def use_install_media(host, options = {})
-      return true if host && host.errors && host.errors.include?(:medium_id)
+      return true if host&.errors && host.errors.include?(:medium_id)
       kickstart_repository_id(host, options).blank?
     end
 

data/app/helpers/katello/katello_urls_helper.rb

@@ -7,7 +7,7 @@ module Katello
     end
 
     def subscription_manager_configuration_url(host = nil, rpm = true)
-      prefix = if host && host.content_source
+      prefix = if host&.content_source
                  "http://#{host.content_source.hostname}"
                else
                  foreman_settings_url

data/app/helpers/katello/layout_helper.rb

@@ -11,9 +11,7 @@ module Katello
       if block
         content_for(:inline_javascripts) { block.call }
       end
-      if args
-        args.map { |arg| content_for(:katello_javascripts) { javascript_include_tag(arg) } }
-      end
+      args&.map { |arg| content_for(:katello_javascripts) { javascript_include_tag(arg) } }
       return ""
     end
 

data/app/helpers/katello/subscription_mailer_helper.rb

@@ -0,0 +1,23 @@
+module Katello
+  module SubscriptionMailerHelper
+    include Rails.application.routes.url_helpers
+    include ActionView::Helpers::UrlHelper
+
+    def report_url
+      base_url = report_data_report_template_path(@report_template.id, job_id: @provider_job_id)
+      "#{Setting[:foreman_url]}#{base_url}"
+    end
+
+    def report_link
+      link_to _("View a report of the affected hosts"), report_url
+    end
+
+    def start_report_task(days_from_now)
+      @report_template = ReportTemplate.find_by(name: "Subscription - Entitlement Report")
+      template_input_id = @report_template.template_inputs.find_by_name("Days from Now").id.to_s
+      params = { format: 'csv', template_id: @report_template.id, input_values: { template_input_id => { value: days_from_now} } }
+      composer = ReportComposer.new(params)
+      @provider_job_id = composer.schedule_rendering.provider_job_id
+    end
+  end
+end