katello 3.4.4 → 3.4.5

data/lib/katello/permissions/user_permissions.rb

@@ -1,13 +1,5 @@
 require 'katello/plugin.rb'
 
-Foreman::Plugin.find(:katello).security_block :user do
-  permission :my_organizations,
-             {
-               'katello/api/rhsm/candlepin_proxies' => [:list_owners]
-             },
-             :public => true
-end
-
 Foreman::AccessControl.permission(:my_account).actions << [
   'katello/api/v2/tasks/show'
 ]

data/lib/katello/plugin.rb

@@ -1,5 +1,7 @@
+require 'katello/permission_creator'
+
 Foreman::Plugin.register :katello do
-  requires_foreman '>= 1.14'
+  requires_foreman '>= 1.15'
 
   sub_menu :top_menu, :content_menu, :caption => N_('Content'), :after => :monitor_menu do
     menu :top_menu,
@@ -253,4 +255,7 @@ Foreman::Plugin.register :katello do
       .preload(:content_view, :lifecycle_environment, :subscription_facet)
       .preload(content_facet: [:bound_repositories, :content_view, :lifecycle_environment])
   end
+
+  Katello::PermissionCreator.new(self).define
+  add_all_permissions_to_default_roles
 end

data/lib/katello/tasks/upgrades/3.4/remove_unused_products.rake

@@ -0,0 +1,28 @@
+namespace :katello do
+  namespace :upgrades do
+    namespace '3.4' do
+      task :disable_dynflow do
+        ForemanTasks.dynflow.config.remote = true
+      end
+
+      desc "Remove orphaned products that are no longer part of the organization after upgrade to candlepin 2.0"
+      task :remove_unused_products => ["environment", "disable_dynflow", "check_ping"] do
+        User.current = User.anonymous_admin
+
+        Organization.all.each do |org|
+          org.products.redhat.each do |product|
+            begin
+              product.multiplier
+            rescue RestClient::ResourceNotFound
+              if product.repositories.any?
+                Rails.logger.warn("Unexpected upgrade issue: Cannot remove product #{product.name}")
+              else
+                product.destroy!
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.4.4".freeze
+  VERSION = "3.4.5".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.4.4
+  version: 3.4.5
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-31 00:00:00.000000000 Z
+date: 2017-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -498,6 +498,7 @@ files:
 - app/controllers/katello/remote_execution_controller.rb
 - app/controllers/katello/sync_management_controller.rb
 - app/helpers/katello/application_helper.rb
+- app/helpers/katello/concerns/dashboard_helper_extensions.rb
 - app/helpers/katello/concerns/foreman_docker/container_steps_helper_extensions.rb
 - app/helpers/katello/concerns/hosts_and_hostgroups_helper_extensions.rb
 - app/helpers/katello/concerns/settings_helper_extensions.rb
@@ -1909,19 +1910,11 @@ files:
 - lib/katello/apipie/validators.rb
 - lib/katello/engine.rb
 - lib/katello/params_parser_wrapper.rb
+- lib/katello/permission_creator.rb
 - lib/katello/permissions.rb
-- lib/katello/permissions/activation_key_permissions.rb
-- lib/katello/permissions/capsule_content_permissions.rb
-- lib/katello/permissions/content_view_permissions.rb
-- lib/katello/permissions/gpg_key_permissions.rb
-- lib/katello/permissions/host_collections_permissions.rb
 - lib/katello/permissions/host_permissions.rb
-- lib/katello/permissions/lifecycle_environment_permissions.rb
 - lib/katello/permissions/organization_permissions.rb
-- lib/katello/permissions/product_permissions.rb
 - lib/katello/permissions/roles_permissions.rb
-- lib/katello/permissions/subscription_permissions.rb
-- lib/katello/permissions/sync_plan_permissions.rb
 - lib/katello/permissions/user_permissions.rb
 - lib/katello/plugin.rb
 - lib/katello/repository_types.rb
@@ -1955,6 +1948,7 @@ files:
 - lib/katello/tasks/upgrades/3.0/update_subscription_facet_backend_data.rake
 - lib/katello/tasks/upgrades/3.3/hypervisors.rake
 - lib/katello/tasks/upgrades/3.3/import_subscriptions.rake
+- lib/katello/tasks/upgrades/3.4/remove_unused_products.rake
 - lib/katello/tasks/virt_who_report.rake
 - lib/katello/url_constrained_cookie_store.rb
 - lib/katello/version.rb

data/lib/katello/permissions/activation_key_permissions.rb

@@ -1,28 +0,0 @@
-require 'katello/plugin.rb'
-
-Foreman::Plugin.find(:katello).security_block :activation_keys do
-  permission :view_activation_keys,
-             {
-               'katello/activation_keys' => [:all, :index],
-               'katello/api/v2/activation_keys' => [:index, :show, :available_host_collections, :available_releases,
-                                                    :product_content, :auto_complete_search]
-             },
-             :resource_type => 'Katello::ActivationKey'
-  permission :create_activation_keys,
-             {
-               'katello/api/v2/activation_keys' => [:create, :copy]
-             },
-             :resource_type => 'Katello::ActivationKey'
-  permission :edit_activation_keys,
-             {
-               'katello/api/v2/activation_keys' => [:update, :content_override,
-                                                    :add_subscriptions, :remove_subscriptions,
-                                                    :add_host_collections, :remove_host_collections]
-             },
-             :resource_type => 'Katello::ActivationKey'
-  permission :destroy_activation_keys,
-             {
-               'katello/api/v2/activation_keys' => [:destroy]
-             },
-             :resource_type => 'Katello::ActivationKey'
-end

data/lib/katello/permissions/capsule_content_permissions.rb

@@ -1,17 +0,0 @@
-require 'katello/plugin.rb'
-
-Foreman::Plugin.find(:katello).security_block :capsule_content do
-  permission :manage_capsule_content,
-             {
-               'katello/api/v2/capsule_content' => [:lifecycle_environments, :available_lifecycle_environments, :add_lifecycle_environment, :remove_lifecycle_environment,
-                                                    :sync, :sync_status, :cancel_sync],
-               'katello/api/v2/capsules'        => [:index, :show]
-             },
-             :resource_type => 'SmartProxy'
-
-  permission :view_capsule_content,
-            {
-              'smart_proxies' => [:pulp_storage, :pulp_status, :show_with_content]
-            },
-            :resource_type => "SmartProxy"
-end

data/lib/katello/permissions/content_view_permissions.rb

@@ -1,82 +0,0 @@
-require 'katello/plugin.rb'
-
-Foreman::Plugin.find(:katello).security_block :content_views do
-  permission :view_content_views,
-             {
-               'katello/api/v2/content_views' => [:index, :show, :available_puppet_modules, :auto_complete_search,
-                                                  :available_puppet_module_names],
-               'katello/api/v2/content_view_filters' => [:index, :show, :auto_complete_search],
-               'katello/api/v2/content_view_filter_rules' => [:index, :show],
-               'katello/api/v2/content_view_histories' => [:index, :auto_complete_search],
-               'katello/api/v2/content_view_puppet_modules' => [:index, :show, :auto_complete_search],
-               'katello/api/v2/content_view_versions' => [:index, :show, :auto_complete_search],
-               'katello/api/v2/content_view_components' => [:index, :show],
-               'katello/api/v2/package_groups' => [:index, :show],
-               'katello/api/v2/errata' => [:index, :show],
-               'katello/api/v2/puppet_modules' => [:index, :show],
-               'katello/content_views' => [:auto_complete, :auto_complete_search],
-               'katello/errata' => [:short_details, :auto_complete],
-               'katello/packages' => [:details, :auto_complete],
-               'katello/products' => [:auto_complete],
-               'katello/repositories' => [:auto_complete_library],
-               'katello/content_search' => [:index,
-                                            :products,
-                                            :repos,
-                                            :packages,
-                                            :errata,
-                                            :puppet_modules,
-                                            :packages_items,
-                                            :errata_items,
-                                            :puppet_modules_items,
-                                            :view_packages,
-                                            :view_puppet_modules,
-                                            :repo_packages,
-                                            :repo_errata,
-                                            :repo_puppet_modules,
-                                            :repo_compare_errata,
-                                            :repo_compare_packages,
-                                            :repo_compare_puppet_modules,
-                                            :view_compare_errata,
-                                            :view_compare_packages,
-                                            :view_compare_puppet_modules,
-                                            :views]
-             },
-             :resource_type => 'Katello::ContentView'
-  permission :create_content_views,
-             {
-               'katello/api/v2/content_views' => [:create, :copy]
-             },
-             :resource_type => 'Katello::ContentView'
-  permission :edit_content_views,
-             {
-               'katello/api/v2/content_views' => [:update],
-               'katello/api/v2/content_view_filters' => [:create, :update, :destroy],
-               'katello/api/v2/content_view_filter_rules' => [:create, :update, :destroy],
-               'katello/api/v2/content_view_puppet_modules' => [:create, :update, :destroy],
-               'katello/api/v2/content_view_components' => [:add_components, :remove_components, :update]
-             },
-             :resource_type => 'Katello::ContentView'
-  permission :destroy_content_views,
-             {
-               'katello/api/v2/content_views' => [:destroy, :remove],
-               'katello/api/v2/content_view_versions' => [:destroy]
-             },
-             :resource_type => 'Katello::ContentView'
-  permission :publish_content_views,
-             {
-               'katello/api/v2/content_views' => [:publish],
-               'katello/api/v2/content_view_versions' => [:incremental_update, :republish_repositories]
-             },
-             :resource_type => 'Katello::ContentView'
-  permission :promote_or_remove_content_views,
-             {
-               'katello/api/v2/content_view_versions' => [:promote],
-               'katello/api/v2/content_views' => [:remove_from_environment, :remove, :republish_repositories]
-             },
-             :resource_type => 'Katello::ContentView'
-  permission :export_content_views,
-             {
-               'katello/api/v2/content_view_versions' => [:export]
-             },
-             :resource_type => 'Katello::ContentView'
-end

data/lib/katello/permissions/gpg_key_permissions.rb

@@ -1,24 +0,0 @@
-require 'katello/plugin.rb'
-
-Foreman::Plugin.find(:katello).security_block :gpg_keys do
-  permission :view_gpg_keys,
-             {
-               'katello/api/v2/gpg_keys' => [:index, :show, :auto_complete_search]
-             },
-             :resource_type => 'Katello::GpgKey'
-  permission :create_gpg_keys,
-             {
-               'katello/api/v2/gpg_keys' => [:create]
-             },
-             :resource_type => 'Katello::GpgKey'
-  permission :edit_gpg_keys,
-             {
-               'katello/api/v2/gpg_keys' => [:update, :content]
-             },
-             :resource_type => 'Katello::GpgKey'
-  permission :destroy_gpg_keys,
-             {
-               'katello/api/v2/gpg_keys' => [:destroy]
-             },
-             :resource_type => 'Katello::GpgKey'
-end

data/lib/katello/permissions/host_collections_permissions.rb

@@ -1,24 +0,0 @@
-require 'katello/plugin.rb'
-
-Foreman::Plugin.find(:katello).security_block :host_collections do
-  permission :view_host_collections,
-             {
-               'katello/api/v2/host_collections' => [:index, :show, :auto_complete_search]
-             },
-             :resource_type => 'Katello::HostCollection'
-  permission :create_host_collections,
-             {
-               'katello/api/v2/host_collections' => [:create, :copy]
-             },
-             :resource_type => 'Katello::HostCollection'
-  permission :edit_host_collections,
-             {
-               'katello/api/v2/host_collections' => [:update, :add_hosts, :remove_hosts]
-             },
-             :resource_type => 'Katello::HostCollection'
-  permission :destroy_host_collections,
-             {
-               'katello/api/v2/host_collections' => [:destroy]
-             },
-             :resource_type => 'Katello::HostCollection'
-end

data/lib/katello/permissions/lifecycle_environment_permissions.rb

@@ -1,29 +0,0 @@
-require 'katello/plugin.rb'
-
-Foreman::Plugin.find(:katello).security_block :lifecycle_environments do
-  permission :view_lifecycle_environments,
-             {
-               'katello/api/v2/environments' => [:index, :show, :paths, :repositories, :auto_complete_search],
-               'katello/api/rhsm/candlepin_proxies' => [:rhsm_index]
-             },
-             :resource_type => 'Katello::KTEnvironment'
-  permission :create_lifecycle_environments,
-             {
-               'katello/api/v2/environments' => [:create]
-             },
-             :resource_type => 'Katello::KTEnvironment'
-  permission :edit_lifecycle_environments,
-             {
-               'katello/api/v2/environments' => [:update]
-             },
-             :resource_type => 'Katello::KTEnvironment'
-  permission :destroy_lifecycle_environments,
-             {
-               'katello/api/v2/environments' => [:destroy]
-             },
-             :resource_type => 'Katello::KTEnvironment'
-
-  permission :promote_or_remove_content_views_to_environments,
-             {},
-             :resource_type => 'Katello::KTEnvironment'
-end

data/lib/katello/permissions/product_permissions.rb

@@ -1,80 +0,0 @@
-require 'katello/plugin.rb'
-
-Foreman::Plugin.find(:katello).security_block :products do
-  permission :view_products,
-             {
-               'katello/products' => [:auto_complete, :auto_complete_search],
-               'katello/api/v2/products' => [:index, :show, :auto_complete_search],
-               'katello/api/v2/repositories' => [:index, :show, :repository_types, :auto_complete_search, :cancel],
-               'katello/api/v2/packages' => [:index, :show, :auto_complete_search, :auto_complete_name, :auto_complete_arch],
-               'katello/api/v2/package_groups' => [:index, :show, :auto_complete_search],
-               'katello/api/v2/docker_manifests' => [:index, :show, :auto_complete_search],
-               'katello/api/v2/docker_tags' => [:index, :show, :auto_complete_search, :auto_complete_name],
-               'katello/api/v2/file_units' => [:index, :show, :auto_complete_search],
-               'katello/api/v2/ostree_branches' => [:index, :show, :auto_complete_search],
-               'katello/api/v2/errata' => [:index, :show, :auto_complete_search, :compare],
-               'katello/api/v2/puppet_modules' => [:index, :show, :auto_complete_search],
-               'katello/errata' => [:short_details, :auto_complete],
-               'katello/packages' => [:details, :auto_complete],
-               'katello/puppet_modules' => [:show],
-               'katello/files' => [:auto_complete],
-               'katello/repositories' => [:auto_complete_library, :repository_types],
-               'katello/content_search' => [:index,
-                                            :products,
-                                            :repos,
-                                            :packages,
-                                            :errata,
-                                            :puppet_modules,
-                                            :packages_items,
-                                            :errata_items,
-                                            :puppet_modules_items,
-                                            :repo_packages,
-                                            :repo_errata,
-                                            :repo_puppet_modules,
-                                            :repo_compare_errata,
-                                            :repo_compare_packages,
-                                            :repo_compare_puppet_modules]
-             },
-             :resource_type => 'Katello::Product'
-  permission :create_products,
-             {
-               'katello/api/v2/products' => [:create],
-               'katello/api/v2/repositories' => [:create],
-               'katello/api/v2/package_groups' => [:create]
-             },
-             :resource_type => 'Katello::Product'
-  permission :edit_products,
-             {
-               'katello/api/v2/products' => [:update],
-               'katello/api/v2/repositories' => [:update, :remove_content, :import_uploads, :upload_content, :republish],
-               'katello/api/v2/products_bulk_actions' => [:update_sync_plans],
-               'katello/api/v2/content_uploads' => [:create, :update, :destroy],
-               'katello/api/v2/organizations' => [:repo_discover, :cancel_repo_discover]
-             },
-             :resource_type => 'Katello::Product'
-  permission :destroy_products,
-             {
-               'katello/api/v2/products' => [:destroy],
-               'katello/api/v2/repositories' => [:destroy],
-               'katello/api/v2/products_bulk_actions' => [:destroy_products],
-               'katello/api/v2/repositories_bulk_actions' => [:destroy_repositories],
-               'katello/api/v2/package_groups' => [:destroy]
-             },
-             :resource_type => 'Katello::Product'
-  permission :sync_products,
-             {
-               'katello/api/v2/products' => [:sync],
-               'katello/api/v2/repositories' => [:sync],
-               'katello/api/v2/products_bulk_actions' => [:sync_products],
-               'katello/api/v2/repositories_bulk_actions' => [:sync_repositories],
-               'katello/api/v2/sync' => [:index],
-               'katello/api/v2/sync_plans' => [:sync],
-               'katello/sync_management' => [:index, :sync_status, :product_status, :sync, :destroy]
-             },
-             :resource_type => 'Katello::Product'
-  permission :export_products,
-             {
-               'katello/api/v2/repositories' => [:export]
-             },
-             :resource_type => 'Katello::Product'
-end

data/lib/katello/permissions/subscription_permissions.rb

@@ -1,33 +0,0 @@
-require 'katello/plugin.rb'
-
-Foreman::Plugin.find(:katello).security_block :subscriptions do
-  permission :view_subscriptions,
-             {
-               'katello/api/v2/subscriptions' => [:index, :show, :available, :manifest_history, :auto_complete_search],
-               'katello/api/v2/repository_sets' => [:index, :show, :available_repositories]
-             },
-             :resource_type => 'Katello::Subscription'
-  permission :attach_subscriptions,
-             {
-               'katello/api/v2/subscriptions' => [:create]
-             },
-             :resource_type => 'Katello::Subscription'
-  permission :unattach_subscriptions,
-             {
-               'katello/api/v2/subscriptions' => [:destroy]
-             },
-             :resource_type => 'Katello::Subscription'
-  permission :import_manifest,
-             {
-               'katello/products' => [:available_repositories, :toggle_repository],
-               'katello/providers' => [:redhat_provider, :redhat_provider_tab],
-               'katello/api/v2/subscriptions' => [:upload, :refresh_manifest],
-               'katello/api/v2/repository_sets' => [:enable, :disable]
-             },
-             :resource_type => 'Katello::Subscription'
-  permission :delete_manifest,
-             {
-               'katello/api/v2/subscriptions' => [:delete_manifest]
-             },
-             :resource_type => 'Katello::Subscription'
-end