katello 3.5.2 → 3.6.0.rc1

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

@@ -28,17 +28,8 @@ module Katello
       param :ids, Array, :desc => N_("ids to filter content by")
       param_group :search, ::Katello::Api::V2::ApiController
       def index
-        sort_options = []
-        options = {}
-        if default_sort.is_a?(Array)
-          sort_options = default_sort
-        elsif default_sort.is_a?(Proc)
-          options[:custom_sort] = default_sort
-        else
-          fail "Unsupported default_sort type"
-        end
-
-        respond(:collection => scoped_search(index_relation, sort_options[0], sort_options[1], options))
+        sort_by, sort_order, options = sort_options
+        respond(:collection => scoped_search(index_relation, sort_by, sort_order, options))
       end
 
       api :GET, "/:resource_id/:id", N_("Show :a_resource")
@@ -49,7 +40,7 @@ module Katello
         respond :resource => @resource
       end
 
-      api :GET, "/compare/", N_("List :resource_id")
+      api :GET, "/:resource_id/compare/", N_("List :resource_id")
       param :content_view_version_ids, Array, :desc => N_("content view versions to compare")
       param :repository_id, :number, :desc => N_("Library repository id to restrict comparisons to")
       def compare
@@ -65,7 +56,8 @@ module Katello
         repos = Katello::Repository.where(:content_view_version_id => @versions.pluck(:id))
         repos = repos.where(:library_instance_id => @repo.id) if @repo
 
-        collection = scoped_search(filter_by_repos(repos, collection).uniq, default_sort[0], default_sort[1])
+        sort_by, sort_order, options = sort_options
+        collection = scoped_search(filter_by_repos(repos, collection).distinct, sort_by, sort_order, options)
         collection[:results] = collection[:results].map { |item| ContentViewVersionComparePresenter.new(item, @versions, @repo) }
         respond_for_index(:collection => collection)
       end
@@ -104,6 +96,16 @@ module Katello
         %w(id desc)
       end
 
+      def sort_options
+        if default_sort.is_a?(Array)
+          return [default_sort[0], default_sort[1], {}]
+        elsif default_sort.is_a?(Proc)
+          return [nil, nil, { :custom_sort => default_sort }]
+        else
+          fail "Unsupported default_sort type"
+        end
+      end
+
       def filter_by_content_view_filter(filter, collection)
         ids = filter.send("#{singular_resource_name}_rules").pluck(:uuid)
         filter_by_ids(ids, collection)
@@ -194,6 +196,8 @@ module Katello
         case resource_class.to_s
         when "Katello::Erratum"
           _("Erratum")
+        when "Katello::Deb"
+          _("Deb Package")
         when "Katello::Rpm"
           _("Package")
         when "Katello::PackageGroup"

data/app/controllers/katello/concerns/containers/steps_controller_extensions.rb

@@ -3,50 +3,52 @@ module Katello
     module Containers
       module StepsControllerExtensions
         extend ActiveSupport::Concern
-        included do
-          alias_method_chain :set_form, :katello
-          alias_method_chain :build_state, :katello
-        end
 
-        def set_form_with_katello
-          if step == :image && @state.image.nil?
-            @docker_container_wizard_states_image = @state.build_image(:katello => true)
-          else
-            set_form_without_katello
+        module Overrides
+          def set_form
+            if step == :image && @state.image.nil?
+              @docker_container_wizard_states_image = @state.build_image(:katello => true)
+            else
+              super
+            end
           end
-        end
 
-        def build_state_with_katello
-          if step == :image && params.key?(:katello)
-            repo = nil
-            tag = nil
-            capsule_id = nil
-            if params[:repository] && params[:repository][:id]
-              repo = Repository.where(:id => params[:repository][:id]).first
-            end
+          def build_state
+            if step == :image && params.key?(:katello)
+              repo = nil
+              tag = nil
+              capsule_id = nil
+              if params[:repository] && params[:repository][:id]
+                repo = Repository.where(:id => params[:repository][:id]).first
+              end
 
-            if params[:tag] && params[:tag][:id]
-              tag = DockerMetaTag.where(:id => params[:tag][:id]).first
-            end
-            if params[:capsule] && params[:capsule][:id]
-              capsule_id = params[:capsule][:id]
-            end
+              if params[:tag] && params[:tag][:id]
+                tag = DockerMetaTag.where(:id => params[:tag][:id]).first
+              end
+              if params[:capsule] && params[:capsule][:id]
+                capsule_id = params[:capsule][:id]
+              end
 
-            katello_content = {
-              organization_id: params[:organization_id],
-              environment_id: params.fetch(:kt_environment, {})[:id],
-              content_view_id: params.fetch(:content_view, {})[:id],
-              repository_id: repo.try(:id),
-              tag_id: tag.try(:id)
-            }
-            @docker_container_wizard_states_image = @state.build_image(:repository_name => repo.try(:container_repository_name),
-                                :tag => tag.try(:name),
-                                :capsule_id => capsule_id,
-                                :katello => true, :katello_content => katello_content)
-          else
-            build_state_without_katello
+              katello_content = {
+                organization_id: params[:organization_id],
+                environment_id: params.fetch(:kt_environment, {})[:id],
+                content_view_id: params.fetch(:content_view, {})[:id],
+                repository_id: repo.try(:id),
+                tag_id: tag.try(:id)
+              }
+              @docker_container_wizard_states_image = @state.build_image(:repository_name => repo.try(:container_repository_name),
+                                  :tag => tag.try(:name),
+                                  :capsule_id => capsule_id,
+                                  :katello => true, :katello_content => katello_content)
+            else
+              super
+            end
           end
         end
+
+        included do
+          prepend Overrides
+        end
       end
     end
   end

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

@@ -4,14 +4,25 @@ module Katello
       extend ActiveSupport::Concern
       include ForemanTasks::Triggers
 
+      module Overrides
+        def action_permission
+          case params[:action]
+          when 'content_hosts'
+            'view'
+          else
+            super
+          end
+        end
+      end
+
       included do
-        alias_method_chain :action_permission, :katello
+        prepend Overrides
 
         def destroy
           sync_task(::Actions::Katello::Host::Destroy, @host)
-          process_success(:success_redirect => hosts_path)
+          process_success
         rescue StandardError => ex
-          process_error(:object => @host, :error_msg => ex.message)
+          process_error(:object => @host, :error_msg => ex.message, :redirect => saved_redirect_url_or(send("#{controller_name}_url")))
         end
 
         def submit_multiple_destroy
@@ -46,17 +57,6 @@ module Katello
           end
         end
       end
-
-      private
-
-      def action_permission_with_katello
-        case params[:action]
-        when 'content_hosts'
-          'view'
-        else
-          action_permission_without_katello
-        end
-      end
     end
   end
 end

data/app/controllers/katello/concerns/organizations_controller_extensions.rb

@@ -4,46 +4,47 @@ module Katello
       extend ActiveSupport::Concern
       include ForemanTasks::Triggers
 
-      included do
-        alias_method_chain :destroy, :dynflow
-        alias_method_chain :create, :dynflow
-      end
-
-      def destroy_with_dynflow
-        if @taxonomy.is_a?(Organization)
-          begin
-            async_task(::Actions::Katello::Organization::Destroy, @taxonomy,
-                       ::Organization.current)
-            process_success :success_msg => _("Organization %s is being deleted.") % @taxonomy.name
-          rescue ::Katello::Errors::OrganizationDestroyException => ex
-            process_error(:error_msg => ex.message)
+      module Overrides
+        def destroy
+          if @taxonomy.is_a?(Organization)
+            begin
+              async_task(::Actions::Katello::Organization::Destroy, @taxonomy,
+                         ::Organization.current)
+              process_success :success_msg => _("Organization %s is being deleted.") % @taxonomy.name
+            rescue ::Katello::Errors::OrganizationDestroyException => ex
+              process_error(:error_msg => ex.message)
+            end
+          else
+            super
           end
-        else
-          destroy_without_dynflow
         end
-      end
 
-      def create_with_dynflow
-        if taxonomy_class == Organization
-          begin
-            @taxonomy = Organization.new(resource_params)
-            sync_task(::Actions::Katello::Organization::Create, @taxonomy)
-            @taxonomy.reload
-            switch_taxonomy
-            if @count_nil_hosts > 0
-              redirect_to send("step2_#{taxonomy_single}_path", @taxonomy)
-            else
-              process_success(:object => @taxonomy, :success_redirect => send("edit_#{taxonomy_single}_path", @taxonomy))
+        def create
+          if taxonomy_class == Organization
+            begin
+              @taxonomy = Organization.new(resource_params)
+              sync_task(::Actions::Katello::Organization::Create, @taxonomy)
+              @taxonomy.reload
+              switch_taxonomy
+              if @count_nil_hosts > 0
+                redirect_to send("step2_#{taxonomy_single}_path", @taxonomy)
+              else
+                process_success(:object => @taxonomy, :success_redirect => send("edit_#{taxonomy_single}_path", @taxonomy))
+              end
+            rescue ActiveRecord::RecordInvalid
+              process_error(:render => "taxonomies/new", :object => @taxonomy)
+            rescue StandardError => ex
+              process_error(:render => "taxonomies/new", :object => @taxonomy, :error_msg => ex.message)
             end
-          rescue ActiveRecord::RecordInvalid
-            process_error(:render => "taxonomies/new", :object => @taxonomy)
-          rescue StandardError => ex
-            process_error(:render => "taxonomies/new", :object => @taxonomy, :error_msg => ex.message)
+          else
+            super
           end
-        else
-          create_without_dynflow
         end
       end
+
+      included do
+        prepend Overrides
+      end
     end
   end
 end

data/app/controllers/katello/concerns/smart_proxies_controller_extensions.rb

@@ -3,13 +3,27 @@ module Katello
     module SmartProxiesControllerExtensions
       extend ActiveSupport::Concern
 
+      module Overrides
+        def show
+          @task_search_url = main_app.foreman_tasks_tasks_path(:search => "resource_id = #{@smart_proxy.id} AND resource_type = #{@smart_proxy.class}")
+          render 'foreman/smart_proxies/show', :layout => 'katello/layouts/foreman_with_bastion'
+        end
+
+        def action_permission
+          if params[:action] == 'pulp_status' || params[:action] == 'pulp_storage'
+            :view
+          else
+            super
+          end
+        end
+      end
+
       included do
+        prepend Overrides
         helper 'bastion/layout'
 
         append_view_path('app/views/foreman')
         before_action :find_resource_and_status, :only => [:pulp_storage, :pulp_status]
-        alias_method_chain :action_permission, :katello
-        alias_method_chain :show, :content
 
         def pulp_storage
           pulp_connection = @proxy_status[:pulp] || @proxy_status[:pulpnode]
@@ -21,7 +35,7 @@ module Katello
         rescue ::Foreman::WrappedException => e
           Rails.logger.warn _('Error connecting. Got: %s') % e
           respond_to do |format|
-            format.html { render :text => _('Error retrieving Pulp storage') }
+            format.html { render :plain => _('Error retrieving Pulp storage') }
             format.json { render :json => {:success => false, :message => e} }
           end
         end
@@ -32,7 +46,7 @@ module Katello
           if @pulp_status['fatal']
             Rails.logger.warn @pulp_status['fatal']
             respond_to do |format|
-              format.html { render :text => _('Error connecting to Pulp service') }
+              format.html { render :plain => _('Error connecting to Pulp service') }
               format.json { render :json => {:success => false, :message => @pulp_status['fatal']} }
             end
           else
@@ -44,25 +58,12 @@ module Katello
         end
       end
 
-      def show_with_content
-        @task_search_url = main_app.foreman_tasks_tasks_path(:search => "resource_id = #{@smart_proxy.id} AND resource_type = #{@smart_proxy.class}")
-        render 'foreman/smart_proxies/show', :layout => 'katello/layouts/foreman_with_bastion'
-      end
-
       private
 
       def find_resource_and_status
         find_resource
         find_status
       end
-
-      def action_permission_with_katello
-        if params[:action] == 'pulp_status' || params[:action] == 'pulp_storage'
-          :view
-        else
-          action_permission_without_katello
-        end
-      end
     end
   end
 end

data/app/controllers/katello/products_controller.rb

@@ -60,7 +60,7 @@ module Katello
     end
 
     def substitutions
-      params.slice(:basearch, :releasever, :registry_name)
+      params.permit(:basearch, :releasever, :registry_name).to_h
     end
 
     def task_error(task)

data/app/controllers/katello/providers_controller.rb

@@ -4,6 +4,7 @@ module Katello
     helper ReactjsHelper
     before_action :find_rh_provider, :only => [:redhat_provider, :redhat_provider_tab]
     before_action :search_filter, :only => [:auto_complete_search]
+    around_action :skip_bullet, :only => :redhat_provider_tab if defined?(Bullet)
 
     respond_to :html, :js
 
@@ -49,5 +50,15 @@ module Katello
     def title
       _('Repositories')
     end
+
+    private
+
+    # temporarily disable this override when introducing changes to the page so that bullet can audit them
+    def skip_bullet
+      Bullet.enable = false
+      yield
+    ensure
+      Bullet.enable = true
+    end
   end
 end

data/app/controllers/katello/react_controller.rb

@@ -0,0 +1,9 @@
+module Katello
+  class ReactController < ::ApplicationController
+    skip_before_action :authorize
+
+    def index
+      render 'katello/layouts/react', :layout => false
+    end
+  end
+end

data/app/controllers/katello/sync_management_controller.rb

@@ -45,7 +45,7 @@ module Katello
     def destroy
       repo = Repository.where(:id => params[:id]).syncable.first
       repo.cancel_dynflow_sync if repo
-      render :text => ""
+      render :plain => ""
     end
 
     private

data/app/helpers/katello/concerns/hosts_and_hostgroups_helper_extensions.rb

@@ -3,16 +3,17 @@ module Katello
     module HostsAndHostgroupsHelperExtensions
       extend ActiveSupport::Concern
 
-      included do
-        alias_method_chain :puppet_environment_field, :katello
+      module Overrides
+        def puppet_environment_field(form, environments_choice, select_options = {}, html_options = {})
+          html_options.merge!(
+            :label => _("Puppet Environment"),
+            'data-content_puppet_match' => (@host || @hostgroup).new_record? || (@host || @hostgroup).content_and_puppet_match?,
+            :help_inline => link_to(_("Reset Puppet Environment"), '#', :id => 'reset_puppet_environment'))
+          super(form, environments_choice, select_options, html_options)
+        end
       end
-
-      def puppet_environment_field_with_katello(form, environments_choice, select_options = {}, html_options = {})
-        html_options.merge!(
-          :label => _("Puppet Environment"),
-          'data-content_puppet_match' => (@host || @hostgroup).new_record? || (@host || @hostgroup).content_and_puppet_match?,
-          :help_inline => link_to(_("Reset Puppet Environment to match selected Content View"), '#', :id => 'reset_puppet_environment'))
-        puppet_environment_field_without_katello(form, environments_choice, select_options, html_options)
+      included do
+        prepend Overrides
       end
     end
   end

data/app/helpers/katello/concerns/settings_helper_extensions.rb

@@ -3,43 +3,52 @@ module Katello
     module SettingsHelperExtensions
       extend ActiveSupport::Concern
 
-      included do
-        alias_method_chain :value, :katello
-      end
-
-      def value_with_katello(setting)
-        return value_without_katello(setting) unless [
-          'default_download_policy',
-          'katello_default_finish',
-          'katello_default_iPXE',
-          'katello_default_provision',
-          'katello_default_ptable',
-          'katello_default_PXELinux',
-          'katello_default_user_data',
-          'katello_default_kexec',
-          'katello_default_atomic_provision'
-        ].include?(setting.name)
+      module Overrides
+        # rubocop:disable MethodLength
+        def value(setting)
+          return super(setting) unless [
+            'default_download_policy',
+            'katello_default_finish',
+            'katello_default_iPXE',
+            'katello_default_provision',
+            'katello_default_ptable',
+            'katello_default_PXELinux',
+            'katello_default_PXEGrub',
+            'katello_default_PXEGrub2',
+            'katello_default_user_data',
+            'katello_default_kexec',
+            'katello_default_atomic_provision'
+          ].include?(setting.name)
 
-        case setting.name
-        when "default_download_policy"
-          edit_select(setting, :value, :select_values => Hash[::Runcible::Models::YumImporter::DOWNLOAD_POLICIES.collect { |p| [p, p] }].to_json)
-        when "katello_default_finish"
-          edit_select(setting, :value, :select_values => katello_template_setting_values("finish"))
-        when "katello_default_iPXE"
-          edit_select(setting, :value, :select_values => katello_template_setting_values("iPXE"))
-        when "katello_default_provision", "katello_default_atomic_provision"
-          edit_select(setting, :value, :select_values => katello_template_setting_values("provision"))
-        when "katello_default_ptable"
-          edit_select(setting, :value, :select_values => Hash[Template.all.where(:type => "Ptable").map { |tmp| [tmp[:name], tmp[:name]] }].to_json)
-        when "katello_default_PXELinux"
-          edit_select(setting, :value, :select_values => katello_template_setting_values("PXELinux"))
-        when "katello_default_user_data"
-          edit_select(setting, :value, :select_values => katello_template_setting_values("user_data"))
-        when "katello_default_kexec"
-          edit_select(setting, :value, :select_values => katello_template_setting_values("kexec"))
+          case setting.name
+          when "default_download_policy"
+            edit_select(setting, :value, :select_values => Hash[::Runcible::Models::YumImporter::DOWNLOAD_POLICIES.collect { |p| [p, p] }].to_json)
+          when "katello_default_finish"
+            edit_select(setting, :value, :select_values => katello_template_setting_values("finish"))
+          when "katello_default_iPXE"
+            edit_select(setting, :value, :select_values => katello_template_setting_values("iPXE"))
+          when "katello_default_provision", "katello_default_atomic_provision"
+            edit_select(setting, :value, :select_values => katello_template_setting_values("provision"))
+          when "katello_default_ptable"
+            edit_select(setting, :value, :select_values => Hash[Template.all.where(:type => "Ptable").map { |tmp| [tmp[:name], tmp[:name]] }].to_json)
+          when "katello_default_PXELinux"
+            edit_select(setting, :value, :select_values => katello_template_setting_values("PXELinux"))
+          when "katello_default_PXEGrub"
+            edit_select(setting, :value, :select_values => katello_template_setting_values("PXEGrub"))
+          when "katello_default_PXEGrub2"
+            edit_select(setting, :value, :select_values => katello_template_setting_values("PXEGrub2"))
+          when "katello_default_user_data"
+            edit_select(setting, :value, :select_values => katello_template_setting_values("user_data"))
+          when "katello_default_kexec"
+            edit_select(setting, :value, :select_values => katello_template_setting_values("kexec"))
+          end
         end
       end
 
+      included do
+        prepend Overrides
+      end
+
       private
 
       def katello_template_setting_values(name)