-
-
-
- <%= check_box_tag 'http_proxy[default_content]',
- '1',
- params.dig('http_proxy', 'default_content') == '1',
- id: 'http_proxy_default_content' %>
- Set this proxy as the default for content, updating the 'Default HTTP Proxy' setting.
-
+
diff --git a/config/initializers/monkeys.rb b/config/initializers/monkeys.rb
index 8ed5b9fe7a5..1cba332c8aa 100644
--- a/config/initializers/monkeys.rb
+++ b/config/initializers/monkeys.rb
@@ -1,4 +1,3 @@
#place where monkey patches are required
require 'monkeys/ar_postgres_evr_t'
-require 'monkeys/fx_sqlite_skip'
require 'monkeys/remove_hidden_distribution'
diff --git a/config/routes/api/registry.rb b/config/routes/api/registry.rb
index e4a365ed80a..d5ff6ec475d 100644
--- a/config/routes/api/registry.rb
+++ b/config/routes/api/registry.rb
@@ -19,6 +19,7 @@ class ActionDispatch::Routing::Mapper
match '/v2' => 'registry_proxies#ping', :via => :get
match '/v1/_ping' => 'registry_proxies#v1_ping', :via => :get
match '/v1/search' => 'registry_proxies#v1_search', :via => :get
+ match '/index/static' => 'registry_proxies#static_index', :via => :get
end
end
end
diff --git a/config/routes/api/v2.rb b/config/routes/api/v2.rb
index c6c894a76fe..d3dd1fa9272 100644
--- a/config/routes/api/v2.rb
+++ b/config/routes/api/v2.rb
@@ -30,6 +30,10 @@ class ActionDispatch::Routing::Mapper
end
end
+ api_resources :host_bootc_images, :only => [:auto_complete_search] do
+ get :auto_complete_search, :on => :collection
+ end
+
api_resources :capsules, :only => [:index, :show] do
member do
resource :content, :only => [], :controller => 'capsule_content' do
diff --git a/config/routes/overrides.rb b/config/routes/overrides.rb
index 142312d6e8d..32bcf9d5fdb 100644
--- a/config/routes/overrides.rb
+++ b/config/routes/overrides.rb
@@ -59,6 +59,7 @@ def matches?(request)
collection do
match '/auto_complete_search' => 'host_autocomplete#auto_complete_search', :via => :get
+ match '/bootc_images' => 'host_bootc_images#bootc_images', :via => :get
match '/bulk/add_host_collections' => 'hosts_bulk_actions#bulk_add_host_collections', :via => :put
match '/bulk/remove_host_collections' => 'hosts_bulk_actions#bulk_remove_host_collections', :via => :put
match '/bulk/remove_host_collections' => 'hosts_bulk_actions#bulk_remove_host_collections', :via => :put
diff --git a/db/migrate/20200213184848_create_evr_type.rb b/db/migrate/20200213184848_create_evr_type.rb
index 8bd6bfe9148..4426fd730ff 100644
--- a/db/migrate/20200213184848_create_evr_type.rb
+++ b/db/migrate/20200213184848_create_evr_type.rb
@@ -4,7 +4,132 @@ class CreateEvrType < ActiveRecord::Migration[5.2]
def up
unless connection.adapter_name.downcase.include?('sqlite')
- enable_extension "evr"
+ execute <<~SQL
+ create type evr_array_item as (
+ n NUMERIC,
+ s TEXT
+ );
+
+ create type evr_t as (
+ epoch INT,
+ version evr_array_item[],
+ release evr_array_item[]
+ );
+
+ CREATE FUNCTION evr_trigger() RETURNS trigger AS $$
+ BEGIN
+ NEW.evr = (select ROW(coalesce(NEW.epoch::numeric,0),
+ rpmver_array(coalesce(NEW.version,'empty'))::evr_array_item[],
+ rpmver_array(coalesce(NEW.release,'empty'))::evr_array_item[])::evr_t);
+ RETURN NEW;
+ END;
+ $$ language 'plpgsql';
+
+ create or replace FUNCTION empty(t TEXT)
+ RETURNS BOOLEAN as $$
+ BEGIN
+ return t ~ '^[[:space:]]*$';
+ END;
+ $$ language 'plpgsql';
+
+ create or replace FUNCTION isalpha(ch CHAR)
+ RETURNS BOOLEAN as $$
+ BEGIN
+ if ascii(ch) between ascii('a') and ascii('z') or
+ ascii(ch) between ascii('A') and ascii('Z')
+ then
+ return TRUE;
+ end if;
+ return FALSE;
+ END;
+ $$ language 'plpgsql';
+
+ create or replace FUNCTION isalphanum(ch CHAR)
+ RETURNS BOOLEAN as $$
+ BEGIN
+ if ascii(ch) between ascii('a') and ascii('z') or
+ ascii(ch) between ascii('A') and ascii('Z') or
+ ascii(ch) between ascii('0') and ascii('9')
+ then
+ return TRUE;
+ end if;
+ return FALSE;
+ END;
+ $$ language 'plpgsql';
+
+ create or replace function isdigit(ch CHAR)
+ RETURNS BOOLEAN as $$
+ BEGIN
+ if ascii(ch) between ascii('0') and ascii('9')
+ then
+ return TRUE;
+ end if;
+ return FALSE;
+ END ;
+ $$ language 'plpgsql';
+
+ create or replace FUNCTION rpmver_array (string1 IN VARCHAR)
+ RETURNS evr_array_item[] as $$
+ declare
+ str1 VARCHAR := string1;
+ digits VARCHAR(10) := '0123456789';
+ lc_alpha VARCHAR(27) := 'abcdefghijklmnopqrstuvwxyz';
+ uc_alpha VARCHAR(27) := 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+ alpha VARCHAR(54) := lc_alpha || uc_alpha;
+ one VARCHAR;
+ isnum BOOLEAN;
+ ver_array evr_array_item[] := ARRAY[]::evr_array_item[];
+ BEGIN
+ if str1 is NULL
+ then
+ RAISE EXCEPTION 'VALUE_ERROR.';
+ end if;
+
+ one := str1;
+ <
>
+ while one <> ''
+ loop
+ declare
+ segm1 VARCHAR;
+ segm1_n NUMERIC := 0;
+ begin
+ -- Throw out all non-alphanum characters
+ while one <> '' and not isalphanum(one)
+ loop
+ one := substr(one, 2);
+ end loop;
+ str1 := one;
+ if str1 <> '' and isdigit(str1)
+ then
+ str1 := ltrim(str1, digits);
+ isnum := true;
+ else
+ str1 := ltrim(str1, alpha);
+ isnum := false;
+ end if;
+ if str1 <> ''
+ then segm1 := substr(one, 1, length(one) - length(str1));
+ else segm1 := one;
+ end if;
+
+ if segm1 = '' then return ver_array; end if; /* arbitrary */
+ if isnum
+ then
+ segm1 := ltrim(segm1, '0');
+ if segm1 <> '' then segm1_n := segm1::numeric; end if;
+ segm1 := NULL;
+ else
+ end if;
+ ver_array := array_append(ver_array, (segm1_n, segm1)::evr_array_item);
+ one := str1;
+ end;
+ end loop segment_loop;
+
+ return ver_array;
+ END ;
+ $$ language 'plpgsql';
+
+ SQL
add_column :katello_rpms, :evr, :evr_t
add_column :katello_installed_packages, :evr, :evr_t
diff --git a/db/migrate/20240924161240_katello_recreate_evr_constructs.rb b/db/migrate/20240924161240_katello_recreate_evr_constructs.rb
new file mode 100644
index 00000000000..e0a28790d26
--- /dev/null
+++ b/db/migrate/20240924161240_katello_recreate_evr_constructs.rb
@@ -0,0 +1,160 @@
+class KatelloRecreateEvrConstructs < ActiveRecord::Migration[6.1]
+ def up
+ if !extension_enabled?('evr')
+ return
+ else
+ execute <<~SQL
+ DROP EXTENSION evr CASCADE;
+ SQL
+
+ execute <<~SQL
+ create type evr_array_item as (
+ n NUMERIC,
+ s TEXT
+ );
+
+ create type evr_t as (
+ epoch INT,
+ version evr_array_item[],
+ release evr_array_item[]
+ );
+
+ CREATE FUNCTION evr_trigger() RETURNS trigger AS $$
+ BEGIN
+ NEW.evr = (select ROW(coalesce(NEW.epoch::numeric,0),
+ rpmver_array(coalesce(NEW.version,'empty'))::evr_array_item[],
+ rpmver_array(coalesce(NEW.release,'empty'))::evr_array_item[])::evr_t);
+ RETURN NEW;
+ END;
+ $$ language 'plpgsql';
+
+ create or replace FUNCTION empty(t TEXT)
+ RETURNS BOOLEAN as $$
+ BEGIN
+ return t ~ '^[[:space:]]*$';
+ END;
+ $$ language 'plpgsql';
+
+ create or replace FUNCTION isalpha(ch CHAR)
+ RETURNS BOOLEAN as $$
+ BEGIN
+ if ascii(ch) between ascii('a') and ascii('z') or
+ ascii(ch) between ascii('A') and ascii('Z')
+ then
+ return TRUE;
+ end if;
+ return FALSE;
+ END;
+ $$ language 'plpgsql';
+
+ create or replace FUNCTION isalphanum(ch CHAR)
+ RETURNS BOOLEAN as $$
+ BEGIN
+ if ascii(ch) between ascii('a') and ascii('z') or
+ ascii(ch) between ascii('A') and ascii('Z') or
+ ascii(ch) between ascii('0') and ascii('9')
+ then
+ return TRUE;
+ end if;
+ return FALSE;
+ END;
+ $$ language 'plpgsql';
+
+ create or replace function isdigit(ch CHAR)
+ RETURNS BOOLEAN as $$
+ BEGIN
+ if ascii(ch) between ascii('0') and ascii('9')
+ then
+ return TRUE;
+ end if;
+ return FALSE;
+ END ;
+ $$ language 'plpgsql';
+
+ create or replace FUNCTION rpmver_array (string1 IN VARCHAR)
+ RETURNS evr_array_item[] as $$
+ declare
+ str1 VARCHAR := string1;
+ digits VARCHAR(10) := '0123456789';
+ lc_alpha VARCHAR(27) := 'abcdefghijklmnopqrstuvwxyz';
+ uc_alpha VARCHAR(27) := 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+ alpha VARCHAR(54) := lc_alpha || uc_alpha;
+ one VARCHAR;
+ isnum BOOLEAN;
+ ver_array evr_array_item[] := ARRAY[]::evr_array_item[];
+ BEGIN
+ if str1 is NULL
+ then
+ RAISE EXCEPTION 'VALUE_ERROR.';
+ end if;
+
+ one := str1;
+ <>
+ while one <> ''
+ loop
+ declare
+ segm1 VARCHAR;
+ segm1_n NUMERIC := 0;
+ begin
+ -- Throw out all non-alphanum characters
+ while one <> '' and not isalphanum(one)
+ loop
+ one := substr(one, 2);
+ end loop;
+ str1 := one;
+ if str1 <> '' and isdigit(str1)
+ then
+ str1 := ltrim(str1, digits);
+ isnum := true;
+ else
+ str1 := ltrim(str1, alpha);
+ isnum := false;
+ end if;
+ if str1 <> ''
+ then segm1 := substr(one, 1, length(one) - length(str1));
+ else segm1 := one;
+ end if;
+
+ if segm1 = '' then return ver_array; end if; /* arbitrary */
+ if isnum
+ then
+ segm1 := ltrim(segm1, '0');
+ if segm1 <> '' then segm1_n := segm1::numeric; end if;
+ segm1 := NULL;
+ else
+ end if;
+ ver_array := array_append(ver_array, (segm1_n, segm1)::evr_array_item);
+ one := str1;
+ end;
+ end loop segment_loop;
+
+ return ver_array;
+ END ;
+ $$ language 'plpgsql';
+
+ SQL
+
+ add_column :katello_rpms, :evr, :evr_t
+ add_column :katello_installed_packages, :evr, :evr_t
+
+ execute <<-SQL
+ update katello_rpms SET evr = (ROW(coalesce(epoch::numeric,0),
+ rpmver_array(coalesce(version,'empty'))::evr_array_item[],
+ rpmver_array(coalesce(release,'empty'))::evr_array_item[])::evr_t);
+
+ update katello_installed_packages SET evr = (ROW(coalesce(epoch::numeric,0),
+ rpmver_array(coalesce(version,'empty'))::evr_array_item[],
+ rpmver_array(coalesce(release,'empty'))::evr_array_item[])::evr_t);
+ SQL
+
+ create_trigger :evr_insert_trigger_katello_rpms, on: :katello_rpms
+ create_trigger :evr_update_trigger_katello_rpms, on: :katello_rpms
+ create_trigger :evr_insert_trigger_katello_installed_packages, on: :katello_installed_packages
+ create_trigger :evr_update_trigger_katello_installed_packages, on: :katello_installed_packages
+ end
+ end
+
+ def down
+ fail ActiveRecord::IrreversibleMigration
+ end
+end
diff --git a/db/migrate/20241120213713_add_allow_other_types_to_content_view_erratum_filter_rules.rb b/db/migrate/20241120213713_add_allow_other_types_to_content_view_erratum_filter_rules.rb
new file mode 100644
index 00000000000..adac4544e52
--- /dev/null
+++ b/db/migrate/20241120213713_add_allow_other_types_to_content_view_erratum_filter_rules.rb
@@ -0,0 +1,6 @@
+class AddAllowOtherTypesToContentViewErratumFilterRules < ActiveRecord::Migration[6.1]
+ def change
+ add_column :katello_content_view_erratum_filter_rules, :allow_other_types, :boolean,
+ :default => false, :null => false
+ end
+end
diff --git a/db/seeds.d/75-job_templates.rb b/db/seeds.d/75-job_templates.rb
index 385bc3f3ae6..17247eb9c39 100644
--- a/db/seeds.d/75-job_templates.rb
+++ b/db/seeds.d/75-job_templates.rb
@@ -1,8 +1,12 @@
User.as_anonymous_admin do
JobTemplate.without_auditing do
+ # let's name root template as *_action.erb
+ root_action_files = Dir[File.join("#{Katello::Engine.root}/app/views/foreman/job_templates/**/*_action.erb")]
template_files = Dir[File.join("#{Katello::Engine.root}/app/views/foreman/job_templates/**/*.erb")]
template_files.reject! { |file| file.end_with?('_ansible_default.erb') } unless Katello.with_ansible?
- template_files.each do |template|
+
+ # root templates need to be imported first
+ (root_action_files + (template_files - root_action_files)).each do |template|
sync = !Rails.env.test? && Setting[:remote_execution_sync_templates]
template = JobTemplate.import_raw!(File.read(template), :default => true, :lock => true, :update => sync)
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/debs.controller.js b/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/debs.controller.js
index 4cf9adb0c7d..7a2e6ca390e 100644
--- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/debs.controller.js
+++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/debs.controller.js
@@ -1,38 +1,52 @@
-(function () {
- 'use strict';
-
- /**
- * @ngdoc controller
- * @name Bastion.debs.controller:DebsController
- *
- * @description
- * Handles fetching deb packages and populating Nutupane based on the current
- * ui-router state.
- *
- * @requires translate
- *
- */
- function DebsController($scope, $location, translate, Nutupane, Deb, CurrentOrganization) {
+/**
+ * @ngdoc controller
+ * @name Bastion.debs.controller:DebsController
+ *
+ * @description
+ * Handles fetching deb packages and populating Nutupane based on the current
+ * ui-router state.
+ *
+ * @requires translate
+ *
+ */
+angular.module('Bastion.debs').controller('DebsController',
+ ['$scope', '$location', 'translate', 'Nutupane', 'Deb', 'Repository', 'CurrentOrganization',
+ function DebsController($scope, $location, translate, Nutupane, Deb, Repository, CurrentOrganization) {
var nutupane;
var params = {
'organization_id': CurrentOrganization,
'search': $location.search().search || "",
+ 'repository_id': $location.search().repositoryId || null,
'paged': true,
'sort_by': 'name',
'sort_order': 'ASC'
};
- nutupane = new Nutupane(Deb, params);
+ nutupane = $scope.nutupane = new Nutupane(Deb, params);
nutupane.primaryOnly = true;
$scope.table = nutupane.table;
// Labels so breadcrumb strings can be translated
$scope.label = translate('Debs');
+ $scope.repositoriesLabel = translate('Repositories');
$scope.controllerName = 'katello_debs';
+ $scope.repository = {name: translate('All Repositories'), id: 'all'};
+
+ Repository.queryUnpaged({'organization_id': CurrentOrganization, 'content_type': 'deb', 'with_content': 'deb'}, function (response) {
+ $scope.repositories = [$scope.repository];
+ $scope.repositories = $scope.repositories.concat(response.results);
+
+ if ($location.search().repositoryId) {
+ $scope.repository = _.find($scope.repositories, function (repository) {
+ return repository.id === parseInt($location.search().repositoryId, 10);
+ });
+ }
+ });
+
Deb.queryPaged({'organization_id': CurrentOrganization}, function (result) {
$scope.packageCount = result.total;
});
@@ -50,12 +64,22 @@
nutupane.refresh();
};
- }
+ $scope.$watch('repository', function (repository) {
+ var nutupaneParams = nutupane.getParams();
- angular
- .module('Bastion.debs')
- .controller('DebsController', DebsController);
+ if (repository.id === 'all') {
+ nutupaneParams['repository_id'] = null;
+ nutupane.setParams(nutupaneParams);
+ } else {
+ $location.search('repositoryId', repository.id);
+ nutupaneParams['repository_id'] = repository.id;
+ nutupane.setParams(nutupaneParams);
+ }
- DebsController.$inject = ['$scope', '$location', 'translate', 'Nutupane', 'Deb', 'CurrentOrganization'];
+ if (!nutupane.table.initialLoad) {
+ nutupane.refresh();
+ }
+ });
-})();
+ }]
+);
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/views/debs.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/views/debs.html
index 935a718c314..01c2219bdc4 100644
--- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/views/debs.html
+++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/views/debs.html
@@ -6,6 +6,10 @@
Deb Packages
+
+
+
+