katello 4.12.0.rc3 → 4.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a293bc4db62752b15b0d50669e6fe734f0a2b492e75adbb0c81e8be6daab4f30
-  data.tar.gz: 2a1613ac018e081b15b761a2867d9e1cfa8a19f7e29d24ee0fa8087862801421
+  metadata.gz: dd21e38a92cceb34e2ae67a8e9dd1f128eed67323230e83eeb671a63bad4f11f
+  data.tar.gz: 7cddfcb3d2aaae7a8d170b760986c4268b7bde531bff0f88d6b21896cda8e340
 SHA512:
-  metadata.gz: 4b3769b430b04ed0b3c30a5a71852224b2bb561a9d99b47f03be067b36d2071c264b008119f98de7cacffbbc0bd174f21c51658f0073f5fb59b8a00f34832715
-  data.tar.gz: 521aec53e88394450a0a133f1c6f55f9d810cff250a61ade8c6fd93eacc044629efc78ddad60541cadafc7e6d30fc47b1b41384686a4c9c176ecd7a58a25931c
+  metadata.gz: 1762ccadc8e731d4662b243fd46effe9df5d67ce39a6cb5fa36f1593fb60d7e24237b497740feba93cf7e73f62497e8c8b1e637d584f85a864a0c367697f0303
+  data.tar.gz: b16c43097ea41164f44f68225deaa0a4e6cf256e06976f40519237e286575f87728b8af45e5861af6df241826fd31350eb20bbf90461566add5c4a4411e8c2cb

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

@@ -8,16 +8,6 @@ module Katello
       def total_host_count
         host_query.size
       end
-
-      def removed_widgets
-        widgets = super
-
-        if Organization.current&.simple_content_access?
-          widgets.reject! { |widget| ::Widget.singleton_class::SUBSCRIPTION_TEMPLATES.include? widget[:template] }
-        end
-
-        widgets
-      end
     end
   end
 end

data/app/helpers/katello/hosts_and_hostgroups_helper.rb

@@ -72,6 +72,10 @@ module Katello
     def fetch_lifecycle_environment(host_or_hostgroup, options = {})
       return host_or_hostgroup.single_lifecycle_environment if host_or_hostgroup.try(:single_lifecycle_environment)
       return host_or_hostgroup.lifecycle_environment if host_or_hostgroup.try(:lifecycle_environment)
+      if host_or_hostgroup.is_a?(::Hostgroup) && host_or_hostgroup.content_facet.present?
+        # to handle cloned hostgroups that are new records
+        return host_or_hostgroup.content_facet.lifecycle_environment
+      end
       selected_host_group = options.fetch(:selected_host_group, nil)
       return selected_host_group.lifecycle_environment if selected_host_group.present?
     end
@@ -79,12 +83,20 @@ module Katello
     def fetch_content_view(host_or_hostgroup, options = {})
       return host_or_hostgroup.single_content_view if host_or_hostgroup.try(:single_content_view)
       return host_or_hostgroup.content_view if host_or_hostgroup.try(:content_view)
+      if host_or_hostgroup.is_a?(::Hostgroup) && host_or_hostgroup.content_facet.present?
+        # to handle cloned hostgroups that are new records
+        return host_or_hostgroup.content_facet.content_view
+      end
       selected_host_group = options.fetch(:selected_host_group, nil)
       return selected_host_group.content_view if selected_host_group.present?
     end
 
-    def fetch_content_source(host, options = {})
-      return host.content_source if host.try(:content_source_id)
+    def fetch_content_source(host_or_hostgroup, options = {})
+      return host_or_hostgroup.content_source if host_or_hostgroup.content_source_id&.present? && host_or_hostgroup.persisted?
+      if host_or_hostgroup.is_a?(::Hostgroup) && host_or_hostgroup.content_facet.present?
+        # to handle cloned hostgroups that are new records
+        return host_or_hostgroup.content_facet.content_source
+      end
       selected_host_group = options.fetch(:selected_host_group, nil)
       return selected_host_group.content_source if selected_host_group.present?
     end

data/app/lib/katello/resources/cdn.rb

@@ -1,8 +1,6 @@
 module Katello
   module Resources
     module CDN
-      SUPPORTED_SSL_VERSIONS = ['SSLv23', 'TLSv1'].freeze
-
       class Utils
         # takes releasever from contentUrl (e.g. 6Server, 6.0, 6.1)
         # returns hash e.g. {:major => 6, :minor => "6.1"}
@@ -24,11 +22,6 @@ module Katello
         end
 
         def initialize(url, options = {})
-          @ssl_version = Setting[:cdn_ssl_version]
-          if @ssl_version && !SUPPORTED_SSL_VERSIONS.include?(@ssl_version)
-            fail("Invalid SSL version specified. Check the 'CDN SSL Version' setting")
-          end
-
           options.reverse_merge!(:verify_ssl => 9)
           options.assert_valid_keys(:ssl_client_key,
                                     :ssl_client_cert,
@@ -106,12 +99,10 @@ module Katello
             net.cert_store = @cert_store
           end
 
-          # NOTE: This was added because some proxies dont support SSLv23 and do not handle TLS 1.2
-          # Valid values in ruby 1.9.3 are 'SSLv23' or 'TLSV1'
-          # Run the following command in rails console to figure out other
-          # valid constants in other ruby versions
-          # "OpenSSL::SSL::SSLContext::METHODS"
-          net.ssl_version = @ssl_version
+          # NOTE: This is only here due to https://github.com/ruby/openssl/issues/709, otherwise the
+          # system-wide crypto policy could be used. Enforcing TLS version >= 1.2  will prevent using
+          # very old infrastructure for now, but that was considered better than having an insecure default.
+          net.min_version = OpenSSL::SSL::TLS1_2_VERSION
 
           if (@options[:verify_ssl] == false) || (@options[:verify_ssl] == OpenSSL::SSL::VERIFY_NONE)
             net.verify_mode = OpenSSL::SSL::VERIFY_NONE

data/app/services/katello/pulp3/alternate_content_source.rb

@@ -108,7 +108,7 @@ module Katello
           if acs.content_type == ::Katello::Repository::FILE_TYPE && acs.subpaths.present?
             paths = insert_pulp_manifest!(paths)
           end
-          response = api.alternate_content_source_api.create(name: generate_backend_object_name, paths: paths,
+          response = api.alternate_content_source_api.create(name: generate_backend_object_name, paths: paths.sort,
                                                              remote: smart_proxy_acs.remote_href)
           smart_proxy_acs.update!(alternate_content_source_href: response.pulp_href)
           return response
@@ -125,7 +125,7 @@ module Katello
         if acs.content_type == ::Katello::Repository::FILE_TYPE && acs.subpaths.present?
           paths = insert_pulp_manifest!(paths)
         end
-        api.alternate_content_source_api.update(href, name: generate_backend_object_name, paths: paths, remote: smart_proxy_acs.remote_href)
+        api.alternate_content_source_api.update(href, name: generate_backend_object_name, paths: paths.sort, remote: smart_proxy_acs.remote_href)
       end
 
       def delete_alternate_content_source

data/lib/katello/plugin.rb

@@ -373,13 +373,6 @@ Foreman::Plugin.register :katello do
         collection: proc { http_proxy_select },
         include_blank: N_("no global default")
 
-      setting 'cdn_ssl_version',
-        type: :string,
-        default: nil,
-        full_name: N_('CDN SSL version'),
-        description: N_("SSL version used to communicate with the CDN"),
-        collection: proc { hashify_parameters(Katello::Resources::CDN::SUPPORTED_SSL_VERSIONS) }
-
       setting 'katello_default_provision',
         type: :string,
         default: 'Kickstart default',

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.12.0.rc3".freeze
+  VERSION = "4.12.0".freeze
 end

data/webpack/scenes/ContentViews/Publish/CVPublishForm.js

@@ -66,7 +66,7 @@ const CVPublishForm = ({
                 </Alert>)
             }
             {!duplicateReposAlertDismissed && composite &&
-                (duplicateRepos !== null || duplicateRepos.length > 0) &&
+                (duplicateRepos !== null && duplicateRepos.length > 0) &&
                 (
                 <Alert
                   ouiaId="duplicate-repos-alert"

data/webpack/scenes/ContentViews/Publish/__tests__/publishContentView.test.js

@@ -1,6 +1,9 @@
 import React from 'react';
 import * as reactRedux from 'react-redux';
 import { renderWithRedux, patientlyWaitFor, fireEvent, act } from 'react-testing-lib-wrapper';
+import { screen } from '@testing-library/react';
+import '@testing-library/jest-dom';
+
 import { nockInstance, assertNockRequest } from '../../../../test-utils/nockWrapper';
 import api from '../../../../services/api';
 import PublishContentViewWizard from '../PublishContentViewWizard';
@@ -80,6 +83,33 @@ test('Can show wizard with duplicate repository warning for composite CV', async
   assertNockRequest(filterScope, done);
 });
 
+test('Can show wizard without duplicate repository warning for composite CV', async (done) => {
+  const cvCompositeDetailsData = cvDetailData;
+  cvCompositeDetailsData.composite = true;
+  cvCompositeDetailsData.duplicate_repositories_to_publish = [];
+  const scope = nockInstance
+    .get(environmentPathsPath)
+    .query(true)
+    .reply(200, environmentPathsData);
+  const filterScope = nockInstance
+    .get(cvFiltersPath)
+    .reply(200, contentViewFilterData);
+
+  const { getByText } = renderWithRedux(<PublishContentViewWizard
+    details={cvCompositeDetailsData}
+    show
+    onClose={() => { }}
+  />);
+
+  await patientlyWaitFor(() => {
+    expect(getByText('Publish new version - 6.0')).toBeInTheDocument();
+    expect(screen.queryByText('Repositories common to the selected content view versions will merge, resulting in a composite content view that is a union of all content from each of the content view versions.')).not.toBeInTheDocument();
+  });
+
+  assertNockRequest(scope);
+  assertNockRequest(filterScope, done);
+});
+
 test('Can show Wizard and show environment paths', async (done) => {
   const scope = nockInstance
     .get(environmentPathsPath)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.12.0.rc3
+  version: 4.12.0
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-08 00:00:00.000000000 Z
+date: 2024-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -5398,9 +5398,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.4.10
 signing_key: