katello 3.5.2 → 3.6.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf8e8e75ea66a068954c0f1c81c467d8502b581d
-  data.tar.gz: 107669c4de9f0cab916fd4bc4c3c805d3ac06f06
+  metadata.gz: 74b47b654bb5cd12ff6447d5a2eb86be22e2eb86
+  data.tar.gz: 3df18ad11e749d434a78930eee529b2d7501b943
 SHA512:
-  metadata.gz: e5f7a21ec394886599dc847e2e8da9caaee88ab41d6efaaa287b824ca2b9f941aa72141290527c10ea7ab8316201c423b29d75353e0e55ee00d380eabaf3de0c
-  data.tar.gz: 73a610d722cd161c032e659c37948786c107d52ff1f31548abc08d9b605d527badf22228f1e0d92e6c2387b9efc3c523f6266892ed363001539248459baf6b0d
+  metadata.gz: 80e6a16b4daf6415bc9fbb4b659009c93b80bb2e6fbbe0b47d5ac540bf0f1ff4added97ee831bb47f8a54e3905ef275ee3a9de4568de8be4f08de460e816ac6a
+  data.tar.gz: 391a19603ff401a18a95fa781989f76e9bf1302192114b8a0d49f82341a990655701e7497ea8ea6973ac89b168ca4d69c489471bcd78dcc4aaa5224a75b4f333

data/app/assets/javascripts/katello/sync_management/sync_management.js

@@ -62,6 +62,9 @@ $(document).ready(function() {
 KT.content_actions = (function(){
     var syncing = [],
     updater,
+    getOrg = function() {
+        return $('#organization_id').val();
+    },
     addSyncing = function(repo_ids){
         if (repo_ids.length === 0){
             return;
@@ -95,7 +98,7 @@ KT.content_actions = (function(){
 
             $.ajax({
               type: 'DELETE',
-              url: foreman_url('/katello/sync_management/' + repo_id),
+              url: foreman_url('/katello/sync_management/' + repo_id + '?organization_id=' + getOrg()),
               dataType: 'json',
               success: function(data) {
               },
@@ -111,7 +114,7 @@ KT.content_actions = (function(){
         }
         var url = foreman_url('/katello/sync_management/sync_status');
         updater = $.PeriodicalUpdater(url, {
-              data: function(){return {repoids:getSyncing()}},
+              data: function(){return {repoids:getSyncing(), organization_id:getOrg()}},
               method: 'get',
               type: 'json',
               global: false

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

@@ -8,6 +8,8 @@ module Katello
     before_action :find_host, :only => [:upload_package_profile]
     before_action :authorize_client_or_user, :only => [:upload_package_profile]
 
+    skip_before_action :check_content_type
+
     #api :PUT, "/consumers/:id/packages", N_("Update installed packages")
     #api :PUT, "/consumers/:id/profile", N_("Update installed packages")
     #param :id, String, :desc => N_("UUID of the consumer"), :required => true

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

@@ -25,6 +25,9 @@ module Katello
 
     before_action :check_content_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) }
+
     def repackage_message
       yield
     ensure
@@ -48,7 +51,7 @@ module Katello
       if request_from_katello_cli?
         render :json => { :errors => [e.http_body] }, :status => e.http_code
       else
-        render :text => e.http_body, :status => e.http_code
+        render :plain => e.http_body, :status => e.http_code
       end
     end
 
@@ -97,8 +100,7 @@ module Katello
 
     #api :GET, "/owners/:organization_id/environments", N_("List environments for RHSM")
     def rhsm_index
-      organization = find_organization
-      @all_environments = get_content_view_environments(params[:name], organization).collect do |env|
+      @all_environments = get_content_view_environments(params[:name], Organization.current).collect do |env|
         {
           :id => env.cp_id,
           :name => env.label,
@@ -127,7 +129,7 @@ module Katello
       task = User.as(login) do
         params['owner'] = @organization.label #override owner label if
         params['env'] = nil #hypervisors don't need an environment
-        sync_task(::Actions::Katello::Host::Hypervisors, params.except(:controller, :action, :format))
+        sync_task(::Actions::Katello::Host::Hypervisors, params.except(:controller, :action, :format).to_h)
       end
       render :json => task.output[:results]
     end
@@ -223,7 +225,7 @@ module Katello
           sync_task(::Actions::Katello::Host::Unregister, @host)
         end
       end
-      render :text => _("Deleted consumer '%s'") % params[:id], :status => 204
+      render :plain => _("Deleted consumer '%s'") % params[:id], :status => 204
     end
 
     # used for registering with activation keys
@@ -233,6 +235,7 @@ module Katello
       # Activation keys are userless by definition so use the internal generic user
       # Set it before calling find_activation_keys to allow communication with candlepin
       User.current = User.anonymous_admin
+      additional_set_taxonomy
       activation_keys = find_activation_keys
       host = Katello::Host::SubscriptionFacet.find_or_create_host(activation_keys.first.organization, rhsm_params)
 
@@ -268,7 +271,7 @@ module Katello
     end
 
     def serials
-      @host.subscription_facet.last_checkin = DateTime.now
+      @host.subscription_facet.last_checkin = Time.now
       @host.subscription_facet.save!
       render :json => Katello::Resources::Candlepin::Consumer.serials(@host.subscription_facet.uuid)
     end
@@ -281,6 +284,15 @@ module Katello
 
     private
 
+    # in case set taxonomy from core was skipped since the User.current was nil at that moment (typically AK was used instead of username/password)
+    # we need to set proper context, unfortunately params[:organization_id] is already overridden again by set_organization_id so we need to
+    # set correct parameter value and then reset it back
+    def additional_set_taxonomy
+      params[:organization_id], original = find_organization(:owner).id, params[:organization_id] if params[:owner].present?
+      set_taxonomy
+      params[:organization_id] = original if params[:owner].present?
+    end
+
     def disable_strong_params
       params.permit!
     end
@@ -310,7 +322,7 @@ module Katello
       if params.key?(:environment_id)
         environment = get_content_view_environment("cp_id", params[:environment_id])
       elsif params.key?(:organization_id) && !params.key?(:environment_id)
-        organization = find_organization
+        organization = Organization.current
         environment = organization.library.content_view_environment
       elsif User.current.default_organization.present?
         environment = User.current.default_organization.library.content_view_environment
@@ -331,30 +343,39 @@ module Katello
       deny_access unless @organization
     end
 
-    def find_organization
+    def find_organization(key = :organization_id)
       organization = nil
 
-      if params.key?(:organization_id)
-        organization = Organization.find_by(:label => params[:organization_id])
+      if params.key?(key)
+        organization = Organization.find_by(:label => params[key])
       end
 
       if organization.nil?
         message = _("Couldn't find Organization '%s'.")
-        fail HttpErrors::NotFound, message % params[:organization_id]
+        fail HttpErrors::NotFound, message % params[key]
       end
 
       if User.current && !User.consumer? && !User.current.allowed_organizations.include?(organization)
         message = _("User '%{user}' does not belong to Organization '%{organization}'.")
-        fail HttpErrors::NotFound, message % {:user => current_user.login, :organization => params[:organization_id]}
+        fail HttpErrors::NotFound, message % {:user => current_user.login, :organization => params[key]}
       end
 
       organization
     end
 
+    def convert_organization_label_to_id
+      params[:organization_id] = find_organization.id
+    end
+
+    def convert_owner_to_organization_id
+      params[:organization_id] = find_organization(:owner).id
+    end
+
     def find_activation_keys
-      organization = find_organization
+      organization = Organization.current
 
       if (ak_names = params[:activation_keys])
+        fail HttpErrors::NotFound, _("Organization not found") if organization.nil?
         ak_names        = ak_names.split(",")
         activation_keys = ak_names.map do |ak_name|
           activation_key = organization.activation_keys.find_by(:name => ak_name)
@@ -396,7 +417,7 @@ module Katello
     end
 
     def rhsm_params
-      params.slice(:name, :type, :facts, :installedProducts, :autoheal, :releaseVer, :serviceLevel, :uuid, :capabilities, :guestIds, :lastCheckin)
+      params.slice(:name, :type, :facts, :installedProducts, :autoheal, :releaseVer, :serviceLevel, :uuid, :capabilities, :guestIds, :lastCheckin).to_h
     end
 
     def logger
@@ -458,14 +479,12 @@ module Katello
       when "rhsm_proxy_consumer_deletionrecord_delete_path"
         User.consumer? || Organization.deletable?
       when "rhsm_proxy_owner_pools_path"
-        find_organization
         if params[:consumer]
           User.consumer? && current_user.uuid == params[:consumer]
         else
           User.consumer? || ::User.current.can?(:view_organizations, self)
         end
       when "rhsm_proxy_owner_servicelevels_path"
-        find_organization
         (User.consumer? || ::User.current.can?(:view_organizations, self))
       when "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",

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

@@ -24,7 +24,7 @@ module Katello
     param_group :search, Api::V2::ApiController
     def index
       activation_key_includes = [:content_view, :environment, :host_collections, :organization]
-      respond(:collection => scoped_search(index_relation.uniq, :name, :asc, :includes => activation_key_includes))
+      respond(:collection => scoped_search(index_relation.distinct, :name, :asc, :includes => activation_key_includes))
     end
 
     api :POST, "/activation_keys", N_("Create an activation key")
@@ -320,7 +320,7 @@ module Katello
                                                           # For deep_munge; Remove for Rails 5
                                                           :host_collection_ids,
                                                           :content_overrides => [],
-                                                          :host_collection_ids => [])
+                                                          :host_collection_ids => []).to_h
 
       key_params[:environment_id] = params[:environment][:id] if params[:environment].try(:[], :id)
       key_params[:content_view_id] = params[:content_view][:id] if params[:content_view].try(:[], :id)

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

@@ -19,7 +19,7 @@ module Katello
     param :content, File, :required => true, :desc => N_("The actual file contents")
     def update
       pulp_content.upload_bits(params[:id], params[:offset], params[:content])
-      render :nothing => true
+      head :no_content
     end
 
     api :DELETE, "/repositories/:repository_id/content_uploads/:id", N_("Delete an upload request")
@@ -27,7 +27,7 @@ module Katello
     param :id, :number, :required => true, :desc => N_("Upload request id")
     def destroy
       pulp_content.delete_upload_request(params[:id])
-      render :nothing => true
+      head :no_content
     end
 
     private

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

@@ -32,6 +32,7 @@ module Katello
     end
     def add_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))

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

@@ -14,7 +14,7 @@ module Katello
     param :name, String, :desc => N_("filter content view filters by name")
     param :types, Array, :desc => N_("types of filters")
     def index
-      respond(:collection => scoped_search(index_relation.uniq, :name, :asc))
+      respond(:collection => scoped_search(index_relation.distinct, :name, :asc))
     end
 
     def index_relation

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

@@ -7,7 +7,7 @@ module Katello
     api :GET, "/content_views/:id/history", N_("Show a content view's history")
     param :id, :number, :desc => N_("content view numeric identifier"), :required => true
     def index
-      respond_for_index :collection => scoped_search(index_relation.uniq, :katello_content_view_version_id, :asc, :resource_class => ContentViewHistory)
+      respond_for_index :collection => scoped_search(index_relation.distinct, :katello_content_view_version_id, :asc, :resource_class => ContentViewHistory)
     end
 
     def index_relation

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

@@ -12,7 +12,7 @@ module Katello
     param :uuid, String, :desc => N_("the uuid of the puppet module to associate")
     param_group :search, ::Katello::Api::V2::ApiController
     def index
-      respond(:collection => scoped_search(index_relation.uniq, :name, :asc))
+      respond(:collection => scoped_search(index_relation.distinct, :name, :asc))
     end
 
     api :POST, "/content_views/:content_view_id/content_view_puppet_modules",

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

@@ -26,7 +26,7 @@ module Katello
         :includes => [:content_view, :environments, :composite_content_views, :history => :task],
         :custom_sort => lambda { |query| query.order("#{ContentViewVersion.table_name}.major desc, #{ContentViewVersion.table_name}.minor desc") }
       }
-      respond(:collection => scoped_search(index_relation.uniq, nil, nil, options))
+      respond(:collection => scoped_search(index_relation.distinct, nil, nil, options))
     end
 
     def index_relation

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

@@ -33,7 +33,7 @@ module Katello
     def index
       content_view_includes = [:activation_keys, :content_view_puppet_modules, :content_view_versions,
                                :environments, :organization, :repositories]
-      respond(:collection => scoped_search(index_relation.uniq, :name, :asc, :includes => content_view_includes))
+      respond(:collection => scoped_search(index_relation.distinct, :name, :asc, :includes => content_view_includes))
     end
 
     def index_relation
@@ -173,7 +173,7 @@ module Katello
                              :system_environment_id,
                              :key_content_view_id,
                              :key_environment_id
-                            ).reject { |_k, v| v.nil? }
+                            ).reject { |_k, v| v.nil? }.to_unsafe_h
       options[:content_view_versions] = versions
       options[:content_view_environments] = cv_envs
 
@@ -210,7 +210,7 @@ module Katello
       attrs = [:name, :description, :force_puppet_environment, {:repository_ids => []}, {:component_ids => []}]
       attrs.push(:label, :composite) if action_name == "create"
       attrs.push(:component_ids, :repository_ids) # For deep_munge; Remove for Rails 5
-      params.require(:content_view).permit(*attrs)
+      params.require(:content_view).permit(*attrs).to_h
     end
 
     def find_environment

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

@@ -0,0 +1,19 @@
+module Katello
+  class Api::V2::DebsController < Api::V2::ApiController
+    resource_description do
+      name 'Deb Packages'
+    end
+    apipie_concern_subst(:a_resource => N_("a deb"), :resource => "debs")
+    include Katello::Concerns::Api::V2::RepositoryContentController
+
+    def default_sort
+      %w(name asc)
+    end
+
+    private
+
+    def repo_association
+      :repository_id
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+module Katello
+  class Api::V2::DockerManifestListsController < Api::V2::ApiController
+    apipie_concern_subst(:a_resource => N_("a docker manifest list"), :resource => "docker_manifest_lists")
+    include Katello::Concerns::Api::V2::RepositoryContentController
+
+    private
+
+    def resource_class
+      DockerManifestList
+    end
+
+    def custom_index_relation(collection)
+      collection.includes(:docker_tags)
+    end
+
+    def default_sort
+      lambda { |query| query.default_sort }
+    end
+  end
+end

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

@@ -49,7 +49,7 @@ module Katello
     param :name, String, :desc => N_("filter only environments containing this name")
     param_group :search, Api::V2::ApiController
     def index
-      respond(:collection => scoped_search(index_relation.uniq, :name, :asc, :resource_class => KTEnvironment))
+      respond(:collection => scoped_search(index_relation.distinct, :name, :asc, :resource_class => KTEnvironment))
     end
 
     def index_relation

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

@@ -49,6 +49,30 @@ module Katello
       collection
     end
 
+    api :GET, "/content_view_versions/:id/available_errata", N_("List errata that can be added to the Content View Version via an Incremental Update")
+    param :id, :number, :desc => N_("Content View Version identifier"), :required => true
+    param :repository_id, :number, :desc => N_("repository identifier")
+    param :cve, String, :desc => N_("CVE identifier")
+    param :errata_restrict_applicable, :bool, :desc => N_("show only errata with one or more applicable hosts")
+    param_group :search, ::Katello::Api::V2::ApiController
+    def available_errata
+      version = ContentViewVersion.find(params[:id])
+      collection = version.available_errata
+      if @repo
+        collection = collection.joins(:repository_errata => :repository).where(:katello_repositories => { :id => @repo })
+      end
+      if params[:cve]
+        collection = collection.joins(:cves).where(:katello_erratum_cves => { :cve_id => params[:cve] })
+      end
+      if ::Foreman::Cast.to_bool(params[:errata_restrict_applicable])
+        hosts = ::Host::Managed.authorized("view_hosts")
+        collection = collection.applicable_to_hosts(hosts)
+      end
+      sort_by, sort_order, options = sort_options
+      collection = scoped_search(collection, sort_by, sort_order, options)
+      respond_for_index(:collection => collection)
+    end
+
     private
 
     def filter_by_cve(cve, collection)

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

@@ -1,6 +1,9 @@
 module Katello
   class Api::V2::FileUnitsController < Api::V2::ApiController
-    apipie_concern_subst(:a_resource => N_("a file"), :resource => "files")
+    resource_description do
+      name 'Files'
+    end
+    apipie_concern_subst(:a_resource => N_("a file"), :resource_id => "files")
     include Katello::Concerns::Api::V2::RepositoryContentController
 
     def default_sort

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

@@ -3,8 +3,8 @@ module Katello
     include Katello::Concerns::FilteredAutoCompleteSearch
     before_action :authorize
     before_action :find_organization, :only => [:create, :index, :auto_complete_search]
-    before_action :find_gpg_key, :only => [:show, :update, :destroy, :content]
-    skip_before_action :check_content_type, :only => [:create, :content]
+    before_action :find_gpg_key, :only => [:show, :update, :destroy, :content, :set_content]
+    skip_before_action :check_content_type, :only => [:create, :content, :set_content]
 
     def_param_group :gpg_key do
       param :name, :identifier, :action_aware => true, :required => true, :desc => N_("identifier of the gpg key")
@@ -24,7 +24,7 @@ module Katello
     param :name, String, :desc => N_("name of the GPG key"), :required => false
     param_group :search, Api::V2::ApiController
     def index
-      respond(:collection => scoped_search(index_relation.uniq, :name, :asc))
+      respond(:collection => scoped_search(index_relation.distinct, :name, :asc))
     end
 
     def index_relation
@@ -71,10 +71,16 @@ module Katello
       respond_for_destroy
     end
 
+    api :GET, "/gpg_keys/:id/content", N_("Return the content of a gpg key, used directly by yum")
+    param :id, :number, :required => true
+    def content
+      render(:plain => @gpg_key.content, :layout => false)
+    end
+
     api :POST, "/gpg_keys/:id/content", N_("Upload gpg key contents")
     param :id, :number, :desc => N_("gpg key numeric identifier"), :required => true
     param :content, File, :desc => N_("file contents"), :required => true
-    def content
+    def set_content
       filepath = params.try(:[], :content).try(:path)
 
       if filepath