katello 3.18.1 → 3.18.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78239ba1e921e408588db439d4b929151e1a9c10408e23c63f0ec5c76a23c66b
-  data.tar.gz: f945779353ab8cedce6a30e33f5ac4a264f6790e486a00126f15d3862babdfce
+  metadata.gz: c9aff3d142eea532e4af243e46c2b98a4cc1016a60f652d2dd9514dc9f416371
+  data.tar.gz: ea80686280189f05d2ffcbfe8e3cf0406fa2b985082b43e15338f62bca099209
 SHA512:
-  metadata.gz: f5526ccfbae423e0315e89349253756acf60bb920c9e3f1e2b7f581f677312e19d0141a185f58adeea0b08dc4d1a2d323bd051404c6c0d54faedd06ed5667427
-  data.tar.gz: 5f7d476d2061439219dc468b5ead1291835fe68bfacf1396b54db46f3e9afe3ca13c3383e5d5ce92f1d07c76ab5a0f59cffa78cda0c9500345dc5813c6ea24dc
+  metadata.gz: b569aa5d2a488f3f248c4e29dfaf4c51ad1c014b9bcd2c20bf1c99f09f27d57b4490f1e8fd9c5f78b65a1f584e3f2f1262b91f6d0b57cb9c487781176a16de52
+  data.tar.gz: d0f344773b0172a608ca677effbb942fbf2b62386cf1179aefe3e8faf7fa5e0c16940cffb834a3e7be3007c6314525a09883989b51e714191160baa4dba65470

data/app/assets/stylesheets/katello/katello.scss

@@ -163,78 +163,6 @@ input:focus {
   @extend .status_exclamation_icon;
 }
 
-/* BUTTONS */
-input[type='submit'], button, .button {
-  font-size: 10px;
-  display: inline-block;
-  vertical-align: bottom;
-  background: -moz-linear-gradient(top, #f9f9f9, #f0f0f0, #e5e5e5, #e9e9e9);
-  background: -webkit-gradient(linear, left top, left bottom, from(#f9f9f9), color-stop(0.9, #e5e5e5), to(#e9e9e9));
-  box-shadow: none;
-  border: 1px solid darken($stroke_color, 20%);
-  color: #221e1f;
-  cursor: pointer;
-  padding: 4px 8px;
-  border-radius: 5px;
-  text-shadow: 0 1px 0 rgba($white_color, 1);
-  min-height: 14px;
-  .nomargin {
-    margin: 0;
-  }
-  &:hover {
-    background: -moz-linear-gradient(top, $white_color, $white_color, #cfcfcf);
-    background: -webkit-gradient(linear, left top, left bottom, from($white_color), color-stop(0.6, $white_color), to(#cfcfcf));
-    box-shadow: 0 1px 2px rgba(0,0,0,0.5);
-    text-decoration: none;
-    color: black;
-  }
-  &:active {
-    background: -moz-linear-gradient(top, #c2c3c0, #e4e5e4);
-    background: -webkit-gradient(linear, left top, left bottom, from(#c2c3c0), to(#e4e5e4));
-    box-shadow: none;
-    text-decoration: none;
-  }
-  &:focus {
-    text-decoration: none;
-    color: #000;
-    border-width: 2px;
-  }
-  &.dialogbutton {
-    float: right;
-    margin-left: 3px;
-    margin: 40px 4px 4px;
-  }
-  &.formbutton {
-    display: inline-block;
-    margin-left: 3px;
-    margin: 40px 4px 4px;
-  }
-  &.actionlink {
-    margin: 40px 0 0;
-  }
-  &.disabled, &[disabled] {
-    cursor: default;
-    background: transparent;
-    opacity: 0.4;
-
-    &:hover {
-      background: transparent;
-      box-shadow: none;
-    }
-  }
-  &.iconbutton {
-    display: inline-block;
-  }
-  &.tiny {
-    padding: 4px;
-    margin: 0;
-    &:active, &:focus {
-      margin: 0;
-      padding: 3px;
-    }
-  }
-}
-
 table {
   border-collapse: collapse;
   border: 1px solid $stroke_color;

data/app/controllers/katello/api/registry/registry_proxies_controller.rb

@@ -167,11 +167,9 @@ module Katello
       end
 
       if (manifest_response = redirect_client { Resources::Registry::Proxy.get(@_request.fullpath, headers) })
-        #when pulp 2 is removed, this should no longer be needed, and all clients should be redirected
-        logger.debug filter_sensitive_data(manifest_response)
+        #for some requests, we get a redirect, but for others we get the actual manifest in response
         results = JSON.parse(manifest_response)
-
-        response.header['Docker-Content-Digest'] = "sha256:#{Digest::SHA256.hexdigest(manifest_response)}"
+        response.header['Docker-Content-Digest'] = manifest_response.headers[:docker_content_digest]
         # https://docs.docker.com/registry/spec/manifest-v2-2/
         # If its v2 schema 2 only the mediaType attribute will be present in the manifest
         media_type = results['mediaType']
@@ -184,8 +182,8 @@ module Katello
                          'application/vnd.docker.distribution.manifest.v1+prettyjws'
                        end
         end
-
-        render json: manifest_response, content_type: media_type
+        response.headers['Content-Type'] = media_type
+        render json: manifest_response
       end
     end
 

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

@@ -39,8 +39,7 @@ module Katello
     end
 
     def deprecate_katello_agent
-      ::Foreman::Deprecation.api_deprecation_warning("Remote actions using katello-agent are deprecated and will be removed in Katello 4.0.  " \
-                                                         "You may consider switching to Remote Execution.")
+      ::Foreman::Deprecation.api_deprecation_warning("Katello-agent is deprecated and will be removed in a future release.")
     end
 
     def full_result_response(collection)

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

@@ -73,7 +73,7 @@ module Katello
       respond :resource => @filter
     end
 
-    api :delefind_filterte, "/content_views/:content_view_id/filters/:id", N_("delete a filter")
+    api :delete, "/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

data/app/controllers/katello/concerns/api/v2/authorization.rb

@@ -39,7 +39,20 @@ module Katello
       end
 
       def throw_resource_not_found(name: resource_name, id: params[:id])
-        fail HttpErrors::NotFound, _("Could not find %{name} resource with id %{id}") % {id: id, name: name}
+        perms_message = "Potential missing permissions: " +
+          missing_permissions.map(&:name).join(', ')
+        fail HttpErrors::NotFound, _("Could not find %{name} resource with id %{id}. %{perms_message}") % {id: id, name: name, perms_message: perms_message}
+      end
+
+      def missing_permissions
+        missing_perms = ::Foreman::AccessControl.permissions_for_controller_action(path_to_authenticate)
+
+        # promote_or_remove_content_views_to_environments has a special relationship to promote_or_remove_content_views
+        if path_to_authenticate["controller"] == "katello/api/v2/content_view_versions" &&
+            path_to_authenticate["action"].in?(["promote", "remove_from_environment", "remove", "republish_repositories"])
+          missing_perms << ::Permission.find_by(name: "promote_or_remove_content_views_to_environments")
+        end
+        missing_perms
       end
 
       def throw_resources_not_found(name:, expected_ids: [])

data/app/lib/actions/katello/host/update_system_purpose.rb

@@ -14,7 +14,7 @@ module Actions
             host.subscription_facet.purpose_addons = purpose_addon_objects
           end
 
-          host.subscription_facet.save!
+          host.save!
           plan_self(:hostname => host.name)
         end
 

data/app/lib/actions/katello/orphan_cleanup/remove_orphans.rb

@@ -8,7 +8,7 @@ module Actions
         def plan(proxy)
           sequence do
             plan_action(Actions::Pulp::Orchestration::OrphanCleanup::RemoveOrphans, proxy)
-            if proxy.pulp3_enabled?
+            if proxy.pulp3_enabled? && ::Katello::Ping.pulpcore_enabled
               plan_action(
                 Actions::Pulp3::Orchestration::OrphanCleanup::RemoveOrphans,
                 proxy)

data/app/lib/actions/katello/repository/sync.rb

@@ -72,7 +72,11 @@ module Actions
               end
               plan_self(:id => repo.id, :sync_result => output, :skip_metadata_check => skip_metadata_check, :validate_contents => validate_contents,
                         :contents_changed => contents_changed)
-              plan_action(Katello::Repository::ImportApplicability, :repo_id => repo.id, :contents_changed => contents_changed) if generate_applicability
+
+              if generate_applicability && !SETTINGS[:katello][:katello_applicability]
+                plan_action(Katello::Repository::ImportApplicability, :repo_id => repo.id, :contents_changed => contents_changed)
+              end
+
               plan_action(Katello::Repository::SyncHook, :id => repo.id)
             end
           end

data/app/lib/actions/pulp3/content_migration_reset.rb

@@ -0,0 +1,22 @@
+module Actions
+  module Pulp3
+    class ContentMigrationReset < Pulp3::AbstractAsyncTask
+      def plan(smart_proxy)
+        plan_self(smart_proxy_id: smart_proxy.id)
+      end
+
+      def invoke_external_task
+        migration_service = ::Katello::Pulp3::Migration.new(smart_proxy)
+        migration_service.reset
+      end
+
+      def humanized_name
+        _("Content Migration Reset")
+      end
+
+      def rescue_strategy
+        Dynflow::Action::Rescue::Skip
+      end
+    end
+  end
+end

data/app/lib/katello/util/hostgroup_facets_helper.rb

@@ -0,0 +1,126 @@
+# Used exclusively by fix_hostgroup_facets.rake task
+module Katello
+  module Util
+    class HostgroupFacetsHelper
+      def initialize
+        @logger = Logger.new($stdout)
+      end
+
+      def interested_hostgroups
+        groups = ::Hostgroup.unscoped.where(
+                    id: Katello::Hostgroup::ContentFacet.
+                        where(content_source_id: nil,
+                              kickstart_repository_id: nil,
+                              content_view_id: nil,
+                              lifecycle_environment_id: nil).select(:hostgroup_id))
+        parents = groups.select { |group| group.parent.blank? }
+        children = groups.reject { |group| group.parent.blank? }
+        # we want the parents to get created before the children
+        # hence the order
+        parents + children
+      end
+
+      def pick_facet_values(hg)
+        # This call looks at the audit logs for a host group.
+        # Pries out information related to lce, ks, cv and content_source_id from the audit logs.
+        # The audit logs typically only contain updates.
+        # So if the user changed  just the content_view_id, then that is the only thing marked as audited_changes.
+        # Hence we need to go through all the audit logs until we have information on lce, ks, cv and cs.
+        # If there was only one audit log and that was during the creation of hostgroup
+        # the audited changes look like this
+        # ```ruby
+        # {
+        #  content_view_id: 10,
+        #  kickstart_repository_id: 1000
+        #  ......
+        # }
+        # ```
+        # However if you updated the hostgroup and set the kickstart_repository_id, or
+        # content_view_id then audited changes look like
+        # ```ruby
+        # {
+        #  content_view_id: [10, 11],
+        #  kickstart_repository_id: [1000, 1200]
+        #  ......
+        # }
+        # ```
+        # So the code says "if the attribute value is an array pick the last value else just keep the value as it is "
+
+        # Further along it is to be noted that `hostgroup.audits` returns the audits ordered by the version number in ascending order, so the latest audit will be `hostgroup.audits.last`
+
+        # We want to iterate though each audit from latest audit to start, and as soon as we find a  content_view_id key or kickstart_repository_id key or lifecycle environment_id key  or content_source_id key we want it to be set once.
+
+        # So if I had an audit history like
+        # ``` ruby
+        # {
+        #  content_view_id: 10,
+        #  kickstart_repository_id: 1000,
+        #  version:1
+        #  ......
+        # },
+        # {
+        #  content_view_id: [10, 11],
+        #  kickstart_repository_id: [1000, 1200],
+        #   version: 2
+        #  ......
+        # }
+        # ```
+
+        # The code would start at version 2, notice that cv_id and ks_repo were set there
+        # and keep them as the final.
+        # So when it goes to version 1 since cv_id and ks_repo are already set,
+        # it will ignore. It will finally
+        # return {content_view_id: 11, kickstart_repository_id: 1200}
+        facet_values = {}
+        hg.audits.reverse_each do |audit|
+          hg_changes = audit.audited_changes.slice("lifecycle_environment_id",
+                                                   "kickstart_repository_id",
+                                                   "content_view_id",
+                                                   "content_source_id")
+          facet_values = hg_changes.merge(facet_values)
+        end
+
+        values = facet_values.map do |k, v|
+          v = v[-1] if v.is_a? Array
+          [k, v]
+        end
+        values.to_h.with_indifferent_access
+      end
+
+      def main
+        bad_hgs = []
+        good_hgs = []
+
+        groups = interested_hostgroups.each do |hg|
+          facet = hg.content_facet
+          values = pick_facet_values(hg)
+          if !values.empty? && facet.update(values)
+            good_hgs << { hostgroup: hg, facet_values: values }
+          else
+            bad_hgs << { hostgroup: hg, facet_values: values }
+            facet.save(validate: false)
+          end
+        end
+
+        unless bad_hgs.empty?
+          @logger.warn "Some of the hostgroups reported a validation error. "\
+                        "The hostgroups have been updated. "\
+                        "Check via the Web UI."
+
+          bad_hgs.each do |bad_group|
+            @logger.warn "Hostgroup #{bad_group[:hostgroup]}"
+            @logger.warn "Facet Values #{bad_group[:facet_values]}"
+          end
+        end
+        unless good_hgs.empty?
+          @logger.info "Following hostgroups were succesfully updated."
+          good_hgs.each do |good_group|
+            @logger.info "Hostgroup #{good_group[:hostgroup]}"
+            @logger.info "Facet Values #{good_group[:facet_values]}"
+          end
+        end
+        @logger.info("#{groups.count} Hostgroup(s) were updated.")
+      end
+    end
+  end
+end

data/app/lib/katello/util/pulpcore_content_filters.rb

@@ -8,7 +8,7 @@ module Katello
       def filter_package_groups_by_pulp_href(package_groups, package_pulp_hrefs)
         rpms = Katello::Rpm.where(:pulp_id => package_pulp_hrefs)
         package_groups.reject do |package_group|
-          (package_group.package_names & rpms.pluck(:name)).empty?
+          (package_group.package_names - rpms.pluck(:name)).any?
         end
       end
 

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

@@ -107,7 +107,9 @@ module Katello
         return true unless operatingsystem
 
         if operatingsystem.respond_to? :kickstart_repos
-          return operatingsystem.kickstart_repos(self).any? { |repo| repo[:id] == (content_facet&.kickstart_repository_id || content_facet&.kickstart_repository&.id) }
+          operatingsystem.kickstart_repos(self, content_facet: content_facet).any? do |repo|
+            repo[:id] == (content_facet&.kickstart_repository_id || content_facet&.kickstart_repository&.id)
+          end
         end
       end
 
@@ -126,7 +128,7 @@ module Katello
           facet_model = Facets.registered_facets[facet].hostgroup_configuration.model
           value = facet_model.where.not(attribute => nil).joins(:hostgroup).merge(
             ::Hostgroup.where(id: self.ancestor_ids).reorder(ancestry: :desc)
-          ).limit(1).pluck(attribute)
+          ).limit(1).pluck(attribute).first
         end
         value
       end

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

@@ -218,6 +218,18 @@ module Katello
       def db_values(new_ids, pulp_id_href_map, repository)
         new_ids.map { |unit_id| [unit_id.to_i, pulp_id_href_map.dig(unit_id), repository.id.to_i, Time.now.utc.to_s(:db), Time.now.utc.to_s(:db)].compact }
       end
+
+      def unmigrated_content
+        self.where(migrated_pulp3_href: nil, ignore_missing_from_migration: false)
+      end
+
+      def missing_migrated_content #missing or corrupted content that could not be migrated
+        self.where(migrated_pulp3_href: nil, missing_from_migration: true, ignore_missing_from_migration: false)
+      end
+
+      def ignored_missing_migrated_content
+        self.where(migrated_pulp3_href: nil, missing_from_migration: true, ignore_missing_from_migration: true)
+      end
     end
   end
 end

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

@@ -42,10 +42,11 @@ module Katello
         end
       end
 
-      def kickstart_repos(host)
-        distros = distribution_repositories(host).where(distribution_bootable: true)
-        if distros && host.content_source
-          distros.map { |distro| distro.to_hash(host.content_source) }
+      def kickstart_repos(host, content_facet: nil)
+        distros = distribution_repositories(host, content_facet: content_facet).where(distribution_bootable: true)
+        content_facet ||= host.content_facet
+        if distros && content_facet&.content_source
+          distros.map { |distro| distro.to_hash(content_facet.content_source) }
         else
           []
         end
@@ -65,10 +66,10 @@ module Katello
         end
       end
 
-      def distribution_repositories(host)
-        content_view = host.try(:content_facet).try(:content_view) || host.try(:content_view)
-        lifecycle_environment = host.try(:content_facet).try(:lifecycle_environment) || host.try(:lifecycle_environment)
-
+      def distribution_repositories(host, content_facet: nil)
+        content_facet ||= host.content_facet
+        content_view = content_facet.try(:content_view) || host.try(:content_view)
+        lifecycle_environment = content_facet.try(:lifecycle_environment) || host.try(:lifecycle_environment)
         if content_view && lifecycle_environment && host.os && host.architecture
           Katello::Repository.in_environment(lifecycle_environment).in_content_views([content_view]).
               where(:distribution_arch => host.architecture.name).

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

@@ -179,7 +179,9 @@ module Katello
       end
 
       def fix_pulp3_capabilities(type)
-        if missing_pulp3_capabilities? && !pulp2_preferred_for_type?(type)
+        repository_type_obj = type.is_a?(String) ||  type.is_a?(Symbol) ? Katello::RepositoryTypeManager.repository_types[type] : type
+
+        if missing_pulp3_capabilities? && repository_type_obj.pulp3_plugin && !pulp2_preferred_for_type?(repository_type_obj.id)
           self.refresh
           if self.capabilities(::SmartProxy::PULP3_FEATURE).empty?
             fail Katello::Errors::PulpcoreMissingCapabilities

data/app/models/katello/file_unit.rb

@@ -13,6 +13,10 @@ module Katello
       order(:name)
     end
 
+    def filename
+      path
+    end
+
     def self.total_for_repositories(repos)
       self.in_repositories(repos).count
     end