katello 3.6.0.1.rc2 → 3.7.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fef4964b5d77e0a6f601ceb21771e60d669f6ea6
-  data.tar.gz: 7869cc0cd7e1430ea04c54145c3027b5ffb65986
+  metadata.gz: 147daad6f060ba123d7cb4ccf889e33540fd1224
+  data.tar.gz: 0a970ddfacc20136330150f3d535fb06473210c4
 SHA512:
-  metadata.gz: 2007080abb9a0a5ed941452bd794c3452a243b7a584bc3e2c4cf9d37de7284b81d79e00b1b739a797c26249f8191ca8367ab24846184cafdef4b345ce924a9d8
-  data.tar.gz: a753b6c0ba880b00ffc60c9d21a51cea36e907ee37445e1d5dc2b464afb7c015fa71d5b6c46fdc2e2499578d871c9473f2a76b3fd6ec0506fb70dee99af5a2b0
+  metadata.gz: a577fcdf1949cd2b761cb098dc2cdf809c39daf235ba45e1e27f1d5c9fb101a63bd47280eaca2ecfffff8a42e98e082216ab50383572d4fab3090e0913d7461e
+  data.tar.gz: a7bd9315164c9fac9f35c07e81f33ec3095f944392412d1fe17decc664aa707017fe8b5694e5249126bcb79ea5fdd2393633ce0b08bbc685dc3cbeabc93dc87b

data/app/assets/javascripts/katello/hosts/activation_key_edit.js

@@ -79,7 +79,7 @@ function ktSetParam(name, value) {
         if(! paramContainer) { // we create the param for kt_activation_keys
             $("div#parameters a[target~='#global_parameters_table']").click();
             paramContainer = $("div#parameters .fields").last();
-            paramContainer.find("input").val(name);
+            paramContainer.find("input[name*='name']").val(name);
         }
         paramContainer.find("textarea").val(value);
     } else if(paramContainer) {
@@ -179,4 +179,4 @@ $(document).on('ContentLoad', function(){
         ktLoadActivationKeys();
         return false;
     });
-});
+});

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

@@ -1,4 +1,5 @@
 module Katello
+  # rubocop:disable Metrics/ClassLength
   class Api::Rhsm::CandlepinProxiesController < Api::V2::ApiController
     include Katello::Authentication::ClientAuthentication
 
@@ -345,7 +346,8 @@ module Katello
       organization = nil
 
       if params.key?(key)
-        organization = Organization.find_by(:label => params[key])
+        label = params[key].is_a?(ActionController::Parameters) ? params[key]['key'] : params[key]
+        organization = Organization.find_by(:label => label)
       end
 
       if organization.nil?
@@ -490,9 +492,9 @@ module Katello
         (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",
-           "rhsm_proxy_consumer_entitlements_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_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"
         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/activation_keys_controller.rb

@@ -94,12 +94,10 @@ module Katello
                   :release_version => @activation_key.release_version,
                   :auto_attach     => @activation_key.auto_attach
                )
-      @activation_key.content_overrides.each do |content|
-        @new_activation_key.set_content_override(content['contentLabel'], content[:name], content[:value])
-      end
       @activation_key.pools.each do |pool|
         @new_activation_key.subscribe(pool[:id])
       end
+      @new_activation_key.set_content_overrides(@activation_key.content_overrides) unless @activation_key.content_overrides.blank?
       respond_for_show(:resource => @new_activation_key)
     end
 

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

@@ -4,6 +4,7 @@ module Katello
     include Api::Version2
     include Api::V2::Rendering
     include Api::V2::ErrorHandling
+    include ::Foreman::Controller::CsvResponder
 
     # support for session (thread-local) variables must be the last filter in this class
     include Foreman::ThreadSession::Cleaner
@@ -56,6 +57,8 @@ module Katello
       resource = options[:resource_class] || resource_class
       includes = options.fetch(:includes, [])
       group = options.fetch(:group, nil)
+      params[:full_result] = true if options[:csv]
+      blank_query = resource.none
 
       if params[:order]
         (params[:sort_by], params[:sort_order]) = params[:order].split(' ')
@@ -96,16 +99,17 @@ module Katello
       end
       page = params[:page] || 1
       per_page = params[:per_page] || Setting[:entries_per_page]
-      query = (total.zero? || sub_total.zero?) ? [] : query
+      query = (total.zero? || sub_total.zero?) ? blank_query : query
 
-      scoped_search_results(query, sub_total, total, page, per_page)
+      options[:csv] ? query : scoped_search_results(query, sub_total, total, page, per_page)
     rescue ScopedSearch::QueryNotSupported, ActiveRecord::StatementInvalid => error
       message = error.message
       if error.class == ActiveRecord::StatementInvalid
         Rails.logger.error("Invalid search: #{error.message}")
         message = _('Your search query was invalid. Please revise it and try again. The full error has been sent to the application logs.')
       end
-      scoped_search_results([], sub_total, total, page, per_page, message)
+
+      scoped_search_results(blank_query, sub_total, total, page, per_page, message)
     end
 
     protected
@@ -187,5 +191,11 @@ module Katello
       @host = resource_finder(::Host::Managed.authorized(permission, ::Host::Managed), id)
       fail HttpErrors::BadRequest, _("Host has not been registered with subscription-manager") if @host.subscription_facet.nil?
     end
+
+    def check_disconnected
+      msg = "You are currently operating in disconnected mode where access to Red Hat Subcription Management " \
+            "is prohibited. If you would like to change this, please update the content setting 'Disconnected mode'."
+      fail HttpErrors::BadRequest, _(msg) if Setting[:content_disconnected]
+    end
   end
 end

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

@@ -0,0 +1,116 @@
+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]
+
+    def resource_class
+      Katello::GpgKey
+    end
+
+    def_param_group :content_credential do
+      param :name, :identifier, :action_aware => true, :required => true, :desc => N_("identifier of the content credential")
+      param :content_type, String, :action_aware => true, :required => true, :desc => N_("type of content")
+      param :content, String, :action_aware => true, :required => true, :desc => N_("public key block in DER encoding or certificate content")
+    end
+
+    resource_description do
+      description <<-DESC
+        # Description
+
+        Content Credentials are used to store credentials like GPG Keys and Certificates for the authentication
+        to Products / Repositories.
+      DESC
+      api_version "v2"
+    end
+
+    api :GET, "/content_credentials", N_("List content credentials")
+    param :organization_id, :number, :desc => N_("organization identifier"), :required => true
+    param :name, String, :desc => N_("name of the Content Credential"), :required => false
+    param :content_type, String, :desc => N_("type of content"), :required => false
+    param_group :search, Api::V2::ApiController
+    def index
+      respond(:collection => scoped_search(index_relation.distinct, :name, :asc))
+    end
+
+    def index_relation
+      query = GpgKey.readable.where(:organization_id => @organization.id)
+      query = query.where(:name => params[:name]) if params[:name]
+      query = query.where(:content_type => params[:content_type]) if params[:content_type]
+      query
+    end
+
+    api :POST, "/content_credentials", N_("Create a content credential")
+    param :organization_id, :number, :desc => N_("organization identifier"), :required => true
+    param_group :content_credential, :as => :create
+    def create
+      filepath = params.try(:[], :file_path).try(:path)
+
+      content = nil
+      if filepath
+        content = File.open(filepath, "rb") { |file| file.read }
+      else
+        content = params[:content]
+      end
+
+      content_credential = @organization.gpg_keys.create!(content_credential_params.merge(:content => content))
+      respond_for_show(:resource => content_credential)
+    end
+
+    api :GET, "/content_credentials/:id", N_("Show a content credential")
+    param :id, :number, :desc => N_("content credential numeric identifier"), :required => true
+    def show
+      respond_for_show(:resource => @content_credential)
+    end
+
+    api :PUT, "/content_credentials/:id", N_("Update a content credential")
+    param :id, :number, :desc => N_("content credential numeric identifier"), :required => true
+    param_group :content_credential
+    def update
+      @content_credential.update_attributes!(content_credential_params)
+      respond_for_show(:resource => @content_credential)
+    end
+
+    api :DELETE, "/content_credentials/:id", N_("Destroy a content credential")
+    param :id, :number, :desc => N_("content credential numeric identifier"), :required => true
+    def destroy
+      @content_credential.destroy
+      respond_for_destroy
+    end
+
+    api :GET, "/content_credentials/:id/content", N_("Return the content of a content credential, used directly by yum")
+    param :id, :number, :required => true
+    def content
+      render(:plain => @content_credential.content, :layout => false)
+    end
+
+    api :POST, "/content_credentials/:id/content", N_("Upload content credential contents")
+    param :id, :number, :desc => N_("content credential numeric identifier"), :required => true
+    param :content, File, :desc => N_("file contents"), :required => true
+    def set_content
+      filepath = params.try(:[], :content).try(:path)
+
+      if filepath
+        content = File.open(filepath, "rb") { |file| file.read }
+        @content_credential.update_attributes!(:content => content)
+        render :json => {:status => "success"}
+      else
+        fail HttpErrors::BadRequest, _("No file uploaded")
+      end
+    end
+
+    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
+  end
+end

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

@@ -18,7 +18,7 @@ module Katello
     api :POST, "/content_view_filters/:content_view_filter_id/rules",
         N_("Create a filter rule. The parameters included should be based upon the filter type.")
     param :content_view_filter_id, :number, :desc => N_("filter identifier"), :required => true
-    param :name, [String, Array], :desc => N_("package, package group, or docker tag names")
+    param :name, Array, of: [String], :desc => N_("package, package group, or docker tag names")
     param :uuid, String, :desc => N_("package group: uuid")
     param :version, String, :desc => N_("package: version")
     param :architecture, String, :desc => N_("package: architecture")

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

@@ -20,6 +20,7 @@ module Katello
     param :version, String, :desc => N_("Filter versions by version number"), :required => false
     param :composite_version_id, :number, :desc => N_("Filter versions that are components in the specified composite version"), :required => false
     param :organization_id, :number, :desc => N_("Organization identifier")
+    param :triggered_by_id, :number, :desc => N_("Filter composite versions whose publish was triggered by the specified component version"), :required => false
     param_group :search, Api::V2::ApiController
     def index
       options = {
@@ -32,6 +33,7 @@ module Katello
     def index_relation
       version_number = params.permit(:version)[:version]
       versions = ContentViewVersion.readable
+      versions = versions.triggered_by(params[:triggered_by_id]) if params[:triggered_by_id]
       versions = versions.with_organization_id(params[:organization_id]) if params[:organization_id]
       versions = versions.where(:content_view_id => @view.id) if @view
       versions = versions.for_version(version_number) if version_number
@@ -80,6 +82,10 @@ module Katello
         fail HttpErrors::BadRequest, _("ISO export must be enabled when specifying ISO size")
       end
 
+      if (repos = @version.content_view.on_demand_repositories).any?
+        fail HttpErrors::BadRequest, _("This content view has on demand repositories that cannot be exported: %{repos}" % {repos: repos.pluck(:label).join(", ")})
+      end
+
       if params[:since].present?
         begin
           params[:since].to_datetime

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

@@ -18,6 +18,7 @@ module Katello
       param :description, String, :desc => N_("Description for the content view")
       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")
     end
 
     api :GET, "/organizations/:organization_id/content_views", N_("List content views")
@@ -209,7 +210,7 @@ module Katello
     def view_params
       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
+      attrs.push(:component_ids, :repository_ids, :auto_publish) # For deep_munge; Remove for Rails 5
       params.require(:content_view).permit(*attrs).to_h
     end
 

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

@@ -74,6 +74,7 @@ module Katello
     param :name, String, :desc => N_("name of the environment"), :required => true
     param :label, String, :desc => N_("label of the environment"), :required => false
     param :description, String, :desc => N_("description of the environment")
+    param :registry_name_pattern, String, :desc => N_("pattern for container image names")
     param :prior_id, Integer, :required => true, :desc => <<-DESC
       ID of an environment that is prior to the new environment in the chain. It has to be
       either the ID of Library or the ID of an environment at the end of a chain.
@@ -93,12 +94,24 @@ module Katello
     param :organization_id, :number, :desc => N_("name of the organization")
     param :new_name, String, :desc => N_("new name to be given to the environment")
     param :description, String, :desc => N_("description of the environment")
+    param :registry_name_pattern, String, :desc => N_("pattern for container image names")
+    param :async, :bool, desc: N_("Do not wait for the update action to finish. Default: true")
     def update
-      fail HttpErrors::BadRequest, _("Can't update the '%s' environment") % "Library" if @environment.library?
+      async = ::Foreman::Cast.to_bool(params.fetch(:async, true))
       update_params = environment_params
+      fail HttpErrors::BadRequest, _("Can't update the '%s' environment") % "Library" if @environment.library? && update_params.empty?
       update_params[:name] = params[:environment][:new_name] if params[:environment][:new_name]
       @environment.update_attributes!(update_params)
-      respond
+      if update_params[:registry_name_pattern]
+        task = send(async ? :async_task : :sync_task, ::Actions::Katello::Environment::PublishRepositories,
+                    @environment, content_type: Katello::Repository::DOCKER_TYPE)
+      end
+
+      if params.include?(:async) && async && task
+        respond_for_async(resource: task)
+      else
+        respond
+      end
     end
 
     api :DELETE, "/environments/:id", N_("Destroy an environment")
@@ -156,7 +169,11 @@ module Katello
     end
 
     def environment_params
-      attrs = [:name, :description]
+      if @environment && @environment.library?
+        attrs = [:registry_name_pattern]
+      else
+        attrs = [:name, :description, :registry_name_pattern]
+      end
       attrs << :label if params[:action] == "create"
       parms = params.require(:environment).permit(*attrs)
       parms

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

@@ -1,6 +1,7 @@
 module Katello
   class Api::V2::GpgKeysController < Api::V2::ApiController
     include Katello::Concerns::FilteredAutoCompleteSearch
+    before_action :deprecated
     before_action :authorize
     before_action :find_organization, :only => [:create, :index, :auto_complete_search]
     before_action :find_gpg_key, :only => [:show, :update, :destroy, :content, :set_content]
@@ -103,5 +104,9 @@ module Katello
     def gpg_key_params
       params.permit(:name, :content)
     end
+
+    def deprecated
+      ::Foreman::Deprecation.api_deprecation_warning("it will be removed in Katello 4.0, Please see /api/v2/content_credentials")
+    end
   end
 end

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

@@ -6,11 +6,22 @@ module Katello
     before_action :find_content_view_environment, :only => :create
     before_action :check_registration_services, :only => [:destroy, :create]
 
+    def_param_group :installed_products do
+      param :product_id, String, :desc => N_("Product id as listed from a host's installed products, \
+        this is not the same product id as the products api returns")
+      param :product_name, String, :desc => N_("Product name as listed from a host's installed products")
+      param :arch, String, :desc => N_("Product architecture")
+      param :version, String, :desc => N_("Product version")
+    end
+
     def_param_group :subscription_facet_attributes do
       param :release_version, String, :desc => N_("Release version for this Host to use (7Server, 7.1, etc)")
       param :autoheal, :bool, :desc => N_("Sets whether the Host will autoheal subscriptions upon checkin")
       param :service_level, Integer, :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
+      end
     end
 
     resource_description do
@@ -59,11 +70,7 @@ module Katello
     param :facts, Hash, :desc => N_("Key-value hash of subscription-manager facts, nesting uses a period delimiter (.)")
     param :hypervisor_guest_uuids, Array, :desc => N_("UUIDs of the virtual guests from the host's hypervisor")
     param :installed_products, Array, :desc => N_("List of products installed on the host") do
-      param :product_id, String, :desc => N_("Product id as listed from a host's installed products, \
-        this is not the same product id as the products api returns")
-      param :product_name, String, :desc => N_("Product name as listed from a host's installed products")
-      param :arch, String, :desc => N_("Product architecture")
-      param :version, String, :desc => N_("Product version")
+      param_group :installed_products, ::Katello::Api::V2::HostSubscriptionsController
     end
     param :release_version, String, :desc => N_("Release version of the content host")
     param :service_level, String, :desc => N_("A service level for auto-healing process, e.g. SELF-SUPPORT")
@@ -89,7 +96,7 @@ module Katello
       rhsm_params[:facts] ||= {}
       rhsm_params[:facts]['network.hostname'] ||= rhsm_params[:name]
 
-      if params['installed_products']
+      if params['installed_products'] #convert api installed_product to candlepin params
         rhsm_params[:installedProducts] = params['installed_products'].map do |product|
           product_params = { :productId => product['product_id'], :productName => product['product_name'] }
           product_params[:arch] = product['arch'] if product['arch']
@@ -126,7 +133,7 @@ module Katello
     end
     def add_subscriptions
       pools_with_quantities = params.require(:subscriptions).map do |sub_params|
-        PoolWithQuantities.new(Pool.with_identifier(sub_params['id']), sub_params['quantity'])
+        PoolWithQuantities.new(Pool.with_identifier(sub_params['id']), sub_params['quantity'].to_i)
       end
 
       sync_task(::Actions::Katello::Host::AttachSubscriptions, @host, pools_with_quantities)

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

@@ -7,6 +7,9 @@ module Katello
     before_action :find_product, :only => [:update, :destroy, :sync]
     before_action :find_organization_from_product, :only => [:update]
     before_action :authorize_gpg_key, :only => [:update, :create]
+    before_action :authorize_ssl_ca_cert, :only => [:update, :create]
+    before_action :authorize_ssl_client_cert, :only => [:update, :create]
+    before_action :authorize_ssl_client_key, :only => [:update, :create]
 
     resource_description do
       api_version "v2"
@@ -15,6 +18,9 @@ module Katello
     def_param_group :product do
       param :description, String, :desc => N_("Product description")
       param :gpg_key_id, :number, :desc => N_("Identifier of the GPG key")
+      param :ssl_ca_cert_id, :number, :desc => N_("Idenifier of the SSL CA Cert")
+      param :ssl_client_cert_id, :number, :desc => N_("Identifier of the SSL Client Cert")
+      param :ssl_client_key_id, :number, :desc => N_("Identifier of the SSL Client Key")
       param :sync_plan_id, :number, :desc => N_("Plan numeric identifier"), :allow_nil => true
     end
 
@@ -145,12 +151,36 @@ module Katello
       end
     end
 
+    def authorize_ssl_ca_cert
+      ssl_ca_cert_id = product_params[:ssl_ca_cert_id]
+      if ssl_ca_cert_id
+        ssl_ca_cert = GpgKey.readable.where(:id => ssl_ca_cert_id, :organization_id => @organization).first
+        fail HttpErrors::NotFound, _("Couldn't find ssl ca cert '%s'") % ssl_ca_cert_id if ssl_ca_cert.nil?
+      end
+    end
+
+    def authorize_ssl_client_cert
+      ssl_client_cert_id = product_params[:ssl_client_cert_id]
+      if ssl_client_cert_id
+        ssl_client_cert = GpgKey.readable.where(:id => ssl_client_cert_id, :organization_id => @organization).first
+        fail HttpErrors::NotFound, _("Couldn't find ssl client cert '%s'") % ssl_client_cert_id if ssl_client_cert.nil?
+      end
+    end
+
+    def authorize_ssl_client_key
+      ssl_client_key_id = product_params[:ssl_client_key_id]
+      if ssl_client_key_id
+        ssl_client_key = GpgKey.readable.where(:id => ssl_client_key_id, :organization_id => @organization).first
+        fail HttpErrors::NotFound, _("Couldn't find ssl client key '%s'") % ssl_client_key_id if ssl_client_key.nil?
+      end
+    end
+
     def product_params
       # only allow sync plan id to be updated if the product is a Red Hat product
       if @product && @product.redhat?
         params.require(:product).permit(:sync_plan_id)
       else
-        params.require(:product).permit(:name, :label, :description, :provider_id, :gpg_key_id, :sync_plan_id)
+        params.require(:product).permit(:name, :label, :description, :provider_id, :gpg_key_id, :ssl_ca_cert_id, :ssl_client_cert_id, :ssl_client_key_id, :sync_plan_id)
       end
     end
   end