katello 3.17.0 → 3.18.0

data/app/lib/katello/resources/candlepin/upstream_consumer.rb

@@ -24,6 +24,12 @@ module Katello
             raise ::Katello::Errors::UpstreamConsumerGone
           end
 
+          def content_access
+            JSON.parse(self['content_access'].get).with_indifferent_access
+          rescue RestClient::NotFound
+            {}
+          end
+
           def remove_entitlement(entitlement_id)
             fail ArgumentError, "No entitlement ID given to remove." if entitlement_id.blank?
 

data/app/lib/katello/resources/registry.rb

@@ -10,11 +10,12 @@ module Katello
           ::Foreman::Logging.logger('katello/registry_proxy')
         end
 
-        def self.get(path, headers = {:accept => :json})
+        def self.get(path, headers = {:accept => :json}, options = {})
           logger.debug "Sending GET request to Registry: #{path}"
           resource = RegistryResource.load_class
           joined_path = resource.prefix.chomp("/") + path
           client = resource.rest_client(Net::HTTP::Get, :get, joined_path)
+          client.options.merge!(options)
           client.get(headers)
         end
       end
@@ -22,7 +23,6 @@ module Katello
       class RegistryResource < HttpResource
         class << self
           def load_class
-            container_config = SETTINGS.dig(:katello, :container_image_registry)
             registry_url = nil
             pulp_primary = ::SmartProxy.pulp_primary
 
@@ -34,7 +34,7 @@ module Katello
 
               # Assume the registry uses the same CA as the Smart Proxy
               ca_cert_file = Setting[:ssl_ca_file]
-            elsif container_config
+            elsif (container_config = SETTINGS.dig(:katello, :container_image_registry))
               registry_url = container_config[:crane_url]
               ca_cert_file = container_config[:registry_ca_cert_file]
             end

data/app/models/katello/authorization/activation_key.rb

@@ -25,6 +25,10 @@ module Katello
         authorized(:edit_activation_keys)
       end
 
+      def deletable
+        authorized(:destroy_activation_keys)
+      end
+
       def any_editable?
         editable.count > 0
       end

data/app/models/katello/authorization/content_view.rb

@@ -24,6 +24,10 @@ module Katello
       authorized?(:promote_or_remove_content_views) && Katello::KTEnvironment.any_promotable?
     end
 
+    def exportable?
+      authorized?(:export_content_views)
+    end
+
     module ClassMethods
       def readable
         authorized(:view_content_views)
@@ -45,6 +49,15 @@ module Katello
         authorized(:publish_content_views)
       end
 
+      def promotable_or_removable
+        return where("1=0") unless Katello::KTEnvironment.any_promotable?
+        authorized(:promote_or_remove_content_views)
+      end
+
+      def exportable
+        authorized(:export_content_views)
+      end
+
       def readable_repositories(repo_ids = nil)
         query = Katello::Repository.all
         content_views = Katello::ContentView.readable

data/app/models/katello/authorization/content_view_component.rb

@@ -0,0 +1,15 @@
+module Katello
+  module Authorization::ContentViewComponent
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def readable
+        where(:composite_content_view_id => ::Katello::ContentView.readable)
+      end
+
+      def editable
+        where(:composite_content_view_id => ::Katello::ContentView.editable)
+      end
+    end
+  end
+end

data/app/models/katello/authorization/content_view_filter.rb

@@ -0,0 +1,15 @@
+module Katello
+  module Authorization::ContentViewFilter
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def readable
+        where(:content_view_id => ::Katello::ContentView.readable)
+      end
+
+      def editable
+        where(:content_view_id => ::Katello::ContentView.editable)
+      end
+    end
+  end
+end

data/app/models/katello/authorization/content_view_version.rb

@@ -10,9 +10,32 @@ module Katello
     end
 
     module ClassMethods
+      def with_content_view_scope(scope)
+        joins(:content_view).merge(Katello::ContentView.send(scope))
+      end
+
       def readable
-        view_ids = ::Katello::ContentView.readable.collect { |v| v.id }
-        joins(:content_view).where("#{Katello::ContentView.table_name}.id" => view_ids)
+        with_content_view_scope(:readable)
+      end
+
+      def exportable
+        with_content_view_scope(:exportable)
+      end
+
+      def editable
+        with_content_view_scope(:editable)
+      end
+
+      def publishable
+        with_content_view_scope(:publishable)
+      end
+
+      def deletable
+        with_content_view_scope(:deletable)
+      end
+
+      def promotable_or_removable
+        with_content_view_scope(:promotable_or_removable)
       end
     end
   end

data/app/models/katello/authorization/content_view_version_export_history.rb

@@ -4,7 +4,7 @@ module Katello
 
     module ClassMethods
       def readable
-        where(:content_view_version_id => Katello::ContentViewVersion.readable)
+        joins(:content_view_version).merge(Katello::ContentViewVersion.readable)
       end
     end
   end

data/app/models/katello/authorization/gpg_key.rb

@@ -5,20 +5,28 @@ module Katello
     include Authorizable
 
     def readable?
-      authorized?(:view_gpg_keys)
+      authorized?(:view_content_credentials)
     end
 
     def editable?
-      authorized?(:edit_gpg_keys)
+      authorized?(:edit_content_credentials)
     end
 
     def deletable?
-      authorized?(:destroy_gpg_keys)
+      authorized?(:destroy_content_credentials)
     end
 
     module ClassMethods
       def readable
-        authorized(:view_gpg_keys)
+        authorized(:view_content_credentials)
+      end
+
+      def editable
+        authorized(:edit_content_credentials)
+      end
+
+      def deletable
+        authorized(:destroy_content_credentials)
       end
     end
   end

data/app/models/katello/authorization/lifecycle_environment.rb

@@ -45,6 +45,14 @@ module Katello
         ::User.current.can?(:create_lifecycle_environments)
       end
 
+      def deletable
+        authorized(:destroy_lifecycle_environments)
+      end
+
+      def editable
+        authorized(:edit_lifecycle_environments)
+      end
+
       def content_readable(org)
         readable.where(:organization_id => org)
       end

data/app/models/katello/authorization/organization.rb

@@ -12,6 +12,14 @@ module Katello
       authorized?(:import_manifest)
     end
 
+    def can_import_library_content?
+      authorized?(:import_library_content)
+    end
+
+    def can_export_library_content?
+      authorized?(:export_library_content)
+    end
+
     def readable_promotion_paths
       permissible_promotion_paths(KTEnvironment.readable)
     end

data/app/models/katello/authorization/sync_plan.rb

@@ -16,10 +16,26 @@ module Katello
       authorized?(:destroy_sync_plans)
     end
 
+    def syncable?
+      products.all? { |p| p.syncable? }
+    end
+
     module ClassMethods
       def readable
         authorized(:view_sync_plans)
       end
+
+      def editable
+        authorized(:edit_sync_plans)
+      end
+
+      def deletable
+        authorized(:destroy_sync_plans)
+      end
+
+      def syncable
+        authorized(:sync_sync_plans)
+      end
     end
   end
 end

data/app/models/katello/concerns/operatingsystem_extensions.rb

@@ -17,6 +17,8 @@ module Katello
           TemplateKind.all.each do |kind|
             if name == ::Operatingsystem::REDHAT_ATOMIC_HOST_OS && kind.name == "provision"
               provisioning_template_name = Setting["katello_default_atomic_provision"]
+            elsif kind.name == 'registration'
+              provisioning_template_name = 'Linux registration default'
             else
               provisioning_template_name = Setting["katello_default_#{kind.name}"]
             end

data/app/models/katello/concerns/organization_extensions.rb

@@ -228,11 +228,6 @@ module Katello
           subscriptions.select(&:expiring_soon?)
         end
 
-        def clear_syspurpose_status
-          host_purpose = HostStatus::Status.where(type: ::Katello::HostStatusManager::PURPOSE_STATUS.map(&:to_s)).where('host_id in (?)', self.hosts.pluck(:id))
-          host_purpose.destroy_all
-        end
-
         def notification_recipients_ids
           users = User.unscoped.all.find_all do |user|
             user.can?(:import_manifest) && user.can?(:view_organizations, self)
@@ -249,6 +244,10 @@ module Katello
           # doesn't provide much benefit for the frustration it creates.
           self.save(validate: false)
         end
+
+        def upstream_consumer
+          Katello::Candlepin::UpstreamConsumer.new(self)
+        end
       end
     end
   end

data/app/models/katello/concerns/smart_proxy_extensions.rb

@@ -49,6 +49,8 @@ module Katello
         has_many :content_facets, :class_name => "::Katello::Host::ContentFacet", :foreign_key => :content_source_id,
                                   :inverse_of => :content_source, :dependent => :nullify
 
+        has_many :smart_proxy_sync_histories, :class_name => "::Katello::SmartProxySyncHistory", :inverse_of => :smart_proxy, dependent: :delete_all
+
         has_many :hostgroup_content_facets, :class_name => "::Katello::Hostgroup::ContentFacet", :foreign_key => :content_source_id,
                               :inverse_of => :content_source, :dependent => :nullify
         has_many :hostgroups, :class_name => "::Hostgroup", :through => :hostgroup_content_facets
@@ -95,7 +97,7 @@ module Katello
         end
 
         def self.sync_needed?(environment)
-          unscoped.with_environment(environment).any?
+          Setting[:foreman_proxy_content_auto_sync] && unscoped.with_environment(environment).any?
         end
       end
 
@@ -105,9 +107,9 @@ module Katello
 
       def update_puppet_path
         if has_feature?(PULP_FEATURE)
-          path = ProxyAPI::Pulp.new(:url => self.url).capsule_puppet_path['puppet_content_dir']
+          path = ::ProxyAPI::Pulp.new(:url => self.url).capsule_puppet_path['puppet_content_dir']
         elsif has_feature?(PULP_NODE_FEATURE)
-          path = ProxyAPI::PulpNode.new(:url => self.url).capsule_puppet_path['puppet_content_dir']
+          path = ::ProxyAPI::PulpNode.new(:url => self.url).capsule_puppet_path['puppet_content_dir']
         end
         self.update_attribute(:puppet_path, path || '') if persisted?
         path
@@ -128,7 +130,7 @@ module Katello
           config.host = uri.host
           config.scheme = uri.scheme
           pulp3_ssl_configuration(config)
-          config.debugging = true
+          config.debugging = false
           config.logger = ::Foreman::Logging.logger('katello/pulp_rest')
           config.username = self.setting(PULP3_FEATURE, 'username')
           config.password = self.setting(PULP3_FEATURE, 'password')

data/app/models/katello/content_migration_progress.rb

@@ -0,0 +1,4 @@
+module Katello
+  class ContentMigrationProgress < Katello::Model
+  end
+end

data/app/models/katello/content_view.rb

@@ -8,6 +8,7 @@ module Katello
     include ForemanTasks::Concerns::ActionSubject
 
     CONTENT_DIR = "content_views".freeze
+    IMPORT_LIBRARY = "Import-Library".freeze
 
     belongs_to :organization, :inverse_of => :content_views, :class_name => "::Organization"
 
@@ -67,6 +68,14 @@ module Katello
     validates :composite,
               inclusion: { in: [false], message: "Composite Content Views can not solve dependencies"},
               if: :solve_dependencies
+    validates :import_only, :inclusion => [true, false]
+    validates :import_only,
+              inclusion: { in: [false], message: "Import-only Content Views can not be Composite"},
+              if: :composite
+    validates :import_only,
+              inclusion: { in: [false], message: "Import-only Content Views can not solve dependencies"},
+              if: :solve_dependencies
+    validate :import_only_immutable
 
     validates_with Validators::KatelloNameFormatValidator, :attributes => :name
     validates_with Validators::KatelloLabelFormatValidator, :attributes => :label
@@ -94,6 +103,10 @@ module Katello
       name
     end
 
+    def library_import?
+      name == IMPORT_LIBRARY
+    end
+
     def content_host_count
       hosts.count
     end
@@ -580,16 +593,23 @@ module Katello
     end
 
     def check_ready_to_import!
-      fail _("User must be logged in.") if ::User.current.nil?
       fail _("Cannot import a composite content view") if composite?
+      fail _("This Content View must be set to Import-only before performing an import") unless import_only?
       true
     end
 
-    def check_ready_to_publish!
+    def check_ready_to_publish!(importing: false)
       fail _("User must be logged in.") if ::User.current.nil?
       fail _("Cannot publish default content view") if default?
-      check_composite_action_allowed!(organization.library)
-      check_docker_repository_names!([organization.library])
+
+      if importing
+        check_ready_to_import!
+      else
+        fail _("Import-only content views can not be published directly") if import_only?
+        check_composite_action_allowed!(organization.library)
+        check_docker_repository_names!([organization.library])
+      end
+
       true
     end
 
@@ -698,6 +718,12 @@ module Katello
 
     private
 
+    def import_only_immutable
+      if import_only_changed? && self.persisted?
+        errors.add(:import_only, _("Import-only can not be changed after creation"))
+      end
+    end
+
     def generate_cp_environment_label(env)
       # The label for a default view, will simply be the env label; otherwise, it
       # will be a combination of env and view label.  The reason being, the label

data/app/models/katello/content_view_component.rb

@@ -1,5 +1,7 @@
 module Katello
   class ContentViewComponent < Katello::Model
+    include Authorization::ContentViewComponent
+
     audited :associated_with => :composite_content_view
     belongs_to :composite_content_view, :class_name => "Katello::ContentView",
                               :inverse_of => :content_view_components

data/app/models/katello/content_view_filter.rb

@@ -1,5 +1,6 @@
 module Katello
   class ContentViewFilter < Katello::Model
+    include Authorization::ContentViewFilter
     audited :associations => [:repositories]
     DOCKER = 'docker'.freeze
     RPM = Rpm::CONTENT_TYPE
@@ -157,6 +158,10 @@ module Katello
       if self.content_view.composite?
         errors.add(:base, _("cannot contain filters if composite view"))
       end
+
+      if self.content_view.import_only?
+        errors.add(:base, _("cannot add filter to import-only view"))
+      end
     end
 
     def validate_filter_repos(errors, content_view)

data/app/models/katello/content_view_history.rb

@@ -32,7 +32,8 @@ module Katello
       publish: 1,
       promotion: 2,
       removal: 3,
-      export: 4
+      export: 4,
+      importing: 5
     }
 
     def content_view

data/app/models/katello/content_view_package_filter.rb

@@ -43,7 +43,7 @@ module Katello
     end
 
     def self.generate_rpm_clauses(package_filenames = [])
-      { 'filename' => { "$in" => package_filenames } } unless package_filenames.empty?
+      { 'filename' => { "$in" => package_filenames.sort } } unless package_filenames.empty?
     end
 
     def applicable_rpms