katello 3.1.0.1 → 3.2.0.rc1

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

@@ -5,7 +5,7 @@ module Katello
     include Api::V2::Rendering
     include ForemanTasks::Triggers
 
-    before_filter :local_find_taxonomy, :only => %w(repo_discover cancel_repo_discover
+    before_action :local_find_taxonomy, :only => %w(repo_discover cancel_repo_discover
                                                     download_debug_certificate
                                                     redhat_provider update
                                                     autoattach_subscriptions)
@@ -74,7 +74,7 @@ module Katello
     param :description, String, :desc => N_("description")
     param_group :resource
     def create
-      @organization = Organization.new(params[:organization])
+      @organization = Organization.new(resource_params)
       sync_task(::Actions::Katello::Organization::Create, @organization)
       @organization.reload
       respond_for_show :resource => @organization
@@ -116,7 +116,7 @@ module Katello
                 :type => "application/text"
     end
 
-    api :POST, "/organizations/:id/autoattach_subscriptions", N_("Auto-attach available subscriptions to all systems within an organization. Asynchronous operation.")
+    api :POST, "/organizations/:id/autoattach_subscriptions", N_("Auto-attach available subscriptions to all hosts within an organization. Asynchronous operation."), :deprecated => true
     def autoattach_subscriptions
       task = async_task(::Actions::Katello::Organization::AutoAttachSubscriptions, @organization)
       respond_for_async :resource => task

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

@@ -3,7 +3,7 @@ module Katello
     apipie_concern_subst(:a_resource => N_("a package"), :resource => "packages")
     include Katello::Concerns::Api::V2::RepositoryContentController
 
-    before_filter :find_repositories, :only => :auto_complete_name
+    before_action :find_repositories, :only => :auto_complete_name
 
     def auto_complete_name
       page_size = Katello::Concerns::FilteredAutoCompleteSearch::PAGE_SIZE

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

@@ -4,8 +4,8 @@ module Katello
       api_version "v2"
     end
 
-    skip_before_filter :authorize
-    before_filter :require_login, :only => [:index]
+    skip_before_action :authorize
+    before_action :require_login, :only => [:index]
 
     api :GET, "/ping", N_("Shows status of system and it's subcomponents")
     description N_("This service is only available for authenticated users")

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

@@ -1,11 +1,11 @@
 module Katello
   class Api::V2::ProductsBulkActionsController < Api::V2::ApiController
-    before_filter :find_products
+    before_action :find_products
 
     api :PUT, "/products/bulk/destroy", N_("Destroy one or more products")
     param :ids, Array, :desc => N_("List of product ids"), :required => true
     def destroy_products
-      deletable_products = @products.deletable #.select{|p| p.user_deletable?}
+      deletable_products = @products.deletable
       deletable_products.each do |prod|
         async_task(::Actions::Katello::Product::Destroy, prod)
       end

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

@@ -2,12 +2,11 @@ module Katello
   class Api::V2::ProductsController < Api::V2::ApiController
     include Katello::Concerns::FilteredAutoCompleteSearch
 
-    before_filter :find_activation_key, :only => [:index]
-    before_filter :find_system, :only => [:index]
-    before_filter :find_organization, :only => [:create, :index, :auto_complete_search]
-    before_filter :find_product, :only => [:update, :destroy, :sync]
-    before_filter :find_organization_from_product, :only => [:update]
-    before_filter :authorize_gpg_key, :only => [:update, :create]
+    before_action :find_activation_key, :only => [:index]
+    before_action :find_organization, :only => [:create, :index, :auto_complete_search]
+    before_action :find_product, :only => [:update, :destroy, :sync]
+    before_action :find_organization_from_product, :only => [:update]
+    before_action :authorize_gpg_key, :only => [:update, :create]
 
     resource_description do
       api_version "v2"
@@ -46,7 +45,6 @@ module Katello
       query = query.where(:name => params[:name]) if params[:name]
       query = query.enabled if params[:enabled]
       query = query.where(:id => @activation_key.products) if @activation_key
-      query = query.where(:id => @system.products) if @system
 
       if params[:subscription_id]
         pool = Pool.with_identifier(params[:subscription_id])
@@ -54,7 +52,7 @@ module Katello
       end
 
       # filter by sync plan
-      if sync_plan_id = params[:sync_plan_id]
+      if (sync_plan_id = params[:sync_plan_id])
         query = if params[:available_for] == "sync_plan"
                   query.enabled.where("sync_plan_id != ? OR sync_plan_id IS NULL", sync_plan_id)
                 else
@@ -135,14 +133,6 @@ module Katello
       end
     end
 
-    def find_system
-      if params[:system_id]
-        @system = System.find_by(:uuid => params[:system_id])
-        fail HttpErrors::NotFound, _("Couldn't find content host '%s'") % params[:system_id] if @system.nil?
-        @organization = @system.organization
-      end
-    end
-
     def find_organization_from_product
       @organization = @product.organization
     end

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

@@ -1,6 +1,6 @@
 module Katello
   class Api::V2::RepositoriesBulkActionsController < Api::V2::ApiController
-    before_filter :find_repositories
+    before_action :find_repositories
 
     api :PUT, "/repositories/bulk/destroy", N_("Destroy one or more repositories")
     param :ids, Array, :desc => N_("List of repository ids"), :required => true

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

@@ -2,23 +2,23 @@ module Katello
   class Api::V2::RepositoriesController < Api::V2::ApiController
     include Katello::Concerns::FilteredAutoCompleteSearch
 
-    before_filter :find_optional_organization, :only => [:index, :auto_complete_search]
-    before_filter :find_product, :only => [:index, :auto_complete_search]
-    before_filter :find_product_for_create, :only => [:create]
-    before_filter :find_organization_from_product, :only => [:create]
-    before_filter :find_repository, :only => [:show, :update, :destroy, :sync, :export,
+    before_action :find_optional_organization, :only => [:index, :auto_complete_search]
+    before_action :find_product, :only => [:index, :auto_complete_search]
+    before_action :find_product_for_create, :only => [:create]
+    before_action :find_organization_from_product, :only => [:create]
+    before_action :find_repository, :only => [:show, :update, :destroy, :sync, :export,
                                               :remove_content, :upload_content,
                                               :import_uploads, :gpg_key_content]
-    before_filter :find_content, :only => :remove_content
-    before_filter :find_organization_from_repo, :only => [:update]
-    before_filter :find_gpg_key, :only => [:create, :update]
-    before_filter :error_on_rh_product, :only => [:create]
-    before_filter :error_on_rh_repo, :only => [:destroy]
+    before_action :find_content, :only => :remove_content
+    before_action :find_organization_from_repo, :only => [:update]
+    before_action :find_gpg_key, :only => [:create, :update]
+    before_action :error_on_rh_product, :only => [:create]
+    before_action :error_on_rh_repo, :only => [:destroy]
 
-    skip_before_filter :authorize, :only => [:sync_complete, :gpg_key_content]
-    skip_before_filter :require_org, :only => [:sync_complete]
-    skip_before_filter :require_user, :only => [:sync_complete]
-    skip_before_filter :check_content_type, :only => [:upload_content]
+    skip_before_action :authorize, :only => [:sync_complete, :gpg_key_content]
+    skip_before_action :require_org, :only => [:sync_complete]
+    skip_before_action :require_user, :only => [:sync_complete]
+    skip_before_action :check_content_type, :only => [:upload_content]
 
     def_param_group :repo do
       param :name, String, :required => true
@@ -32,10 +32,12 @@ module Katello
       param :docker_upstream_name, String, :desc => N_("name of the upstream docker repository")
       param :download_policy, ["immediate", "on_demand", "background"], :desc => N_("download policy for yum repos (either 'immediate', 'on_demand', or 'background')")
       param :mirror_on_sync, :bool, :desc => N_("true if this repository when synced has to be mirrored from the source and stale rpms removed.")
+      param :verify_ssl_on_sync, :bool, :desc => N_("if true, Katello will verify the upstream url's SSL certifcates are signed by a trusted CA.")
     end
 
     api :GET, "/repositories", N_("List of enabled repositories")
     api :GET, "/content_views/:id/repositories", N_("List of repositories for a content view")
+    api :GET, "/organizations/:organization_id/repositories", N_("List of repositories in an organization")
     api :GET, "/organizations/:organization_id/environments/:environment_id/repositories", _("List repositories in the environment")
     api :GET, "/products/:product_id/repositories", N_("List of repositories for a product")
     api :GET, "/environments/:environment_id/products/:product_id/repositories", N_("List of repositories belonging to a product in an environment")
@@ -46,6 +48,7 @@ module Katello
     param :content_view_version_id, :number, :desc => N_("ID of a content view version to show repositories in")
     param :erratum_id, String, :desc => N_("Id of an erratum to find repositories that contain the erratum")
     param :rpm_id, String, :desc => N_("Id of a package to find repositories that contain the rpm")
+    param :ostree_branch_id, String, :desc => N_("Id of an ostree branch to find repositories that contain that branch")
     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
@@ -71,6 +74,10 @@ module Katello
         query = query.joins(:rpms).where("#{Rpm.table_name}.id" => Rpm.with_identifiers(params[:rpm_id]))
       end
 
+      if params[:ostree_branch_id]
+        query = query.joins(:ostree_branches).where("#{OstreeBranch.table_name}.id" => OstreeBranch.with_identifiers(params[:ostree_branch_id]))
+      end
+
       if params[:puppet_module_id]
         query = query
                   .joins(:puppet_modules)
@@ -139,6 +146,8 @@ module Katello
                                      gpg_key, repository_params[:checksum_type], repo_params[:download_policy])
       repository.docker_upstream_name = repo_params[:docker_upstream_name] if repo_params[:docker_upstream_name]
       repository.mirror_on_sync = ::Foreman::Cast.to_bool(repo_params[:mirror_on_sync]) if repo_params.key?(:mirror_on_sync)
+      repository.verify_ssl_on_sync = ::Foreman::Cast.to_bool(repo_params[:verify_ssl_on_sync]) if repo_params.key?(:verify_ssl_on_sync)
+
       sync_task(::Actions::Katello::Repository::Create, repository, false, true)
       repository = Repository.find(repository.id)
       respond_for_show(:resource => repository)
@@ -212,6 +221,7 @@ module Katello
     param :docker_upstream_name, String, :desc => N_("name of the upstream docker repository")
     param :download_policy, ["immediate", "on_demand", "background"], :desc => N_("download policy for yum repos (either 'immediate', 'on_demand', or 'background')")
     param :mirror_on_sync, :bool, :desc => N_("true if this repository when synced has to be mirrored from the source and stale rpms removed.")
+    param :verify_ssl_on_sync, :bool, :desc => N_("if true, Katello will verify the upstream url's SSL certifcates are signed by a trusted CA.")
     def update
       repo_params = repository_params
       sync_task(::Actions::Katello::Repository::Update, @repository, repo_params)
@@ -294,13 +304,42 @@ module Katello
 
     api :PUT, "/repositories/:id/import_uploads", N_("Import uploads into a repository")
     param :id, :identifier, :required => true, :desc => N_("Repository id")
-    param :upload_ids, Array, :required => true, :desc => N_("Array of upload ids to import")
+    param :upload_ids, Array, :desc => N_("Array of upload ids to import"), :deprecated => true
+    param :uploads, Array, :desc => N_("Array of uploads to import") do
+      param 'id', String, :required => true
+      param 'size', String
+      param 'checksum', String
+      param 'name', String
+    end
     def import_uploads
-      params[:upload_ids].each do |upload_id|
-        begin
-          sync_task(::Actions::Katello::Repository::ImportUpload, @repository, upload_id)
-        rescue => e
-          raise HttpErrors::BadRequest, e.message
+      if params['upload_ids'].empty? && params['uploads'].empty?
+        fail HttpErrors::BadRequest, _('No upload param specified. Either uploads or upload_ids (deprecated) is required.')
+      end
+
+      if params.key?(:upload_ids)
+        Foreman::Deprecation.api_deprecation_warning("The parameter upload_ids will be removed in Katello 3.3. Please update to use the uploads parameter.")
+
+        params[:upload_ids].each do |upload_id|
+          begin
+            sync_task(::Actions::Katello::Repository::ImportUpload, @repository, upload_id)
+          rescue => e
+            raise HttpErrors::BadRequest, e.message
+          end
+        end
+      end
+
+      if params.key?(:uploads)
+        params[:uploads].each do |upload|
+          begin
+            sync_task(
+              ::Actions::Katello::Repository::ImportUpload,
+              @repository,
+              upload['id'],
+              upload.except('id')
+            )
+          rescue => e
+            raise HttpErrors::BadRequest, e.message
+          end
         end
       end
 
@@ -343,7 +382,7 @@ module Katello
     end
 
     def repository_params
-      keys = [:download_policy, :mirror_on_sync]
+      keys = [:download_policy, :mirror_on_sync, :verify_ssl_on_sync]
       keys += [:label, :content_type] if params[:action] == "create"
       if params[:action] == 'create' || @repository.custom?
         keys += [:url, :gpg_key_id, :unprotected, :name, :checksum_type, :docker_upstream_name]

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

@@ -2,9 +2,9 @@ module Katello
   class Api::V2::RepositorySetsController < Api::V2::ApiController
     respond_to :json
 
-    before_filter :find_product
-    before_filter :custom_product?
-    before_filter :find_product_content, :except => [:index]
+    before_action :find_product
+    before_action :custom_product?
+    before_action :find_product_content, :except => [:index]
 
     resource_description do
       api_version "v2"

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

@@ -1,7 +1,7 @@
 module Katello
   class Api::V2::RootController < Api::V2::ApiController
-    skip_before_filter :authorize # ok - only shows URLs available
-    skip_before_filter :require_user
+    skip_before_action :authorize # ok - only shows URLs available
+    skip_before_action :require_user
 
     resource_description do
       api_version 'v2'

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

@@ -2,15 +2,15 @@ module Katello
   class Api::V2::SubscriptionsController < Api::V2::ApiController
     include Katello::Concerns::FilteredAutoCompleteSearch
 
-    before_filter :find_activation_key
-    before_filter :find_host, :only => :index
-    before_filter :find_optional_organization, :only => [:index, :available, :show]
-    before_filter :find_organization, :only => [:upload, :delete_manifest,
+    before_action :find_activation_key
+    before_action :find_host, :only => :index
+    before_action :find_optional_organization, :only => [:index, :available, :show]
+    before_action :find_organization, :only => [:upload, :delete_manifest,
                                                 :refresh_manifest, :manifest_history]
-    before_filter :find_provider
-    before_filter :deprecated, :only => [:create, :destroy]
+    before_action :find_provider
+    before_action :deprecated, :only => [:create, :destroy]
 
-    skip_before_filter :check_content_type, :only => [:upload]
+    skip_before_action :check_content_type, :only => [:upload]
 
     resource_description do
       description "Subscriptions management."
@@ -18,6 +18,7 @@ module Katello
     end
 
     api :GET, "/organizations/:organization_id/subscriptions", N_("List organization subscriptions")
+    api :GET, "/activation_keys/:activation_key_id/subscriptions", N_("List an activation key's subscriptions")
     api :GET, "/subscriptions"
     param_group :search, Api::V2::ApiController
     param :organization_id, :number, :desc => N_("Organization ID"), :required => true
@@ -28,7 +29,15 @@ module Katello
     param :match_installed, :bool, :desc => N_("Return subscriptions that match installed products of the specified host")
     param :no_overlap, :bool, :desc => N_("Return subscriptions which do not overlap with a currently-attached subscription")
     def index
-      respond(:collection => scoped_search(index_relation.uniq, :cp_id, :asc, :resource_class => Pool, :includes => [:subscription]))
+      collection = scoped_search(
+        index_relation.uniq, :cp_id, :asc, resource_class: Pool, includes: [:subscription])
+      if params[:activation_key_id]
+        key_pools = @activation_key.get_key_pools
+        collection[:results] = collection[:results].map do |pool|
+          ActivationKeySubscriptionsPresenter.new(pool, key_pools)
+        end
+      end
+      respond(:collection => collection)
     end
 
     def index_relation
@@ -37,6 +46,7 @@ module Katello
       collection = Pool.readable
       collection = collection.where(:unmapped_guest => false)
       collection = collection.get_for_organization(Organization.find(params[:organization_id])) if params[:organization_id]
+      collection = collection.for_activation_key(@activation_key) if params[:activation_key_id]
       collection
     end
 
@@ -96,7 +106,7 @@ module Katello
       end
 
       # repository url
-      if repo_url = params[:repository_url]
+      if (repo_url = params[:repository_url])
         @provider.repository_url = repo_url
         @provider.save!
       end
@@ -149,7 +159,6 @@ module Katello
     end
 
     def find_provider
-      @organization = @system.organization if @system
       @organization = @activation_key.organization if @activation_key
       @organization = @subscription.organization if @subscription
       @provider = @organization.redhat_provider if @organization

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

@@ -1,8 +1,8 @@
 module Katello
   class Api::V2::SyncController < Api::V2::ApiController
-    before_filter :find_optional_organization, :only => [:index]
-    before_filter :find_object, :only => [:index]
-    before_filter :ensure_library, :only => [:index]
+    before_action :find_optional_organization, :only => [:index]
+    before_action :find_object, :only => [:index]
+    before_action :ensure_library, :only => [:index]
 
     api :GET, "/organizations/:organization_id/products/:product_id/sync", N_("Get status of repo synchronisation for given product")
     api :GET, "/repositories/:repository_id/sync", N_("Get status of synchronisation for given repository")

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

@@ -3,8 +3,8 @@ module Katello
     respond_to :json
 
     include Katello::Concerns::FilteredAutoCompleteSearch
-    before_filter :find_organization, :only => [:create, :index, :auto_complete_search]
-    before_filter :find_plan, :only => [:update, :show, :destroy, :sync,
+    before_action :find_organization, :only => [:create, :index, :auto_complete_search]
+    before_action :find_plan, :only => [:update, :show, :destroy, :sync,
                                         :add_products, :remove_products]
 
     def_param_group :sync_plan do

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

@@ -1,6 +1,6 @@
 module Katello
   class Api::V2::UebercertsController < Api::V2::ApiController
-    before_filter :find_organization, :only => [:show]
+    before_action :find_organization, :only => [:show]
 
     resource_description do
       api_version 'v2'

data/app/controllers/katello/application_controller.rb

@@ -11,20 +11,20 @@ module Katello
 
     helper ::ApplicationHelper
     helper ::TaxonomyHelper
-    before_filter :set_gettext_locale
+    before_action :set_gettext_locale
     helper_method :current_organization
-    before_filter :require_org
+    before_action :require_org
     #before_filter :check_deleted_org
 
     protect_from_forgery # See ActionController::RequestForgeryProtection for details
 
-    after_filter :flash_to_headers
+    after_action :flash_to_headers
 
     # Skipping Foreman's filter that clears the user
     # from the current thread. If this filter is enabled
     # Katello's rescue_from don't have access to User.current.
-    skip_around_filter :clear_thread
-    after_filter :clear_katello_thread
+    skip_around_action :clear_thread
+    after_action :clear_katello_thread
 
     #custom 404 (render_404) and 500 (render_error) pages
     # this is always in the top
@@ -411,7 +411,7 @@ module Katello
       if @environment && !@environment.library?
         @paths.each do |path|
           path.each do |env|
-            if @path = path
+            if (@path = path)
               return if env.id == @environment.id
             end
           end
@@ -419,7 +419,7 @@ module Katello
       elsif next_env
         @paths.each do |path|
           path.each do |env|
-            if @path = path
+            if (@path = path)
               return if env.id == next_env.id
             end
           end

data/app/controllers/katello/auto_complete_search_controller.rb

@@ -1,6 +1,6 @@
 module Katello
   class AutoCompleteSearchController < Katello::ApplicationController
-    include Foreman::Controller::AutoCompleteSearch
+    include ::Foreman::Controller::AutoCompleteSearch
 
     def model_of_controller
       Organization.current ? model.where(:organization_id => Organization.current.id) : model

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

@@ -7,7 +7,7 @@ module Katello
         include ForemanTasks::Triggers
 
         respond_to :json
-        before_filter :set_gettext_locale
+        before_action :set_gettext_locale
       end
 
       # override warden current_user (returns nil because there is no user in that scope)