katello 3.17.1 → 3.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4911d03477352b7d0d1f70c1fe0aabf89a4203f925d11b06b09fb753cca4119
-  data.tar.gz: 0442bdaf70ac3842ccae4d639111cdbefabb4d3c6601292c789fd7184e4273d0
+  metadata.gz: 78239ba1e921e408588db439d4b929151e1a9c10408e23c63f0ec5c76a23c66b
+  data.tar.gz: f945779353ab8cedce6a30e33f5ac4a264f6790e486a00126f15d3862babdfce
 SHA512:
-  metadata.gz: 93f259c486b6f6d766389c062a894ca2a77e46cebe0fa9d4b6cb00d3722cefbeffefc46d0836c4bfcb08979206517d1e586e10ae5de0b22049798f060626b32f
-  data.tar.gz: 61b4ea0699d961668d15ff3235d67e4bb8bb30e987166a8a8cf6a00444a827b19d63665842fccf3f65539e28ddf46c277b4b0c070321b6cfe4254921b483e629
+  metadata.gz: f5526ccfbae423e0315e89349253756acf60bb920c9e3f1e2b7f581f677312e19d0141a185f58adeea0b08dc4d1a2d323bd051404c6c0d54faedd06ed5667427
+  data.tar.gz: 5f7d476d2061439219dc468b5ead1291835fe68bfacf1396b54db46f3e9afe3ca13c3383e5d5ce92f1d07c76ab5a0f59cffa78cda0c9500345dc5813c6ea24dc

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/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&.has_feature?(SmartProxy::PULP_NODE_FEATURE)
+      unless @capsule&.pulp_mirror?
         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&.has_feature?(SmartProxy::PULP_NODE_FEATURE)
+      unless @capsule&.pulp_mirror?
         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

@@ -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_export_incrementals_controller.rb

@@ -0,0 +1,98 @@
+module Katello
+  class Api::V2::ContentExportIncrementalsController < Api::V2::ApiController
+    before_action :fail_if_not_pulp3, :only => [:version, :library]
+    before_action :find_exportable_organization, :only => [:library]
+    before_action :find_exportable_content_view_version, :only => [:version]
+    before_action :find_library_export_view, :only => [:library]
+    before_action :find_history, :only => [:version, :library]
+
+    api :POST, "/content_export_incrementals/version", N_("Performs an incremental-export of 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 => false
+    param :chunk_size_mb, :number, :desc => N_("Split the exported content into archives "\
+                                               "no greater than the specified size in megabytes."), :required => false
+    param :from_history_id, :number, :desc => N_("Export history identifier used for incremental export. "\
+                                                 "If not provided the most recent export history will be used."), :required => false
+    param :fail_on_missing_content, :bool, :desc => N_("Fails if any of the repositories belonging to this version"\
+                                                         " are unexportable. False by default."), :required => false
+    def version
+      tasks = async_task(::Actions::Pulp3::Orchestration::ContentViewVersion::Export,
+                          content_view_version: @version,
+                          destination_server: params[:destination_server],
+                          chunk_size: params[:chunk_size_mb],
+                          from_history: @history,
+                          fail_on_missing_content: ::Foreman::Cast.to_bool(params[:fail_on_missing_content]))
+
+      respond_for_async :resource => tasks
+    end
+
+    api :POST, "/content_export_incrementals/library", N_("Performs an incremental-export of the repositories in library.")
+    param :organization_id, :number, :desc => N_("Organization identifier"), :required => true
+    param :destination_server, String, :desc => N_("Destination Server name"), :required => false
+    param :chunk_size_mb, :number, :desc => N_("Split the exported content into archives "\
+                                               "no greater than the specified size in megabytes."), :required => false
+    param :from_history_id, :number, :desc => N_("Export history identifier used for incremental export. "\
+                                                 "If not provided the most recent export history will be used."), :required => false
+    param :fail_on_missing_content, :bool, :desc => N_("Fails if any of the repositories belonging to this organization"\
+                                                         " are unexportable. False by default."), :required => false
+    def library
+      tasks = async_task(::Actions::Pulp3::Orchestration::ContentViewVersion::ExportLibrary,
+                          @organization,
+                          destination_server: params[:destination_server],
+                          chunk_size: params[:chunk_size_mb],
+                          from_history: @history,
+                          fail_on_missing_content: ::Foreman::Cast.to_bool(params[:fail_on_missing_content]))
+      respond_for_async :resource => tasks
+    end
+
+    private
+
+    def find_exportable_content_view_version
+      @version = ContentViewVersion.exportable.find_by_id(params[:id])
+      throw_resource_not_found(name: 'content view version', id: params[:id]) if @version.blank?
+      @view = @version.content_view
+    end
+
+    def find_library_export_view
+      @view = ::Katello::Pulp3::ContentViewVersion::Export.find_library_export_view(destination_server: params[:destination_server],
+                                                                organization: @organization,
+                                                                create_by_default: false)
+      if @view.blank?
+        msg = _("Unable to incrementally export. Do a Full Export the library content "\
+                "before updating from the latest increment.")
+        fail HttpErrors::BadRequest, msg
+      end
+    end
+
+    def find_history
+      if params[:from_history_id].present?
+        @history = ::Katello::ContentViewVersionExportHistory.find(params[:from_history_id])
+        if @history.blank?
+          throw_resource_not_found(name: 'export history',
+                                   id: params[:from_history_id])
+        end
+      else
+        @history = ::Katello::ContentViewVersionExportHistory.
+                      latest(@view,
+                                          destination_server: params[:destination_server])
+        if @history.blank?
+          msg = _("No existing export history was found to perform an incremental export. A full export must be performed")
+          fail HttpErrors::NotFound, msg
+        end
+      end
+    end
+
+    def find_exportable_organization
+      find_organization
+      unless @organization.can_export_library_content?
+        throw_resource_not_found(name: 'organization', id: params[:organization_id])
+      end
+    end
+
+    def fail_if_not_pulp3
+      unless SmartProxy.pulp_primary.pulp3_repository_type_support?(Katello::Repository::YUM_TYPE)
+        fail HttpErrors::BadRequest, _("Invalid usage for Pulp 2 repositories. Use export for Yum repositories")
+      end
+    end
+  end
+end

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

@@ -0,0 +1,84 @@
+module Katello
+  class Api::V2::ContentExportsController < Api::V2::ApiController
+    before_action :fail_if_not_pulp3, :only => [:version, :library]
+    before_action :find_exportable_organization, :only => [:library]
+    before_action :find_exportable_content_view_version, :only => [:version]
+
+    api :GET, "/content_exports", N_("List export histories")
+    param :content_view_version_id, :number, :desc => N_("Content view version identifier"), :required => false
+    param :content_view_id, :number, :desc => N_("Content view identifier"), :required => false
+    param :destination_server, String, :desc => N_("Destination Server name"), :required => false
+    param :organization_id, :number, :desc => N_("Organization identifier"), :required => false
+    param :id, :number, :desc => N_("Content view version export history identifier"), :required => false
+    param_group :search, Api::V2::ApiController
+    add_scoped_search_description_for(ContentViewVersionExportHistory)
+    def index
+      history = ContentViewVersionExportHistory.readable
+      history = history.where(:id => params[:id]) unless params[:id].blank?
+      history = history.where(:content_view_version_id => params[:content_view_version_id]) unless params[:content_view_version_id].blank?
+      history = history.where(:destination_server => params[:destination_server]) unless params[:destination_server].blank?
+      history = history.with_organization_id(params[:organization_id]) unless params[:organization_id].blank?
+      history = history.with_content_view_id(params[:content_view_id]) unless params[:content_view_id].blank?
+      respond_with_template_collection("index", 'content_view_version_export_histories',
+                                       :collection => scoped_search(history, 'id', 'asc', resource_class: ContentViewVersionExportHistory))
+    end
+
+    api :GET, "/content_exports/api_status", N_("true if the export api is pulp3 ready and usable. This API is intended for use by hammer-cli only.")
+    def api_status
+      ::Foreman::Deprecation.api_deprecation_warning("/content_exports/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_exports/version", N_("Performs a full-export of 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 => false
+    param :chunk_size_mb, :number, :desc => N_("Split the exported content into archives "\
+                                               "no greater than the specified size in megabytes."), :required => false
+    param :fail_on_missing_content, :bool, :desc => N_("Fails if any of the repositories belonging to this version"\
+                                                         " are unexportable. False by default."), :required => false
+    def version
+      tasks = async_task(::Actions::Pulp3::Orchestration::ContentViewVersion::Export,
+                          content_view_version: @version,
+                          destination_server: params[:destination_server],
+                          chunk_size: params[:chunk_size_mb],
+                          fail_on_missing_content: ::Foreman::Cast.to_bool(params[:fail_on_missing_content]))
+      respond_for_async :resource => tasks
+    end
+
+    api :POST, "/content_exports/library", N_("Performs a full-export of the repositories in library.")
+    param :organization_id, :number, :desc => N_("Organization identifier"), :required => true
+    param :destination_server, String, :desc => N_("Destination Server name"), :required => false
+    param :chunk_size_mb, :number, :desc => N_("Split the exported content into archives "\
+                                               "no greater than the specified size in megabytes."), :required => false
+    param :fail_on_missing_content, :bool, :desc => N_("Fails if any of the repositories belonging to this organization"\
+                                                         " are unexportable. False by default."), :required => false
+    def library
+      tasks = async_task(::Actions::Pulp3::Orchestration::ContentViewVersion::ExportLibrary,
+                          @organization,
+                          destination_server: params[:destination_server],
+                          chunk_size: params[:chunk_size_mb],
+                          fail_on_missing_content: ::Foreman::Cast.to_bool(params[:fail_on_missing_content]))
+      respond_for_async :resource => tasks
+    end
+
+    private
+
+    def find_exportable_content_view_version
+      @version = ContentViewVersion.exportable.find_by_id(params[:id])
+      throw_resource_not_found(name: 'content view version', id: params[:id]) if @version.blank?
+    end
+
+    def find_exportable_organization
+      find_organization
+      unless @organization.can_export_library_content?
+        throw_resource_not_found(name: 'organization', id: params[:organization_id])
+      end
+    end
+
+    def fail_if_not_pulp3
+      unless SmartProxy.pulp_primary.pulp3_repository_type_support?(Katello::Repository::YUM_TYPE)
+        fail HttpErrors::BadRequest, _("Invalid usage for Pulp 2 repositories. Use export for Yum repositories")
+      end
+    end
+  end
+end

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

@@ -0,0 +1,59 @@
+module Katello
+  class Api::V2::ContentImportsController < Api::V2::ApiController
+    before_action :find_publishable_content_view, :only => [:version]
+    before_action :find_importable_organization, :only => [:library]
+    before_action :find_default_content_view, :only => [:library]
+
+    api :POST, "/content_imports/version", 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 version
+      if @view.default?
+        fail HttpErrors::BadRequest, _("Cannot use this end point for importing to library. "\
+                                       "If you intented to upload to library, use the library endpoint.")
+      end
+
+      task = async_task(::Actions::Katello::ContentViewVersion::Import, @view, path: params[:path], metadata: metadata_params.to_h)
+      respond_for_async :resource => task
+    end
+
+    api :POST, "/content_imports/library", N_("Import a content view version to the library")
+    param :organization_id, :number, :desc => N_("Organization 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 library
+      task = async_task(::Actions::Katello::ContentViewVersion::ImportLibrary, @organization, path: params[:path], metadata: metadata_params.to_h)
+      respond_for_async :resource => task
+    end
+
+    private
+
+    def find_publishable_content_view
+      @view = ContentView.publishable.find(params[:content_view_id])
+      throw_resource_not_found(name: 'content_view', id: params[:content_view_id]) if @view.blank?
+    end
+
+    def find_default_content_view
+      @view = @organization&.default_content_view
+      throw_resource_not_found(name: 'organization', id: params[:organization_id]) if @view.blank?
+    end
+
+    def find_importable_organization
+      find_organization
+      throw_resource_not_found(name: 'organization', id: params[:organization_id]) unless @organization.can_import_library_content?
+    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