katello 3.17.0.rc2 → 3.18.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c7f446fd8f4d3af288f0bbbf1f5b56bdac0f903d0c55fc332221d2cf2830384
-  data.tar.gz: 621fc49c5e82b6698a805c7a9b29143bad8b4b17690b94cd6cae3a65de1f33d9
+  metadata.gz: 31984263518369ed740c74cc962e0a3726d173f56f39beeff760737391520ba5
+  data.tar.gz: 87110c33c153b8dbb60062382e4afbe36e72ce826b4655fc64bdce3adf639e2f
 SHA512:
-  metadata.gz: e88e27186ae85ae6787743e2295b1076e9b6af862a531fc6aec29de59c18a378aa377725b0f7687594fcb8e9d891e6dc3d19e03f26aed3f1e9009eb03c03877d
-  data.tar.gz: 71d88ce6981546419a0f01f22a634727fdf36e11d164b69366aeabf00eb8ac1490935123c66e0733896ffc158b68b62d61817e4f03329f29cf6873fd1075da58
+  metadata.gz: e34e20b1885f1e552101ed27f9a002844ef460213fe6f0b57efb507bae174a84fd1dc04c6b9bd9caac5af2a81c88e60dddd7e135c236e5f8a4bd3b022620596c
+  data.tar.gz: f33c6fd1f711801f238631c3eda95c5d3c2c2305b5f1a6c4de8c15226d5c6cf717e2827a5552723b2d84edf427ee890c7c933c4d8d632686b5e68a2ba5dba230

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

@@ -166,25 +166,27 @@ module Katello
         headers[header[0].split('_')[1..-1].join('-')] = header[1]
       end
 
-      r = Resources::Registry::Proxy.get(@_request.fullpath, headers)
-      logger.debug filter_sensitive_data(r)
-      results = JSON.parse(r)
-
-      response.header['Docker-Content-Digest'] = "sha256:#{Digest::SHA256.hexdigest(r)}"
-      # https://docs.docker.com/registry/spec/manifest-v2-2/
-      # If its v2 schema 2 only the mediaType attribute will be present in the manifest
-      media_type = results['mediaType']
-      if media_type.blank?
-        # so mediaType is not schema2 v2 only set the mediaType based on
-        # https://docs.docker.com/registry/spec/manifest-v2-1/
-        media_type = if results["signatures"].blank?
-                       'application/vnd.docker.distribution.manifest.v1+json'
-                     else
-                       'application/vnd.docker.distribution.manifest.v1+prettyjws'
-                     end
-      end
+      if (manifest_response = redirect_client { Resources::Registry::Proxy.get(@_request.fullpath, headers) })
+        #when pulp 2 is removed, this should no longer be needed, and all clients should be redirected
+        logger.debug filter_sensitive_data(manifest_response)
+        results = JSON.parse(manifest_response)
+
+        response.header['Docker-Content-Digest'] = "sha256:#{Digest::SHA256.hexdigest(manifest_response)}"
+        # https://docs.docker.com/registry/spec/manifest-v2-2/
+        # If its v2 schema 2 only the mediaType attribute will be present in the manifest
+        media_type = results['mediaType']
+        if media_type.blank?
+          # so mediaType is not schema2 v2 only set the mediaType based on
+          # https://docs.docker.com/registry/spec/manifest-v2-1/
+          media_type = if results["signatures"].blank?
+                         'application/vnd.docker.distribution.manifest.v1+json'
+                       else
+                         'application/vnd.docker.distribution.manifest.v1+prettyjws'
+                       end
+        end
 
-      render json: r, content_type: media_type
+        render json: manifest_response, content_type: media_type
+      end
     end
 
     def check_blob
@@ -199,11 +201,24 @@ module Katello
       render json: {}
     end
 
+    def redirect_client
+      return yield
+    rescue RestClient::Exception => exception
+      if [301, 302, 307].include?(exception.response.code)
+        redirect_to exception.response.headers[:location]
+        nil
+      else
+        raise exception
+      end
+    end
+
     def pull_blob
       headers = {}
       headers['Accept'] = request.headers['Accept'] if request.headers['Accept']
-      r = Resources::Registry::Proxy.get(@_request.fullpath, headers)
-      render json: r
+      if (blob_response = redirect_client { Resources::Registry::Proxy.get(@_request.fullpath, headers, max_redirects: 0) })
+        #when pulp 2 is removed, this should no longer be needed, and all clients should be redirected
+        render json: blob_response
+      end
     end
 
     def push_manifest
@@ -478,7 +493,9 @@ module Katello
     end
 
     def confirm_settings
-      return true if SETTINGS.dig(:katello, :container_image_registry)
+      if SETTINGS.dig(:katello, :container_image_registry) || SmartProxy.pulp_primary&.pulp3_repository_type_support?(::Katello::Repository::DOCKER_TYPE)
+        return true
+      end
       render_error('custom_error', :status => :not_found,
                    :locals => { :message => "Registry not configured" })
     end

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

@@ -119,7 +119,9 @@ module Katello
     # Note that this request comes in as content-type 'text/plain' so that
     # tomcat won't parse the json.  Here we just pass the plain body through to candlepin
     def async_hypervisors_update
-      task = Katello::Resources::Candlepin::Consumer.async_hypervisors(params[:owner], request.raw_post)
+      task = Katello::Resources::Candlepin::Consumer.async_hypervisors(owner: params[:owner],
+                                                                       reporter_id: params[:reporter_id],
+                                                                       raw_json: request.raw_post)
       async_task(::Actions::Katello::Host::Hypervisors, nil, :task_id => task['id'])
 
       render :json => task

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

@@ -1,5 +1,4 @@
 module Katello
-  # rubocop:disable Metrics/ClassLength
   class Api::V2::ActivationKeysController < Api::V2::ApiController
     include Katello::Concerns::FilteredAutoCompleteSearch
     include Katello::Concerns::Api::V2::ContentOverridesController
@@ -7,11 +6,10 @@ module Katello
     before_action :find_environment, :only => [:index, :create, :update]
     before_action :find_optional_organization, :only => [:index, :create, :show]
     before_action :find_content_view, :only => [:index]
-    before_action :find_activation_key, :only => [:show, :update, :destroy, :available_releases, :copy, :product_content,
-                                                  :available_host_collections, :add_host_collections, :remove_host_collections,
-                                                  :content_override, :add_subscriptions, :remove_subscriptions,
-                                                  :subscriptions]
-    before_action :authorize
+    before_action :find_authorized_katello_resource, :only => [:show, :update, :destroy, :available_releases, :product_content,
+                                                               :available_host_collections, :add_host_collections, :remove_host_collections,
+                                                               :content_override, :add_subscriptions, :remove_subscriptions,
+                                                               :subscriptions]
     before_action :verify_simple_content_access_disabled, :only => [:add_subscriptions]
 
     wrap_parameters :include => (ActivationKey.attribute_names + %w(host_collection_ids service_level auto_attach purpose_role purpose_usage purpose_addons content_view_environment))
@@ -97,6 +95,9 @@ module Katello
     param :id, :number, :desc => N_("ID of the activation key"), :required => true
     param :organization_id, :number, :desc => N_("organization identifier"), :required => false
     def copy
+      @activation_key = Katello::ActivationKey.readable.find_by(:id => params[:id])
+      throw_resource_not_found(name: 'activation_key', id: params[:id]) if @activation_key.nil?
+
       fail HttpErrors::BadRequest, _("New name cannot be blank") unless params[:new_name]
       @new_activation_key = @activation_key.copy(params[:new_name])
       @new_activation_key.user = current_user
@@ -256,12 +257,6 @@ module Katello
       activation_keys
     end
 
-    def find_activation_key
-      @activation_key = ActivationKey.find(params[:id])
-      fail HttpErrors::NotFound, _("Couldn't find activation key '%s'") % params[:id] if @activation_key.nil?
-      @activation_key
-    end
-
     private
 
     def subscription_index
@@ -281,7 +276,7 @@ module Katello
       environment_id = params[:environment][:id] if !environment_id && params[:environment]
       return unless environment_id
 
-      @environment = KTEnvironment.find(environment_id)
+      @environment = KTEnvironment.readable.find_by(id: environment_id)
       fail HttpErrors::NotFound, _("Couldn't find environment '%s'") % params[:environment_id] if @environment.nil?
       @organization = @environment.organization
       @environment
@@ -292,7 +287,7 @@ module Katello
       @host_collections = []
 
       ids&.each do |host_collection_id|
-        host_collection = HostCollection.find(host_collection_id)
+        host_collection = HostCollection.readable.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
@@ -306,7 +301,7 @@ module Katello
     def find_content_view
       if params.include?(:content_view_id)
         cv_id = params[:content_view_id]
-        @content_view = ContentView.find_by(:id => cv_id)
+        @content_view = ContentView.readable.find_by(:id => cv_id)
         fail HttpErrors::NotFound, _("Couldn't find content view '%s'") % cv_id if @content_view.nil?
       end
     end

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

@@ -1,9 +1,8 @@
 module Katello
   class Api::V2::ContentCredentialsController < Api::V2::ApiController
     include Katello::Concerns::FilteredAutoCompleteSearch
-    before_action :authorize
     before_action :find_organization, :only => [:create, :index, :auto_complete_search]
-    before_action :find_content_credential, :only => [:show, :update, :destroy, :content, :set_content]
+    before_action :find_authorized_katello_resource, :only => [:show, :update, :destroy, :content, :set_content]
     skip_before_action :check_media_type, :only => [:create, :content, :set_content]
 
     def resource_class
@@ -103,12 +102,6 @@ module Katello
 
     protected
 
-    def find_content_credential
-      @content_credential = GpgKey.find(params[:id])
-    rescue ActiveRecord::RecordNotFound
-      raise HttpErrors::NotFound, _("Couldn't find Content Credential '%s'") % params[:id]
-    end
-
     def content_credential_params
       params.permit(:name, :content_type, :content)
     end

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

@@ -1,7 +1,8 @@
 module Katello
   class Api::V2::ContentViewComponentsController < Api::V2::ApiController
-    before_action :find_composite_content_view
-    before_action :find_content_view_component, :only => [:show, :update]
+    before_action :find_composite_content_view, :only => [:show, :index]
+    before_action :find_composite_content_view_for_edit, :only => [:add_components, :remove_components, :update]
+    before_action :find_authorized_katello_resource, :only => [:show, :update]
 
     wrap_parameters :include => %w(composite_content_view_id content_view_version_id content_view_id latest)
 
@@ -13,7 +14,7 @@ module Katello
     end
 
     def index_response
-      results = @view.content_view_components
+      results = @view.content_view_components.readable
       {
         :results => results.uniq,
         :subtotal => results.count,
@@ -31,15 +32,26 @@ module Katello
       param :latest, :bool, :desc => N_("true if the latest version of the component's content view is desired")
     end
     def add_components
+      @view.add_components(authorized_components)
+      @view.save!
+      respond_for_index(:collection => index_response, :template => "index")
+    end
+
+    private def authorized_components
       components = params.require(:components).map do |component|
         component = component.permit([:latest, :content_view_version_id, :content_view_id])
         options = {}
         options[:latest] = ::Foreman::Cast.to_bool(component[:latest]) if component.key?(:latest)
-        options.merge(component.slice(:content_view_version_id, :content_view_id))
+        options.merge(component.slice(:content_view_version_id, :content_view_id)).with_indifferent_access
+      end
+
+      components.each do |component|
+        if component[:content_view_version_id] && Katello::ContentViewVersion.readable.find_by(id: component[:content_view_version_id]).nil?
+          throw_resource_not_found(name: 'content_view_version', id: component[:content_view_version_id])
+        elsif component[:content_view_id] && Katello::ContentView.readable.find_by(id: component[:content_view_id]).nil?
+          throw_resource_not_found(name: 'content_view', id: component[:content_view_id])
+        end
       end
-      @view.add_components(components)
-      @view.save!
-      respond_for_index(:collection => index_response, :template => "index")
     end
 
     api :PUT, "/content_views/:composite_content_view_id/content_view_components/remove",
@@ -56,7 +68,7 @@ module Katello
     param :composite_content_view_id, :number, :desc => N_("composite content view numeric identifier"), :required => true
     param :id, :number, :desc => N_("content view component ID. Identifier of the component association"), :required => true
     def show
-      respond :resource => @component
+      respond :resource => @content_view_component
     end
 
     api :PUT, "/content_views/:composite_content_view_id/content_view_components/:id",
@@ -67,6 +79,9 @@ module Katello
     param :latest, :bool, :desc => N_("true if the latest version of the components content view is desired")
     def update
       cvv_id = component_params[:content_view_version_id]
+      if cvv_id && Katello::ContentViewVersion.readable.find_by(id: cvv_id).nil?
+        throw_resource_not_found(name: 'content view version', id: cvv_id)
+      end
       if component_params.key?(:latest) && component_params.key?(:content_view_version_id)
         latest = ::Foreman::Cast.to_bool(component_params[:latest])
         if latest && cvv_id.present?
@@ -75,22 +90,24 @@ module Katello
         end
       end
       if cvv_id.present?
-        @component.update!(:content_view_version_id => cvv_id, :latest => false)
+        @content_view_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!(:content_view_version_id => nil, :latest => latest)
+        @content_view_component.update!(:content_view_version_id => nil, :latest => latest)
       end
-      respond :resource => @component
+      respond :resource => @content_view_component
     end
 
     private
 
     def find_composite_content_view
-      @view = ContentView.composite.non_default.find(params[:composite_content_view_id])
+      @view = ContentView.composite.non_default.readable.find_by(id: params[:composite_content_view_id])
+      throw_resource_not_found(name: 'composite content view', id: params[:composite_content_view_id]) if @view.nil?
     end
 
-    def find_content_view_component
-      @component = ContentViewComponent.find(params[:id])
+    def find_composite_content_view_for_edit
+      @view = ContentView.composite.non_default.editable.find_by(id: params[:composite_content_view_id])
+      throw_resource_not_found(name: 'composite content view', id: params[:composite_content_view_id]) if @view.nil?
     end
 
     def component_params

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

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

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

@@ -25,6 +25,7 @@ module Katello
       SQL
 
       query = Katello::Repository.readable.in_default_view.in_organization(@organization)
+      query = query.with_type(params[:content_type]) if params[:content_type]
       # Use custom sort to perform the join and order since we need to order by specific content_view
       # and the ORDER BY query needs access to the katello_content_view_repositories table
       custom_sort = ->(sort_query) { sort_query.joins(:root).joins(join_query).order(order_query) }

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

@@ -1,4 +1,5 @@
 module Katello
+  # rubocop:disable Metrics/ClassLength
   class Api::V2::ContentViewVersionsController < Api::V2::ApiController
     include Concerns::Api::V2::BulkHostsExtensions
     include Katello::Concerns::FilteredAutoCompleteSearch
@@ -99,47 +100,34 @@ module Katello
                         :template => '../../../api/v2/content_view_version_export_histories/index')
     end
 
-    api :POST, "/content_view_versions/:id/export", N_("Export a content view version"), :deprecated => true
+    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")
     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 :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
-      if SmartProxy.pulp_primary.pulp3_repository_type_support?(Katello::Repository::YUM_TYPE)
-        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
-
-        task = async_task(::Actions::Pulp3::Orchestration::ContentViewVersion::Export, @version, destination_server: params[:destination_server])
-      else
-        ::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
-        task = 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
+      task = if SmartProxy.pulp_primary.pulp3_repository_type_support?(Katello::Repository::YUM_TYPE)
+               export_pulp_v3
+             else
+               export_pulp_v2
+             end
+      respond_for_async :resource => task
+    end
 
+    api :POST, "/content_view_versions/import", N_("Import a content view version")
+    param :content_view_id, :number, :desc => N_("Content view identifier"), :required => true
+    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&.to_h)
       respond_for_async :resource => task
     end
 
@@ -333,5 +321,57 @@ module Katello
       return deny_access unless @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
+
+      history = ::Katello::ContentViewVersionExportHistory.find(params[:from_history_id]) unless params[:from_history_id].blank?
+
+      async_task(::Actions::Pulp3::Orchestration::ContentViewVersion::Export, @version, destination_server: params[:destination_server],
+                                                                                         chunk_size: params[:chunk_size_mb],
+                                                                                         from_history: history)
+    end
+
+    def metadata_params
+      params.require(:metadata).permit(
+        :organization,
+        :content_view,
+        :repository_mapping,
+        :toc,
+        content_view_version: [:major, :minor]
+      ).tap do |nested|
+        nested[:repository_mapping] = params[:metadata].require(:repository_mapping).permit!
+      end
+    end
   end
 end