katello 4.17.0 → 4.18.0.rc1

data/app/assets/javascripts/katello/locale/zh_TW/katello.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "katello": {
       "": {
-        "Project-Id-Version": "katello 4.17.0.pre.master",
+        "Project-Id-Version": "katello 4.18.0.pre.master",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2017-12-19 20:14+0000",
         "Last-Translator": "Bryan Kearney <bryan.kearney@gmail.com>, 2024",
@@ -801,6 +801,9 @@
       "Application": [
         "應用程式"
       ],
+      "Application name": [
+        ""
+      ],
       "Apply": [
         "套用"
       ],
@@ -1041,6 +1044,9 @@
       "Below are the repository sets currently available for this content host. For Red Hat subscriptions, additional content can be made available through the {rhrp}. Changing default settings requires subscription-manager 1.10 or newer to be installed on this host.": [
         ""
       ],
+      "Below you can add content overrides, which change whether a repository is enabled or disabled. Change their state one by one, or use the checkboxes and select an action to perform.": [
+        ""
+      ],
       "Beta": [
         "Beta"
       ],
@@ -1200,6 +1206,9 @@
       "Cannot add composite versions to another composite content view": [
         "無法新增複合式版本至另一個複合式內容視域中"
       ],
+      "Cannot add container push repositories to a rolling content view": [
+        ""
+      ],
       "Cannot add content view environments from a different organization": [
         ""
       ],
@@ -1377,6 +1386,12 @@
       "Change host content source": [
         ""
       ],
+      "Change the status of at least one repository.": [
+        ""
+      ],
+      "Changed status": [
+        ""
+      ],
       "Changing a host's content source will change the Smart Proxy from which the host gets its content.": [
         ""
       ],
@@ -1671,6 +1686,9 @@
       "Content override search parameters": [
         ""
       ],
+      "Content overrides updating.": [
+        ""
+      ],
       "Content source": [
         ""
       ],
@@ -1854,6 +1872,9 @@
       "Could not find environments for promotion": [
         ""
       ],
+      "Could not find product with name '%{name}' in organization id %{org_id}.": [
+        ""
+      ],
       "Could not locate Pulp distribution.": [
         ""
       ],
@@ -1965,6 +1986,9 @@
       "Create Export History": [
         ""
       ],
+      "Create Flatpak Remote": [
+        ""
+      ],
       "Create Import History": [
         ""
       ],
@@ -2157,6 +2181,12 @@
       "Default and Rolling content view versions cannot be promoted": [
         ""
       ],
+      "Default custom non-yum repository mirroring policy": [
+        ""
+      ],
+      "Default custom yum repository mirroring policy": [
+        ""
+      ],
       "Default download policy for Smart Proxy syncs (either 'inherit', immediate', or 'on_demand')": [
         ""
       ],
@@ -2184,6 +2214,12 @@
       "Default location for subscribed hosts": [
         ""
       ],
+      "Default mirroring policy for custom non-yum repositories (either 'mirror_content_only' or 'additive')": [
+        ""
+      ],
+      "Default mirroring policy for custom yum repositories (either 'mirror_content_only', 'additive' or 'mirror_complete')": [
+        ""
+      ],
       "Default partitioning table for new Operating Systems created from synced content": [
         ""
       ],
@@ -2238,6 +2274,9 @@
       "Delete Activation Key": [
         "刪除啟動金鑰"
       ],
+      "Delete Flatpak remote?": [
+        ""
+      ],
       "Delete Host upon unregister": [
         ""
       ],
@@ -2481,12 +2520,18 @@
       "Duration": [
         "持續時間"
       ],
+      "During incremental update, the previous content view version '%s' could not be found.": [
+        ""
+      ],
       "ERRATA ADVISORY": [
         "勘誤諮詢"
       ],
       "Edit": [
         "編輯"
       ],
+      "Edit Flatpak Remote": [
+        ""
+      ],
       "Edit RPM rule": [
         ""
       ],
@@ -2946,15 +2991,33 @@
       "Finished": [
         "已完成"
       ],
+      "Flatpak Remote ${name} created": [
+        ""
+      ],
+      "Flatpak Remote Details": [
+        ""
+      ],
       "Flatpak Remotes": [
         ""
       ],
+      "Flatpak remote could not be deleted: ": [
+        ""
+      ],
+      "Flatpak remote deleted": [
+        ""
+      ],
       "Flatpak remote numeric identifier": [
         ""
       ],
       "Flatpak remote repository numeric identifier": [
         ""
       ],
+      "Flatpak remote scan could not be started: ": [
+        ""
+      ],
+      "Flatpak remote updated": [
+        ""
+      ],
       "Force": [
         ""
       ],
@@ -3252,6 +3315,9 @@
       "How to order the sorted results (e.g. ASC for ascending)": [
         "如何排序結果的順序（比方說 ASC 從下到上）"
       ],
+      "ID": [
+        ""
+      ],
       "ID of a HTTP Proxy": [
         ""
       ],
@@ -3978,6 +4044,9 @@
       "Last checkin": [
         ""
       ],
+      "Last mirrored": [
+        ""
+      ],
       "Last published": [
         ""
       ],
@@ -4392,6 +4461,9 @@
       "Manage packages": [
         ""
       ],
+      "Manage repository sets": [
+        ""
+      ],
       "Manifest": [
         ""
       ],
@@ -4494,12 +4566,21 @@
       "Minimum version": [
         ""
       ],
+      "Mirror": [
+        ""
+      ],
       "Mirror Remote Repository": [
         ""
       ],
+      "Mirror Repository": [
+        ""
+      ],
       "Mirror a flatpak remote repository": [
         ""
       ],
+      "Mirroring will import the remote flatpak repository": [
+        ""
+      ],
       "Missing activation key!": [
         ""
       ],
@@ -4542,9 +4623,18 @@
       "Multi-entitlement": [
         "多重權利"
       ],
+      "Multi-environment activation key(s) affected": [
+        ""
+      ],
+      "Multi-environment host(s) affected": [
+        ""
+      ],
       "Must be Ascii alphanumeric, '_' or '-'": [
         ""
       ],
+      "Must be a vaild URL": [
+        ""
+      ],
       "N/A": [
         "N/A"
       ],
@@ -4602,6 +4692,9 @@
       "Name of the host": [
         "主機名稱"
       ],
+      "Name of the product to mirror the remote repository to": [
+        ""
+      ],
       "Name of the repository": [
         ""
       ],
@@ -4710,6 +4803,9 @@
       "No available repository or filter updates": [
         ""
       ],
+      "No change": [
+        ""
+      ],
       "No content": [
         ""
       ],
@@ -5136,6 +5232,9 @@
       "Organization ID is required": [
         ""
       ],
+      "Organization ID or title": [
+        ""
+      ],
       "Organization Information not provided.": [
         ""
       ],
@@ -5433,6 +5532,9 @@
       "Physical": [
         "實體的"
       ],
+      "Place symlinks to entitlement certificates on the host, enabling container/flatpak registry access without a username or password.": [
+        ""
+      ],
       "Plan numeric identifier": [
         "計畫的數字識別元"
       ],
@@ -5481,9 +5583,6 @@
       "Policy to set for mirroring content.  Must be one of %s.": [
         ""
       ],
-      "Possible values: %s": [
-        ""
-      ],
       "Prefer registered through Smart Proxy for remote execution": [
         ""
       ],
@@ -6390,6 +6489,9 @@
       "Review and optionally exclude hosts from your selection. Note that package actions on any image mode hosts will be transient and lost on the next reboot.": [
         ""
       ],
+      "Review and then click 'Set content overrides.' Status will be changed for the selected repository sets on the selected hosts.": [
+        ""
+      ],
       "Review and then click {submitBtnText}.": [
         ""
       ],
@@ -6474,6 +6576,9 @@
       "Saving alternate content source...": [
         ""
       ],
+      "Scan": [
+        ""
+      ],
       "Scan a flatpak remote": [
         ""
       ],
@@ -6573,6 +6678,9 @@
       "Select a lifecycle environment from the available promotion paths to promote new version.": [
         ""
       ],
+      "Select a product to mirror the repository into": [
+        ""
+      ],
       "Select a provider to install katello-host-tools-tracer": [
         ""
       ],
@@ -6666,6 +6774,9 @@
       "Select products to associate to this source.": [
         ""
       ],
+      "Select repository sets": [
+        ""
+      ],
       "Select row": [
         ""
       ],
@@ -6714,6 +6825,9 @@
       "Service level to be used for autoheal": [
         ""
       ],
+      "Set content overrides": [
+        ""
+      ],
       "Set content overrides for the host": [
         "為主機設定內容覆寫"
       ],
@@ -6729,6 +6843,9 @@
       "Set true to remove an override and reset it to 'default'": [
         ""
       ],
+      "Set up container registry certs": [
+        ""
+      ],
       "Sets the system purpose usage": [
         ""
       ],
@@ -7674,6 +7791,9 @@
       "This Content View must be set to Import-only before performing an import": [
         ""
       ],
+      "This Flatpak remote will be deleted. Repositories mirrored from this remote will remain available and functional for use": [
+        ""
+      ],
       "This Host is not currently registered with subscription-manager.": [
         ""
       ],
@@ -7836,6 +7956,9 @@
       "To include or exclude specific content from the content view, create a filter. Without filters, the content view includes everything from the added repositories.": [
         ""
       ],
+      "To manage host content overrides, a specific organization must be selected from the organization context.": [
+        ""
+      ],
       "To manage host packages, a specific organization must be selected from the organization context.": [
         ""
       ],
@@ -7938,6 +8061,9 @@
       "URL of an OSTree repository.": [
         ""
       ],
+      "URL:": [
+        ""
+      ],
       "UUID": [
         "UUID"
       ],
@@ -8013,6 +8139,9 @@
       "Unable to refresh any alternate content source. You either do not have the permission to refresh, or none of the alternate content sources exist.": [
         ""
       ],
+      "Unable to refresh host-repository mapping": [
+        ""
+      ],
       "Unable to send errata e-mail notification: %{error}": [
         "無法收到勘誤的電子郵件通知：%{error}"
       ],
@@ -8025,6 +8154,12 @@
       "Unable to synchronize any repository. You either do not have the permission to synchronize or the selected repositories do not have a feed url.": [
         "無法同步任何軟體庫。您可能沒有同步的權限，或是選擇的軟體庫沒有摘要 url。"
       ],
+      "Unable to update host-repository mapping": [
+        ""
+      ],
+      "Unable to update hosts": [
+        ""
+      ],
       "Unable to update the repository list": [
         ""
       ],
@@ -8061,6 +8196,9 @@
       "Unregister host %s before assigning an organization": [
         ""
       ],
+      "Unregister host %s before assigning an organization.": [
+        ""
+      ],
       "Unregister the host as a subscription consumer": [
         "取消註冊主機為訂閱消耗者"
       ],
@@ -8331,6 +8469,9 @@
       "Use HTTP proxies": [
         ""
       ],
+      "Use container certificates for container registry authentication. If it is set to true, container registry certificates will be installed on the host": [
+        ""
+      ],
       "Used to determine download concurrency of the repository in pulp3. Use value less than 20. Defaults to 10": [
         ""
       ],
@@ -9102,6 +9243,9 @@
       "interpret specified object to return only Repositories that can be associated with specified object.  Only 'content_view' & 'content_view_version' are supported.": [
         ""
       ],
+      "into a product. Details from the flatpak remote will automatically populate the repository fields. The repository will be available for syncing once it has been mirrored into a product.": [
+        ""
+      ],
       "invalid: Repositories can only require one OS version.": [
         ""
       ],

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

@@ -77,11 +77,16 @@ module Katello
           redirect_authorization_headers if redirect_on_failure
           return false
         end
+      elsif header_host_uuid
+        @host = Katello::Host::ContentFacet.find_by(uuid: header_host_uuid)&.host
       else
         authenticate_cert_request
-        return true if @host
       end
-      false
+      return @host.presence
+    end
+
+    def header_host_uuid
+      request.headers['HostUUID'] || request.headers['HTTP_HOSTUUID'] || request.get_header('HTTP_HOSTUUID')
     end
 
     def optional_authorize
@@ -560,6 +565,8 @@ module Katello
 
     def check_blob
       pulp_response = Resources::Registry::Proxy.get(@_request.fullpath, 'Accept' => request.headers['Accept'])
+      response.headers['Content-Type'] = pulp_response.headers[:content_type] if pulp_response.headers[:content_type]
+      response.headers['Content-Length'] = pulp_response.headers[:content_length] if pulp_response.headers[:content_length]
       head pulp_response.code
     end
 
@@ -841,21 +848,14 @@ module Katello
 
     def static_index
       host_ip = request.remote_ip
-      host = ::Host.joins(:primary_interface).where("nics.ip = :host_ip OR nics.ip6 = :host_ip", host_ip: host_ip)&.first
+      @host ||= ::Host.joins(:primary_interface).where("nics.ip = :host_ip OR nics.ip6 = :host_ip", host_ip: host_ip)&.first
       flatpak_index = (redirect_client { Resources::Registry::Proxy.get(@_request.fullpath, headers) })
       flatpak_index_json = JSON.parse(flatpak_index)
-      # Filter out repositories if it's a registered host
-      if host&.content_view_environments&.any?
-        # host.update(flatpak_index: flatpak_index) Will this help??
-        repos = host.content_view_environments.flat_map do |cve|
-          cve.content_view_version.repositories
-        end
-        available_container_repo_names = repos.map(&:container_repository_name)
-        flatpak_index_json['Results'] = flatpak_index_json['Results'].select do |result|
-          available_container_repo_names.include?(result['Name'])
-        end
+      repos = Repository.readable_docker_catalog(@host)
+      available_container_repo_names = repos.map(&:container_repository_name)
+      flatpak_index_json['Results'] = flatpak_index_json['Results'].select do |result|
+        available_container_repo_names.include?(result['Name'])
       end
-      # Otherwise just return unfiltered pulp flatpak index
       render json: flatpak_index_json
     end
   end

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

@@ -33,8 +33,9 @@ module Katello
     param :offset, :number, :required => true, :desc => N_("The offset in the file where the content starts")
     param :content, File, :required => true, :desc => N_("The actual file contents")
     def update
+      content = params[:content].respond_to?(:read) ? params[:content].read : params[:content]
       @repository.backend_content_service(::SmartProxy.pulp_primary)
-        .upload_chunk(params[:id], params[:offset], params[:content], params[:size])
+        .upload_chunk(params[:id], params[:offset], content, params[:size])
       head :no_content
     end
 

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

@@ -6,6 +6,8 @@ module Katello
     before_action :find_host, :only => [:index]
     before_action :find_optional_organization, :only => [:index, :auto_complete_search]
 
+    after_action :strip_errata_type, only: :auto_complete_search
+
     api :GET, "/errata", N_("List errata")
     param :organization_id, :number, :desc => N_("Organization identifier")
     param :content_view_version_id, :number, :desc => N_("Content View Version identifier")
@@ -99,6 +101,20 @@ module Katello
       collection.where(:errata_id => filter.erratum_rules.pluck(:errata_id))
     end
 
+    def strip_errata_type
+      return if response.body.blank?
+
+      begin
+        items = JSON.parse(response.body)
+      rescue JSON::ParserError
+        return
+      end
+
+      filtered = items.reject { |h| h['part'].to_s.strip == 'errata_type' }
+
+      response.body = filtered.to_json
+    end
+
     def default_sort
       %w(updated desc)
     end

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

@@ -52,7 +52,9 @@ module Katello
 
     api :POST, "/flatpak_remote_repositories/:id/mirror", N_("Mirror a flatpak remote repository")
     param :id, :number, :desc => N_("Flatpak remote repository numeric identifier"), :required => true
-    param :product_id, :number, :desc => N_("Product ID to mirror the remote repository to"), :required => true
+    param :product_id, :number, :desc => N_("Product ID to mirror the remote repository to")
+    param :product_name, String, :desc => N_("Name of the product to mirror the remote repository to")
+    param :organization_id, :number, :desc => N_("organization identifier")
     def mirror
       task = async_task(::Actions::Katello::Flatpak::MirrorRemoteRepository, @flatpak_remote_repository, @product)
       respond_for_async :resource => task
@@ -73,9 +75,24 @@ module Katello
     end
 
     def find_product
-      @product = Product.editable.find(params[:product_id])
-      throw_resource_not_found(name: 'product', id: params[:product_id]) unless @product
+      if params[:product_id]
+        @product = Product.editable.find(params[:product_id])
+        throw_resource_not_found(name: 'product', id: params[:product_id]) unless @product
+      elsif params[:product_name] && params[:organization_id]
+        @product = Product.editable.find_by(name: params[:product_name], organization_id: params[:organization_id])
+        unless @product
+          msg = _("Could not find product with name '%{name}' in organization id %{org_id}.") %
+                  { name: params[:product_name], org_id: params[:organization_id] }
+          fail HttpErrors::NotFound, msg
+        end
+      end
       @product
     end
+
+    protected
+
+    def rejected_autocomplete_items
+      ['flatpak_remote_id', 'flatpak_remote']
+    end
   end
 end

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

@@ -6,7 +6,7 @@ module Katello
     filter_parameters :token
 
     before_action :find_authorized_katello_resource, :except => [:index, :create, :auto_complete_search]
-    before_action :find_optional_organization, :only => [:index, :auto_complete_search]
+    before_action :find_organization, :only => [:index, :auto_complete_search]
 
     resource_description do
       name 'Flatpak Remotes'
@@ -20,7 +20,7 @@ module Katello
 
     api :GET, "/organizations/:organization_id/flatpak_remotes", N_("List flatpak remotes")
     api :GET, "/flatpak_remotes", N_("List flatpak remotes")
-    param :organization_id, :number, :desc => N_("organization identifier"), :required => false
+    param :organization_id, :number, :desc => N_("organization identifier"), :required => true
     param :name, String, :desc => N_("Name of the flatpak remote"), :required => false
     param_group :search, Api::V2::ApiController
     add_scoped_search_description_for(FlatpakRemote)
@@ -68,7 +68,7 @@ module Katello
     api :DELETE, "/flatpak_remotes/:id", N_("Delete a flatpak remote")
     param :id, :number, :desc => N_("Flatpak remote numeric identifier"), :required => true
     def destroy
-      @flatpak_remote.destroy
+      @flatpak_remote.destroy!
     end
 
     api :POST, "/flatpak_remotes/:id/scan", N_("Scan a flatpak remote")
@@ -85,5 +85,9 @@ module Katello
     def flatpak_remote_params
       params.require(:flatpak_remote).permit(:name, :url, :description, :organization_id, :username, :token)
     end
+
+    def rejected_autocomplete_items
+      ['organization_id']
+    end
   end
 end

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

@@ -2,8 +2,7 @@ module Katello
   class Api::V2::GenericContentUnitsController < Api::V2::ApiController
     resource_description do
       name 'Content Units'
-      param :content_type, lambda { |val| Katello::RepositoryTypeManager.generic_content_types.include?(val) },
-            desc: N_("Possible values: %s") % Katello::RepositoryTypeManager.generic_content_types.join(", "), required: true
+      param :content_type, :callable_enum, of: -> { Katello::RepositoryTypeManager.generic_content_types }, required: true
     end
     apipie_concern_subst(:a_resource => N_("a content unit"), :resource_id => "content_units")
 

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

@@ -128,6 +128,24 @@ module Katello
       respond_for_async(:resource => task)
     end
 
+    def auto_complete_name
+      page_size = params[:per_page].to_i.positive? ? params[:per_page].to_i : Katello::Concerns::FilteredAutoCompleteSearch::PAGE_SIZE
+
+      query = Product.readable
+                    .where(organization_id: params.require(:organization_id))
+                    .enabled
+
+      query = query.custom if Foreman::Cast.to_bool(params[:custom])
+
+      product_names = query
+                        .where("#{Product.table_name}.name ILIKE ?", "#{params[:term]}%")
+                        .order("#{Product.table_name}.name")
+                        .limit(page_size)
+                        .pluck(:name)
+
+      render json: product_names
+    end
+
     protected
 
     def find_product(options = {})

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

@@ -311,6 +311,8 @@ Pass [] to make repo available for clients regardless of OS version. Maximum len
         repo_params[:package_types] = repo_params[:package_types].map(& :strip)
       end
 
+      repo_params[:mirroring_policy] ||= Katello::Repository::YUM_TYPE == repo_params[:content_type] ? Setting[:default_yum_mirroring_policy] : Setting[:default_non_yum_mirroring_policy]
+
       root = construct_repo_from_params(repo_params)
       sync_task(::Actions::Katello::Repository::CreateRoot, root)
       @repository = root.reload.library_instance
@@ -500,7 +502,8 @@ Alternatively, use the 'force' parameter to regenerate metadata locally. On the
       param 'name', String, :desc => N_("Needs to only be set for file repositories or docker tags"), :required => true
       param 'digest', String, :desc => N_("Needs to only be set for docker tags")
     end
-    Katello::RepositoryTypeManager.generic_repository_types.each_pair do |_, repo_type|
+
+    Katello::RepositoryTypeManager.generic_repository_types(false).each_pair do |_, repo_type|
       repo_type.import_attributes.each do |import_attribute|
         param import_attribute.api_param, import_attribute.type,
             :desc => N_(import_attribute.description)
@@ -635,9 +638,8 @@ Alternatively, use the 'force' parameter to regenerate metadata locally. On the
       root = @product.add_repo(repo_params.slice(:label, :name, :description, :url, :content_type, :arch, :unprotected,
                                                             :gpg_key, :ssl_ca_cert, :ssl_client_cert, :ssl_client_key,
                                                             :checksum_type, :download_policy, :http_proxy_policy,
-                                                            :metadata_expire, :sync_dependencies).to_h.with_indifferent_access)
+                                                            :metadata_expire, :sync_dependencies, :mirroring_policy).to_h.with_indifferent_access)
       root.verify_ssl_on_sync = ::Foreman::Cast.to_bool(repo_params[:verify_ssl_on_sync]) if repo_params.key?(:verify_ssl_on_sync)
-      root.mirroring_policy = repo_params[:mirroring_policy] || Katello::RootRepository::MIRRORING_POLICY_CONTENT
       root.upstream_username = repo_params[:upstream_username] if repo_params.key?(:upstream_username)
       root.upstream_password = repo_params[:upstream_password] if repo_params.key?(:upstream_password)
       root.http_proxy_policy = repo_params[:http_proxy_policy] if repo_params.key?(:http_proxy_policy)

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

@@ -13,6 +13,16 @@ module Katello
           end
           process_response(true, { :message => _("Deleted %{host_count} %{hosts}") % { :host_count => destroyed_count, :hosts => 'host'.pluralize(destroyed_count) }})
         end
+
+        def assign_organization
+          registered_host = find_editable_hosts.where.not(organization_id: params[:id]).joins(:subscription_facet).first
+          if registered_host
+            render_error :custom_error, :status => :bad_request, :locals => { :message => _("Unregister host %s before assigning an organization.") % registered_host.name }
+            return
+          end
+
+          super
+        end
       end
 
       included do