katello 3.18.0 → 3.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbd0716cd63dcfb9f135e084f2dcd07401019b45f4a0c6c4f61ddf0953fbb00b
-  data.tar.gz: d7ae76869fc68b2046637b8eb116f9f23048b0f5dce7042b3c65d77556d9d7c4
+  metadata.gz: 78239ba1e921e408588db439d4b929151e1a9c10408e23c63f0ec5c76a23c66b
+  data.tar.gz: f945779353ab8cedce6a30e33f5ac4a264f6790e486a00126f15d3862babdfce
 SHA512:
-  metadata.gz: b86b93fe297e88ea9c5bac35ae1dbc746ffd2ddcbfdd06046552cef774153182ab5938483ff6663d6d382613603066ede7a0cccc99386d3def6c63db46194f2b
-  data.tar.gz: 3813c0ec50e517fbe18575d033322e0ee7df5f63b5aad7abe514e62eda523339e6f3d9a54c1734e5fdc07031217fff59ece0dc17b4d02f1e28b86db93dbb13dd
+  metadata.gz: f5526ccfbae423e0315e89349253756acf60bb920c9e3f1e2b7f581f677312e19d0141a185f58adeea0b08dc4d1a2d323bd051404c6c0d54faedd06ed5667427
+  data.tar.gz: 5f7d476d2061439219dc468b5ead1291835fe68bfacf1396b54db46f3e9afe3ca13c3383e5d5ce92f1d07c76ab5a0f59cffa78cda0c9500345dc5813c6ea24dc

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

@@ -267,8 +267,9 @@ module Katello
     api :POST, "/hosts/bulk/available_incremental_updates", N_("Given a set of hosts and errata, lists the content view versions" \
                                                                  " and environments that need updating.")
     param_group :bulk_params
-    param :errata_ids, Array, :desc => N_("List of Errata ids")
+    param :errata_ids, Array, :desc => N_("List of Errata ids"), :required => true
     def available_incremental_updates
+      fail HttpErrors::BadRequest, _("errata_ids is a required parameter") if params[:errata_ids].empty?
       version_environments = {}
       content_facets = Katello::Host::ContentFacet.with_non_installable_errata(@errata, @hosts)
 

data/app/lib/actions/katello/capsule_content/sync_capsule.rb

@@ -19,9 +19,14 @@ module Actions
                                     Actions::Pulp3::CapsuleContent::Sync],
                                      repo, smart_proxy,
                                      skip_metadata_check: skip_metadata_check)
+                end
+              end
+
+              concurrence do
+                repo_batch.each do |repo|
                   if repo.is_a?(::Katello::Repository) &&
-                    repo.distribution_bootable? &&
-                    repo.download_policy == ::Runcible::Models::YumImporter::DOWNLOAD_ON_DEMAND
+                      repo.distribution_bootable? &&
+                      repo.download_policy == ::Runcible::Models::YumImporter::DOWNLOAD_ON_DEMAND
                     plan_action(Katello::Repository::FetchPxeFiles,
                                 id: repo.id,
                                 capsule_id: smart_proxy.id)

data/app/lib/actions/katello/content_view_version/incremental_update.rb

@@ -352,20 +352,36 @@ module Actions
         end
 
         def copy_yum_content(new_repo, dep_solve, package_ids, errata_ids)
+          return [] unless new_repo.content_type == ::Katello::Repository::YUM_TYPE
+
           copy_outputs = []
-          if new_repo.content_type == ::Katello::Repository::YUM_TYPE
-            unless errata_ids.blank?
+
+          unless errata_ids.blank?
+            content_present_in_this_repo = new_repo
+                                            .library_instance
+                                            .errata
+                                            .with_identifiers(errata_ids)
+                                            .exists?
+            if content_present_in_this_repo
               copy_outputs << plan_action(Pulp::Repository::CopyUnits, new_repo.library_instance, new_repo,
                                           ::Katello::Erratum.with_identifiers(errata_ids),
                                           incremental_update: dep_solve).output
             end
+          end
 
-            unless package_ids.blank?
+          unless package_ids.blank?
+            content_present_in_this_repo = new_repo
+                                            .library_instance
+                                            .rpms
+                                            .with_identifiers(package_ids)
+                                            .exists?
+            if content_present_in_this_repo
               copy_outputs << plan_action(Pulp::Repository::CopyUnits, new_repo.library_instance, new_repo,
                                           ::Katello::Rpm.with_identifiers(package_ids),
                                           incremental_update: dep_solve).output
             end
           end
+
           copy_outputs
         end
 

data/app/lib/actions/middleware/record_smart_proxy_sync_history.rb

@@ -1,12 +1,32 @@
 module Actions
   module Middleware
     class RecordSmartProxySyncHistory < Dynflow::Middleware
-      def run(*args)
+      def save_smart_proxy_sync_history
         if (action.input[:repository_id] && (action.input[:smart_proxy_id] || action.input[:capsule_id]) && !self.action.output[:smart_proxy_history_id])
-          repo = ::Katello::Repository.find(action.input[:repository_id])
+          repo_id = action.input[:repository_id]
+          repo = ::Katello::Repository.find_by(id: repo_id)
           smart_proxy_id = action.input[:smart_proxy_id] || action.input[:capsule_id]
-          smart_proxy = ::SmartProxy.find(smart_proxy_id)
-          self.action.output[:smart_proxy_history_id] = repo.create_smart_proxy_sync_history(smart_proxy)
+          smart_proxy = ::SmartProxy.find_by(id: smart_proxy_id)
+
+          #skip pulp2 puppet syncs
+          if (repo_pulp_id = action.input[:repo_pulp_id])
+            return if ::Katello::ContentViewPuppetEnvironment.find_by(pulp_id: repo_pulp_id)
+          end
+
+          if repo && smart_proxy
+            self.action.output[:smart_proxy_history_id] = repo.create_smart_proxy_sync_history(smart_proxy)
+          else
+            fail "Smart Proxy could not be found with id #{smart_proxy_id}" if smart_proxy.nil?
+            fail "Repository could not be found with id #{repo_id}" if repo.nil?
+          end
+        end
+      end
+
+      def run(*args)
+        begin
+          save_smart_proxy_sync_history
+        rescue => error
+          Rails.logger.error("Error saving smart proxy history: #{error.message}")
         end
         pass(*args)
       end

data/app/lib/actions/pulp3/orchestration/content_view_version/export.rb

@@ -76,8 +76,10 @@ module Actions
                                                        content_view_version: cvv,
                                                        smart_proxy: smart_proxy,
                                                        from_content_view_version: from_cvv).generate_metadata
-            toc = Dir.glob("#{path}/*toc.json").first
-            export_metadata[:toc] = File.basename(toc) if toc
+
+            toc_path_info = output[:exported_file_checksum].find { |item| item.first.end_with?("toc.json") }
+            export_metadata[:toc] = File.basename(toc_path_info.first)
+
             history = ::Katello::ContentViewVersionExportHistory.create!(
               content_view_version_id: input[:content_view_version_id],
               destination_server: input[:destination_server],

data/app/lib/actions/pulp3/orchestration/content_view_version/import.rb

@@ -36,10 +36,6 @@ module Actions
           def humanized_name
             _("Import")
           end
-
-          def rescue_strategy
-            Dynflow::Action::Rescue::Skip
-          end
         end
       end
     end

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

@@ -91,6 +91,13 @@ module Katello
         service_class.pulp_units_batch_all(pulp_ids).each do |units|
           units.each do |unit|
             unit = unit.with_indifferent_access
+            if content_type == 'rpm' && repository
+              rpms_to_disassociate = ::Katello::Rpm.where(name: unit[:name], version: unit[:version], release: unit[:release],
+                                                          epoch: unit[:epoch], arch: unit[:arch]).select(:id)
+              if rpms_to_disassociate.any?
+                ::Katello::RepositoryRpm.where(rpm_id: rpms_to_disassociate, repository_id: repository.id).destroy_all
+              end
+            end
             model = Katello::Util::Support.active_record_retry do
               self.where(:pulp_id => unit[service_class.unit_identifier]).first_or_create
             end

data/app/models/katello/host/subscription_facet.rb

@@ -282,6 +282,10 @@ module Katello
         name.gsub('_', '-').chomp('.').downcase
       end
 
+      def unsubscribed_hypervisor?
+        self.hypervisor && !self.candlepin_consumer.entitlements?
+      end
+
       def candlepin_consumer
         @candlepin_consumer ||= Katello::Candlepin::Consumer.new(self.uuid, self.host.organization.label)
       end

data/app/models/katello/subscription_status.rb

@@ -43,9 +43,10 @@ module Katello
 
     def to_status(options = {})
       return UNKNOWN unless host.subscription_facet.try(:uuid)
-      status_override = 'unsubscribed_hypervisor' if host.subscription_facet.hypervisor && !host.subscription_facet.candlepin_consumer.entitlements?
+      return DISABLED if host.organization.simple_content_access?
+      status_override = 'unsubscribed_hypervisor' if host.subscription_facet.unsubscribed_hypervisor?
       status_override ||= options.fetch(:status_override, nil)
-      status = status_override || Katello::Candlepin::Consumer.new(host.subscription_facet.uuid, host.organization.label).entitlement_status
+      status = status_override || host.subscription_facet.candlepin_consumer.entitlement_status
 
       case status
       when Katello::Candlepin::Consumer::ENTITLEMENTS_DISABLED

data/app/services/katello/applicability/applicable_content_helper.rb

@@ -78,7 +78,8 @@ module Katello
           joins("INNER JOIN katello_installed_packages ON
             katello_rpms.name = katello_installed_packages.name AND
             katello_rpms.arch = katello_installed_packages.arch AND
-            katello_rpms.evr > katello_installed_packages.evr").
+            katello_rpms.evr > katello_installed_packages.evr AND
+            katello_installed_packages.id in (#{newest_distinct_installed_packages_query})").
           joins("LEFT JOIN katello_module_stream_rpms ON
             katello_rpms.id = katello_module_stream_rpms.rpm_id").
           joins("INNER JOIN katello_host_installed_packages ON
@@ -92,6 +93,16 @@ module Katello
             :enabled_module_streams => enabled_module_stream_ids).pluck(:id).uniq
       end
 
+      def newest_distinct_installed_packages_query
+        "SELECT DISTINCT ON (katello_installed_packages.name) katello_installed_packages.id " \
+          "FROM katello_installed_packages INNER JOIN " \
+          "katello_host_installed_packages ON " \
+          "katello_installed_packages.id = " \
+          "katello_host_installed_packages.installed_package_id " \
+          "WHERE katello_host_installed_packages.host_id = " \
+          "#{content_facet.host.id} ORDER BY katello_installed_packages.name, katello_installed_packages.evr DESC"
+      end
+
       def applicable_differences
         consumer_ids = content_facet.send(applicable_units).pluck("#{content_unit_class.table_name}.id")
         content_ids = fetch_content_ids

data/app/services/katello/pulp3/content_view_version/import_validator.rb

@@ -2,7 +2,6 @@ module Katello
   module Pulp3
     module ContentViewVersion
       class ImportValidator
-        BASEDIR = '/var/lib/pulp'.freeze
         attr_accessor :metadata, :path, :content_view
         def initialize(content_view:, path:, metadata:)
           self.content_view = content_view
@@ -11,7 +10,6 @@ module Katello
         end
 
         def check!
-          check_permissions!
           unless content_view.default?
             ensure_importing_cvv_does_not_exist!
             ensure_from_cvv_exists!
@@ -71,34 +69,6 @@ module Katello
           end
         end
 
-        def check_permissions!
-          fail _("Invalid path specified.") if path.blank? || !File.directory?(path)
-          fail _("The import path must be in a subdirectory under '%s'." % BASEDIR) unless path.starts_with?(BASEDIR)
-          fail _("Pulp user or group unable to read content in '%s'." % path) unless pulp_user_accessible?(path)
-
-          Dir.glob("#{path}/*").each do |file|
-            fail _("Pulp user or group unable to read '%s'." % file) unless pulp_user_accessible?(file)
-          end
-          toc_path = "#{path}/#{metadata[:toc]}"
-          fail _("The TOC file specified in the metadata does not exist. %s " % toc_path) unless File.exist?(toc_path)
-        end
-
-        def pulp_user_accessible?(path)
-          pulp_info = fetch_pulp_user_info
-          return false if pulp_info.blank?
-
-          stat = File.stat(path)
-          stat.gid.to_s == pulp_info.gid ||
-            stat.uid.to_s == pulp_info.uid ||
-            stat.mode.to_s(8)[-1].to_i >= 4
-        end
-
-        def fetch_pulp_user_info
-          pulp_user = nil
-          Etc.passwd { |u| pulp_user = u if u.name == 'pulp' }
-          pulp_user
-        end
-
         def generate_product_repo_i18n_string(product_repos)
           # product_repos look like [["prod1", "repo1", false], ["prod2", "repo2", false]]
           product_repos.map do |product, repo, redhat|

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

@@ -4,6 +4,12 @@ extends "katello/api/v2/content_views/base"
 
 attributes :content_host_count
 
+node :errors do
+  unless @resource.valid?
+    attribute :messages => @resource.errors.full_messages
+  end
+end
+
 child :duplicate_repositories_to_publish => :duplicate_repositories_to_publish do
   attributes :id, :name
   node :components do |repo|

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/content-view-version-deletion-activation-keys.controller.js

@@ -16,16 +16,20 @@
 angular.module('Bastion.content-views').controller('ContentViewVersionDeletionActivationKeysController',
     ['$scope', '$location', 'Organization', 'CurrentOrganization', 'Nutupane', 'ActivationKey',
     function ($scope, $location, Organization, CurrentOrganization, Nutupane, ActivationKey) {
-        var params, nutupane;
+        var params, nutupane, nutupaneParams;
 
         $scope.validateEnvironmentSelection();
         params = {
             'organization_id': CurrentOrganization,
-            'content_view_id': $scope.contentView.id,
             'sort_by': 'name',
             'sort_order': 'ASC'
         };
-        nutupane = new Nutupane(ActivationKey, params);
+
+        nutupaneParams = {
+            'disableAutoLoad': true
+        };
+
+        nutupane = new Nutupane(ActivationKey, params, undefined, nutupaneParams);
         $scope.controllerName = 'katello_activation_keys';
 
         nutupane.searchTransform = function (term) {
@@ -43,6 +47,7 @@ angular.module('Bastion.content-views').controller('ContentViewVersionDeletionAc
 
             return term + " AND " + addition;
         };
+        nutupane.load();
 
         $scope.table = nutupane.table;
         $scope.table.closeItem = function () {};

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/content-view-version-deletion-content-hosts.controller.js

@@ -17,16 +17,20 @@ angular.module('Bastion.content-views').controller('ContentViewVersionDeletionCo
     ['$scope', '$location', 'Organization', 'CurrentOrganization', 'Nutupane', 'Host',
     function ($scope, $location, Organization, CurrentOrganization, Nutupane, Host) {
 
-        var params, nutupane;
+        var params, nutupane, nutupaneParams;
 
         $scope.validateEnvironmentSelection();
         params = {
             'organization_id': CurrentOrganization,
-            'content_view_id': $scope.contentView.id,
             'sort_by': 'name',
             'sort_order': 'ASC'
         };
-        nutupane = new Nutupane(Host, params);
+
+        nutupaneParams = {
+            'disableAutoLoad': true
+        };
+
+        nutupane = new Nutupane(Host, params, undefined, nutupaneParams);
         $scope.controllerName = 'hosts';
 
         nutupane.searchTransform = function (term) {
@@ -44,6 +48,8 @@ angular.module('Bastion.content-views').controller('ContentViewVersionDeletionCo
 
             return term + " AND " + addition;
         };
+
+        nutupane.load();
         $scope.table = nutupane.table;
         $scope.table.closeItem = function () {};
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-details.html

@@ -13,7 +13,7 @@
   </div>
 
   <nav data-block="item-actions">
-    <button type="button" class="btn btn-primary" ng-hide="denied('publish_content_views', contentView) || contentView.import_only"
+    <button type="button" class="btn btn-primary" ng-hide="denied('publish_content_views', contentView) || contentView.import_only" 
             ui-sref="content-view.publish">
       <span translate>Publish New Version</span>
     </button>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-publish.html

@@ -7,6 +7,10 @@
   It can be promoted to other environments from the Versions tab of this Content View.
 </p>
 
+<div bst-alert="warning" ng-show="contentView.errors['messages'].length > 0">
+  <span translate>{{contentView.errors['messages'][0]}}</span>
+  </div>
+
 <header class="details-header">
   <h3 translate>Version Details</h3>
 </header>

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.18.0".freeze
+  VERSION = "3.18.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.18.0
+  version: 3.18.1
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-10 00:00:00.000000000 Z
+date: 2021-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails