katello 3.16.1.2 → 3.18.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 808bc23ecac2fda98ac24ce30217831caa4977d250e759baf83ab78150db70f3
-  data.tar.gz: 5531f14549ff16ea0f157a013ebf5ead92ab2acd5fa9a085face6f48fd0a3a50
+  metadata.gz: 7163fd6dce0ae11188b016225be2effa59131c5bcc4a4b3482a749dfba7ef545
+  data.tar.gz: 202f81621e52adce6d318faa95fa9a527c0e3fc0f25bab3c3cb2ca7133cb12e3
 SHA512:
-  metadata.gz: 40a2c815ff331564ff218ce5d688183b4595d4c423e16f27cdb1d1cfb083bbaaa678d9d09cd5303cc6d56825bd300d33b2192dd5c51edf260a09b37aa7e5102f
-  data.tar.gz: 785618e922bfa8a6f1a9675c4eccf2dc1d0e3038401ed9ac30ca1ddeb2294fbc2ba13987f07b08b96884aa90fcd1fd2a85acf18f28d2c9030a42782544941d0b
+  metadata.gz: 29f15645418ab0683328f83b804dc3fdf45d7f93ce4d23578a558310e0f1ad3cb7f2d98fe74ba3d16181505df56f081092aacb2bb028364995ac15413674862a
+  data.tar.gz: 99b0a150d0d689951d63b2acb37a0bbab702bfb5a13739572e764f9b49eeda60bb3451b6cc6a7aae4c20886755b499637213afef91eb565a92e2c887a4dcc376

data/app/assets/stylesheets/katello/katello.scss

@@ -1,10 +1,3 @@
-/**
- * = require "katello/jquery.loadmask.css"
- * = require "katello/jquery-ui-1.8.11.custom.css"
- * = require "katello/jquery.treeTable.css"
- * = require "katello/ui.spinner.css"
- */
-
 @import "katello/overrides";
 @import "katello/katello_base";
 @import "katello/look";
@@ -18,6 +11,9 @@
 @import "katello/generic";
 @import "katello/notifications";
 
+@import "katello/jquery.treeTable";
+@import "katello/jquery-ui-1.8.11.custom.css";
+
 body {
   background-color: white;
 }

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

@@ -10,8 +10,8 @@ module Katello
     before_action :registry_authorize, except: [:token, :v1_search, :catalog]
     before_action :authorize_repository_read, only: [:pull_manifest, :tags_list]
     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_before_action :check_media_type, only: [:start_upload_blob, :upload_blob, :finish_upload_blob,
+                                                 :chunk_upload_blob, :push_manifest]
 
     wrap_parameters false
 
@@ -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,9 +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
-      r = Resources::Registry::Proxy.get(@_request.fullpath, 'Accept' => request.headers['Accept'])
-      render json: r
+      headers = {}
+      headers['Accept'] = request.headers['Accept'] if request.headers['Accept']
+      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
@@ -476,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_dynflow_proxy_controller.rb

@@ -10,7 +10,7 @@ module Katello
     before_action :find_host, :only => [:upload_package_profile, :upload_profiles, :deb_package_profile]
     before_action :authorize_client_or_user, :only => [:upload_package_profile, :upload_profiles, :deb_package_profile]
 
-    skip_before_action :check_content_type
+    skip_before_action :check_media_type
 
     #api :PUT, "/consumers/:id/packages", N_("Update installed packages")
     #api :PUT, "/consumers/:id/profile", N_("Update installed packages")

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

@@ -26,7 +26,7 @@ module Katello
     before_action :set_organization_id, :except => [:hypervisors_update, :async_hypervisors_update]
     before_action :find_hypervisor_organization, :only => [:async_hypervisors_update, :hypervisors_update]
 
-    before_action :check_content_type, :except => :async_hypervisors_update
+    before_action :check_media_type, :except => :async_hypervisors_update
 
     prepend_before_action :convert_owner_to_organization_id, :except => [:hypervisors_update, :async_hypervisors_update], :if => lambda { params.key?(:owner) }
     prepend_before_action :convert_organization_label_to_id, :only => [:rhsm_index, :consumer_activate, :consumer_create], :if => lambda { params.key?(:organization_id) }
@@ -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

@@ -6,11 +6,11 @@ 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))
 
@@ -95,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
@@ -254,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
@@ -279,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
@@ -290,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
@@ -304,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
@@ -348,5 +345,11 @@ module Katello
 
       key_params
     end
+
+    def verify_simple_content_access_disabled
+      if @activation_key.organization.simple_content_access?
+        fail HttpErrors::BadRequest, _("The specified organization is in Simple Content Access mode. Attaching subscriptions is disabled")
+      end
+    end
   end
 end

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

@@ -5,7 +5,7 @@ module Katello
     include Api::V2::Rendering
     include Api::V2::ErrorHandling
     include ::Foreman::Controller::CsvResponder
-    include Concerns::Api::V2::AssociationsPermissionCheck
+    include Concerns::Api::V2::Authorization
 
     # support for session (thread-local) variables must be the last filter in this class
     include Foreman::ThreadSession::Cleaner

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

@@ -1,10 +1,9 @@
 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]
-    skip_before_action :check_content_type, :only => [:create, :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
       Katello::GpgKey
@@ -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_uploads_controller.rb

@@ -1,7 +1,7 @@
 module Katello
   class Api::V2::ContentUploadsController < Api::V2::ApiController
     before_action :find_repository
-    skip_before_action :check_content_type, :only => [:update]
+    skip_before_action :check_media_type, :only => [:update]
 
     include ::Foreman::Controller::FilterParameters
     filter_parameters :content
@@ -13,8 +13,8 @@ module Katello
     param :content_type, RepositoryTypeManager.uploadable_content_types.map(&:label), :required => false, :desc => N_("content type ('deb', 'docker_manifest', 'file', 'ostree', 'puppet_module', 'rpm', 'srpm')")
     def create
       content_type = params[:content_type] || ::Katello::RepositoryTypeManager.find(@repository.content_type).default_managed_content_type.label
-      unit_type_id = SmartProxy.pulp_master.content_service(content_type).content_type
-      render :json => @repository.backend_content_service(::SmartProxy.pulp_master).create_upload(params[:size], params[:checksum], unit_type_id)
+      unit_type_id = SmartProxy.pulp_primary.content_service(content_type).content_type
+      render :json => @repository.backend_content_service(::SmartProxy.pulp_primary).create_upload(params[:size], params[:checksum], unit_type_id)
     end
 
     api :PUT, "/repositories/:repository_id/content_uploads/:id", N_("Upload a chunk of the file's content")
@@ -24,7 +24,7 @@ module Katello
     param :offset, :number, :required => true, :desc => N_("The offset in the file where the content starts")
     param :content, File, :required => true, :desc => N_("The actual file contents")
     def update
-      @repository.backend_content_service(::SmartProxy.pulp_master)
+      @repository.backend_content_service(::SmartProxy.pulp_primary)
         .upload_chunk(params[:id], params[:offset], params[:content], params[:size])
       head :no_content
     end
@@ -33,7 +33,7 @@ module Katello
     param :repository_id, :number, :required => true, :desc => N_("Repository id")
     param :id, String, :required => true, :desc => N_("Upload request id")
     def destroy
-      @repository.backend_content_service(::SmartProxy.pulp_master).delete_upload(params[:id])
+      @repository.backend_content_service(::SmartProxy.pulp_primary).delete_upload(params[:id])
       head :no_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_repositories_controller.rb

@@ -0,0 +1,48 @@
+module Katello
+  class Api::V2::ContentViewRepositoriesController < Api::V2::ApiController
+    # There are other Content View Repository related endpoints that are in RepositoriesController
+    include Katello::Concerns::FilteredAutoCompleteSearch
+
+    before_action :find_content_view
+    before_action :find_organization_from_cv
+
+    # content_views/:id/repositories/show_all
+    # Shows all repositories, added and available to add, for a content view
+    # Undocumented endpoint since the functionality exists in separate calls already.
+    # This was created for ease of pagination and search for the UI
+    param :id, :number, desc: N_("Content View id"), required: true
+    def show_all
+      kr = Katello::Repository.table_name
+      krr = Katello::RootRepository.table_name
+      kcvr = Katello::ContentViewRepository.table_name
+      join_query = <<-SQL
+        LEFT OUTER JOIN #{kcvr}
+        ON #{kr}.id = #{kcvr}.repository_id
+        AND #{kcvr}.content_view_id = #{@content_view.id}
+      SQL
+      order_query = <<-SQL
+        CAST (#{kcvr}.repository_id as BOOLEAN) ASC, #{krr}.name
+      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) }
+      options = { resource_class: Katello::Repository, custom_sort: custom_sort }
+      repos = scoped_search(query, nil, nil, options)
+
+      respond_for_index(:collection => repos)
+    end
+
+    private
+
+    def find_content_view
+      @content_view = ContentView.find(params[:content_view_id])
+    end
+
+    def find_organization_from_cv
+      @organization = @content_view.organization
+    end
+  end
+end