katello 3.11.2 → 3.12.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6bc74e910b6619e481c98639a8c35762b2a190950dd08105741c148fa67e625
-  data.tar.gz: 97d7a845754bb44a742c2d3179daedee6a3efb4dbb2678b2cb533c359564a6e2
+  metadata.gz: de90074d2a8e2705d398aa2eb12738fe464db7c9c2faf3290756ff5f65dca379
+  data.tar.gz: 366d93dcaea3017282c693fced4b10199af8722e5b12ec849bb45fdbfe272bd3
 SHA512:
-  metadata.gz: 83be864e4e5b9d12b9dd148b45640742c5d6754f058e5f8f7ee602a5822af4836308ee39c6ab828256aa67acb2d87f8d6677dfb75bf0c59bbbeb8a2dc4409a10
-  data.tar.gz: 3b74fc7608493a0bea334ee4e508edf1dec92800fa2d438defe2f417624e6fd9a866d2da5d59094b92a70e326007cfbe02edcdd5b54d0eb1127255b3b2f985a3
+  metadata.gz: 7ec11a64c64efdcfa27c3eb0cf5326e3fb6e7dd60bf82d394dea14b3c82da3ba2cbf3f642cd529cb1e041955b379a4aa9bb3ca469ea7986065a00a6f349529ce
+  data.tar.gz: 0cd6d05e64ba6ffc5f10dc3c34a7877dc9ca4128d5055605eef98bdecb2d7ecff818d75275d000d8e8d882b249d17b8ed0ab97beebc1cb26ed671f8d8ce2d820

data/README.md

@@ -68,7 +68,7 @@ See the [developer documentation](https://www.theforeman.org/plugins/katello/dev
 
 ## Annotated Pulp and Candlepin Workflows and test Scenarios
 
-See the [annotation docs](./test/scenarios/README.md) for more information.
+See the [annotation docs](./test/scenarios/annotations/README.md) for more information.
 
 ## Contact & Resources
 

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

@@ -51,7 +51,7 @@ module Katello
 
     def registry_authorize
       @repository = find_readable_repository
-      return true if request.method == 'GET' && @repository && @repository.environment.registry_unauthenticated_pull
+      return true if ['GET', 'HEAD'].include?(request.method) && @repository && @repository.environment.registry_unauthenticated_pull
 
       token = request.headers['Authorization']
       if token
@@ -150,7 +150,7 @@ module Katello
     def pull_manifest
       headers = {}
       env = request.env.select do |key, _value|
-        key.match("^HTTP.*")
+        key.match("^HTTP_.*")
       end
       env.each do |header|
         headers[header[0].split('_')[1..-1].join('-')] = header[1]
@@ -161,7 +161,20 @@ module Katello
       results = JSON.parse(r)
 
       response.header['Docker-Content-Digest'] = "sha256:#{Digest::SHA256.hexdigest(r)}"
-      render json: r, content_type: results['mediaType']
+      # 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
     end
 
     def check_blob
@@ -223,12 +236,12 @@ module Katello
       response.header['Location'] = "#{request_url}/v2/#{params[:repository]}/blobs/uploads/#{params[:uuid]}"
       response.header['Range'] = "123"
       response.header['Docker-Upload-UUID'] = "123"
-      render plain: '', status: 204
+      render plain: '', status: :no_content
     end
 
     def chunk_upload_blob
       response.header['Location'] = "#{request_url}/v2/#{params[:repository]}/blobs/uploads/#{params[:uuid]}"
-      render plain: '', status: 202
+      render plain: '', status: :accepted
     end
 
     def upload_blob
@@ -265,12 +278,12 @@ module Katello
     end
 
     def cancel_upload_blob
-      render plain: '', status: 200
+      render plain: '', status: :ok
     end
 
     def ping
       response.headers['Docker-Distribution-API-Version'] = 'registry/2.0'
-      render json: {}, status: 200
+      render json: {}, status: :ok
     end
 
     def v1_ping
@@ -295,7 +308,7 @@ module Katello
       results[:results] = search_results[:results].collect do |repository|
         { name: repository[:container_repository_name], description: repository[:description] }
       end
-      render json: results, status: 200
+      render json: results, status: :ok
     end
 
     def catalog

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

@@ -215,7 +215,7 @@ module Katello
       User.as_anonymous_admin do
         Katello::RegistrationManager.unregister_host(@host, :unregistering => !Setting['unregister_delete_host'])
       end
-      render :plain => _("Deleted consumer '%s'") % params[:id], :status => 204
+      render :plain => _("Deleted consumer '%s'") % params[:id], :status => :no_content
     end
 
     # used for registering with activation keys
@@ -257,7 +257,7 @@ module Katello
       User.current = User.anonymous_admin
       async_task(::Actions::Katello::Host::Update, @host, rhsm_params)
       update_host_registered_through(@host, request.headers)
-      render :json => {:content => _("Facts successfully updated.")}, :status => 200
+      render :json => {:content => _("Facts successfully updated.")}, :status => :ok
     end
 
     def serials
@@ -481,11 +481,12 @@ module Katello
         end
       when "rhsm_proxy_owner_servicelevels_path"
         (User.consumer? || ::User.current.can?(:view_organizations, self))
-      when "rhsm_proxy_consumer_certificates_path", "rhsm_proxy_consumer_releases_path", "rhsm_proxy_certificate_serials_path",
+      when "rhsm_proxy_consumer_accessible_content_path", "rhsm_proxy_consumer_certificates_path",
+           "rhsm_proxy_consumer_releases_path", "rhsm_proxy_certificate_serials_path",
            "rhsm_proxy_consumer_entitlements_path", "rhsm_proxy_consumer_entitlements_post_path",
            "rhsm_proxy_consumer_entitlements_delete_path", "rhsm_proxy_consumer_entitlements_pool_delete_path",
            "rhsm_proxy_consumer_certificates_put_path", "rhsm_proxy_consumer_dryrun_path",
-           "rhsm_proxy_consumer_owners_path", "rhsm_proxy_consumer_compliance_path"
+           "rhsm_proxy_consumer_owners_path", "rhsm_proxy_consumer_compliance_path", "rhsm_proxy_consumer_purpose_compliance_path"
         User.consumer? && current_user.uuid == params[:id]
       when "rhsm_proxy_consumer_certificates_delete_path"
         User.consumer? && current_user.uuid == params[:consumer_id]

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

@@ -115,12 +115,12 @@ module Katello
 
     def scoped_search_results(query, sub_total, total, page, per_page, error = nil)
       {
-        :results  => query,
+        :results => query,
         :subtotal => sub_total,
-        :total    => total,
-        :page     => page,
+        :total => total,
+        :page => page,
         :per_page => per_page,
-        :error    => error
+        :error => error
       }
     end
 

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

@@ -22,29 +22,30 @@ module Katello
     api :GET, '/capsules/:id/content/lifecycle_environments', N_('List the lifecycle environments attached to the smart proxy')
     param_group :lifecycle_environments
     def lifecycle_environments
-      environments = capsule_content.lifecycle_environments(params[:organization_id]).readable
-      respond_for_lifecycle_environments_index(environments)
+      environments = @capsule.lifecycle_environments
+      environment_org_scope = params[:organization_id] ? environments.where(organization_id: params[:organization_id]) : environments
+      respond_for_lifecycle_environments_index(environment_org_scope)
     end
 
     api :GET, '/capsules/:id/content/available_lifecycle_environments', N_('List the lifecycle environments not attached to the smart proxy')
     param_group :lifecycle_environments
     def available_lifecycle_environments
-      environments = capsule_content.available_lifecycle_environments(params[:organization_id]).readable
+      environments = @capsule.available_lifecycle_environments(params[:organization_id]).readable
       respond_for_lifecycle_environments_index(environments)
     end
 
     api :POST, '/capsules/:id/content/lifecycle_environments', N_('Add lifecycle environments to the smart proxy')
     param_group :update_lifecycle_environments
     def add_lifecycle_environment
-      capsule_content.add_lifecycle_environment(@environment)
-      respond_for_lifecycle_environments_index(capsule_content.lifecycle_environments)
+      @capsule.add_lifecycle_environment(@environment)
+      respond_for_lifecycle_environments_index(@capsule.lifecycle_environments)
     end
 
     api :DELETE, '/capsules/:id/content/lifecycle_environments/:environment_id', N_('Remove lifecycle environments from the smart proxy')
     param_group :update_lifecycle_environments
     def remove_lifecycle_environment
-      capsule_content.remove_lifecycle_environment(@environment)
-      respond_for_lifecycle_environments_index(capsule_content.lifecycle_environments)
+      @capsule.remove_lifecycle_environment(@environment)
+      respond_for_lifecycle_environments_index(@capsule.lifecycle_environments)
     end
 
     api :POST, '/capsules/:id/content/sync', N_('Synchronize the content to the smart proxy')
@@ -55,7 +56,7 @@ module Katello
       find_environment if params[:environment_id]
       skip_metadata_check = ::Foreman::Cast.to_bool(params[:skip_metadata_check])
       task = async_task(::Actions::Katello::CapsuleContent::Sync,
-                        capsule_content.capsule,
+                        @capsule,
                         :environment_id => @environment.try(:id),
                         :skip_metadata_check => skip_metadata_check)
       respond_for_async :resource => task
@@ -65,14 +66,13 @@ module Katello
     param :id, Integer, :desc => N_('Id of the smart proxy'), :required => true
     param :organization_id, Integer, :desc => N_('Id of the organization to get the status for'), :required => false
     def sync_status
-      @capsule_content = capsule_content
-      @lifecycle_environments = @capsule_content.lifecycle_environments(@organization)
+      @lifecycle_environments = @organization ? @capsule.lifecycle_environments.where(organization_id: @organization.id) : @capsule.lifecycle_environments
     end
 
     api :DELETE, '/capsules/:id/content/sync', N_('Cancel running smart proxy synchronization')
     param :id, Integer, :desc => N_('Id of the smart proxy'), :required => true
     def cancel_sync
-      tasks = capsule_content.cancel_sync
+      tasks = @capsule.cancel_sync
       if tasks.empty?
         render_message _('There\'s no running synchronization for this smart proxy.')
       else
@@ -109,8 +109,8 @@ module Katello
       @environment = Katello::KTEnvironment.readable.find(params[:environment_id])
     end
 
-    def capsule_content
-      CapsuleContent.new(@capsule)
+    def smart_proxy_service
+      Pulp::SmartProxyRepository.new(@capsule)
     end
   end
 end

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

@@ -15,9 +15,9 @@ module Katello
     def index_response
       results = @view.content_view_components
       {
-        :results  => results.uniq,
+        :results => results.uniq,
         :subtotal => results.count,
-        :total    => results.count
+        :total => results.count
       }
     end
 

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

@@ -125,7 +125,7 @@ module Katello
       param :environment_ids, Array, :desc => N_("The list of environments to promote the specified Content View Version to (replacing the older version)")
     end
     param :description, String, :desc => N_("The description for the new generated Content View Versions")
-    param :resolve_dependencies, :bool, :desc => N_("If true, when adding the specified errata or packages, any needed dependencies will be copied as well")
+    param :resolve_dependencies, :bool, :desc => N_("If true, when adding the specified errata or packages, any needed dependencies will be copied as well. Defaults to true")
     param :propagate_all_composites, :bool, :desc => N_("If true, will publish a new composite version using any specified content_view_version_id that has been promoted to a lifecycle environment")
     param :add_content, Hash do
       param :errata_ids, Array, :desc => "Errata ids to copy into the new versions"
@@ -151,8 +151,9 @@ module Katello
       end
 
       validate_content(params[:add_content])
-      task = async_task(::Actions::Katello::ContentView::IncrementalUpdates, @version_environments, @composite_version_environments, params[:add_content],
-                        params[:resolve_dependencies], hosts, params[:description])
+      resolve_dependencies = params.fetch(:resolve_dependencies, true)
+      task = async_task(::Actions::Katello::ContentView::IncrementalUpdates, @version_environments, @composite_version_environments,
+                        params[:add_content], resolve_dependencies, hosts, params[:description])
       respond_for_async :resource => task
     end
 

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

@@ -19,6 +19,7 @@ module Katello
       param :repository_ids, Array, :desc => N_("List of repository ids")
       param :component_ids, Array, :desc => N_("List of component content view version ids for composite views")
       param :auto_publish, :bool, :desc => N_("Enable/Disable auto publish of composite view")
+      param :solve_dependencies, :bool, :desc => N_("Solve RPM dependencies by default on Content View publish, defaults to false")
     end
 
     api :GET, "/organizations/:organization_id/content_views", N_("List content views")
@@ -79,7 +80,6 @@ module Katello
     param :description, String, :desc => N_("Description for the new published content view version")
     param :major, :number, :desc => N_("Override the major version number"), :required => false
     param :minor, :number, :desc => N_("Override the minor version number"), :required => false
-
     param :repos_units, Array, :desc => N_("Specify the list of units in each repo"), :required => false do
       param :label, String, :desc => N_("repo label"), :required => true
       param :rpm_filenames, Array, of: String, :desc => N_("list of rpm filename strings to include in published version"), :required => true
@@ -229,7 +229,7 @@ module Katello
     def view_params
       attrs = [:name, :description, :force_puppet_environment, {:component_ids => []}]
       attrs.push(:label, :composite) if action_name == "create"
-      attrs.push(:component_ids, :auto_publish) # For deep_munge; Remove for Rails 5
+      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/errata_controller.rb

@@ -50,7 +50,7 @@ module Katello
       applicable = ::Foreman::Cast.to_bool(params[:errata_restrict_applicable]) || @host
       installable = ::Foreman::Cast.to_bool(params[:errata_restrict_installable])
       if applicable || installable
-        hosts = @host ? [@host] : ::Host::Managed.authorized("view_hosts")
+        hosts = @host ? ::Host::Managed.where(:id => @host.id) : ::Host::Managed.authorized("view_hosts")
         hosts = hosts.where(:organization_id => params[:organization_id]) if params[:organization_id]
         if installable
           collection = collection.where(:id => Erratum.ids_installable_for_hosts(hosts))

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

@@ -20,7 +20,7 @@ module Katello
       param :purpose_usage, String, :desc => N_("Sets the system purpose usage")
       param :purpose_role, String, :desc => N_("Sets the system purpose usage")
       param :purpose_addons, Array, :desc => N_("Sets the system add-ons")
-      param :service_level, Integer, :desc => N_("Service level to be used for autoheal")
+      param :service_level, String, :desc => N_("Service level to be used for autoheal")
       param :hypervisor_guest_uuids, Array, :desc => N_("List of hypervisor guest uuids")
       param :installed_products_attributes, Array, :desc => N_("List of products installed on the host") do
         param_group :installed_products

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

@@ -11,6 +11,8 @@ module Katello
       rpms = Rpm.in_repositories(@repositories)
       col = "#{Rpm.table_name}.name"
       rpms = rpms.where("#{Rpm.table_name}.name ILIKE ?", "#{params[:term]}%").select(col).group(col).order(col).limit(page_size)
+      rpms = rpms.modular if ::Foreman::Cast.to_bool(params[:modular_only])
+      rpms = rpms.non_modular if ::Foreman::Cast.to_bool(params[:non_modular_only])
       render :json => rpms.pluck(col)
     end
 
@@ -19,6 +21,8 @@ module Katello
       rpms = Rpm.in_repositories(@repositories)
       col = "#{Rpm.table_name}.arch"
       rpms = rpms.where("#{col} ILIKE ?", "%#{params[:term]}%").select(col).group(col).order(col).limit(page_size)
+      rpms = rpms.modular if ::Foreman::Cast.to_bool(params[:modular_only])
+      rpms = rpms.non_modular if ::Foreman::Cast.to_bool(params[:non_modular_only])
       render :json => rpms.pluck(col)
     end
 

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

@@ -16,8 +16,8 @@ module Katello
     api :GET, "/status", N_("Shows version information")
     description N_("This service is available for unauthenticated users")
     def server_status
-      status = { :version    => Katello::VERSION,
-                 :timeUTC    => Time.now.getutc }
+      status = { :version => Katello::VERSION,
+                 :timeUTC => Time.now.getutc }
       respond_for_show :resource => status, :template => "server_status"
     end
   end

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

@@ -81,6 +81,7 @@ module Katello
     param :library, :bool, :desc => N_("show repositories in Library and the default content view")
     param :content_type, RepositoryTypeManager.repository_types.keys, :desc => N_("limit to only repositories of this type")
     param :name, String, :desc => N_("name of the repository"), :required => false
+    param :label, String, :desc => N_("label of the repository"), :required => false
     param :description, String, :desc => N_("description of the repository")
     param :available_for, String, :desc => N_("interpret specified object to return only Repositories that can be associated with specified object.  Only 'content_view' & 'content_view_version' are supported."),
           :required => false
@@ -115,6 +116,7 @@ module Katello
       query = index_relation_product(query)
       query = query.with_type(params[:content_type]) if params[:content_type]
       query = query.where(:root_id => RootRepository.where(:name => params[:name])) if params[:name]
+      query = query.where(:root_id => RootRepository.where(:label => params[:label])) if params[:label]
       query = index_relation_content_unit(query)
       query = index_relation_content_view(query)
       query = index_relation_environment(query)
@@ -443,14 +445,14 @@ module Katello
     def repository_params
       keys = [:download_policy, :mirror_on_sync, :arch, :verify_ssl_on_sync, :upstream_password, :upstream_username,
               :ostree_upstream_sync_depth, :ostree_upstream_sync_policy, :ignore_global_proxy,
-              :deb_releases, :deb_components, :deb_architectures, :description, {:ignorable_content => []},
-              {:docker_tags_whitelist => []}
+              :deb_releases, :deb_components, :deb_architectures, :description, {:ignorable_content => []}
              ]
 
+      keys += [{:docker_tags_whitelist => []}, :docker_upstream_name] if params[:action] == 'create' || @repository&.docker?
       keys += [:label, :content_type] if params[:action] == "create"
       if params[:action] == 'create' || @repository.custom?
         keys += [:url, :gpg_key_id, :ssl_ca_cert_id, :ssl_client_cert_id, :ssl_client_key_id, :unprotected, :name,
-                 :checksum_type, :docker_upstream_name]
+                 :checksum_type]
       end
       params.require(:repository).permit(*keys).to_h.with_indifferent_access
     end
@@ -471,7 +473,7 @@ module Katello
                                                             :gpg_key, :ssl_ca_cert, :ssl_client_cert, :ssl_client_key,
                                                             :checksum_type, :download_policy).to_h.with_indifferent_access)
       root.docker_upstream_name = repo_params[:docker_upstream_name] if repo_params[:docker_upstream_name]
-      root.docker_tags_whitelist = repo_params[:docker_tags_whitelist] if repo_params[:docker_tags_whitelist]
+      root.docker_tags_whitelist = repo_params.fetch(:docker_tags_whitelist, []) if root.docker?
       root.mirror_on_sync = ::Foreman::Cast.to_bool(repo_params[:mirror_on_sync]) if repo_params.key?(:mirror_on_sync)
       root.ignore_global_proxy = ::Foreman::Cast.to_bool(repo_params[:ignore_global_proxy]) if repo_params.key?(:ignore_global_proxy)
       root.verify_ssl_on_sync = ::Foreman::Cast.to_bool(repo_params[:verify_ssl_on_sync]) if repo_params.key?(:verify_ssl_on_sync)

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

@@ -64,7 +64,7 @@ module Katello
       collection = {
         :results => sorted_repos.reverse,
         :subtotal => repos.size,
-        :total    => repos.size
+        :total => repos.size
       }
 
       respond_for_index :collection => collection

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

@@ -47,12 +47,15 @@ module Katello
     param :organization_id, :number, :desc => N_("Filter sync plans by organization name or label"), :required => true
     param_group :sync_plan
     def create
+      if params[:sync_plan].key?(:enabled) || params.key?(:enabled)
+        enabled = params[:sync_plan][:enabled] || params[:enabled]
+      end
       unless sync_plan_params[:sync_date].to_time(:utc).is_a?(Time)
         fail _("Date format is incorrect.")
       end
-      @sync_plan = SyncPlan.new(sync_plan_params)
+      @sync_plan = SyncPlan.new(sync_plan_params.except(:enabled))
       @sync_plan.organization = @organization
-      @sync_plan.save_with_logic!
+      @sync_plan.save_with_logic!(enabled)
       respond_for_create(:resource => @sync_plan)
     end
 
@@ -63,6 +66,9 @@ module Katello
     param_group :sync_plan
     def update
       sync_date = sync_plan_params.try(:[], :sync_date).try(:to_time)
+      params[:enabled] = params[:enabled] || params[:sync_plan][:enabled]
+      toggle_enabled = (@sync_plan.enabled? != params[:enabled]) && !params[:enabled].nil? && !@sync_plan.foreman_tasks_recurring_logic.cancelled?
+      @sync_plan.foreman_tasks_recurring_logic.enabled = params[:enabled] if toggle_enabled
       if !sync_date.nil? && !sync_date.is_a?(Time)
         fail _("Date format is incorrect.")
       end
@@ -116,6 +122,7 @@ module Katello
     end
 
     def sync_plan_params
+      params[:sync_plan][:enabled] = params[:enabled] unless params[:enabled].nil?
       params.require(:sync_plan).permit(:name, :description, :interval, :sync_date, :product_ids, :enabled, :cron_expression)
     end
   end

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

@@ -28,7 +28,7 @@ module Katello
         def host_collections
           @host.host_collection_ids = params[:host_collection_ids]
           @host.save!
-          render(:locals => { :resource => @host }, :template => 'katello/api/v2/hosts/show', :status => 200)
+          render(:locals => { :resource => @host }, :template => 'katello/api/v2/hosts/show', :status => :ok)
         end
       end
     end

data/app/helpers/katello/sync_management_helper.rb

@@ -39,7 +39,7 @@ module Katello
 
         products.map do |prod|
           minor_repos, repos_without_minor = collect_minor(prod.repos(env, nil, include_feedless))
-          { :name     => prod.name, :object => prod, :id => prod.id, :type => "product", :repos => repos_without_minor,
+          { :name => prod.name, :object => prod, :id => prod.id, :type => "product", :repos => repos_without_minor,
             :children => minors(minor_repos), :organization => prod.organization.name }
         end
       end

data/app/lib/actions/candlepin/candlepin_listening_service.rb

@@ -14,7 +14,7 @@ module Actions
         attr_reader :instance
 
         def initialize(logger, url, address)
-          @instance ||= self.new(logger, url, address)
+          @instance = self.new(logger, url, address)
         end
 
         def close