katello 3.15.1 → 3.16.0.rc2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0e59e380081b85056d0babdeff1cc1bf1922da00e775bf2636c8d77217a1056
-  data.tar.gz: 23b423ff8b50a973affd765cd9f44c5ca2ae9581539dfb5858918f16b8962092
+  metadata.gz: 07abcc2d0e780bd3bfee4cd44b73ef4183e0a50daebe6a32cd056e162e3fde52
+  data.tar.gz: 6c95fe44a013f6e74d36098c3e96f8e669f5670925620a9dc26e6ed674cc2abb
 SHA512:
-  metadata.gz: 73817fdabb0fdb4d47dd1f295858b38778dad330ad29e1b54a06c0365916217a88f421ed2cf9fa24e4f6d4ea62314a554428029879cb3b3201e38c5d7c2a957e
-  data.tar.gz: 210ad0aa94dfc1d1528d4430051f7d43642b85882761ebc9016eb24c81ef1b4170934f411635dccfa2f2fd2ee100e1878089267519af013353291406e1397357
+  metadata.gz: 17dece7796e9c33d88970ed5eaba5d810db5b84c76ddc03d0767c8bf426013ac9c3e29f14a3bb3be6663e0233e8968551294f51000fb4161e348028add9ecb0b
+  data.tar.gz: c8b139917779fb48e642270141eb4418c4f668433307cb8097661b581985edc7163f67524328f13368c5cf80d7fc51ef2c856816eacb19ff9a720f40cef595d8

data/app/assets/javascripts/katello/common/vendor.js

@@ -1,7 +1,8 @@
-//= require "jquery.ui.dialog"
-//= require "jquery.ui.sortable"
-//= require "jquery.ui.tabs"
-//= require "jquery.ui.progressbar"
-//= require "jquery.ui.effect.all"
+//= require "jquery-ui/widgets/dialog"
+//= require "jquery-ui/widgets/sortable"
+//= require "jquery-ui/widgets/tabs"
+//= require "jquery-ui/widgets/progressbar"
+//= require "jquery-ui/effect"
+//= require "jquery-ui/effect.all"
 //= require "katello/jquery.periodicalupdater"
 //= require "katello/jquery.trunk8"

data/app/controllers/katello/api/registry/registry_proxies_controller.rb

@@ -12,7 +12,6 @@ module Katello
     before_action :authorize_repository_write, only: [:push_manifest]
     skip_before_action :check_content_type, only: [:start_upload_blob, :upload_blob, :finish_upload_blob,
                                                    :chunk_upload_blob, :push_manifest]
-    skip_after_action :log_response_body, :only => [:pull_blob]
 
     wrap_parameters false
 
@@ -160,7 +159,7 @@ module Katello
       end
 
       r = Resources::Registry::Proxy.get(@_request.fullpath, headers)
-      logger.debug r
+      logger.debug filter_sensitive_data(r)
       results = JSON.parse(r)
 
       response.header['Docker-Content-Digest'] = "sha256:#{Digest::SHA256.hexdigest(r)}"
@@ -488,7 +487,7 @@ module Katello
 
     def process_action(method_name, *args)
       ::Api::V2::BaseController.instance_method(:process_action).bind(self).call(method_name, *args)
-      Rails.logger.debug "With body: #{response.body}\n" unless route_name == 'pull_blob'
+      Rails.logger.debug "With body: #{filter_sensitive_data(response.body)}\n" unless route_name == 'pull_blob'
     end
 
     def item_not_found(item)

data/app/controllers/katello/api/rhsm/candlepin_dynflow_proxy_controller.rb

@@ -67,7 +67,7 @@ module Katello
     end
 
     def deprecated
-      ::Foreman::Deprecation.api_deprecation_warning("it will be removed in Katello 3.15 - please use /consumers/:id/profiles instead.")
+      ::Foreman::Deprecation.api_deprecation_warning("it will be removed in Katello 4.0. Please use /consumers/:id/profiles instead.")
     end
   end
 end

data/app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb

@@ -13,7 +13,7 @@ module Katello
                                         :available_releases, :serials, :upload_tracer_profile]
     before_action :authorize, :only => [:consumer_create, :list_owners, :rhsm_index]
     before_action :authorize_client_or_user, :only => [:consumer_show, :regenerate_identity_certificates, :upload_tracer_profile, :facts, :proxy_jobs_get_path]
-    before_action :authorize_client_or_admin, :only => [:hypervisors_update, :async_hypervisors_update]
+    before_action :authorize_client_or_admin, :only => [:hypervisors_update, :async_hypervisors_update, :hypervisors_heartbeat]
     before_action :authorize_proxy_routes, :only => [:get, :post, :put, :delete]
     before_action :authorize_client, :only => [:consumer_destroy, :consumer_checkin,
                                                :enabled_repos, :available_releases]
@@ -42,7 +42,7 @@ module Katello
           end
           response.body = body_json.to_s
 
-        # rubocop:disable HandleExceptions
+        # rubocop:disable Lint/SuppressedException
         rescue JSON::ParserError
           # Not a json response, leave as-is
         end
@@ -73,25 +73,25 @@ module Katello
 
     def get
       r = Resources::Candlepin::Proxy.get(@request_path)
-      logger.debug r
+      logger.debug filter_sensitive_data(r)
       render :json => r
     end
 
     def delete
       r = Resources::Candlepin::Proxy.delete(@request_path, @request_body.read)
-      logger.debug r
+      logger.debug filter_sensitive_data(r)
       render :json => r
     end
 
     def post
       r = Resources::Candlepin::Proxy.post(@request_path, @request_body.read)
-      logger.debug r
+      logger.debug filter_sensitive_data(r)
       render :json => r
     end
 
     def put
       r = Resources::Candlepin::Proxy.put(@request_path, @request_body.read)
-      logger.debug r
+      logger.debug filter_sensitive_data(r)
       render :json => r
     end
 
@@ -137,10 +137,14 @@ module Katello
       render :json => task.output[:results]
     end
 
+    def hypervisors_heartbeat
+      render json: Katello::Resources::Candlepin::Consumer.hypervisors_heartbeat(owner: params[:owner], reporter_id: params[:reporter_id])
+    end
+
     #api :PUT, "/consumers/:id/checkin/", N_("Update consumer check-in time")
     #param :date, String, :desc => N_("check-in time")
     def consumer_checkin
-      @host.update_attributes(:last_checkin => params[:date])
+      @host.update(:last_checkin => params[:date])
       Candlepin::Consumer.new(@host.subscription_facet.uuid, @host.organization.label).checkin(params[:date])
       render :json => Resources::Candlepin::Consumer.get(@host.subscription_facet.uuid)
     end
@@ -151,7 +155,7 @@ module Katello
       User.as_anonymous_admin do
         @host.import_tracer_profile(params[:traces])
       end
-      render :json => Resources::Candlepin::Consumer.get(@host.subscription_facet.uuid)
+      render json: { displayMessage: _("Tracer profile uploaded successfully") }
     end
 
     def available_releases
@@ -457,7 +461,7 @@ module Katello
       fail "Unable to register system, not all services available" unless Katello::RegistrationManager.check_registration_services
     end
 
-    # rubocop:disable MethodLength
+    # rubocop:disable Metrics/MethodLength
     # rubocop:disable Metrics/CyclomaticComplexity
     def authorize_proxy_routes
       deny_access unless (authenticate || authenticate_client)

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

@@ -288,12 +288,11 @@ module Katello
     def find_host_collections
       ids = params[:activation_key][:host_collection_ids] if params[:activation_key]
       @host_collections = []
-      if ids
-        ids.each do |host_collection_id|
-          host_collection = HostCollection.find(host_collection_id)
-          fail HttpErrors::NotFound, _("Couldn't find host collection '%s'") % host_collection_id if host_collection.nil?
-          @host_collections << host_collection
-        end
+
+      ids&.each do |host_collection_id|
+        host_collection = HostCollection.find(host_collection_id)
+        fail HttpErrors::NotFound, _("Couldn't find host collection '%s'") % host_collection_id if host_collection.nil?
+        @host_collections << host_collection
       end
     end
 
@@ -324,8 +323,6 @@ module Katello
                                              :purpose_role,
                                              :purpose_usage,
                                              :purpose_addon_ids,
-                                             # For deep_munge; Remove for Rails 5
-                                             :host_collection_ids,
                                              :content_overrides => [],
                                              :host_collection_ids => []).to_h
     end

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

@@ -10,6 +10,8 @@ module Katello
     include Foreman::ThreadSession::Cleaner
 
     skip_before_action :setup_has_many_params # TODO: get this working #8862
+    # avoid a duplicate log message from Foreman's API::BaseController with private keys not filtered out
+    skip_after_action :log_response_body
 
     resource_description do
       api_version 'v2'
@@ -192,6 +194,18 @@ module Katello
       end
     end
 
+    def respond_for_show(options = {})
+      check_resource_organization(options[:resource], params[:organization_id])
+      super
+    end
+
+    def check_resource_organization(resource, organization_id)
+      return unless resource.try(:organization_id) && organization_id
+      if resource.organization_id != organization_id.to_i
+        fail HttpErrors::BadRequest, _("The requested resource does not belong to the specified Organization")
+      end
+    end
+
     def find_host_with_subscriptions(id, permission)
       @host = resource_finder(::Host::Managed.authorized(permission, ::Host::Managed), id)
       fail HttpErrors::BadRequest, _("Host has not been registered with subscription-manager") if @host.subscription_facet.nil?

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

@@ -93,14 +93,14 @@ module Katello
 
     def find_editable_capsule
       @capsule = SmartProxy.unscoped.authorized(:manage_capsule_content).find(params[:id])
-      unless @capsule && @capsule.has_feature?(SmartProxy::PULP_NODE_FEATURE)
+      unless @capsule&.has_feature?(SmartProxy::PULP_NODE_FEATURE)
         fail _("This request may only be performed on a Smart proxy that has the Pulp Node feature.")
       end
     end
 
     def find_capsule
       @capsule = SmartProxy.unscoped.authorized(:view_capsule_content).find(params[:id])
-      unless @capsule && @capsule.has_feature?(SmartProxy::PULP_NODE_FEATURE)
+      unless @capsule&.has_feature?(SmartProxy::PULP_NODE_FEATURE)
         fail _("This request may only be performed on a Smart proxy that has the Pulp Node feature.")
       end
     end

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

@@ -94,7 +94,7 @@ module Katello
 
       if filepath
         content = File.open(filepath, "rb") { |file| file.read }
-        @content_credential.update_attributes!(:content => content)
+        @content_credential.update!(:content => content)
         render :json => {:status => "success"}
       else
         fail HttpErrors::BadRequest, _("No file uploaded")

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

@@ -75,10 +75,10 @@ module Katello
         end
       end
       if cvv_id.present?
-        @component.update_attributes!(:content_view_version_id => cvv_id, :latest => false)
+        @component.update!(:content_view_version_id => cvv_id, :latest => false)
       elsif component_params.key?(:latest)
         latest = ::Foreman::Cast.to_bool(component_params[:latest])
-        @component.update_attributes!(:content_view_version_id => nil, :latest => latest)
+        @component.update!(:content_view_version_id => nil, :latest => latest)
       end
       respond :resource => @component
     end

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

@@ -94,7 +94,7 @@ module Katello
         update_params[:max_version] = "" unless rule_params[:max_version]
       end
 
-      @rule.update_attributes!(update_params)
+      @rule.update!(update_params)
       respond :resource => @rule
     end
 

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

@@ -65,7 +65,7 @@ module Katello
     param :description, String, :desc => N_("description of the filter"), :required => false
 
     def update
-      @filter.update_attributes!(filter_params)
+      @filter.update!(filter_params)
       respond :resource => @filter
     end
 

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

@@ -43,7 +43,7 @@ module Katello
     param :author, String, :desc => N_("author of the puppet module")
     param :uuid, String, :desc => N_("the uuid of the puppet module to associate"), :deprecated => true
     def update
-      @puppet_module.update_attributes!(puppet_module_params)
+      @puppet_module.update!(puppet_module_params)
       respond :resource => @puppet_module
     end
 

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

@@ -52,7 +52,6 @@ module Katello
     api :POST, "/content_view_versions/:id/promote", N_("Promote a content view version")
     param :id, :number, :desc => N_("Content view version identifier"), :required => true
     param :force, :bool, :desc => N_("force content view promotion and bypass lifecycle environment restriction")
-    param :environment_id, :number, :deprecated => true, :desc => N_("LifeCycle Environment identifier")
     param :environment_ids, Array, :desc => N_("Identifiers for Lifecycle Environment")
     param :description, String, :desc => N_("The description for the content view version promotion")
     def promote
@@ -145,7 +144,7 @@ module Katello
     end
     def incremental_update
       any_environments = params[:content_view_version_environments].any? { |cvve| cvve[:environment_ids].try(:any?) }
-      if params[:add_content] && params[:add_content].key?(:errata_ids) && params[:update_hosts] && any_environments
+      if params[:add_content]&.key?(:errata_ids) && params[:update_hosts] && any_environments
         hosts = calculate_hosts_for_incremental(params[:update_hosts], params[:propagate_to_composites])
       else
         hosts = []
@@ -185,7 +184,7 @@ module Katello
 
     def find_content_view
       @view = @version ? @version.content_view : ContentView.where(:id => params[:content_view_id]).first
-      if @view && @view.default? && params[:action] == "promote"
+      if @view&.default? && params[:action] == "promote"
         fail HttpErrors::BadRequest, _("The default content view cannot be promoted")
       end
     end
@@ -287,12 +286,7 @@ module Katello
     end
 
     def find_environments
-      @environments = if params[:environment_id]
-                        ::Foreman::Deprecation.api_deprecation_warning("The parameter environment_id will be removed in Katello 3.4. Please update to use the environment_ids parameter.")
-                        KTEnvironment.where(:id => params[:environment_id])
-                      else
-                        KTEnvironment.where(:id => params[:environment_ids])
-                      end
+      @environments = KTEnvironment.where(:id => params[:environment_ids])
     end
 
     def validate_promotable

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

@@ -125,7 +125,7 @@ module Katello
         query = query.where(:name => params[:name])
         if current_uuids.present?
           module_by_name = current_cv_puppet_modules.find_by(:name => params[:name])
-          if module_by_name && module_by_name.latest_in_modules_by_author?(query)
+          if module_by_name&.latest_in_modules_by_author?(query)
             current_uuids.delete(module_by_name.uuid)
             selected_latest_versions.push(module_by_name.uuid)
           end
@@ -228,9 +228,9 @@ module Katello
     end
 
     def view_params
-      attrs = [:name, :description, :force_puppet_environment, {:component_ids => []}]
+      attrs = [:name, :description, :force_puppet_environment, :auto_publish, :solve_dependencies,
+               :default, :created_at, :updated_at, :next_version, {:component_ids => []}]
       attrs.push(:label, :composite) if action_name == "create"
-      attrs.push(:component_ids, :auto_publish, :solve_dependencies) # For deep_munge; Remove for Rails 5
       if (!@view || !@view.composite?)
         attrs.push({:repository_ids => []}, :repository_ids)
       end

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

@@ -67,7 +67,7 @@ module Katello
     param :id, :number, :desc => N_("ID of the environment"), :required => true
     param :organization_id, :number, :desc => N_("ID of the organization")
     def show
-      respond
+      respond(resource: @environment)
     end
 
     api :POST, "/environments", N_("Create an environment")
@@ -104,7 +104,7 @@ module Katello
       update_params = environment_params
       fail HttpErrors::BadRequest, _("Can't update the '%s' environment") % "Library" if @environment.library? && update_params.empty?
       update_params[:name] = params[:environment][:new_name] if params[:environment][:new_name]
-      @environment.update_attributes!(update_params)
+      @environment.update!(update_params)
       if update_params[:registry_name_pattern]
         task = send(async ? :async_task : :sync_task, ::Actions::Katello::Environment::PublishRepositories,
                     @environment, content_type: Katello::Repository::DOCKER_TYPE)
@@ -177,7 +177,7 @@ module Katello
     end
 
     def environment_params
-      if @environment && @environment.library?
+      if @environment&.library?
         attrs = [:registry_name_pattern, :registry_unauthenticated_pull]
       else
         attrs = [:name, :description, :registry_name_pattern, :registry_unauthenticated_pull]

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

@@ -88,7 +88,7 @@ module Katello
 
       if filepath
         content = File.open(filepath, "rb") { |file| file.read }
-        @gpg_key.update_attributes!(:content => content)
+        @gpg_key.update!(:content => content)
         render :json => {:status => "success"}
       else
         fail HttpErrors::BadRequest, _("No file uploaded")

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

@@ -19,8 +19,9 @@ module Katello
 
     api :GET, "/host_collections/:id", N_("Show a host collection")
     param :id, :number, :desc => N_("Id of the host collection"), :required => true
+    param :organization_id, :number, :desc => N_("organization identifier"), :required => false
     def show
-      respond
+      respond(:resource => @host_collection)
     end
 
     api :GET, "/host_collections", N_("List host collections")
@@ -77,7 +78,7 @@ module Katello
     param :name, String, :required => false, :desc => N_("Host Collection name")
     param_group :host_collection
     def update
-      @host_collection.update_attributes!(host_collection_params_with_host_ids)
+      @host_collection.update!(host_collection_params_with_host_ids)
       respond_for_show(:resource => @host_collection)
     end
 
@@ -187,8 +188,6 @@ module Katello
                :description,
                :max_hosts,
                :unlimited_hosts,
-               # For deep_munge; Remove for Rails 5
-               :host_ids,
                { :host_ids => [] }
               ]
       params.fetch(:host_collection).permit(*attrs)

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

@@ -48,17 +48,14 @@ module Katello
     api :PUT, "/hosts/:host_id/subscriptions/auto_attach", N_("Trigger an auto-attach of subscriptions")
     param :host_id, Integer, :desc => N_("Id of the host"), :required => true
     def auto_attach
+      if @host.organization.simple_content_access?
+        fail ::Katello::HttpErrors::BadRequest, _("This host's organization is in Simple Content Access mode. Auto-attach is disabled")
+      end
+
       sync_task(::Actions::Katello::Host::AutoAttachSubscriptions, @host)
       respond_for_index(:collection => index_response, :template => "index")
     end
 
-    api :GET, "/hosts/:host_id/subscriptions/events", N_("List subscription events for the host"), :deprecated => true
-    param :host_id, Integer, :desc => N_("Id of the host"), :required => true
-    def events
-      ::Foreman::Deprecation.api_deprecation_warning("Events API is being deprecated and will be removed in Katello 3.16.")
-      respond_for_index :collection => full_result_response([])
-    end
-
     api :DELETE, "/hosts/:host_id/subscriptions/", N_("Unregister the host as a subscription consumer")
     param :host_id, Integer, :desc => N_("Id of the host"), :required => true
     def destroy
@@ -147,7 +144,6 @@ module Katello
 
     api :PUT, "/hosts/:host_id/subscriptions/content_override", N_("Set content overrides for the host")
     param :host_id, String, :desc => N_("Id of the content host"), :required => true
-    param :content_label, String, :desc => N_("Label of the content"), :required => false
     param :value, String, :desc => N_("Override to a boolean value or 'default'"), :required => false
     param :content_overrides, Array, :desc => N_("Array of Content override parameters") do
       param :content_label, String, :desc => N_("Label of the content"), :required => true
@@ -156,20 +152,7 @@ module Katello
       param :remove, :bool, :desc => N_("Set true to remove an override and reset it to 'default'"), :required => false
     end
     def content_override
-      content_overrides = []
-      if params[:content_label]
-        ::Foreman::Deprecation.api_deprecation_warning("The parameter content_label will be removed in Katello 3.5. Please update to use the content_overrides parameter.")
-        content_override_params = {:content_label => params[:content_label]}
-        value = params[:value]
-        if value == "default"
-          content_override_params[:remove] = true
-        elsif value
-          content_override_params[:value] = ::Foreman::Cast.to_bool(value)
-        end
-        content_overrides << content_override_params
-      elsif params[:content_overrides]
-        content_overrides = params[:content_overrides]
-      end
+      content_overrides = params[:content_overrides] || []
 
       content_override_values = content_overrides.map do |override_params|
         validate_content_overrides_enabled(override_params)

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

@@ -1,7 +1,5 @@
 module Katello
   class Api::V2::HostTracerController < Api::V2::ApiController
-    #include Katello::Concerns::FilteredAutoCompleteSearch
-
     before_action :find_host, :only => :index
 
     resource_description do
@@ -16,6 +14,45 @@ module Katello
       respond_for_index(:collection => collection)
     end
 
+    api :PUT, "/traces/resolve", N_("Resolve Traces")
+    param :trace_ids, Array, :required => true, :desc => N_("Array of Trace IDs")
+    def resolve
+      traces = Katello::HostTracer.resolvable.where(id: params[:trace_ids])
+
+      traces.each do |trace|
+        if trace.reboot_required?
+          trace.helper = 'reboot'
+        end
+      end
+
+      traces_by_host_id = traces.group_by(&:host_id)
+      traces_by_helper = traces.group_by(&:helper)
+
+      composers = []
+
+      if traces_by_host_id.size < traces_by_helper.size
+        traces_by_host_id.each do |host_id, trace|
+          needed_traces = trace.map(&:helper).join(',')
+          joined_helpers = { :helper => needed_traces }
+          composers << JobInvocationComposer.for_feature(:katello_service_restart, [host_id], joined_helpers)
+        end
+      else
+        traces_by_helper.each do |helper, trace|
+          helpers = { :helper => helper }
+          composers << JobInvocationComposer.for_feature(:katello_service_restart, trace.map(&:host_id), helpers)
+        end
+      end
+
+      job_invocations = []
+
+      composers.each do |composer|
+        composer.trigger
+        job_invocations << composer.job_invocation
+      end
+
+      render json: job_invocations
+    end
+
     protected
 
     def index_relation