katello 3.16.0.rc3.1 → 3.16.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c111ad081f2588aaf6e770186fc98a2945887a06e465cdce62cc7fc20d56205
-  data.tar.gz: bb1a4f8f3872e632bf36deb2db63a92753f5f4eaab3cea97bb47d5809d24e9ec
+  metadata.gz: 590a33ff3016ad29aaeca6e8d5a0c967b9053a01cf3dbf8f28fcb68b63d056bd
+  data.tar.gz: e8c30ca9e88f472f3aabf89b7f2cc3c6122750706e9bdfbb9d1cfa8aa957d4a5
 SHA512:
-  metadata.gz: 30b8f98b25c3a1f04d8796a9e060868e306f802dc50fc140f8d528eec3afe4c2c564d8f20858edb753c9ba75a6c3e56d26636c2b8bdbb5e6363e07d2af1d81a6
-  data.tar.gz: af95e39c10ea7d9ed8805db3dc18be1a58e90a2e24d18fbf9e99ff1eb710abb657737b6a5094c693a2cee42f2bcdc798a9de6395e250645059f3134c89d913c7
+  metadata.gz: 2fbba71f828db21edacf4100aac226a638fa7c6dd59871f6d0f029846af27ff54914c803798fd6054463ae4f44bbfc29d9466fca8a19867e63c10486668ce30c
+  data.tar.gz: 17347500daf6bb1b2dd1ff7126b97e84f2120e1c12e23066036d2f30402cdb9018dc5c6cb1f74ceff441f069a2733dceb4e3a4958032237034eaff5783915b49

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

@@ -211,10 +211,14 @@ module Katello
       fail HttpErrors::BadRequest, _("Host has not been registered with subscription-manager") if @host.subscription_facet.nil?
     end
 
-    def check_disconnected
-      msg = "You are currently operating in disconnected mode where access to Red Hat Subcription Management " \
-            "is prohibited. If you would like to change this, please update the content setting 'Disconnected mode'."
-      fail HttpErrors::BadRequest, _(msg) if Setting[:content_disconnected]
+    def check_upstream_connection
+      checker = Katello::UpstreamConnectionChecker.new(@organization)
+
+      begin
+        checker.assert_connection
+      rescue => e
+        raise HttpErrors::BadRequest, e.message
+      end
     end
   end
 end

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

@@ -7,7 +7,7 @@ module Katello
     before_action :find_optional_organization, :only => [:index, :available, :show]
     before_action :find_organization, :only => [:upload, :delete_manifest,
                                                 :refresh_manifest, :manifest_history]
-    before_action :check_disconnected, only: [:refresh_manifest]
+    before_action :check_upstream_connection, only: [:refresh_manifest]
     before_action :find_provider
 
     skip_before_action :check_content_type, :only => [:upload]

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

@@ -1,6 +1,7 @@
 module Katello
   class Api::V2::UpstreamSubscriptionsController < Api::V2::ApiController
-    before_action :check_disconnected
+    before_action :find_organization
+    before_action :check_upstream_connection
 
     resource_description do
       description "Red Hat subscriptions management platform."
@@ -65,6 +66,17 @@ module Katello
       respond_for_async resource: task
     end
 
+    api :GET, "/organizations/:organization_id/upstream_subscriptions/ping",
+      N_("Check if a connection can be made to Red Hat Subscription Management.")
+    def ping
+      # This API raises an error if:
+      # - Katello is in disconnected mode
+      # - There is no manifest imported
+      # - The local manifest identity certs have expired
+      # - The manifest has been deleted upstream
+      render json: { status: 'OK' }
+    end
+
     private
 
     def update_params

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

@@ -18,6 +18,17 @@ module Katello
       included do
         prepend Overrides
 
+        def update_multiple_taxonomies(type)
+          registered_host = @hosts.detect { |host| host.subscription_facet }
+          unless registered_host.nil?
+            error _("Unregister host %s before assigning an organization") % registered_host.name
+            redirect_back_or_to hosts_path
+            return
+          end
+
+          super
+        end
+
         def destroy
           if Katello::RegistrationManager.unregister_host(@host, :unregistering => false)
             process_success redirection_url_on_host_deletion

data/app/lib/katello/errors.rb

@@ -39,6 +39,12 @@ module Katello
       end
     end
 
+    class HostRegisteredException < StandardError
+      def message
+        _("Content host must be unregistered before performing this action.")
+      end
+    end
+
     class EmptyBulkActionException < StandardError
       def message
         _("No hosts registered with subscription-manager found in selection.")
@@ -154,5 +160,24 @@ module Katello
         _("No URL found for a container registry. Please check the configuration.")
       end
     end
+
+    class DisconnectedMode < StandardError
+      def message
+        _("You are currently operating in disconnected mode where access to Red Hat Subcription Management " \
+        "is prohibited. If you would like to change this, please update the content setting 'Disconnected mode'.")
+      end
+    end
+
+    class NoManifestImported < StandardError
+      def message
+        _("Current organization has no manifest imported.")
+      end
+    end
+
+    class ManifestExpired < StandardError
+      def message
+        _("This Organization's subscription manifest has expired. Please import a new manifest.")
+      end
+    end
   end
 end

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

@@ -142,7 +142,7 @@ module Katello
           def upstream_consumer
             fail _("Current organization not set.") unless Organization.current
             upstream_consumer = Organization.current.owner_details['upstreamConsumer']
-            fail _("Current organization has no manifest imported.") unless upstream_consumer
+            fail Katello::Errors::NoManifestImported unless upstream_consumer
 
             upstream_consumer
           end

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

@@ -9,6 +9,12 @@ module Katello
             super(id)
           end
 
+          def ping
+            resource.head
+          rescue RestClient::Unauthorized, RestClient::Gone
+            raise ::Katello::Errors::UpstreamConsumerGone
+          end
+
           # Overrides the HttpResource get method to check if the upstream
           # consumer exists.
           def get(params)

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

@@ -50,6 +50,7 @@ module Katello
 
         before_save :correct_puppet_environment
         before_validation :correct_kickstart_repository
+        before_update :check_host_registration, :if => proc { organization_id_changed? }
 
         scope :with_pools_expiring_in_days, ->(days) { joins(:pools).merge(Katello::Pool.expiring_in_days(days)).distinct }
 
@@ -76,6 +77,12 @@ module Katello
         end
       end
 
+      def check_host_registration
+        if subscription_facet
+          fail ::Katello::Errors::HostRegisteredException
+        end
+      end
+
       def correct_kickstart_repository
         return unless content_facet
 

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

@@ -82,6 +82,20 @@ module Katello
           self.providers.anonymous.first
         end
 
+        def manifest_imported?
+          owner_details['upstreamConsumer'].present?
+        end
+
+        def manifest_expired?
+          manifest_expiry = owner_details.dig(:upstreamConsumer, :idCert, :serial, :expiration)
+
+          if manifest_expiry
+            DateTime.parse(manifest_expiry) < DateTime.now
+          else
+            false
+          end
+        end
+
         def manifest_history
           imports.map { |i| OpenStruct.new(i) }
         end

data/app/models/katello/pulp3/content_guard.rb

@@ -5,7 +5,7 @@ module Katello
         return unless (count == 0 || force)
         content_guard_api = Katello::Pulp3::Api::ContentGuard.new(smart_proxy)
         content_guard = content_guard_api.list&.results&.first
-        fail _("No Content Guard configured!") unless content_guard
+        return unless content_guard
         katello_content_guard = self.new(name: content_guard.name, pulp_href: content_guard.pulp_href)
         katello_content_guard.save!
       end

data/app/services/katello/candlepin/message_handler.rb

@@ -81,9 +81,8 @@ module Katello
       end
 
       def delete_pool
-        if pool
-          Rails.logger.info "deleting pool #{pool.id} from Katello"
-          pool.destroy!
+        if Katello::Pool.where(:cp_id => pool_id).destroy_all.any?
+          Rails.logger.info "deleted pool #{pool_id} from Katello"
         end
       end
     end

data/app/services/katello/pulp3/repository.rb

@@ -48,6 +48,10 @@ module Katello
         nil
       end
 
+      def skip_types
+        nil
+      end
+
       def content_service
         Katello::Pulp3::Content
       end
@@ -190,7 +194,10 @@ module Katello
       end
 
       def sync
-        repository_sync_url_data = api.class.repository_sync_url_class.new(remote: repo.remote_href, mirror: repo.root.mirror_on_sync)
+        sync_url_params = {remote: repo.remote_href, mirror: repo.root.mirror_on_sync}
+        skip_type_param = skip_types
+        sync_url_params[:skip_types] = skip_type_param if skip_type_param
+        repository_sync_url_data = api.class.repository_sync_url_class.new(sync_url_params)
         [api.repositories_api.sync(repository_reference.repository_href, repository_sync_url_data)]
       end
 

data/app/services/katello/pulp3/repository/yum.rb

@@ -15,6 +15,14 @@ module Katello
           end
         end
 
+        def skip_types
+          skip_types = []
+          if root.ignorable_content.try(:include?, "srpm")
+            skip_types << "srpm"
+          end
+          skip_types
+        end
+
         def distribution_options(path)
           {
             base_path: path,

data/app/services/katello/ui_notifications/subscriptions/manifest_expired_warning.rb

@@ -7,14 +7,11 @@ module Katello
         CDN_PATH = '/content/dist/rhel/server/7/listing'.freeze
 
         def self.deliver!(orgs = ::Organization.all)
+          return if Setting[:content_disconnected]
+
           orgs.each do |org|
-            next unless redhat_connected?(org)
-            content = org.contents.find_by(:label => CONTENT_LABEL)
-            product = content&.products&.find { |p| p.key }
-            if content && product && product.pools.any?
-              if got_403? { product.cdn_resource.get(CDN_PATH) }
-                new(org).deliver!
-              end
+            if cdn_inaccessible?(org) || upstream_inaccessible?(org)
+              new(org).deliver!
             end
           end
         rescue StandardError => e
@@ -47,6 +44,14 @@ module Katello
           @blueprint ||= NotificationBlueprint.find_by(name: 'manifest_expired_warning')
         end
 
+        def self.cdn_inaccessible?(org)
+          content = org.contents.find_by(:label => CONTENT_LABEL)
+          product = content&.products&.find { |p| p.key }
+          if content && product && product.pools.any?
+            return got_403? { product.cdn_resource.get(CDN_PATH) }
+          end
+        end
+
         def self.got_403?
           yield
           false
@@ -54,8 +59,15 @@ module Katello
           true
         end
 
+        def self.upstream_inaccessible?(org)
+          return unless org.manifest_imported?
+
+          checker = Katello::UpstreamConnectionChecker.new(org)
+          !checker.can_connect?
+        end
+
         def self.redhat_connected?(org)
-          org.redhat_provider.repository_url.include?(CDN_HOSTNAME) && !Setting[:content_disconnected]
+          org.redhat_provider.repository_url.include?(CDN_HOSTNAME)
         end
       end
     end

data/app/services/katello/upstream_connection_checker.rb

@@ -0,0 +1,48 @@
+module Katello
+  class UpstreamConnectionChecker
+    POSSIBLE_EXCEPTIONS = [
+      Katello::Errors::DisconnectedMode,
+      Katello::Errors::ManifestExpired,
+      Katello::Errors::UpstreamConsumerGone,
+      Katello::Errors::NoManifestImported
+    ].freeze
+
+    def initialize(organization)
+      @organization = organization
+    end
+
+    def can_connect?
+      assert_connection
+    rescue StandardError => e
+      if POSSIBLE_EXCEPTIONS.include?(e.class)
+        false
+      else
+        raise e
+      end
+    end
+
+    def assert_connection
+      assert_connected
+      assert_unexpired_manifest
+      assert_can_upstream_ping
+
+      true
+    end
+
+    private
+
+    def assert_connected
+      fail Katello::Errors::DisconnectedMode if Setting[:content_disconnected]
+    end
+
+    def assert_can_upstream_ping
+      ::Organization.as_org(@organization) do
+        Katello::Resources::Candlepin::UpstreamConsumer.ping
+      end
+    end
+
+    def assert_unexpired_manifest
+      fail Katello::Errors::ManifestExpired if @organization.manifest_expired?
+    end
+  end
+end

data/app/views/katello/api/v2/srpms/backend.json.rabl

@@ -0,0 +1,11 @@
+attributes :description
+attributes :license, :buildhost, :vendor, :relativepath
+attributes :children, :checksumtype, :size, :url, :build_time, :summary, :group, :requires, :provides, :files
+
+node :human_readable_size do |package|
+  number_to_human_size(package.size) if package.size
+end
+
+node :build_time_utc do |package|
+  Time.at(package.build_time).to_datetime if package.build_time
+end

data/app/views/katello/api/v2/srpms/base.json.rabl

@@ -0,0 +1,5 @@
+object @resource
+
+attributes :id, :pulp_id, :name, :filename
+attributes :created_at, :updated, :version, :arch, :release
+attributes :epoch, :checksum, :summary, :nvra

data/app/views/katello/api/v2/srpms/compare.json.rabl

@@ -0,0 +1,10 @@
+object false
+
+extends "katello/api/v2/common/metadata"
+
+child @collection[:results] => :results do
+  extends 'katello/api/v2/srpms/base'
+  node :comparison do |result|
+    result.comparison
+  end
+end

data/app/views/katello/api/v2/srpms/index.json.rabl

@@ -3,5 +3,5 @@ object false
 extends "katello/api/v2/common/metadata"
 
 child @collection[:results] => :results do
-  extends 'katello/api/v2/srpms/show'
+  extends 'katello/api/v2/srpms/base'
 end

data/app/views/katello/api/v2/srpms/show.json.rabl

@@ -1,5 +1,5 @@
 object @resource
 
-attributes :id, :pulp_id, :name, :filename
-attributes :created_at, :updated, :version, :arch, :release
-attributes :epoch, :checksum, :summary, :nvra
+extends "katello/api/v2/srpms/base"
+extends "katello/api/v2/srpms/backend",
+  :object => SmartProxy.pulp_master!.content_service("srpm").new(@resource.pulp_id)

data/config/routes/api/v2.rb

@@ -349,10 +349,12 @@ Katello::Engine.routes.draw do
               put :refresh_manifest
             end
           end
+
           api_resources :upstream_subscriptions, only: [:index, :create] do
             collection do
               delete :destroy
               put :update
+              get :ping
             end
           end
         end

data/db/seeds.d/109-katello-notification-blueprints.rb

@@ -22,7 +22,7 @@ blueprints = [
   {
     group: N_('Subscriptions'),
     name: 'manifest_expired_warning',
-    message: N_('The manifest imported within Organization %{subject} is no longer valid.  Attempted CDN access returned Forbidden.  Refreshing the manifest may resolve this issue.'),
+    message: N_('The manifest imported within Organization %{subject} is no longer valid. Please import a new manifest.'),
     level: 'warning'
   },
   {

data/lib/katello/permission_creator.rb

@@ -367,7 +367,7 @@ module Katello
                          :resource_type => 'Katello::Subscription'
       @plugin.permission :manage_subscription_allocations,
                          {
-                           'katello/api/v2/upstream_subscriptions' => [:index, :create, :destroy, :update]
+                           'katello/api/v2/upstream_subscriptions' => [:index, :create, :destroy, :update, :ping]
                          },
                          :resource_type => 'Katello::Subscription'
     end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.16.0.rc3.1".freeze
+  VERSION = "3.16.0.rc4".freeze
 end

data/package.json

@@ -29,8 +29,8 @@
     "@storybook/storybook-deployer": "^2.0.0",
     "@testing-library/jest-dom": "^5.3.0",
     "@testing-library/react": "^10.0.2",
-    "@theforeman/builder": "^4.2.0",
-    "@theforeman/vendor-dev": "^4.2.0",
+    "@theforeman/builder": "4.3.0",
+    "@theforeman/vendor-dev": "4.3.0",
     "axios-mock-adapter": "^1.10.0",
     "babel-eslint": "^10.0.3",
     "babel-jest": "^24.9.0",
@@ -56,8 +56,8 @@
     "react-test-renderer": "^16.0.0",
     "redux-mock-store": "^1.3.0"
   },
-  "_comment": "We don't include @theforeman/vendor because it's assumed to be present in Foreman",
   "dependencies": {
+    "@theforeman/vendor-core": "4.3.0",
     "@patternfly/react-icons": "^3.15.15",
     "@patternfly/react-tokens": "^2.8.13",
     "angular": "1.7.9",