katello 4.0.0.rc3 → 4.0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25c755b23475d0447099ee99388c1d900ae9815b1e4be88ab5d13afeb7d044d2
-  data.tar.gz: 4482488f5ff9186dfe7f7db25901b2afa00b979c2fbf926ccfc329983a122661
+  metadata.gz: 175f5091971a1a03e1ef6045897717e644600f46baa4255e76703b17f37a5bd6
+  data.tar.gz: e9f6e8a076b105e02e14bcfd4bfe61c4b50bd98b6fc96fd64e8be422e2c81696
 SHA512:
-  metadata.gz: 464106f37ffb3915d1029ea95f9ecdc8d6c985fde7d0a40826dc111aefb1e621c17a79d478ef6538be9f485c35fec13cc1af6ad47a3b30485183a381af71828a
-  data.tar.gz: 1da0019879786addea556e156ae5b187df06170a0718eff50580d4e9bb8579b9c897fd7729c893bf414068d89813a5f9614d799e7b0584852c6c890ffac8660e
+  metadata.gz: 4af5af4d5c32367976e4131d93e55d61c6802696e779615cd8bdf0f4cd1d9b5c1fccee39fdbe8d0c7148eda66ce1201800159537f57a29a1bcd686870f6173c6
+  data.tar.gz: e58234ec4c65a357a66c588ee1f2c226ebcfb0a4a843db3f36cda2263724974400601b16a577805a213d1b7dd84aaa46419dcb9f1960546f5b087f892b310e9c

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

@@ -106,7 +106,7 @@ module Katello
       return nil unless params[:repository]
       repository = Repository.docker_type.find_by(container_repository_name: params[:repository])
       if require_user_authorization?(repository)
-        repository = readable_repositories.docker_type.find_by(container_repository_name: params[:repository])
+        repository = Repository.readable_docker_catalog.find_by(container_repository_name: params[:repository])
       end
       repository
     end
@@ -167,11 +167,9 @@ module Katello
       end
 
       if (manifest_response = redirect_client { Resources::Registry::Proxy.get(@_request.fullpath, headers) })
-        #when pulp 2 is removed, this should no longer be needed, and all clients should be redirected
-        logger.debug filter_sensitive_data(manifest_response)
+        #for some requests, we get a redirect, but for others we get the actual manifest in response
         results = JSON.parse(manifest_response)
-
-        response.header['Docker-Content-Digest'] = "sha256:#{Digest::SHA256.hexdigest(manifest_response)}"
+        response.header['Docker-Content-Digest'] = manifest_response.headers[:docker_content_digest]
         # https://docs.docker.com/registry/spec/manifest-v2-2/
         # If its v2 schema 2 only the mediaType attribute will be present in the manifest
         media_type = results['mediaType']
@@ -184,8 +182,8 @@ module Katello
                          'application/vnd.docker.distribution.manifest.v1+prettyjws'
                        end
         end
-
-        render json: manifest_response, content_type: media_type
+        response.headers['Content-Type'] = media_type
+        render json: manifest_response
       end
     end
 
@@ -333,7 +331,7 @@ module Katello
       params[:per_page] = params[:n] || 25
       params[:search] = params[:q]
 
-      search_results = scoped_search(readable_repositories.docker_type.distinct,
+      search_results = scoped_search(Repository.readable_docker_catalog.distinct,
                                      :container_repository_name, :asc, options)
 
       results = {
@@ -347,7 +345,7 @@ module Katello
     end
 
     def catalog
-      repositories = readable_repositories.docker_type.collect do |repository|
+      repositories = Repository.readable_docker_catalog.collect do |repository|
         repository.container_repository_name
       end
       render json: { repositories: repositories }

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

@@ -52,9 +52,9 @@ module Katello
       param :upstream_password, String, :desc => N_("Password of the upstream repository user used for authentication")
       param :ostree_upstream_sync_policy, ::Katello::RootRepository::OSTREE_UPSTREAM_SYNC_POLICIES, :desc => N_("policies for syncing upstream ostree repositories")
       param :ostree_upstream_sync_depth, :number, :desc => N_("if a custom sync policy is chosen for ostree repositories then a 'depth' value must be provided")
-      param :deb_releases, String, :desc => N_("comma-separated list of releases to be synced from deb-archive")
-      param :deb_components, String, :desc => N_("comma-separated list of repo components to be synced from deb-archive")
-      param :deb_architectures, String, :desc => N_("comma-separated list of architectures to be synced from deb-archive")
+      param :deb_releases, String, :desc => N_("whitespace-separated list of releases to be synced from deb-archive")
+      param :deb_components, String, :desc => N_("whitespace-separated list of repo components to be synced from deb-archive")
+      param :deb_architectures, String, :desc => N_("whitespace-separated list of architectures to be synced from deb-archive")
       param :ignorable_content, Array, :desc => N_("List of content units to ignore while syncing a yum repository. Must be subset of %s") % RootRepository::IGNORABLE_CONTENT_UNIT_TYPES.join(",")
       param :ansible_collection_requirements, String, :desc => N_("Contents of requirement yaml file to sync from URL")
       param :http_proxy_policy, ::Katello::RootRepository::HTTP_PROXY_POLICIES, :desc => N_("policies for HTTP proxy for content sync")
@@ -95,6 +95,7 @@ module Katello
           :required => false
     param :with_content, RepositoryTypeManager.enabled_content_types, :desc => N_("only repositories having at least one of the specified content type ex: rpm , erratum")
     param :download_policy, ::Runcible::Models::YumImporter::DOWNLOAD_POLICIES, :desc => N_("limit to only repositories with this download policy")
+    param :username, String, :desc => N_("only show the repositories readable by this user with this username")
     param_group :search, Api::V2::ApiController
     add_scoped_search_description_for(Repository)
     def index

data/app/helpers/katello/katello_urls_helper.rb

@@ -20,7 +20,7 @@ module Katello
       "#{prefix}/pub/#{config}"
     end
 
-    def repository_url(content_path, content_type = 'repos', schema = 'http')
+    def repository_url(content_path, _content_type = nil, schema = 'http')
       return content_path if content_path =~ %r|^([\w\-\+]+)://|
       url = if @host.content_source
               "#{schema}://#{@host.content_source.hostname}"
@@ -33,7 +33,7 @@ module Katello
       end
       path = ::Katello::Glue::Pulp::Repos.repo_path_from_content_path(
         @host.lifecycle_environment, content_path)
-      "#{url}/pulp/#{content_type}/#{path}"
+      "#{url}/pulp/content/#{path}"
     end
   end
 end

data/app/lib/actions/katello/agent_action.rb

@@ -15,22 +15,15 @@ module Actions
       def plan(host, options)
         action_subject(host, :hostname => host.name, :content => options[:content])
 
-        # if already dispatched by bulk action use the provided history ID
-        dispatch_history_id = options.dig(:dispatch_histories, host.id.to_s)
-
-        unless dispatch_history_id
-          histories = ::Katello::Agent::Dispatcher.dispatch(
-            self.class.agent_message,
-            [host.id],
-            content: options[:content]
-          )
-
-          dispatch_history_id = histories.first.id
-        end
+        dispatch_history_id = options.dig(:dispatch_histories, host.id.to_s) || ::Katello::Agent::Dispatcher.create_histories(
+          host_ids: [host.id]
+        ).first.id
 
         plan_self(
           host_id: host.id,
-          dispatch_history_id: dispatch_history_id
+          dispatch_history_id: dispatch_history_id,
+          content: options[:content],
+          bulk: options[:bulk]
         )
       end
 
@@ -38,20 +31,23 @@ module Actions
         case event
         when nil
           history = dispatch_history
+          timeout = accept_timeout
 
           if history.finished?
             fail_on_errors
             return
           elsif history.accepted?
-            schedule_timeout(finish_timeout)
-          else
-            schedule_timeout(accept_timeout)
+            timeout = finish_timeout
           end
 
           suspend do |suspended_action|
             history.dynflow_execution_plan_id = suspended_action.execution_plan_id
             history.dynflow_step_id = suspended_action.step_id
             history.save!
+
+            dispatch_message(history) unless input[:bulk]
+
+            schedule_timeout(timeout)
           end
         when Dynflow::Action::Timeouts::Timeout
           process_timeout
@@ -63,6 +59,14 @@ module Actions
         end
       end
 
+      def dispatch_message(history)
+        ::Katello::Agent::Dispatcher.dispatch(
+          self.class.agent_message,
+          [history],
+          content: input[:content]
+        )
+      end
+
       def accept_timeout
         Setting['content_action_accept_timeout']
       end
@@ -79,7 +83,12 @@ module Actions
         end
 
         unless history.finished?
-          fail _("Host did not finish content action in %s seconds.  The task has been cancelled.") % finish_timeout
+          # we could be processing the accept_timeout here
+          # only fail for finish_timeout unless the actual duration has elapsed
+          finish_limit = history.accepted_at + finish_timeout
+          if finish_limit < DateTime.now
+            fail _("Host did not finish content action in %s seconds.  The task has been cancelled.") % finish_timeout
+          end
         end
       end
 

data/app/lib/actions/katello/bulk_agent_action.rb

@@ -3,19 +3,32 @@ module Actions
     class BulkAgentAction < Actions::BulkAction
       def plan(agent_action, hosts, args)
         host_ids = hosts.map(&:id)
-        dispatch_args = {
-          content: args[:content]
-        }
-        histories = ::Katello::Agent::Dispatcher.dispatch(agent_action.agent_message, host_ids, dispatch_args)
+
+        histories = ::Katello::Agent::Dispatcher.create_histories(
+          host_ids: host_ids
+        )
 
         grouped_histories = {}
         histories.each { |h| grouped_histories[h.host_id] = h.id }
         options = {
           dispatch_histories: grouped_histories,
-          content: args[:content]
+          type: agent_action.agent_message,
+          content: args[:content],
+          bulk: true
         }
         super(agent_action, hosts, options)
       end
+
+      def spawn_plans
+        args = input[:args].first
+        histories = ::Katello::Agent::DispatchHistory.where(id: args[:dispatch_histories].slice(*current_batch.map(&:to_s)).values)
+        ::Katello::Agent::Dispatcher.dispatch(
+          args[:type].to_sym,
+          histories,
+          content: args[:content]
+        )
+        super
+      end
     end
   end
 end

data/app/lib/actions/katello/capsule_content/sync_capsule.rb

@@ -35,15 +35,53 @@ module Actions
               end
             end
           end
-          update_unauthenticated_repo_list(smart_proxy) if smart_proxy.has_feature?("Container_Gateway")
+          sync_container_gateway(smart_proxy)
         end
 
-        def update_unauthenticated_repo_list(smart_proxy)
-          unauthenticated_repo_list =
-            ::Katello::SmartProxyHelper.new(smart_proxy).combined_repos_available_to_capsule.select do |repo|
-              repo.docker? && repo.environment.registry_unauthenticated_pull
+        def sync_container_gateway(smart_proxy)
+          if smart_proxy.has_feature?(::SmartProxy::CONTAINER_GATEWAY_FEATURE)
+            update_container_repo_list(smart_proxy)
+            users = smart_proxy.container_gateway_users
+            update_user_container_repo_mapping(smart_proxy, users) if users.any?
+          end
+        end
+
+        def unauthenticated_container_repositories
+          ::Katello::Repository.joins(:environment).where("#{::Katello::KTEnvironment.table_name}.registry_unauthenticated_pull" => true).select(:id).pluck(:id)
+        end
+
+        def update_container_repo_list(smart_proxy)
+          # [{ repository: "repoA", auth_required: false }]
+          repo_list = []
+          ::Katello::SmartProxyHelper.new(smart_proxy).combined_repos_available_to_capsule.each do |repo|
+            if repo.docker? && !repo.container_repository_name.nil?
+              repo_list << { repository: repo.container_repository_name,
+                             auth_required: !unauthenticated_container_repositories.include?(repo.id) }
             end
-          smart_proxy.update_unauthenticated_repo_list(unauthenticated_repo_list.map(&:container_repository_name))
+          end
+          smart_proxy.update_container_repo_list(repo_list)
+        end
+
+        def update_user_container_repo_mapping(smart_proxy, users)
+          # Example user-repo mapping:
+          # { users:
+          #   [
+          #     'user a' => [{ repository: 'repo 1', auth_required: true }]
+          #   ]
+          # }
+
+          user_repo_map = { users: [] }
+          users.each do |user|
+            inner_repo_list = []
+            repositories = ::Katello::Repository.readable_docker_catalog_as(user)
+            repositories.each do |repo|
+              next if repo.container_repository_name.nil?
+              inner_repo_list << { repository: repo.container_repository_name,
+                                   auth_required: !unauthenticated_container_repositories.include?(repo.id) }
+            end
+            user_repo_map[:users] << { user.login => inner_repo_list }
+          end
+          smart_proxy.update_user_container_repo_mapping(user_repo_map)
         end
 
         def repos_to_sync(smart_proxy, environment, content_view, repository, skip_metatadata_check = false)

data/app/lib/actions/katello/content_view/promote.rb

@@ -2,6 +2,9 @@ module Actions
   module Katello
     module ContentView
       class Promote < Actions::EntryAction
+        extend ApipieDSL::Class
+        include ::Actions::ObservableAction
+
         def plan(version, environments, is_force = false, description = nil, incremental_update = false)
           action_subject(version.content_view)
           version.check_ready_to_promote!(environments)
@@ -18,6 +21,28 @@ module Actions
             end
           end
         end
+
+        def environments
+          input['environments']
+        end
+
+        apipie :class, "A class representing #{self} object" do
+          desc 'This object is available as **@object** variable in
+                webhook templates when a corresponding event occures.
+                The following properties can be used to retrieve the needed information.'
+          name "#{class_scope}"
+          refs "#{class_scope}"
+          sections only: %w[all webhooks]
+          property :task, object_of: 'Task', desc: 'Returns the task to which this action belongs'
+          property :environments, array_of: String, desc: 'Returns the list of environments the content view was promoted to'
+        end
+        include Actions::Katello::JailConcern::Organization
+        include Actions::Katello::JailConcern::ContentView
+        class Jail < ::Actions::ObservableAction::Jail
+          allow :organization_id, :organization_name, :organization_label,
+                :content_view_id, :content_view_name, :content_view_label,
+                :environments
+        end
       end
     end
   end

data/app/lib/actions/katello/content_view/publish.rb

@@ -3,7 +3,9 @@ module Actions
   module Katello
     module ContentView
       class Publish < Actions::EntryAction
+        extend ApipieDSL::Class
         include ::Katello::ContentViewHelper
+        include ::Actions::ObservableAction
         attr_accessor :version
         # rubocop:disable Metrics/MethodLength,Metrics/AbcSize,Metrics/CyclomaticComplexity
         def plan(content_view, description = "", options = {importing: false}) # rubocop:disable Metrics/PerceivedComplexity
@@ -145,6 +147,14 @@ module Actions
         rescue ::Katello::Errors::CapsuleCannotBeReached # skip any capsules that cannot be connected to
         end
 
+        def content_view_version_id
+          input['content_view_version_id']
+        end
+
+        def content_view_version_name
+          input['content_view_version_name']
+        end
+
         private
 
         def include_other_components(override_components, content_view)
@@ -197,6 +207,25 @@ module Actions
             end
           end
         end
+
+        apipie :class, "A class representing #{self} object" do
+          desc 'This object is available as **@object** variable in
+                webhook templates when a corresponding event occures.
+                The following properties can be used to retrieve the needed information.'
+          name "#{class_scope}"
+          refs "#{class_scope}"
+          sections only: %w[all webhooks]
+          property :task, object_of: 'Task', desc: 'Returns the task to which this action belongs'
+          property :content_view_version_id, Integer, desc: 'Returns published content view version id'
+          property :content_view_version_name, String, desc: 'Returns published content view version name'
+        end
+        include Actions::Katello::JailConcern::Organization
+        include Actions::Katello::JailConcern::ContentView
+        class Jail < ::Actions::ObservableAction::Jail
+          allow :organization_id, :organization_name, :organization_label,
+                :content_view_id, :content_view_name, :content_view_label,
+                :content_view_version_id, :content_view_version_name
+        end
       end
     end
   end

data/app/lib/actions/katello/jail_concern/content_view.rb

@@ -0,0 +1,30 @@
+module Actions
+  module Katello
+    module JailConcern
+      module ContentView
+        def content_view_id
+          input['content_view']['id']
+        end
+
+        def content_view_name
+          input['content_view']['name']
+        end
+
+        def content_view_label
+          input['content_view']['label']
+        end
+
+        def self.included(base)
+          super
+          base.instance_eval do
+            apipie :class do
+              property :content_view_id, Integer, desc: 'Returns the id of the content view'
+              property :content_view_name, String, desc: 'Returns the name of the content view'
+              property :content_view_label, String, desc: 'Returns the label of the content view'
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/lib/actions/katello/jail_concern/organization.rb

@@ -0,0 +1,30 @@
+module Actions
+  module Katello
+    module JailConcern
+      module Organization
+        def organization_id
+          input['organization']['id']
+        end
+
+        def organization_name
+          input['organization']['name']
+        end
+
+        def organization_label
+          input['organization']['label']
+        end
+
+        def self.included(base)
+          super
+          base.instance_eval do
+            apipie :class do
+              property :organization_id, Integer, desc: 'Returns the id of the organization'
+              property :organization_name, String, desc: 'Returns the name of the organization'
+              property :organization_label, String, desc: 'Returns the label of the organization'
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/lib/actions/katello/repository/sync.rb

@@ -3,8 +3,10 @@ module Actions
   module Katello
     module Repository
       class Sync < Actions::EntryAction
+        extend ApipieDSL::Class
         include Helpers::Presenter
         include Actions::Katello::PulpSelector
+        include ::Actions::ObservableAction
         middleware.use Actions::Middleware::ExecuteIfContentsChanged
 
         input_format do
@@ -124,6 +126,63 @@ module Actions
         def rescue_strategy
           Dynflow::Action::Rescue::Skip
         end
+
+        def repository_id
+          input['repository']['id']
+        end
+
+        def repository_name
+          input['repository']['name']
+        end
+
+        def repository_label
+          input['repository']['label']
+        end
+
+        def product_id
+          input['product']['id']
+        end
+
+        def product_name
+          input['product']['name']
+        end
+
+        def product_label
+          input['product']['label']
+        end
+
+        def contents_changed
+          input['contents_changed']
+        end
+
+        def sync_result
+          input['sync_result']
+        end
+
+        apipie :class, "A class representing #{self} object" do
+          desc 'This object is available as **@object** variable in
+                webhook templates when a corresponding event occures.
+                The following properties can be used to retrieve the needed information.'
+          name "#{class_scope}"
+          refs "#{class_scope}"
+          sections only: %w[all webhooks]
+          property :task, object_of: 'Task', desc: 'Returns the task to which this action belongs'
+          property :repository_id, Integer, desc: 'Returns synced repository id'
+          property :repository_name, String, desc: 'Returns synced repository name'
+          property :repository_label, String, desc: 'Returns synced repository label'
+          property :product_id, Integer, desc: 'Returns product id the synced repository belongs to'
+          property :product_name, String, desc: 'Returns product name the synced repository belongs to'
+          property :product_label, String, desc: 'Returns product label the synced repository belongs to'
+          property :sync_result, Hash, desc: 'Returns Hash object with sync result'
+          property :contents_changed, one_of: [true, false], desc: 'Returns true if repository content was changed due to sync, false otherwise'
+        end
+        include Actions::Katello::JailConcern::Organization
+        class Jail < ::Actions::ObservableAction::Jail
+          allow :organization_id, :organization_name, :organization_label,
+                :repository_id, :repository_name, :repository_label,
+                :product_id, :product_name, :product_label,
+                :sync_result, :contents_changed
+        end
       end
     end
   end