foreman_remote_execution 5.1.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 831ec5aca2ec4aaa3df1229f7addd9a968c7c49b0fc49a15253e33d2ab0f5689
-  data.tar.gz: 07a4f17f0d4d694c4b927291ee8e55dafd839cf902a9ef06c79b227fdf65760f
+  metadata.gz: 61d64bd14e3ce43367e26ad39ec10408baf8ec7920f45aa4ea1353340d3cf742
+  data.tar.gz: 0ab68114a29368fa4c2a269287b875368cdcc31db63dd481df223a1f91a36cef
 SHA512:
-  metadata.gz: 75fd11cfe45b5223a2427561c0859c39f19923535283fa919927af9b4ffd67ea56a4c9b791632e73c72c4dff1946f2e1046cb10a1f84ed7dae0e686daff2d90d
-  data.tar.gz: 03557c309e25a902c0def6e7575ad74a02e724482da823b4580f4bbe9b80358eadb2e0781b832f45a2e9101196447edf887476fa79782a3d6ee125640dccd92a
+  metadata.gz: 5d908f4f766c2b55bf6814035058b5faea29ba1ae3c61729275d2492e62b5f5aba2f60838d0b8383b9075f75daed15788d34ae1b2b9e091fea3ec26f812c670a
+  data.tar.gz: 05d63bba759d31d2b85030bc8cb4e39faeb9af50e784374e016edb4637d84906f6527b533efd5600da969a1b2315f34392f5f994d1ae17bbc840f5a2dfdf04a9

data/README.md

@@ -24,6 +24,13 @@ management functionality with remote management functionality.
 
 Check the Foreman manual [remote execution section](http://theforeman.org/plugins/foreman_remote_execution/)
 
+## Compatibility
+
+| Foreman Version | Plugin Version |
+| --------------- | -------------- |
+| >= 3.1          | ~> 5.0.0       |
+| >= 3.2          | >= 6.0.0       |
+
 ## Simulated runs
 There is an option to use an alternative `ScriptRunner` implementation. Instead of doing ssh connections it discards any input its given and gives back fake output.
 

data/app/controllers/ui_job_wizard_controller.rb

@@ -3,10 +3,11 @@ class UiJobWizardController < ApplicationController
   def categories
     job_categories = resource_scope
                      .search_for("job_category ~ \"#{params[:search]}\"")
+                     .where(:snippet => false)
                      .select(:job_category).distinct
                      .reorder(:job_category)
                      .pluck(:job_category)
-    render :json => {:job_categories =>job_categories, :with_katello => with_katello}
+    render :json => {:job_categories => job_categories, :with_katello => with_katello, default_category: default_category, default_template: default_template&.id}
   end
 
   def template
@@ -24,6 +25,16 @@ class UiJobWizardController < ApplicationController
     template_inputs_with_foreign.map { |input| input.attributes.merge({:resource_type_tableize => input.resource_type&.tableize }) }
   end
 
+  def default_category
+    default_template&.job_category
+  end
+
+  def default_template
+    if (setting_value = Setting['remote_execution_form_job_template'])
+      JobTemplate.authorized(:view_job_templates).find_by :name => setting_value
+    end
+  end
+
   def resource_name(nested_resource = nil)
     nested_resource || 'job_template'
   end

data/app/helpers/concerns/foreman_remote_execution/hosts_helper_extensions.rb

@@ -8,7 +8,7 @@ module ForemanRemoteExecution
 
     def multiple_actions
       res = super
-      res += [ [_('Schedule Remote Job'), new_job_invocation_path, false] ] if authorized_for(controller: :job_invocations, action: :new)
+      res += [ [_('Schedule Remote Job'), new_job_invocation_path, false] ] if can_schedule_jobs?
       res
     end
 
@@ -22,20 +22,20 @@ module ForemanRemoteExecution
       end
     end
 
-    def rex_host_features(*args)
-      return unless authorized_for(controller: :job_invocations, action: :create)
+    def rex_host_features(host, *_rest)
+      return [] unless can_execute_on_host?(host)
       RemoteExecutionFeature.with_host_action_button.order(:label).map do |feature|
-        link_to(_('%s') % feature.name, job_invocations_path(:host_ids => [args.first.id], :feature => feature.label), :method => :post)
+        link_to(_('%s') % feature.name, job_invocations_path(:host_ids => [host.id], :feature => feature.label), :method => :post)
       end
     end
 
-    def schedule_job_button(*args)
-      return unless authorized_for(controller: :job_invocations, action: :new)
-      link_to(_('Schedule Remote Job'), new_job_invocation_path(:host_ids => [args.first.id]), :id => :run_button, :class => 'btn btn-default')
+    def schedule_job_button(host, *_rest)
+      return unless can_execute_on_host?(host)
+      link_to(_('Schedule Remote Job'), new_job_invocation_path(:host_ids => [host.id]), :id => :run_button, :class => 'btn btn-default')
     end
 
     def web_console_button(host, *args)
-      return unless authorized_for(permission: 'cockpit_hosts', auth_object: host)
+      return if !authorized_for(permission: 'cockpit_hosts', auth_object: host) || !can_execute_on_infrastructure_host?(host)
 
       url = SSHExecutionProvider.cockpit_url_for_host(host.name)
       url ? link_to(_('Web Console'), url, :class => 'btn btn-default', :id => :'web-console-button', :target => '_new') : nil
@@ -46,6 +46,17 @@ module ForemanRemoteExecution
         button_group(web_console_button(*args)))
       super(*args)
     end
-  end
 
+    def can_schedule_jobs?
+      authorized_for(controller: :job_invocations, action: :create)
+    end
+
+    def can_execute_on_host?(host)
+      can_schedule_jobs? && can_execute_on_infrastructure_host?(host)
+    end
+
+    def can_execute_on_infrastructure_host?(host)
+      !host.infrastructure_host? || User.current.can?(:execute_jobs_on_infrastructure_hosts)
+    end
+  end
 end

data/app/helpers/remote_execution_helper.rb

@@ -31,7 +31,7 @@ module RemoteExecutionHelper
 
     if authorized_for(hash_for_host_path(host).merge(auth_object: host, permission: :view_hosts, authorizer: job_hosts_authorizer))
       links << { title: _('Host detail'),
-        action: { href: host_path(host), 'data-method': 'get', id: "#{host.name}-actions-detail" } }
+        action: { href: current_host_details_path(host), 'data-method': 'get', id: "#{host.name}-actions-detail" } }
     end
 
     if authorized_for(hash_for_rerun_job_invocation_path(id: job_invocation, host_ids: [ host.id ], authorizer: job_hosts_authorizer))

data/app/mailers/rex_job_mailer.rb

@@ -1,5 +1,5 @@
 class RexJobMailer < ApplicationMailer
-  add_template_helper(ApplicationHelper)
+  helper ApplicationHelper
 
   def job_finished(job, opts = {})
     @job = job

data/app/models/concerns/foreman_remote_execution/host_extensions.rb

@@ -121,6 +121,10 @@ module ForemanRemoteExecution
       @cached_rex_host_params_hash = nil
     end
 
+    def infrastructure_host?
+      infrastructure_facet&.foreman_instance || infrastructure_facet&.smart_proxy_id
+    end
+
     private
 
     def extend_host_params_hash(params)

data/app/models/targeting.rb

@@ -67,7 +67,7 @@ class Targeting < ApplicationRecord
     return '' if ids.empty?
 
     hosts = Host.execution_scope.where(:id => ids).distinct.pluck(:name)
-    "name ^ (#{hosts.join(', ')})"
+    hosts.any? ? "name ^ (#{hosts.join(', ')})" : ''
   end
 
   def resolved?

data/app/views/job_invocations/_preview_hosts_list.html.erb

@@ -7,7 +7,7 @@
 <% if @hosts.any? -%>
   <ul>
     <% @hosts.each do |host| -%>
-        <li><%= link_to h(host.name), host_path(host), :target => '_blank' %></li>
+        <li><%= link_to h(host.name), current_host_details_path(host), :target => '_blank' %></li>
     <% end -%>
 
     <% if @additional > 0 -%>

data/app/views/template_invocations/show.html.erb

@@ -30,7 +30,7 @@ end
 <% if @host %>
   <% proxy_id = @template_invocation_task.input[:proxy_id] %>
   <h3>
-    <%= _('Target: ') %><%= link_to(@host.name, host_path(@host)) %>
+    <%= _('Target: ') %><%= link_to(@host.name, current_host_details_path(@host)) %>
     <% if proxy_id && proxy = SmartProxy.find_by(id: proxy_id) %>
       <%= _('using Smart Proxy') %> <%= link_to(proxy.name, smart_proxy_path(proxy)) %>
     <% end %>

data/lib/foreman_remote_execution/engine.rb

@@ -47,7 +47,7 @@ module ForemanRemoteExecution
 
     initializer 'foreman_remote_execution.register_plugin', before: :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_remote_execution do
-        requires_foreman '>= 3.1'
+        requires_foreman '>= 3.2'
         register_global_js_file 'global'
 
         apipie_documented_controllers ["#{ForemanRemoteExecution::Engine.root}/app/controllers/api/v2/*.rb"]
@@ -214,7 +214,11 @@ module ForemanRemoteExecution
         role 'Remote Execution User', USER_PERMISSIONS, 'Role with permissions to run remote execution jobs against hosts'
         role 'Remote Execution Manager', MANAGER_PERMISSIONS, 'Role with permissions to manage job templates, remote execution features, cancel jobs and view audit logs'
 
-        add_all_permissions_to_default_roles
+        add_all_permissions_to_default_roles(except: [:execute_jobs_on_infrastructure_hosts])
+        add_permissions_to_default_roles({
+          Role::MANAGER => [:execute_jobs_on_infrastructure_hosts],
+          Role::SITE_MANAGER => USER_PERMISSIONS + [:execute_jobs_on_infrastructure_hosts],
+        })
 
         # add menu entry
         menu :top_menu, :job_templates,

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '5.1.0'.freeze
+  VERSION = '6.0.0'.freeze
 end

data/locale/action_names.rb

@@ -1,6 +1,5 @@
 # Autogenerated!
-_("Preupgrade job")
-_("Action with sub plans")
-_("Import facts")
-_("Import Puppet classes")
 _("Remote action:")
+_("»Import facts«")
+_("»Import Puppet classes«")
+_("»Action with sub plans«")