katello 4.0.0.rc1 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3942a71eb36eb3e5c9e6adcf139e30a2443a038eea11c417e55c6b590580465f
-  data.tar.gz: f59fa795ac9c2298450020e4c8f90409691374acc1f09e1c49a88e661d06cdd6
+  metadata.gz: 02ff428534ded98d248efb23e9684364f8930cb1175c25a70ad3529963e435a0
+  data.tar.gz: 680e66df3f38df78a5feface53e92cc4129cc4a847fbd5e344ab63e5dd6bfd40
 SHA512:
-  metadata.gz: ff801d6c4540553020d70162d030def3a7782771f58fe8e85a81def49dd1abdb4abeab3b039ce56a2741636e745bba0887e0713ae534809e952ab0fc0482ba23
-  data.tar.gz: 4920f4ab7232331cc2d79a56f05625811a71f334e8909bab61a7d74cbbb8fbf345a9394a888bf44ca94dac9ae17dd4f53a069f6a7fd822926377dd8b9dc1c6ed
+  metadata.gz: 32ccbc77851e99ff2e16ebb36219871a0e086f86f60da1d3265e26cddbfdb7563c1363fc72ba5d3db34fb8360eb01ddb678fc882a41a16e635397631ab6b767e
+  data.tar.gz: 882219885a8aa1dd105a6b24a630092984d462fcac3a2030fa8fb3e6c112225ac48b00e746f7194bbb4e5ff2fb1d8766610b65434e0555958b4b251668be4cf6

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/content_exports_controller.rb

@@ -29,7 +29,7 @@ module Katello
 
     api :GET, "/content_exports/api_status", N_("true if the export api is pulp3 ready and usable. This API is intended for use by hammer-cli only.")
     def api_status
-      ::Foreman::Deprecation.api_deprecation_warning("/content_exports/api_status is being deprecated and will be removed in a future version of Katello.")
+      ::Foreman::Deprecation.api_deprecation_warning("/content_exports/api_status is being deprecated and will be removed in Katello 4.1.")
       render json: { api_usable: SmartProxy.pulp_primary.pulp3_repository_type_support?(Katello::Repository::YUM_TYPE) }, status: :ok
     end
 

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

@@ -9,7 +9,7 @@ module Katello
     param :content_view_id, :number, :desc => N_("content view identifier"), :required => true
     param :name, String, :desc => N_("name of the puppet module")
     param :author, String, :desc => N_("author of the puppet module")
-    param :uuid, String, :desc => N_("uuid of the puppet module"), :deprecated => true
+    param :uuid, String, :desc => N_("uuid of the puppet module")
     param_group :search, ::Katello::Api::V2::ApiController
     add_scoped_search_description_for(ContentViewPuppetModule)
     def index
@@ -22,7 +22,7 @@ module Katello
     param :name, String, :desc => N_("name of the puppet module")
     param :author, String, :desc => N_("author of the puppet module")
     param :id, String, :desc => N_("the id of the puppet module to associate")
-    param :uuid, String, :desc => N_("the uuid of the puppet module to associate"), :deprecated => true
+    param :uuid, String, :desc => N_("the uuid of the puppet module to associate")
     def create
       params[:content_view_puppet_module][:uuid] ||= PuppetModule.find(params[:id]).try(:pulp_id) if params[:id]
       respond resource: ContentViewPuppetModule.create!(puppet_module_params.merge(content_view: @view))
@@ -41,7 +41,7 @@ module Katello
     param :id, :number, :desc => N_("puppet module ID"), :required => true
     param :name, String, :desc => N_("name of the puppet module")
     param :author, String, :desc => N_("author of the puppet module")
-    param :uuid, String, :desc => N_("the uuid of the puppet module to associate"), :deprecated => true
+    param :uuid, String, :desc => N_("the uuid of the puppet module to associate")
     def update
       @puppet_module.update!(puppet_module_params)
       respond :resource => @puppet_module

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

@@ -95,7 +95,7 @@ module Katello
         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.")
+      ::Foreman::Deprecation.api_deprecation_warning("Pulp 2 export is deprecated and will not work as of Katello 4.0. To export using Pulp 3, use hammer content-export version.")
       if params[:export_to_iso].blank? && params[:iso_mb_size].present?
         fail HttpErrors::BadRequest, _("ISO export must be enabled when specifying ISO size")
       end

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

@@ -62,7 +62,7 @@ module Katello
       collection
     end
 
-    api :GET, "/content_view_versions/:id/available_errata", N_("Return errata that can be added to the Content View Version via an Incremental Update"), :deprecated => true
+    api :GET, "/content_view_versions/:id/available_errata", N_("Return errata that can be added to the Content View Version via an Incremental Update. Will be removed in Katello 4.1."), :deprecated => true
     param :id, :number, :desc => N_("Content View Version identifier"), :required => true
     param :organization_id, :number, :desc => N_("Organization identifier")
     param :content_view_filter_id, :number, :desc => N_("Content View Filter identifier")

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

@@ -51,11 +51,11 @@ module Katello
 
     api :PUT, "/hosts/:host_id/errata/apply", N_("Schedule errata for installation")
     param :host_id, :number, :desc => N_("Host ID"), :required => true
-    param :errata_ids, Array, :desc => N_("List of Errata ids to install"), :required => false, :deprecated => true
+    param :errata_ids, Array, :desc => N_("List of Errata ids to install. Will be removed in Katello 4.1."), :required => false, :deprecated => true
 
     param_group :bulk_errata_ids
     def apply
-      task = async_task(::Actions::Katello::Host::Erratum::Install, @host, @errata_ids)
+      task = async_task(::Actions::Katello::Host::Erratum::Install, @host, content: @errata_ids)
       respond_for_async :resource => task
     end
 

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

@@ -33,14 +33,14 @@ module Katello
     def install
       if params[:packages]
         packages = validate_package_list_format(params[:packages])
-        task     = async_task(::Actions::Katello::Host::Package::Install, @host, packages)
+        task     = async_task(::Actions::Katello::Host::Package::Install, @host, content: packages)
         respond_for_async :resource => task
         return
       end
 
       if params[:groups]
         groups = extract_group_names(params[:groups])
-        task   = async_task(::Actions::Katello::Host::PackageGroup::Install, @host, groups)
+        task   = async_task(::Actions::Katello::Host::PackageGroup::Install, @host, content: groups)
         respond_for_async :resource => task
       end
     end
@@ -51,7 +51,7 @@ module Katello
     def upgrade
       if params[:packages]
         packages = validate_package_list_format(params[:packages])
-        task     = async_task(::Actions::Katello::Host::Package::Update, @host, packages)
+        task     = async_task(::Actions::Katello::Host::Package::Update, @host, content: packages)
         respond_for_async :resource => task
       end
     end
@@ -59,7 +59,7 @@ module Katello
     api :PUT, "/hosts/:host_id/packages/upgrade_all", N_("Update packages remotely")
     param :host_id, :number, :required => true, :desc => N_("ID of the host")
     def upgrade_all
-      task = async_task(::Actions::Katello::Host::Package::Update, @host, [])
+      task = async_task(::Actions::Katello::Host::Package::Update, @host, content: [])
       respond_for_async :resource => task
     end
 
@@ -69,14 +69,14 @@ module Katello
     def remove
       if params[:packages]
         packages = validate_package_list_format(params[:packages])
-        task     = async_task(::Actions::Katello::Host::Package::Remove, @host, packages)
+        task     = async_task(::Actions::Katello::Host::Package::Remove, @host, content: packages)
         respond_for_async :resource => task
         return
       end
 
       if params[:groups]
         groups = extract_group_names(params[:groups])
-        task   = async_task(::Actions::Katello::Host::PackageGroup::Remove, @host, groups)
+        task   = async_task(::Actions::Katello::Host::PackageGroup::Remove, @host, content: groups)
         respond_for_async :resource => task
       end
     end

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

@@ -365,7 +365,7 @@ module Katello
         if params[:action] == :update_content && params[:update_all]
           content = []
         end
-        task = async_task(::Actions::BulkAction, PARAM_ACTIONS[params[:action]][params[:content_type]], @hosts, content)
+        task = async_task(Actions::Katello::BulkAgentAction, PARAM_ACTIONS[params[:action]][params[:content_type]], @hosts, content: content)
         respond_for_async :resource => task
       end
     end

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

@@ -22,7 +22,6 @@ module Katello
         param :smart_proxy_ids, Array, N_("Smart proxy IDs"), :required => false
         param :compute_resource_ids, Array, N_("Compute resource IDs"), :required => false
         param :medium_ids, Array, N_("Medium IDs"), :required => false
-        param :config_template_ids, Array, N_("Provisioning template IDs"), :required => false # FIXME: deprecated
         param :ptable_ids, Array, N_("Partition template IDs"), :required => false
         param :provisioning_template_ids, Array, N_("Provisioning template IDs"), :required => false
         param :domain_ids, Array, N_("Domain IDs"), :required => false

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

@@ -52,9 +52,9 @@ module Katello
       param :upstream_password, String, :desc => N_("Password of the upstream repository user used for authentication")
       param :ostree_upstream_sync_policy, ::Katello::RootRepository::OSTREE_UPSTREAM_SYNC_POLICIES, :desc => N_("policies for syncing upstream ostree repositories")
       param :ostree_upstream_sync_depth, :number, :desc => N_("if a custom sync policy is chosen for ostree repositories then a 'depth' value must be provided")
-      param :deb_releases, String, :desc => N_("comma-separated list of releases to be synced from deb-archive")
-      param :deb_components, String, :desc => N_("comma-separated list of repo components to be synced from deb-archive")
-      param :deb_architectures, String, :desc => N_("comma-separated list of architectures to be synced from deb-archive")
+      param :deb_releases, String, :desc => N_("whitespace-separated list of releases to be synced from deb-archive")
+      param :deb_components, String, :desc => N_("whitespace-separated list of repo components to be synced from deb-archive")
+      param :deb_architectures, String, :desc => N_("whitespace-separated list of architectures to be synced from deb-archive")
       param :ignorable_content, Array, :desc => N_("List of content units to ignore while syncing a yum repository. Must be subset of %s") % RootRepository::IGNORABLE_CONTENT_UNIT_TYPES.join(",")
       param :ansible_collection_requirements, String, :desc => N_("Contents of requirement yaml file to sync from URL")
       param :http_proxy_policy, ::Katello::RootRepository::HTTP_PROXY_POLICIES, :desc => N_("policies for HTTP proxy for content sync")

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

@@ -126,7 +126,7 @@ module Katello
     end
 
     def deprecated
-      ::Foreman::Deprecation.api_deprecation_warning("it will be removed in Katello 4.0, Please see /api/v2/simple_content_access")
+      ::Foreman::Deprecation.api_deprecation_warning("This will be removed in Katello 4.2, Please see /api/v2/simple_content_access")
     end
   end
 end

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/controllers/katello/concerns/smart_proxies_controller_extensions.rb

@@ -26,8 +26,7 @@ module Katello
         before_action :find_resource_and_status, :only => [:pulp_storage, :pulp_status]
 
         def pulp_storage
-          pulp_connection = @proxy_status[:pulp] || @proxy_status[:pulpnode]
-          @storage = pulp_connection.storage
+          @storage = @smart_proxy.pulp_disk_usage
           respond_to do |format|
             format.html { render :layout => false }
             format.json { render :json => {:success => true, :message => @storage} }

data/app/helpers/katello/concerns/smart_proxy_helper_extensions.rb

@@ -2,20 +2,21 @@ module Katello
   module Concerns
     module SmartProxyHelperExtensions
       def disks(storage)
-        mount_points = {}
-        disks = []
-        storage.each_value do |values|
-          mount = values['mounted']
-          mount_points[mount].nil? ? mount_points[mount] = [values['path']] : mount_points[mount] << values['path']
-          values['header'] = "#{mount_points[mount].to_sentence} (on #{values['filesystem']})"
-          values['available_percent'] = available_percent(values['percent'])
-          values['size_status'] = storage_warning(values['available'])
-          values['total'] = kb_to_actual(values.delete('1k-blocks'))
-          values['used'] = kb_to_actual(values['used'])
-          values['available'] = kb_to_actual(values['available'])
-          disks << values
+        storage.map do |values|
+          values['header'] = values['description']
+          values['available_percent'] = 100 - values['percentage']
+          values['size_status'] = storage_warning(values['free'])
+          values
+        end
+      end
+
+      def humanize_bytes(bytes)
+        mb = bytes / 1024 / 1024
+        if mb < 1000
+          "#{mb} MB"
+        else
+          "#{mb / 1024} GB"
         end
-        disks.group_by { |h| h['mounted'] }.map { |_, hs| hs.reduce(:merge) }
       end
 
       def boolean_to_icon(boolean)
@@ -24,12 +25,6 @@ module Katello
         icon_text(icon, '', :kind => 'pficon')
       end
 
-      def available_percent(percent_string)
-        used_percent = percent_string.delete('%').to_i
-        available_percent = 100 - used_percent
-        "#{available_percent}%"
-      end
-
       def download_policies
         policies = [
           {
@@ -54,7 +49,7 @@ module Katello
       end
 
       def storage_warning(available)
-        gb_size = available.to_i / 1_048_576
+        gb_size = available.to_i / 1_073_741_824
         case gb_size
         when 0..1
           "danger"

data/app/helpers/katello/katello_urls_helper.rb

@@ -20,7 +20,7 @@ module Katello
       "#{prefix}/pub/#{config}"
     end
 
-    def repository_url(content_path, content_type = 'repos', schema = 'http')
+    def repository_url(content_path, _content_type = nil, schema = 'http')
       return content_path if content_path =~ %r|^([\w\-\+]+)://|
       url = if @host.content_source
               "#{schema}://#{@host.content_source.hostname}"
@@ -33,7 +33,7 @@ module Katello
       end
       path = ::Katello::Glue::Pulp::Repos.repo_path_from_content_path(
         @host.lifecycle_environment, content_path)
-      "#{url}/pulp/#{content_type}/#{path}"
+      "#{url}/pulp/content/#{path}"
     end
   end
 end

data/app/lib/actions/katello/agent/dispatch_history_presenter.rb

@@ -0,0 +1,64 @@
+module Actions
+  module Katello
+    module Agent
+      class DispatchHistoryPresenter
+        def initialize(dispatch_history, action_type)
+          @result = dispatch_history&.result&.with_indifferent_access
+          @action_type = action_type
+        end
+
+        def humanized_output
+          return if @result.empty?
+
+          result = package_result
+
+          if result[:message]
+            result[:message]
+          elsif result[:packages].any?
+            packages = result[:packages].map { |package| package[:qname] }
+            packages.sort.join("\n")
+          else
+            humanized_no_package
+          end
+        end
+
+        def error_messages
+          messages = []
+          @result.each_value do |result|
+            if !result[:succeeded] && result.dig(:details, :message)
+              messages << result[:details][:message]
+            end
+          end
+          messages
+        end
+
+        private
+
+        def package_result
+          result = { packages: [] }
+
+          @result.each_value do |v|
+            if v[:succeeded]
+              result[:packages].concat(v[:details][:resolved] + v[:details][:deps])
+              break
+            else
+              result[:message] = v[:details][:message]
+              break
+            end
+          end
+
+          result
+        end
+
+        def humanized_no_package
+          case @action_type
+          when :content_install
+            _("No new packages installed")
+          when :content_uninstall
+            _("No packages removed")
+          end
+        end
+      end
+    end
+  end
+end