katello 4.2.0.1 → 4.2.1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-info.controller.js

@@ -90,7 +90,7 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
 
             $scope.save = function (repository, saveUpstreamAuth) {
                 var deferred = $q.defer();
-                var fields = ['upstream_password', 'upstream_username', 'ansible_collection_auth_token', 'ansible_collection_auth_url', 'ansible_collection_requirements'];
+                var fields = ['upstream_password', 'upstream_username', 'upstream_authentication_token', 'ansible_collection_auth_token', 'ansible_collection_auth_url', 'ansible_collection_requirements'];
                 if (repository.content_type === 'yum' && typeof repository.ignore_srpms !== 'undefined') {
                     if (repository['ignore_srpms']) {
                         repository['ignorable_content'] = ["srpm"];
@@ -102,6 +102,7 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
                 if (!saveUpstreamAuth) {
                     repository['upstream_username'] = null;
                     repository['upstream_password'] = null;
+                    repository['upstream_authentication_token'] = null;
                 }
 
                 if (!_.isEmpty(repository.commaTagsWhitelist)) {
@@ -200,6 +201,7 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
                 $scope.repository['upstream_password'] = null;
                 $scope.repository['upstream_auth_exists'] = false;
                 $scope.repository['upstream_username'] = null;
+                $scope.repository['upstream_authentication_token'] = null;
                 $scope.save($scope.repository);
             };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html

@@ -161,6 +161,12 @@
                  type="password"
                  autocomplete="off"
                  ng-model="repository.upstream_password"/>
+          <div translate>Upstream Authentication Token</div>
+          <input id="upstream_authentication_token"
+                  name="upstream_authentication_token"
+                  type="password"
+                  autocomplete="off"
+                  ng-model="repository.upstream_authentication_token"/>
         </dd>
       </span>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html

@@ -218,6 +218,17 @@
         </p>
       </div>
 
+      <div bst-form-group label="{{ 'Upstream Authentication Token' | translate }}" >
+        <input id="upstream_authentication_token"
+              name="upstream_authentication_token"
+              type="text"
+              autocomplete="off"
+              ng-model="repository.upstream_authentication_token"/>
+        <p class="help-block" translate>
+          Token of the upstream repository user for authentication. Leave empty if repository does not require authentication.
+        </p>
+      </div>
+
       <div bst-form-group label="{{ 'Download Policy' | translate }}" ng-if="repository.content_type === 'yum'">
         <select id="download_policy"
                 name="download_policy"

data/lib/katello/permission_creator.rb

@@ -257,9 +257,11 @@ module Katello
                            'katello/api/v2/errata' => [:index, :show, :auto_complete_search, :compare],
                            'katello/api/v2/module_streams' => [:index, :show, :auto_complete_search, :compare, :auto_complete_name],
                            'katello/api/v2/ansible_collections' => [:index, :show, :auto_complete_search, :compare],
+                           'katello/api/v2/generic_content_units' => [:index, :show, :auto_complete_search, :compare],
                            'katello/errata' => [:short_details, :auto_complete],
                            'katello/packages' => [:details, :auto_complete],
                            'katello/files' => [:auto_complete],
+                           'katello/generic' => [:auto_complete],
                            'katello/repositories' => [:auto_complete_library, :repository_types],
                            'katello/content_search' => [:index,
                                                         :products,

data/lib/katello/repository_types/deb.rb

@@ -5,7 +5,7 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::DEB_TYPE) do
   pulp3_plugin 'deb'
   prevent_unneeded_metadata_publish
 
-  default_managed_content_type Katello::Deb
+  default_managed_content_type Katello::Deb::CONTENT_TYPE
   content_type Katello::Deb,
     :pulp2_service_class => ::Katello::Pulp::Deb,
     :pulp3_service_class => ::Katello::Pulp3::Deb,

data/lib/katello/repository_types/docker.rb

@@ -1,6 +1,6 @@
 Katello::RepositoryTypeManager.register(::Katello::Repository::DOCKER_TYPE) do
   service_class Katello::Pulp::Repository::Docker
-  default_managed_content_type Katello::DockerManifest
+  default_managed_content_type Katello::DockerManifest::CONTENT_TYPE
   pulp3_service_class Katello::Pulp3::Repository::Docker
   pulp3_api_class Katello::Pulp3::Api::Docker
   pulp3_skip_publication true

data/lib/katello/repository_types/file.rb

@@ -10,5 +10,5 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::FILE_TYPE) do
                :pulp3_service_class => ::Katello::Pulp3::FileUnit,
                :removable => true,
                :uploadable => true
-  default_managed_content_type Katello::FileUnit
+  default_managed_content_type Katello::FileUnit::CONTENT_TYPE
 end

data/lib/katello/repository_types/ostree.rb

@@ -1,5 +1,5 @@
 Katello::RepositoryTypeManager.register(::Katello::Repository::OSTREE_TYPE) do
   service_class Katello::Pulp::Repository::Ostree
-  default_managed_content_type Katello::OstreeBranch
+  default_managed_content_type Katello::OstreeBranch::CONTENT_TYPE
   content_type Katello::OstreeBranch, :pulp2_service_class => ::Katello::Pulp::OstreeBranch, :removable => true, :uploadable => true
 end

data/lib/katello/repository_types/python.rb

@@ -33,5 +33,8 @@ Katello::RepositoryTypeManager.register('python') do
                        pulp3_model: PulpPythonClient::PythonPythonPackageContent,
                        pulp3_service_class: Katello::Pulp3::GenericContentUnit,
                        removable: true,
-                       uploadable: true
+                       uploadable: true,
+                       duplicates_allowed: false,
+                       filename_key: :filename
+  default_managed_content_type :python_package
 end

data/lib/katello/repository_types/yum.rb

@@ -5,7 +5,7 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::YUM_TYPE) do
   pulp3_plugin 'rpm'
   prevent_unneeded_metadata_publish
 
-  default_managed_content_type Katello::Rpm
+  default_managed_content_type Katello::Rpm::CONTENT_TYPE
   content_type Katello::Rpm,
     :priority => 1,
     :pulp2_service_class => ::Katello::Pulp::Rpm,

data/lib/katello/tasks/reset.rake

@@ -5,7 +5,7 @@ namespace :katello do
     service_start = "sudo /usr/bin/systemctl start %s"
 
     task :pulp do
-      SERVICES = %w(rh-redis5-redis pulpcore-api pulpcore-resource-manager pulpcore-content).freeze
+      SERVICES = %w(rh-redis5-redis pulpcore-api pulpcore-content).freeze
 
       puts "\e[33mStarting Pulp3 Reset\e[0m\n\n"
 
@@ -15,9 +15,9 @@ namespace :katello do
       system("sudo runuser - postgres -c 'createdb pulpcore'")
 
       Dir.chdir("/tmp") do
-        fail "\e[31mCannot migrate Pulp3 database\e[0m\n\n" unless system("sudo -u pulp PULP_SETTINGS='/etc/pulp/settings.py' DJANGO_SETTINGS_MODULE='pulpcore.app.settings' python3-django-admin migrate --no-input")
+        fail "\e[31mCannot migrate Pulp3 database\e[0m\n\n" unless system("sudo -u pulp PULP_SETTINGS='/etc/pulp/settings.py' DJANGO_SETTINGS_MODULE='pulpcore.app.settings' pulpcore-manager migrate --no-input")
         puts "\e[33mRecreating Admin User\e[0m\n\n"
-        system("sudo -u pulp PULP_SETTINGS='/etc/pulp/settings.py' DJANGO_SETTINGS_MODULE='pulpcore.app.settings' python3-django-admin reset-admin-password --password password")
+        system("sudo -u pulp PULP_SETTINGS='/etc/pulp/settings.py' DJANGO_SETTINGS_MODULE='pulpcore.app.settings' pulpcore-manager reset-admin-password --password password")
       end
 
       SERVICES.each { |s| system(service_start.gsub("%s", s)) }
@@ -38,7 +38,7 @@ namespace :katello do
     end
   end
 
-  task :reset_default_smart_proxy do
+  task :reset_default_smart_proxy => :environment do
     User.current = User.anonymous_admin
     hostname = Socket.gethostname.chomp
     SmartProxy.where(name: hostname, url: "https://#{hostname}:9090").first_or_create!
@@ -54,7 +54,8 @@ namespace :katello do
     ENV['SEED_ADMIN_PASSWORD'] ||= 'changeme'
     ENV['SEED_ORGANIZATION'] ||= 'Default Organization'
     ENV['SEED_LOCATION'] ||= 'Default Location'
-    Rake::Task['katello:reset_backends'].invoke
+    # Rake::Task['katello:reset_backends'].invoke
+    ENV['RAILS_ENV'] = 'development'
     Rake::Task['db:drop'].invoke
     Rake::Task['db:create'].invoke
 

data/lib/katello/tasks/test.rake

@@ -155,8 +155,7 @@ namespace :test do
         test_task = Rake::TestTask.new('katello_services_test_task') do |t|
           t.libs << ["test", "#{Katello::Engine.root}/test"]
           t.test_files = [
-            "#{Katello::Engine.root}/test/services/katello/pulp3/**/*_test.rb",
-            "#{Katello::Engine.root}/test/actions/pulp3/**/*_test.rb"
+            "#{Katello::Engine.root}/test/**/pulp3/**/*_test.rb"
           ]
           t.verbose = true
           t.warning = false

data/lib/katello/tasks/upgrades/4.1/{update_content_import_export_perms.rake → reupdate_content_import_export_perms.rake}

@@ -2,9 +2,29 @@ namespace :katello do
   namespace :upgrades do
     namespace '4.1' do
       desc "Update for content import/export permissions."
-      task :update_content_import_export_perms => ['environment'] do
+      task :reupdate_content_import_export_perms => ['environment'] do
         User.current = User.anonymous_api_admin
 
+        def deduplicate_filters(perm)
+          # This method makes sure that the perms [import_content, export_content]
+          # are not duplicated in this role
+          # This case used to occur if this upgrade script  did not run
+          # and the user created a role with
+          # import_library_content, export_library_content, import_content, export_content
+          # After running this task the output used to be
+          # [import_content, import_content, export_content, export_content]
+          # This method just ensures that those get cleaned up.
+
+          filtering_map = Filtering.where(permission_id: Permission.where(name: [perm]))
+                           .order(:id)
+                           .group_by(&:filter_id)
+                           .select { |_, value| value.length > 1 }
+          filtering_map.values.each do |filterings|
+            sliced = filterings[0...-1] # keep the last filtering and destroy the rest
+            sliced.each(&:destroy)
+          end
+        end
+
         permission_map = {
           Permission.find_by(name: :export_library_content) => Permission.find_by(name: :export_content),
           Permission.find_by(name: :import_library_content) => Permission.find_by(name: :import_content)
@@ -17,6 +37,9 @@ namespace :katello do
         names = permission_map.keys.compact.map(&:name)
         Permission.where(:name => names).destroy_all if names.any?
 
+        deduplicate_filters('import_content')
+        deduplicate_filters('export_content')
+
         export_content_views = Permission.find_by_name(:export_content_views)
         next if export_content_views.blank?
 

data/lib/katello/tasks/upgrades/4.2/remove_checksum_values.rake

@@ -0,0 +1,17 @@
+namespace :katello do
+  namespace :upgrades do
+    namespace '4.2' do
+      desc "Removed orphaned pools and correct org+subscription mismatch"
+      task :remove_checksum_values => ["environment"] do
+        api = Katello::Pulp3::Api::Yum.new(SmartProxy.pulp_primary)
+        repos = Katello::Pulp3::Api::Core.fetch_from_list do |page_opts|
+          api.repositories_api.list(page_opts)
+        end
+
+        repos.each do |repo|
+          api.repositories_api.partial_update(repo.pulp_href, {metadata_checksum_type: nil, package_checksum_type: nil})
+        end
+      end
+    end
+  end
+end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.2.0.1".freeze
+  VERSION = "4.2.1".freeze
 end

data/webpack/components/extensions/RegistrationCommands/__tests__/__snapshots__/ActivationKeys.test.js.snap

@@ -48,6 +48,7 @@ exports[`ActivationKeys renders 1`] = `
     onTypeaheadInputChanged={null}
     ouiaSafe={true}
     placeholderText="No Activation keys to select"
+    position="left"
     removeSelectionAriaLabel="Remove"
     selections={Array []}
     toggleAriaLabel="Options menu"

data/webpack/components/extensions/RegistrationCommands/__tests__/__snapshots__/Force.test.js.snap

@@ -20,6 +20,7 @@ exports[`Force renders 1`] = `
       </span>
     }
     onChange={[Function]}
+    ouiaSafe={true}
   />
 </FormGroup>
 `;

data/webpack/components/extensions/RegistrationCommands/__tests__/__snapshots__/IgnoreSubmanErrors.test.js.snap

@@ -20,6 +20,7 @@ exports[`IgnoreSubmanErrors renders 1`] = `
       </span>
     }
     onChange={[Function]}
+    ouiaSafe={true}
   />
 </FormGroup>
 `;

data/webpack/scenes/RedHatRepositories/components/SearchBar.js

@@ -6,10 +6,8 @@ import PropTypes from 'prop-types';
 import { Form, FormGroup } from 'react-bootstrap';
 import { translate as __ } from 'foremanReact/common/I18n';
 
-import { selectOrganizationProducts }
-  from '../../../redux/OrganizationProducts/OrganizationProductsSelectors';
-import { loadOrganizationProducts }
-  from '../../../redux/OrganizationProducts/OrganizationProductsActions';
+import { selectOrganizationProducts } from '../../../redux/OrganizationProducts/OrganizationProductsSelectors';
+import { loadOrganizationProducts } from '../../../redux/OrganizationProducts/OrganizationProductsActions';
 
 import { loadEnabledRepos } from '../../../redux/actions/RedHatRepositories/enabled';
 import { loadRepositorySets } from '../../../redux/actions/RedHatRepositories/sets';

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.2.0.1
+  version: 4.2.1
 platform: ruby
 authors:
 - N/A
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-06 00:00:00.000000000 Z
+date: 2021-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -752,6 +752,7 @@ files:
 - app/controllers/katello/api/v2/environments_controller.rb
 - app/controllers/katello/api/v2/errata_controller.rb
 - app/controllers/katello/api/v2/file_units_controller.rb
+- app/controllers/katello/api/v2/generic_content_units_controller.rb
 - app/controllers/katello/api/v2/host_autocomplete_controller.rb
 - app/controllers/katello/api/v2/host_collections_controller.rb
 - app/controllers/katello/api/v2/host_contents_controller.rb
@@ -1663,6 +1664,10 @@ files:
 - app/views/katello/api/v2/file_units/compare.json.rabl
 - app/views/katello/api/v2/file_units/index.json.rabl
 - app/views/katello/api/v2/file_units/show.json.rabl
+- app/views/katello/api/v2/generic_content_units/base.json.rabl
+- app/views/katello/api/v2/generic_content_units/compare.json.rabl
+- app/views/katello/api/v2/generic_content_units/index.json.rabl
+- app/views/katello/api/v2/generic_content_units/show.json.rabl
 - app/views/katello/api/v2/gpg_keys/index.json.rabl
 - app/views/katello/api/v2/gpg_keys/show.json.rabl
 - app/views/katello/api/v2/host_collection_errata/index.json.rabl
@@ -1821,6 +1826,7 @@ files:
 - ca/redhat-uep.pem
 - config/compass.rb
 - config/initializers/active_record.rb
+- config/initializers/filter_parameters.rb
 - config/initializers/inflections.rb
 - config/initializers/mime_types.rb
 - config/initializers/monkeys.rb
@@ -2148,6 +2154,7 @@ files:
 - db/migrate/20210714140440_remove_repo_export_permission.rb
 - db/migrate/20210721163730_change_gpg_keys_to_content_credentials.rb
 - db/migrate/20210728130748_create_function_deb_version_cmp.rb
+- db/migrate/20210831161843_add_upstream_auth_token_to_root_repository.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/104-proxy.rb
@@ -4481,8 +4488,9 @@ files:
 - lib/katello/tasks/upgrade_check.rake
 - lib/katello/tasks/upgrades/4.0/remove_ostree_puppet_content.rake
 - lib/katello/tasks/upgrades/4.1/fix_invalid_pools.rake
+- lib/katello/tasks/upgrades/4.1/reupdate_content_import_export_perms.rake
 - lib/katello/tasks/upgrades/4.1/sync_noarch_content.rake
-- lib/katello/tasks/upgrades/4.1/update_content_import_export_perms.rake
+- lib/katello/tasks/upgrades/4.2/remove_checksum_values.rake
 - lib/katello/tasks/virt_who_report.rake
 - lib/katello/url_constrained_cookie_store.rb
 - lib/katello/version.rb
@@ -5128,7 +5136,7 @@ homepage: http://www.katello.org
 licenses:
 - GPL-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -5143,8 +5151,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Content and Subscription Management plugin for Foreman
 test_files: []