katello 3.17.0 → 3.18.0

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

@@ -1,7 +1,8 @@
 module Katello
   class Api::V2::ContentViewComponentsController < Api::V2::ApiController
-    before_action :find_composite_content_view
-    before_action :find_content_view_component, :only => [:show, :update]
+    before_action :find_composite_content_view, :only => [:show, :index]
+    before_action :find_composite_content_view_for_edit, :only => [:add_components, :remove_components, :update]
+    before_action :find_authorized_katello_resource, :only => [:show, :update]
 
     wrap_parameters :include => %w(composite_content_view_id content_view_version_id content_view_id latest)
 
@@ -13,7 +14,7 @@ module Katello
     end
 
     def index_response
-      results = @view.content_view_components
+      results = @view.content_view_components.readable
       {
         :results => results.uniq,
         :subtotal => results.count,
@@ -31,15 +32,26 @@ module Katello
       param :latest, :bool, :desc => N_("true if the latest version of the component's content view is desired")
     end
     def add_components
+      @view.add_components(authorized_components)
+      @view.save!
+      respond_for_index(:collection => index_response, :template => "index")
+    end
+
+    private def authorized_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))
+        options.merge(component.slice(:content_view_version_id, :content_view_id)).with_indifferent_access
+      end
+
+      components.each do |component|
+        if component[:content_view_version_id] && Katello::ContentViewVersion.readable.find_by(id: component[:content_view_version_id]).nil?
+          throw_resource_not_found(name: 'content_view_version', id: component[:content_view_version_id])
+        elsif component[:content_view_id] && Katello::ContentView.readable.find_by(id: component[:content_view_id]).nil?
+          throw_resource_not_found(name: 'content_view', id: component[:content_view_id])
+        end
       end
-      @view.add_components(components)
-      @view.save!
-      respond_for_index(:collection => index_response, :template => "index")
     end
 
     api :PUT, "/content_views/:composite_content_view_id/content_view_components/remove",
@@ -56,7 +68,7 @@ module Katello
     param :composite_content_view_id, :number, :desc => N_("composite content view numeric identifier"), :required => true
     param :id, :number, :desc => N_("content view component ID. Identifier of the component association"), :required => true
     def show
-      respond :resource => @component
+      respond :resource => @content_view_component
     end
 
     api :PUT, "/content_views/:composite_content_view_id/content_view_components/:id",
@@ -67,6 +79,9 @@ module Katello
     param :latest, :bool, :desc => N_("true if the latest version of the components content view is desired")
     def update
       cvv_id = component_params[:content_view_version_id]
+      if cvv_id && Katello::ContentViewVersion.readable.find_by(id: cvv_id).nil?
+        throw_resource_not_found(name: 'content view version', id: cvv_id)
+      end
       if component_params.key?(:latest) && component_params.key?(:content_view_version_id)
         latest = ::Foreman::Cast.to_bool(component_params[:latest])
         if latest && cvv_id.present?
@@ -75,22 +90,24 @@ module Katello
         end
       end
       if cvv_id.present?
-        @component.update!(:content_view_version_id => cvv_id, :latest => false)
+        @content_view_component.update!(:content_view_version_id => cvv_id, :latest => false)
       elsif component_params.key?(:latest)
         latest = ::Foreman::Cast.to_bool(component_params[:latest])
-        @component.update!(:content_view_version_id => nil, :latest => latest)
+        @content_view_component.update!(:content_view_version_id => nil, :latest => latest)
       end
-      respond :resource => @component
+      respond :resource => @content_view_component
     end
 
     private
 
     def find_composite_content_view
-      @view = ContentView.composite.non_default.find(params[:composite_content_view_id])
+      @view = ContentView.composite.non_default.readable.find_by(id: params[:composite_content_view_id])
+      throw_resource_not_found(name: 'composite content view', id: params[:composite_content_view_id]) if @view.nil?
     end
 
-    def find_content_view_component
-      @component = ContentViewComponent.find(params[:id])
+    def find_composite_content_view_for_edit
+      @view = ContentView.composite.non_default.editable.find_by(id: params[:composite_content_view_id])
+      throw_resource_not_found(name: 'composite content view', id: params[:composite_content_view_id]) if @view.nil?
     end
 
     def component_params

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

@@ -2,9 +2,9 @@ module Katello
   class Api::V2::ContentViewFiltersController < Api::V2::ApiController
     include Katello::Concerns::FilteredAutoCompleteSearch
 
-    before_action :find_content_view
+    before_action :find_editable_content_view, :only => [:create, :update, :destroy]
+    before_action :find_readable_content_view, :only => [:show, :index, :auto_complete_search]
     before_action :find_filter, :except => [:index, :create, :auto_complete_search]
-
     wrap_parameters :include => (ContentViewFilter.attribute_names + %w(repository_ids))
 
     api :get, "/content_views/:content_view_id/filters", N_("list filters")
@@ -73,7 +73,7 @@ module Katello
       respond :resource => @filter
     end
 
-    api :delete, "/content_views/:content_view_id/filters/:id", N_("delete a filter")
+    api :delefind_filterte, "/content_views/:content_view_id/filters/:id", N_("delete a filter")
     api :delete, "/content_view_filters/:id", N_("delete a filter")
     param :content_view_id, :number, :desc => N_("content view identifier")
     param :id, :number, :desc => N_("filter identifier"), :required => true
@@ -84,18 +84,27 @@ module Katello
 
     private
 
-    def find_content_view
-      @view = ContentView.find(params[:content_view_id]) if params[:content_view_id]
+    def find_readable_content_view
+      @view = ContentView.readable.find_by(id: params[:content_view_id]) if params[:content_view_id]
+      throw_resource_not_found(name: 'content view', id: params[:content_view_id]) if params[:content_view_id] && @view.nil?
+    end
+
+    def find_editable_content_view
+      @view = ContentView.editable.find_by(id: params[:content_view_id]) if params[:content_view_id]
+      throw_resource_not_found(name: 'content view', id: params[:content_view_id]) if params[:content_view_id] && @view.nil?
     end
 
     def find_filter
       if @view
         @filter = @view.filters.find_by(:id => params[:id])
-        fail HttpErrors::NotFound, _("Couldn't find ContentViewFilter with id=%s") % params[:id] unless @filter
+      elsif params[:action] == 'show'
+        @filter = ContentViewFilter.readable.find_by(id: params[:id])
+        @view = @filter&.content_view
       else
-        @filter = ContentViewFilter.find(params[:id])
-        @view = @filter.content_view
+        @filter = ContentViewFilter.editable.find_by(id: params[:id])
+        @view = @filter&.content_view
       end
+      fail HttpErrors::NotFound, _("Couldn't find ContentViewFilter with id=%s") % params[:id] unless @filter
     end
 
     def filter_params

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

@@ -25,6 +25,7 @@ module Katello
       SQL
 
       query = Katello::Repository.readable.in_default_view.in_organization(@organization)
+      query = query.with_type(params[:content_type]) if params[:content_type]
       # Use custom sort to perform the join and order since we need to order by specific content_view
       # and the ORDER BY query needs access to the katello_content_view_repositories table
       custom_sort = ->(sort_query) { sort_query.joins(:root).joins(join_query).order(order_query) }

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

@@ -3,8 +3,11 @@ module Katello
     include Concerns::Api::V2::BulkHostsExtensions
     include Katello::Concerns::FilteredAutoCompleteSearch
 
-    before_action :find_content_view_version, :only => [:show, :update, :promote, :destroy, :export, :republish_repositories]
-    before_action :find_content_view, :except => [:incremental_update]
+    before_action :find_authorized_katello_resource, :only => [:show, :update, :promote, :destroy, :export, :republish_repositories]
+    before_action :find_content_view_from_version, :only => [:show, :update, :promote, :destroy, :export, :republish_repositories]
+    before_action :find_optional_readable_content_view, :only => [:index]
+    before_action :find_publishable_content_view, :only => [:import]
+
     before_action :find_environment, :only => [:index]
     before_action :find_environments, :only => [:promote]
     before_action :validate_promotable, :only => [:promote]
@@ -46,7 +49,7 @@ module Katello
     api :GET, "/content_view_versions/:id", N_("Show content view version")
     param :id, :number, :desc => N_("Content view version identifier"), :required => true
     def show
-      respond :resource => @version
+      respond :resource => @content_view_version
     end
 
     api :POST, "/content_view_versions/:id/promote", N_("Promote a content view version")
@@ -57,7 +60,7 @@ module Katello
     def promote
       is_force = ::Foreman::Cast.to_bool(params[:force])
       task = async_task(::Actions::Katello::ContentView::Promote,
-                        @version, @environments, is_force, params[:description])
+                        @content_view_version, @environments, is_force, params[:description])
       respond_for_async :resource => task
     end
 
@@ -65,96 +68,70 @@ module Katello
     param :id, :number, :desc => N_("Content view version identifier"), :required => true
     param :description, String, :desc => N_("The description for the content view version"), :required => true
     def update
-      history = @version.history.publish.successful.first
+      history = @content_view_version.history.publish.successful.first
       if history.blank?
         fail HttpErrors::BadRequest, _("This content view version doesn't have a history.")
       else
         history.notes = params[:description]
         history.save!
-        respond_for_show(:resource => @version)
+        respond_for_show(:resource => @content_view_version)
       end
     end
 
     api :PUT, "/content_view_versions/:id/republish_repositories", N_("Forces a republish of the version's repositories' metadata")
     param :id, :number, :desc => N_("Content view version identifier"), :required => true
     def republish_repositories
-      task = async_task(::Actions::Katello::ContentViewVersion::RepublishRepositories, @version)
+      task = async_task(::Actions::Katello::ContentViewVersion::RepublishRepositories, @content_view_version)
       respond_for_async :resource => task
     end
 
-    api :GET, "/content_view_versions/export_histories", N_("Show the export history for a content view version")
-    param :content_view_version_id, :number, :desc => N_("Content view version identifier"), :required => false
-    param :content_view_id, :number, :desc => N_("Content view identifier"), :required => false
-    param :destination_server, String, :desc => N_("Destination Server name"), :required => false
-    param :organization_id, :number, :desc => N_("Organization identifier"), :required => false
-    param_group :search, Api::V2::ApiController
-    add_scoped_search_description_for(ContentViewVersionExportHistory)
-    def export_histories
-      history = ContentViewVersionExportHistory.readable
-      history = history.where(:content_view_version_id => params[:content_view_version_id]) unless params[:content_view_version_id].blank?
-      history = history.where(:destination_server => params[:destination_server]) unless params[:destination_server].blank?
-      history = history.with_organization_id(params[:organization_id]) unless params[:organization_id].blank?
-      history = history.with_content_view_id(params[:content_view_id]) unless params[:content_view_id].blank?
-      respond_for_index(:collection => scoped_search(history, 'id', 'asc', resource_class: ContentViewVersionExportHistory),
-                        :template => '../../../api/v2/content_view_version_export_histories/index')
-    end
-
-    api :POST, "/content_view_versions/:id/export", N_("Export a content view version")
+    api :POST, "/content_view_versions/:id/export", N_("Export a content view version.  Relevant only for Pulp 2 repositories.")
     param :id, :number, :desc => N_("Content view version identifier"), :required => true
-    param :destination_server, String, :desc => N_("Destination Server name, required for Pulp3")
-    param :export_to_iso, :bool, :desc => N_("Export to ISO format. Relevant only for Pulp 2 repositories"), :required => false
+    param :export_to_iso, :bool, :desc => N_("Export to ISO format."), :required => false
     param :iso_mb_size, :number, :desc => N_("maximum size of each ISO in MB. Relevant only for Pulp 2 repositories"), :required => false
     param :since, Date, :desc => N_("Optional date of last export (ex: 2010-01-01T12:00:00Z). Relevant only for Pulp 2 repositories"), :required => false
     def export
       if SmartProxy.pulp_primary.pulp3_repository_type_support?(Katello::Repository::YUM_TYPE)
-        invalid_params = [:export_to_iso, :iso_mb_size, :since].reject { |param| params[param].blank? }
-        unless invalid_params.empty?
-          fail HttpErrors::BadRequest, _("Invalid parameters provided - %{params}. These are only relevant for Pulp 2 repositories" % { params: invalid_params.join(', ')})
-        end
-
-        if params[:destination_server].blank?
-          fail HttpErrors::BadRequest, _("Destination Server Name required for Pulp3 repositories")
-        end
-
-        task = async_task(::Actions::Pulp3::Orchestration::ContentViewVersion::Export, @version, destination_server: params[:destination_server])
-      else
-        ::Foreman::Deprecation.api_deprecation_warning("Export is being deprecated and will be removed in a future version of Katello. Use hammer content-view version export instead.")
-        if params[:export_to_iso].blank? && params[:iso_mb_size].present?
-          fail HttpErrors::BadRequest, _("ISO export must be enabled when specifying ISO size")
-        end
+        fail HttpErrors::BadRequest, _("Invalid usage for Pulp 3 repositories. "\
+                                       "Use hammer content-export for Yum repositories")
+      end
+      ::Foreman::Deprecation.api_deprecation_warning("Export is being deprecated and will be removed in a future version of Katello. Use hammer content-view version export instead.")
+      if params[:export_to_iso].blank? && params[:iso_mb_size].present?
+        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 (repos = @content_view_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
-          rescue
-            raise HttpErrors::BadRequest, _("Invalid date provided.")
-          end
+      if params[:since].present?
+        begin
+          params[:since].to_datetime
+        rescue
+          raise HttpErrors::BadRequest, _("Invalid date provided.")
         end
-        task = async_task(::Actions::Katello::ContentViewVersion::Export, @version,
-                          ::Foreman::Cast.to_bool(params[:export_to_iso]),
-                          params[:since].try(:to_datetime),
-                          params[:iso_mb_size])
       end
+      task = async_task(::Actions::Katello::ContentViewVersion::Export, @content_view_version,
+                        ::Foreman::Cast.to_bool(params[:export_to_iso]),
+                        params[:since].try(:to_datetime),
+                        params[:iso_mb_size])
 
       respond_for_async :resource => task
     end
 
     api :POST, "/content_view_versions/import", N_("Import a content view version")
     param :content_view_id, :number, :desc => N_("Content view identifier"), :required => true
-    param :path, String, :desc => N_("Import path"), :required => true
+    param :path, String, :desc => N_("Directory containing the exported Content View Version"), :required => true
+    param :metadata, Hash, :desc => N_("Metadata taken from the upstream export history for this Content View Version"), :required => true
     def import
-      task = async_task(::Actions::Katello::ContentViewVersion::Import, @view, path: params[:path])
+      task = async_task(::Actions::Katello::ContentViewVersion::Import, @view, path: params[:path], metadata: metadata_params&.to_h)
       respond_for_async :resource => task
     end
 
     api :DELETE, "/content_view_versions/:id", N_("Remove content view version")
     param :id, :number, :desc => N_("Content view version identifier"), :required => true
     def destroy
-      task = async_task(::Actions::Katello::ContentViewVersion::Destroy, @version)
+      task = async_task(::Actions::Katello::ContentViewVersion::Destroy, @content_view_version)
       respond_for_async :resource => task
     end
 
@@ -194,7 +171,7 @@ module Katello
 
       validate_content(params[:add_content])
       resolve_dependencies = params.fetch(:resolve_dependencies, true)
-      task = async_task(::Actions::Katello::ContentView::IncrementalUpdates, @version_environments, @composite_version_environments,
+      task = async_task(::Actions::Katello::ContentView::IncrementalUpdates, @content_view_version_environments, @composite_version_environments,
                         params[:add_content], resolve_dependencies, hosts, params[:description])
       respond_for_async :resource => task
     end
@@ -220,17 +197,22 @@ module Katello
       find_bulk_hosts(:edit_hosts, params[:update_hosts], restrict_hosts)
     end
 
-    def find_content_view_version
-      @version = ContentViewVersion.find(params[:id])
-    end
-
-    def find_content_view
-      @view = @version ? @version.content_view : ContentView.where(:id => params[:content_view_id]).first
+    def find_content_view_from_version
+      @view = @content_view_version.content_view
       if @view&.default? && params[:action] == "promote"
         fail HttpErrors::BadRequest, _("The default content view cannot be promoted")
       end
     end
 
+    def find_optional_readable_content_view
+      @view = ContentView.readable.find_by(:id => params[:content_view_id])
+    end
+
+    def find_publishable_content_view
+      @view = ContentView.publishable.find_by(:id => params[:content_view_id])
+      throw_resource_not_found(name: 'product', id: params[:product_id]) if @view.nil?
+    end
+
     def find_version_environments
       #Generates a data structure for incremental update:
       # [{:content_view_version => ContentViewVersion, :environments => [KTEnvironment]}]
@@ -238,7 +220,7 @@ module Katello
       list = params[:content_view_version_environments]
       fail _("At least one Content View Version must be specified") if list.empty?
 
-      @version_environments = []
+      @content_view_version_environments = []
       @composite_version_environments = []
       list.each do |combination|
         version_environment = {
@@ -262,7 +244,7 @@ module Katello
         if view.composite?
           @composite_version_environments << version_environment
         else
-          @version_environments << version_environment
+          @content_view_version_environments << version_environment
           @composite_version_environments += lookup_all_composites(version_environment[:content_view_version]) if params[:propagate_all_composites]
         end
       end
@@ -281,7 +263,7 @@ module Katello
     def find_version_environments_for_hosts(include_composites)
       if include_composites
         version_environments_for_systems_map = {}
-        @version_environments.each do |version_environment|
+        @content_view_version_environments.each do |version_environment|
           version_environment[:content_view_version].composites.each do |composite_version|
             version_environments_for_systems_map[composite_version.id] ||= {:content_view_version => composite_version,
                                                                             :environments => composite_version.environments}
@@ -290,7 +272,7 @@ module Katello
 
         version_environments_for_systems_map.values
       else
-        @version_environments.select { |ve| !ve[:environments].blank? }
+        @content_view_version_environments.select { |ve| !ve[:environments].blank? }
       end
     end
 
@@ -333,13 +315,25 @@ module Katello
 
     def validate_promotable
       fail HttpErrors::BadRequest, _("Could not find environments for promotion") if @environments.blank?
-      return deny_access unless @environments.all?(&:promotable_or_removable?) && @version.content_view.promotable_or_removable?
+      return deny_access unless @environments.all?(&:promotable_or_removable?) && @content_view_version.content_view.promotable_or_removable?
       true
     end
 
     def authorize_destroy
-      return deny_access unless @version.content_view.deletable?
+      return deny_access unless @content_view_version.content_view.deletable?
       true
     end
+
+    def metadata_params
+      params.require(:metadata).permit(
+        :organization,
+        :content_view,
+        :repository_mapping,
+        :toc,
+        content_view_version: [:major, :minor]
+      ).tap do |nested|
+        nested[:repository_mapping] = params[:metadata].require(:repository_mapping).permit!
+      end
+    end
   end
 end

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

@@ -3,7 +3,8 @@ module Katello
     include Concerns::Authorization::Api::V2::ContentViewsController
     include Katello::Concerns::FilteredAutoCompleteSearch
 
-    before_action :find_content_view, :except => [:index, :create, :auto_complete_search]
+    before_action :find_authorized_katello_resource, :except => [:index, :create, :copy, :auto_complete_search]
+    before_action :ensure_non_default, :except => [:index, :create, :copy, :auto_complete_search]
     before_action :find_organization, :only => [:create]
     before_action :find_optional_organization, :only => [:index, :auto_complete_search]
     before_action :find_environment, :only => [:index, :remove_from_environment]
@@ -20,6 +21,7 @@ module Katello
       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")
       param :solve_dependencies, :bool, :desc => N_("Solve RPM dependencies by default on Content View publish, defaults to false")
+      param :import_only, :bool, :desc => N_("Designate this Content View for importing from upstream servers only. Defaults to false") if pulp3_yum?
     end
 
     def filtered_associations
@@ -29,6 +31,10 @@ module Katello
       }
     end
 
+    def self.pulp3_yum?
+      SmartProxy.pulp_primary&.pulp3_repository_type_support?(Katello::Repository::YUM_TYPE)
+    end
+
     api :GET, "/organizations/:organization_id/content_views", N_("List content views")
     api :GET, "/content_views", N_("List content views")
     param :organization_id, :number, :desc => N_("organization identifier")
@@ -66,12 +72,16 @@ module Katello
     param :composite, :bool, :desc => N_("Composite content view")
     param_group :content_view
     def create
-      @view = ContentView.create!(view_params) do |view|
+      if ::Foreman::Cast.to_bool(params[:content_view][:import_only])
+        fail HttpErrors::BadRequest, _("Import-only content views will be available in a future version.") unless self.class.pulp3_yum?
+      end
+
+      @content_view = ContentView.create!(view_params) do |view|
         view.organization = @organization
         view.label ||= labelize_params(params[:content_view])
       end
 
-      respond :resource => @view
+      respond :resource => @content_view
     end
 
     api :PUT, "/content_views/:id", N_("Update a content view")
@@ -79,8 +89,8 @@ module Katello
     param :name, String, :desc => N_("New name for the content view")
     param_group :content_view
     def update
-      sync_task(::Actions::Katello::ContentView::Update, @view, view_params)
-      respond :resource => @view.reload
+      sync_task(::Actions::Katello::ContentView::Update, @content_view, view_params)
+      respond :resource => @content_view.reload
     end
 
     api :POST, "/content_views/:id/publish", N_("Publish a content view")
@@ -93,7 +103,7 @@ module Katello
       param :rpm_filenames, Array, of: String, :desc => N_("list of rpm filename strings to include in published version"), :required => true
     end
     def publish
-      if params[:repos_units].present? && @view.composite?
+      if params[:repos_units].present? && @content_view.composite?
         fail HttpErrors::BadRequest, _("Directly setting package lists on composite content views is not allowed. Please " \
                                      "update the components, then re-publish the composite.")
       end
@@ -105,7 +115,7 @@ module Katello
         fail HttpErrors::BadRequest, _("Both major and minor parameters have to be used to override a CV version")
       end
 
-      task = async_task(::Actions::Katello::ContentView::Publish, @view, params[:description],
+      task = async_task(::Actions::Katello::ContentView::Publish, @content_view, params[:description],
                         :major => params[:major],
                         :minor => params[:minor],
                         :repos_units => params[:repos_units])
@@ -115,7 +125,7 @@ module Katello
     api :GET, "/content_views/:id", N_("Show a content view")
     param :id, :number, :desc => N_("content view numeric identifier"), :required => true
     def show
-      respond :resource => @view
+      respond :resource => @content_view
     end
 
     api :GET, "/content_views/:id/available_puppet_modules",
@@ -123,9 +133,9 @@ module Katello
     param :id, :number, :desc => N_("content view numeric identifier"), :required => true
     param :name, String, :desc => N_("module name to restrict modules for"), :required => false
     def available_puppet_modules
-      current_cv_puppet_modules = @view.content_view_puppet_modules.where("uuid is NOT NULL")
+      current_cv_puppet_modules = @content_view.content_view_puppet_modules.where("uuid is NOT NULL")
       current_uuids = current_cv_puppet_modules.pluck(:uuid)
-      repositories = @view.organization.library.puppet_repositories
+      repositories = @content_view.organization.library.puppet_repositories
       query = PuppetModule.in_repositories(repositories)
       selected_latest_versions = []
       if params[:name]
@@ -154,9 +164,9 @@ module Katello
         N_("Get puppet modules names that are available to be added to the content view")
     param :id, :number, :desc => N_("content view numeric identifier"), :required => true
     def available_puppet_module_names
-      current_names = @view.content_view_puppet_modules.where("name is NOT NULL").pluck(:name)
+      current_names = @content_view.content_view_puppet_modules.where("name is NOT NULL").pluck(:name)
 
-      repos = @view.organization.library.puppet_repositories
+      repos = @content_view.organization.library.puppet_repositories
 
       modules = PuppetModule.in_repositories(repos)
       modules = modules.where('name NOT in (?)', current_names) if current_names.present?
@@ -169,12 +179,12 @@ module Katello
     param :id, :number, :desc => N_("content view numeric identifier"), :required => true
     param :environment_id, :number, :desc => N_("environment numeric identifier"), :required => true
     def remove_from_environment
-      unless @view.environments.include?(@environment)
+      unless @content_view.environments.include?(@environment)
         fail HttpErrors::BadRequest, _("Content view '%{view}' is not in lifecycle environment '%{env}'.") %
-              {view: @view.name, env: @environment.name}
+              {view: @content_view.name, env: @environment.name}
       end
 
-      task = async_task(::Actions::Katello::ContentView::RemoveFromEnvironment, @view, @environment)
+      task = async_task(::Actions::Katello::ContentView::RemoveFromEnvironment, @content_view, @environment)
       respond_for_async :resource => task
     end
 
@@ -190,7 +200,7 @@ module Katello
       cv_envs = ContentViewEnvironment.where(:environment_id => params[:environment_ids],
                                              :content_view_id => params[:id]
                                             )
-      versions = @view.versions.where(:id => params[:content_view_version_ids])
+      versions = @content_view.versions.where(:id => params[:content_view_version_ids])
 
       if cv_envs.empty? && versions.empty?
         fail _("There either were no environments nor versions specified or there were invalid environments/versions specified. "\
@@ -205,14 +215,14 @@ module Katello
       options[:content_view_versions] = versions
       options[:content_view_environments] = cv_envs
 
-      task = async_task(::Actions::Katello::ContentView::Remove, @view, options)
+      task = async_task(::Actions::Katello::ContentView::Remove, @content_view, options)
       respond_for_async :resource => task
     end
 
     api :DELETE, "/content_views/:id", N_("Delete a content view")
     param :id, :number, :desc => N_("content view numeric identifier"), :required => true
     def destroy
-      task = async_task(::Actions::Katello::ContentView::Destroy, @view)
+      task = async_task(::Actions::Katello::ContentView::Destroy, @content_view)
       respond_for_async :resource => task
     end
 
@@ -220,25 +230,26 @@ module Katello
     param :id, :number, :desc => N_("Content view numeric identifier"), :required => true
     param :name, String, :required => true, :desc => N_("New content view name")
     def copy
-      new_content_view = @view.copy(params[:content_view][:name])
+      @content_view = Katello::ContentView.readable.find_by(:id => params[:id])
+      throw_resource_not_found(name: 'content_view', id: params[:id]) if @content_view.blank?
+      ensure_non_default
+      new_content_view = @content_view.copy(params[:content_view][:name])
       respond_for_create :resource => new_content_view
     end
 
     private
 
-    def find_content_view
-      @view = ContentView.find(params[:id])
-
-      if @view.default? && !%w(show history).include?(params[:action])
+    def  ensure_non_default
+      if @content_view.default? && !%w(show history).include?(params[:action])
         fail HttpErrors::BadRequest, _("The default content view cannot be edited, published, or deleted.")
       end
     end
 
     def view_params
-      attrs = [:name, :description, :force_puppet_environment, :auto_publish, :solve_dependencies,
+      attrs = [:name, :description, :force_puppet_environment, :auto_publish, :solve_dependencies, :import_only,
                :default, :created_at, :updated_at, :next_version, {:component_ids => []}]
       attrs.push(:label, :composite) if action_name == "create"
-      if (!@view || !@view.composite?)
+      if (!@content_view || !@content_view.composite?)
         attrs.push({:repository_ids => []}, :repository_ids)
       end
       params.require(:content_view).permit(*attrs).to_h
@@ -246,7 +257,7 @@ module Katello
 
     def find_environment
       return if !params.key?(:environment_id) && params[:action] == "index"
-      @environment = KTEnvironment.find(params[:environment_id])
+      @environment = KTEnvironment.readable.find(params[:environment_id])
     end
 
     def add_use_latest_records(module_records, selected_latest_versions)