katello 4.18.1 → 4.19.0.rc1

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

@@ -3,7 +3,7 @@
   "locale_data": {
     "katello": {
       "": {
-        "Project-Id-Version": "katello 4.18.0",
+        "Project-Id-Version": "katello 4.19.0.pre.master",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2017-12-19 20:14+0000",
         "Last-Translator": "Bryan Kearney <bryan.kearney@gmail.com>, 2025",
@@ -447,9 +447,6 @@
       "A remote execution job is in progress.": [
         ""
       ],
-      "A service level for auto-healing process, e.g. SELF-SUPPORT": [
-        "auto-healing 程序的服務等級，例如 SELF-SUPPORT"
-      ],
       "A smart proxy seems to have been refreshed without pulpcore being running. Please refresh the smart proxy after ensuring that pulpcore services are running.": [
         ""
       ],
@@ -552,11 +549,14 @@
       "Add RPM rule": [
         ""
       ],
-      "Add Subscriptions": [
+      "Add Red Hat Flatpak remote": [
+        ""
+      ],
+      "Add Red Hat flatpak remote": [
         ""
       ],
-      "Add a subscription to a host": [
-        "新增訂閱至一部主機"
+      "Add Subscriptions": [
+        ""
       ],
       "Add an alternate content source": [
         ""
@@ -621,9 +621,6 @@
       "Add subscriptions consumed by a manifest from Red Hat Subscription Management": [
         ""
       ],
-      "Add subscriptions to one or more hosts": [
-        ""
-      ],
       "Add subscriptions using the Add Subscriptions button.": [
         ""
       ],
@@ -891,12 +888,6 @@
       "Array of pools to add": [
         ""
       ],
-      "Array of subscriptions to add": [
-        "欲新增的訂閱集"
-      ],
-      "Array of subscriptions to remove": [
-        "欲移除的訂閱集"
-      ],
       "Array of uploads to import": [
         ""
       ],
@@ -951,15 +942,6 @@
       "At least one organization must exist.": [
         "至少必須存在一個組織。"
       ],
-      "Attach a subscription": [
-        "連接一組訂閱服務"
-      ],
-      "Attach subscriptions": [
-        "連接訂閱服務"
-      ],
-      "Attach subscriptions to %s": [
-        "連接訂閱服務至 %s"
-      ],
       "Attempted to destroy consumer %s from candlepin, but consumer does not exist in candlepin": [
         ""
       ],
@@ -1071,6 +1053,9 @@
       "Bootc upgrade via Bootc interface": [
         ""
       ],
+      "Booted": [
+        ""
+      ],
       "Booted Container Images": [
         ""
       ],
@@ -1539,6 +1524,9 @@
       "Container image tags": [
         ""
       ],
+      "Container images": [
+        ""
+      ],
       "Container manifest lists": [
         ""
       ],
@@ -2052,12 +2040,6 @@
       "Create organization": [
         "建立組織"
       ],
-      "Create package filter rule": [
-        ""
-      ],
-      "Create rule": [
-        ""
-      ],
       "Credentials": [
         ""
       ],
@@ -2457,9 +2439,6 @@
       "Disable Red Hat Insights.": [
         ""
       ],
-      "Disable Simple Content Access": [
-        ""
-      ],
       "Disable a repository from the set": [
         ""
       ],
@@ -2523,6 +2502,9 @@
       "Edit": [
         "編輯"
       ],
+      "Edit DEB rule": [
+        ""
+      ],
       "Edit Flatpak Remote": [
         ""
       ],
@@ -2550,9 +2532,6 @@
       "Edit filter rule": [
         ""
       ],
-      "Edit package filter rule": [
-        ""
-      ],
       "Edit products": [
         ""
       ],
@@ -2595,9 +2574,6 @@
       "Enable Red Hat repositories": [
         ""
       ],
-      "Enable Simple Content Access": [
-        ""
-      ],
       "Enable Tracer": [
         ""
       ],
@@ -3084,6 +3060,9 @@
       "Generate repository applicability": [
         ""
       ],
+      "Generate username and password": [
+        ""
+      ],
       "Generated": [
         ""
       ],
@@ -3507,9 +3486,6 @@
       "If set, newly created APT repos in Katello will use the same repo structure as the remote repos they are synchronized from. You may migrate existing APT repos to match the setting, by running 'foreman-rake katello:migrate_structure_content_for_deb'.": [
         ""
       ],
-      "If specified, remove the first instance of a subscription with matching id and quantity": [
-        "指定後，使用相符的 ID 與數量，移除訂閱服務的第一個項目"
-      ],
       "If the smart proxies' assigned HTTP proxies should be used": [
         ""
       ],
@@ -3933,6 +3909,9 @@
       "It's not possible to promote a rolling content view.": [
         ""
       ],
+      "It's not possible to provide environment_ids for anything other than a rolling content view.": [
+        ""
+      ],
       "It's not possible to publish a rolling content view.": [
         ""
       ],
@@ -4332,6 +4311,9 @@
       "List of hypervisor guest uuids": [
         ""
       ],
+      "List of lifecycle environments for rolling content views": [
+        ""
+      ],
       "List of package group names (Deprecated)": [
         ""
       ],
@@ -5232,9 +5214,6 @@
       "Organization ID": [
         "組織 ID"
       ],
-      "Organization ID is required": [
-        ""
-      ],
       "Organization ID or title": [
         ""
       ],
@@ -5718,6 +5697,9 @@
       "Promotion to Environment": [
         ""
       ],
+      "Provide credentials if the registry requires authentication": [
+        ""
+      ],
       "Provide the required information and click {update} below to save changes.": [
         ""
       ],
@@ -5844,15 +5826,6 @@
       "Quantity of entitlements to bind": [
         ""
       ],
-      "Quantity of specified subscription to remove": [
-        ""
-      ],
-      "Quantity of this subscription to add": [
-        "要新增此訂閱的數量"
-      ],
-      "Quantity of this subscriptions to add": [
-        "要新增此訂閱的數量"
-      ],
       "Quantity to Allocate": [
         ""
       ],
@@ -6021,9 +5994,6 @@
       "Register a host with subscription and information": [
         ""
       ],
-      "Register host '%s' before attaching subscriptions": [
-        ""
-      ],
       "Registered": [
         "已註冊"
       ],
@@ -6168,18 +6138,6 @@
       "Remove products from sync plan": [
         "從同步計畫中移除產品"
       ],
-      "Remove subscriptions": [
-        "移除訂閱服務"
-      ],
-      "Remove subscriptions from %s": [
-        "從 %s 移除訂閱服務"
-      ],
-      "Remove subscriptions from a host": [
-        ""
-      ],
-      "Remove subscriptions from one or more hosts": [
-        ""
-      ],
       "Remove versions and/or environments from a content view and reassign systems and keys": [
         "從內容視域中移除版本且（或）環境，並重新指定系統與金鑰"
       ],
@@ -6399,6 +6357,9 @@
       "Return Red Hat (non-custom) products only": [
         ""
       ],
+      "Return a list of installed debs distinct by name": [
+        ""
+      ],
       "Return a list of installed packages distinct by name": [
         ""
       ],
@@ -6579,6 +6540,9 @@
       "Save": [
         "儲存"
       ],
+      "Save Environments": [
+        ""
+      ],
       "Saving alternate content source...": [
         ""
       ],
@@ -6825,10 +6789,13 @@
       "Service Level (SLA)": [
         ""
       ],
+      "Service level": [
+        ""
+      ],
       "Service level of host": [
         ""
       ],
-      "Service level to be used for autoheal": [
+      "Service level, e.g. SELF-SUPPORT": [
         ""
       ],
       "Set content overrides": [
@@ -6855,9 +6822,6 @@
       "Sets the system purpose usage": [
         ""
       ],
-      "Sets whether the Host will autoheal subscriptions upon checkin": [
-        ""
-      ],
       "Setting 'default_location_subscribed_hosts' is not set to a valid location.": [
         ""
       ],
@@ -7008,6 +6972,9 @@
       "Smart proxy name": [
         ""
       ],
+      "Smart proxy verify content checksum has started in the background": [
+        ""
+      ],
       "Sockets": [
         "插槽"
       ],
@@ -7122,7 +7089,7 @@
       "Something went wrong while refreshing alternate content sources: ": [
         ""
       ],
-      "Something went wrong while refreshing content counts: ${getResponseErrorMsgs(error.response)}": [
+      "Something went wrong while refreshing content counts: ${getResponseErrorMsgs(error?.response)}": [
         ""
       ],
       "Something went wrong while removing a filter rule! ${getResponseErrorMsgs(error.response)}": [
@@ -7191,6 +7158,9 @@
       "Something went wrong while updating the content source. See the logs for more information": [
         ""
       ],
+      "Something went wrong while verifying content checksums: ${getResponseErrorMsgs(error?.response)}": [
+        ""
+      ],
       "Something went wrong! Please check server logs!": [
         ""
       ],
@@ -7278,9 +7248,6 @@
       "Subscription Details": [
         "訂閱詳細資訊"
       ],
-      "Subscription ID": [
-        "訂閱 ID"
-      ],
       "Subscription Info": [
         "訂閱服務資訊"
       ],
@@ -7296,12 +7263,6 @@
       "Subscription Name": [
         ""
       ],
-      "Subscription Pool id": [
-        "訂閱集區 ID"
-      ],
-      "Subscription Pool uuid": [
-        "訂閱集區的 UUID"
-      ],
       "Subscription UUID": [
         ""
       ],
@@ -7470,6 +7431,9 @@
       "Synced Content": [
         "已同步內容"
       ],
+      "Synced container images content": [
+        ""
+      ],
       "Synchronize": [
         "同步"
       ],
@@ -7719,9 +7683,6 @@
       "The selected/Inherited Content View is not available for this Lifecycle Environment": [
         ""
       ],
-      "The specified organization is in Simple Content Access mode. Attaching subscriptions is disabled": [
-        ""
-      ],
       "The subscription cannot be found upstream": [
         ""
       ],
@@ -7863,12 +7824,6 @@
       "This host is associated with multiple content view environments. If you assign a lifecycle environment and content view here, the host will be removed from the other environments.": [
         ""
       ],
-      "This host's organization is in Simple Content Access mode. Attaching subscriptions is disabled.": [
-        ""
-      ],
-      "This host's organization is in Simple Content Access mode. Auto-attach is disabled": [
-        ""
-      ],
       "This is disabled because a manifest task is in progress": [
         ""
       ],
@@ -7947,6 +7902,9 @@
       "To change content view environments, a specific organization must be selected from the organization context.": [
         ""
       ],
+      "To continue with Red Hat Flatpak remote, you need to generate your username and password in": [
+        ""
+      ],
       "To enable the synced content option, this host must use a content source, content view, and lifecycle environment which contain synced kickstart repositories for the selected architecture and operating system.": [
         ""
       ],
@@ -8022,12 +7980,6 @@
       "Traffic for all alternate content sources associated with this smart proxy will go through the chosen HTTP proxy.": [
         ""
       ],
-      "Trigger an auto-attach of subscriptions": [
-        "觸發自動連接訂閱服務"
-      ],
-      "Trigger an auto-attach of subscriptions on one or more hosts": [
-        ""
-      ],
       "Try changing your search criteria.": [
         ""
       ],
@@ -8181,9 +8133,6 @@
       "Unapplied Errata": [
         "未套用的勘誤"
       ],
-      "Unattach a subscription": [
-        "取消訂閱的連結"
-      ],
       "Unfiltered params array: %s.": [
         ""
       ],
@@ -8538,6 +8487,9 @@
       "Value must either be a boolean or 'default' for 'enabled'": [
         ""
       ],
+      "Verify Content Checksum": [
+        ""
+      ],
       "Verify SSL": [
         "驗證 SSL"
       ],
@@ -8622,6 +8574,9 @@
       "View by": [
         ""
       ],
+      "View container images in the local registry using the Synced tab. View container images booted by image mode hosts using the Booted tab. The Booted tab also shows images outside of the local container registry.": [
+        ""
+      ],
       "View content views": [
         ""
       ],
@@ -8910,9 +8865,6 @@
       "attempted to sync without a feed URL": [
         "試圖在沒有 feed URL 的情況下同步"
       ],
-      "auto attach subscriptions upon registration": [
-        "註冊後自動連接訂閱"
-      ],
       "base url to perform repo discovery on": [
         "進行軟體庫復原的基礎網址"
       ],
@@ -9549,9 +9501,6 @@
       "start datetime of synchronization": [
         "開始同步的日期與時間"
       ],
-      "subscriptions not specified": [
-        "未指定訂閱服務"
-      ],
       "sync plan description": [
         "同步計畫的描述"
       ],

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

@@ -7,6 +7,7 @@ module Katello
     skip_before_action :authorize
     before_action :optional_authorize, only: [:token, :catalog]
     before_action :registry_authorize, except: [:token, :v1_search, :catalog, :static_index]
+    before_action :static_index_authorize, only: [:static_index]
     before_action :authorize_repository_read, only: [:pull_manifest, :tags_list, :check_blob, :pull_blob]
     before_action :container_push_prop_validation, only: [:start_upload_blob, :upload_blob, :finish_upload_blob, :push_manifest]
     before_action :create_container_repo_if_needed, only: [:start_upload_blob, :upload_blob, :finish_upload_blob, :push_manifest]
@@ -63,7 +64,7 @@ module Katello
                                              "scope=\"repository:registry:pull,push\""
     end
 
-    def set_user_by_token(token, redirect_on_failure = true)
+    def authenticate_from_request(token, redirect_on_failure = true)
       if token
         token_type, token = token.split
         if token_type == 'Bearer' && token
@@ -94,7 +95,7 @@ module Katello
       if @repository && (@repository.environment.registry_unauthenticated_pull || ssl_client_authorized?(@repository.organization.label))
         true
       elsif params['action'] == 'catalog'
-        set_user_by_token(request.headers['Authorization'], false)
+        authenticate_from_request(request.headers['Authorization'], false)
       elsif (params['action'] == 'token' && params['scope'].blank? && params['account'].blank?)
         true
       else
@@ -106,13 +107,26 @@ module Katello
       @repository = find_readable_repository
       return true if ['GET', 'HEAD'].include?(request.method) && @repository && !require_user_authorization?
 
-      is_user_set = set_user_by_token(request.headers['Authorization'])
+      return true if authenticate_from_request(request.headers['Authorization'])
 
-      return true if is_user_set
+      unauthorized
+    end
 
+    def static_index_authorize
+      authenticate_from_request(request.headers['Authorization'])
+      find_host_by_ip unless @host
+      true
+    end
+
+    def find_host_by_ip
+      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
+    end
+
+    def unauthorized
       redirect_authorization_headers
       render_error('unauthorized', :status => :unauthorized)
-      return false
+      false
     end
 
     def container_push_prop_validation(props = nil)
@@ -416,7 +430,12 @@ module Katello
         )
       end
 
-      instance_repo.update!(version_href: latest_version_href)
+      # Fetch version PRN from Pulp API
+      # FIXME: Remove this workaround when https://github.com/pulp/pulpcore/issues/7008 is resolved
+      version_response = pulp_api.repository_versions_api.read(latest_version_href, {fields: 'prn'})
+      latest_version_prn = version_response&.prn
+
+      instance_repo.update!(version_href: latest_version_href, version_prn: latest_version_prn)
       # The Pulp repository should not change after first creation
       if root_repository.repository_references.empty?
         ::Katello::Pulp3::RepositoryReference.where(root_repository_id: instance_repo.root_id,
@@ -432,6 +451,7 @@ module Katello
       instance_repo = root_repository&.library_instance
       distribution_api_response = pulp_api.container_push_distribution_for_repository(pulp_repo_href)
       pulp_distribution_href = distribution_api_response&.pulp_href
+      pulp_distribution_prn = distribution_api_response&.prn
 
       if pulp_distribution_href.empty?
         return render_podman_error(
@@ -445,11 +465,12 @@ module Katello
                                                            repository_id: instance_repo.id).first
       if dist
         if dist.href != pulp_distribution_href
-          dist.update(href: pulp_distribution_href)
+          dist.update(href: pulp_distribution_href, prn: pulp_distribution_prn)
         end
       else
         ::Katello::Pulp3::DistributionReference.create!(path: @container_path_input,
                                                        href: pulp_distribution_href,
+                                                       prn: pulp_distribution_prn,
                                                        repository_id: instance_repo.id)
       end
     end
@@ -851,12 +872,20 @@ module Katello
     end
 
     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
-      flatpak_index = (redirect_client { Resources::Registry::Proxy.get(@_request.fullpath, headers) })
-      flatpak_index_json = JSON.parse(flatpak_index)
       repos = Repository.readable_docker_catalog(@host)
-      available_container_repo_names = repos.map(&:container_repository_name)
+      return render json: { 'Registry' => request_url, 'Results' => [] } if repos.empty?
+
+      available_container_repo_names = repos.map(&:container_repository_name).compact
+
+      flatpak_index = (redirect_client { Resources::Registry::Proxy.get(@_request.fullpath, headers) })
+
+      begin
+        flatpak_index_json = JSON.parse(flatpak_index)
+      rescue JSON::ParserError => e
+        Rails.logger.error("Failed to parse flatpak index JSON: #{e.message}")
+        return render json: { 'Registry' => request_url, 'Results' => [] }
+      end
+
       flatpak_index_json['Results'] = flatpak_index_json['Results'].select do |result|
         available_container_repo_names.include?(result['Name'])
       end

data/app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb

@@ -447,7 +447,7 @@ module Katello
     end
 
     def rhsm_params
-      params.slice(:name, :type, :facts, :installedProducts, :autoheal, :releaseVer, :usage, :role, :serviceLevel, :uuid, :capabilities, :guestIds, :lastCheckin).to_h
+      params.slice(:name, :type, :facts, :installedProducts, :releaseVer, :usage, :role, :serviceLevel, :uuid, :capabilities, :guestIds, :lastCheckin).to_h
     end
 
     def logger

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

@@ -7,13 +7,11 @@ module Katello
     before_action :find_optional_organization, :only => [:index, :create, :show]
     before_action :find_authorized_katello_resource, :only => [:show, :update, :destroy, :available_releases,
                                                                :available_host_collections, :add_host_collections, :remove_host_collections,
-                                                               :content_override, :add_subscriptions, :remove_subscriptions,
-                                                               :subscriptions]
+                                                               :content_override, :subscriptions]
     before_action :find_content_view_environments, :only => [:create, :update]
-    before_action :verify_simple_content_access_disabled, :only => [:add_subscriptions]
     before_action :validate_release_version, :only => [:create, :update]
 
-    wrap_parameters :include => (ActivationKey.attribute_names + %w(host_collection_ids service_level auto_attach purpose_role purpose_usage content_view_environments))
+    wrap_parameters :include => (ActivationKey.attribute_names + %w(host_collection_ids service_level purpose_role purpose_usage content_view_environments))
 
     def_param_group :activation_key do
       param :organization_id, :number, :desc => N_("organization identifier"), :required => true
@@ -22,7 +20,6 @@ module Katello
       param :unlimited_hosts, :bool, :desc => N_("can the activation key have unlimited hosts")
       param :release_version, String, :desc => N_("content release version")
       param :service_level, String, :desc => N_("service level")
-      param :auto_attach, :bool, :desc => N_("auto attach subscriptions upon registration"), deprecated: true
       param :purpose_usage, String, :desc => N_("Sets the system purpose usage")
       param :purpose_role, String, :desc => N_("Sets the system purpose usage")
 
@@ -125,8 +122,7 @@ module Katello
       @new_activation_key.reload
       sync_task(::Actions::Katello::ActivationKey::Update, @new_activation_key,
                   :service_level   => @activation_key.service_level,
-                  :release_version => @activation_key.release_version,
-                  :auto_attach     => @activation_key.auto_attach
+                  :release_version => @activation_key.release_version
                )
       @activation_key.pools.each do |pool|
         @new_activation_key.subscribe(pool[:id])
@@ -181,46 +177,6 @@ module Katello
       respond_for_show(:resource => @activation_key)
     end
 
-    def deprecate_entitlement_mode_endpoint
-      ::Foreman::Deprecation.api_deprecation_warning(N_("This endpoint is deprecated and will be removed in an upcoming release. Simple Content Access is the only supported content access mode."))
-    end
-
-    api :PUT, "/activation_keys/:id/add_subscriptions", N_("Attach a subscription"), deprecated: true
-    param :id, :number, :desc => N_("ID of the activation key"), :required => true
-    param :subscription_id, :number, :desc => N_("Subscription identifier"), :required => false
-    param :quantity, :number, :desc => N_("Quantity of this subscription to add"), :required => false
-    param :subscriptions, Array, :desc => N_("Array of subscriptions to add"), :required => false do
-      param :id, String, :desc => N_("Subscription Pool uuid"), :required => false
-      param :quantity, :number, :desc => N_("Quantity of this subscriptions to add"), :required => false
-    end
-    def add_subscriptions
-      deprecate_entitlement_mode_endpoint
-      if params[:subscriptions]
-        params[:subscriptions].each { |subscription| @activation_key.subscribe(subscription[:id], subscription[:quantity]) }
-      elsif params[:subscription_id]
-        @activation_key.subscribe(params[:subscription_id], params[:quantity])
-      end
-
-      respond_for_index(:collection => subscription_index, :template => 'subscriptions')
-    end
-
-    api :PUT, "/activation_keys/:id/remove_subscriptions", N_("Unattach a subscription"), deprecated: true
-    param :id, :number, :desc => N_("ID of the activation key"), :required => true
-    param :subscription_id, String, :desc => N_("Subscription ID"), :required => false
-    param :subscriptions, Array, :desc => N_("Array of subscriptions to add"), :required => false do
-      param :id, String, :desc => N_("Subscription Pool uuid"), :required => false
-    end
-    def remove_subscriptions
-      deprecate_entitlement_mode_endpoint
-      if params[:subscriptions]
-        params[:subscriptions].each { |subscription| @activation_key.unsubscribe(subscription[:id]) }
-      elsif params[:subscription_id]
-        @activation_key.unsubscribe(params[:subscription_id])
-      end
-
-      respond_for_index(:collection => subscription_index, :template => 'subscriptions')
-    end
-
     api :PUT, "/activation_keys/:id/content_override", N_("Override content for activation_key")
     param :id, :number, :desc => N_("ID of the activation key"), :required => true
     param :content_overrides, Array, :desc => N_("Array of Content override parameters to be added in bulk") do
@@ -273,17 +229,6 @@ module Katello
 
     private
 
-    def subscription_index
-      subs = @activation_key.subscriptions
-      {
-        :results => subs,
-        :subtotal => subs.count,
-        :total => subs.count,
-        :page => 1,
-        :per_page => subs.count,
-      }
-    end
-
     def find_cve_for_single
       environment_id = params.dig(:environment, :id) || params[:environment_id]
       content_view_id = params.dig(:content_view, :id) || params[:content_view_id]
@@ -379,7 +324,6 @@ module Katello
                                              :content_view_id,
                                              :release_version,
                                              :service_level,
-                                             :auto_attach,
                                              :max_hosts,
                                              :unlimited_hosts,
                                              :purpose_role,
@@ -408,12 +352,6 @@ module Katello
       key_params
     end
 
-    def verify_simple_content_access_disabled
-      if @activation_key.organization.simple_content_access?
-        fail HttpErrors::BadRequest, _("The specified organization is in Simple Content Access mode. Attaching subscriptions is disabled")
-      end
-    end
-
     def validate_release_version
       @organization ||= find_organization
       if params[:release_version].present? && !@organization.library.available_releases.include?(params[:release_version])