smart_proxy_remote_execution_ssh 0.10.1 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: debc9989aade4d23bda1b90e9fa8e85c99948f5b9ca37d6cecca7573bb994e5e
-  data.tar.gz: 38a2731c7f28643daaa33ddd29f93172b7467877f36b12c750b82f86e921c04d
+  metadata.gz: 4bc5fac79b7bea854a28d0e8d26af6851ec0937015b88ffad4f8cea5215b3f8f
+  data.tar.gz: d4e14b27b7b2c02b441f2161473abe6aa629d1dac75d8045f83537f69cba197e
 SHA512:
-  metadata.gz: a3f5776ce0f6ad361f2c344d0ff5d5cef9b6b032e23dc42ae0e877298abd9e95c0156c77334b106036f376e62c60c01ab13344d6bda53baa52c93c7caba79b71
-  data.tar.gz: d1de077038e5fce86df1871e4702e2abb4c7de4937f66aa8730803bb4542aa8f26c1c848d24bb74db1ce5594514d3a552b92b7ad315d346ead5e7586cb20da20
+  metadata.gz: bd4e101e224717ae4e607b54692cf2f1cbcf0c1512ba912e3255aaaa934addcf4829e27b7dc75453d416527257d8dec0cb4ba388a33ee93ccc4db030ac06ea9f
+  data.tar.gz: 2dc61c86cfef3d383e41fad38bc0818f4a3231763bd74633102076bc8a9d9ebc3b01a4e927b9e00dd0e7cbb9e977b9e49dc5d05afb0a78e8d097384dcb74cba7

data/lib/smart_proxy_remote_execution_ssh/actions/pull_script.rb

@@ -54,7 +54,9 @@ module Proxy::RemoteExecution::Ssh::Actions
 
       plan_event(PickupTimeout, input[:time_to_pickup], optional: true) if input[:time_to_pickup]
 
-      input[:job_uuid] = job_storage.store_job(host_name, execution_plan_id, run_step_id, input[:script].tr("\r", ''), effective_user: input[:effective_user])
+      input[:job_uuid] = 
+        job_storage.store_job(host_name, execution_plan_id, run_step_id, input[:script].tr("\r", ''), 
+                              effective_user: input[:effective_user])
       output[:state] = READY_FOR_PICKUP
       output[:result] = []
 
@@ -83,7 +85,11 @@ module Proxy::RemoteExecution::Ssh::Actions
 
     def process_external_unversioned(payload)
       continuous_output = Proxy::Dynflow::ContinuousOutput.new
-      Array(payload['output']).each { |line| continuous_output.add_output(line, payload['type']) } if payload.key?('output')
+      if payload.key?('output')
+        Array(payload['output']).each do |line|
+          continuous_output.add_output(line, payload['type'])
+        end
+      end
       exit_code = payload['exit_code'].to_i if payload['exit_code']
       process_update(Proxy::Dynflow::Runner::Update.new(continuous_output, exit_code))
     end

data/lib/smart_proxy_remote_execution_ssh/mqtt/dispatcher.rb

@@ -2,15 +2,39 @@ require 'concurrent'
 require 'mqtt'
 
 class Proxy::RemoteExecution::Ssh::MQTT
+  class DispatcherSupervisor < Concurrent::Actor::RestartingContext
+    def initialize
+      limit = Proxy::RemoteExecution::Ssh::Plugin.settings[:mqtt_rate_limit]
+      @dispatcher = DispatcherActor.spawn('MQTT dispatcher',
+                                          Proxy::Dynflow::Core.world.clock,
+                                          limit)
+    end
+
+    def on_message(message)
+      case message
+      when :dispatcher_reference
+        @dispatcher
+      when :resumed
+        # Carry on
+      else
+        pass
+      end
+    end
+
+    # In case an exception is raised during processing, instruct concurrent-ruby
+    # to keep going without losing state
+    def behaviour_definition
+      Concurrent::Actor::Behaviour.restarting_behaviour_definition(:resume!)
+    end
+  end
+
   class Dispatcher
     include Singleton
 
     attr_reader :reference
     def initialize
-      limit = Proxy::RemoteExecution::Ssh::Plugin.settings[:mqtt_rate_limit]
-      @reference = DispatcherActor.spawn('MQTT dispatcher',
-                                         Proxy::Dynflow::Core.world.clock,
-                                         limit)
+      @supervisor = DispatcherSupervisor.spawn(name: 'RestartingSupervisor', args: [])
+      @reference = @supervisor.ask!(:dispatcher_reference)
     end
 
     def new(uuid, topic, payload)
@@ -159,11 +183,5 @@ class Proxy::RemoteExecution::Ssh::MQTT
     def timer_off
       @timer.shutdown
     end
-
-    # In case an exception is raised during processing, instruct concurrent-ruby
-    # to keep going without losing state
-    def behaviour_definition
-      Concurrent::Actor::Behaviour.restarting_behaviour_definition(:resume!)
-    end
   end
 end

data/lib/smart_proxy_remote_execution_ssh/multiplexed_ssh_connection.rb

@@ -103,7 +103,8 @@ module Proxy::RemoteExecution::Ssh::Runners
       # does not close its stderr which trips up the process manager which
       # expects all FDs to be closed
 
-      full_command = [method.ssh_command_prefix, 'ssh', establish_ssh_options, method.ssh_options, @host, 'true'].flatten
+      full_command = [method.ssh_command_prefix, 'ssh', establish_ssh_options, method.ssh_options, @host,
+                      'true'].flatten
       log_command(full_command)
       pm = Proxy::Dynflow::ProcessManager.new(full_command)
       pm.start!

data/lib/smart_proxy_remote_execution_ssh/runners/script_runner.rb

@@ -90,7 +90,6 @@ module Proxy::RemoteExecution::Ssh::Runners
     def reset; end
   end
 
-  # rubocop:disable Metrics/ClassLength
   class ScriptRunner < Proxy::Dynflow::Runner::Base
     include Proxy::Dynflow::Runner::ProcessManagerCommand
     include CommandLogging
@@ -162,17 +161,19 @@ module Proxy::RemoteExecution::Ssh::Runners
     end
 
     def preflight_checks
-      ensure_remote_command(cp_script_to_remote("#!/bin/sh\nexec true", 'test'),
+      script = cp_script_to_remote("#!/bin/sh\nexec true")
+      ensure_remote_command(script,
         error: 'Failed to execute script on remote machine, exit code: %{exit_code}.'
       )
       unless @user_method.is_a? NoopUserMethod
-        path = cp_script_to_remote("#!/bin/sh\nexec #{@user_method.cli_command_prefix} true", 'effective-user-test')
-        ensure_remote_command(path,
+        ensure_remote_command("#{@user_method.cli_command_prefix} #{script}",
                               error: 'Failed to change to effective user, exit code: %{exit_code}',
                               tty: true,
                               user_method: @user_method,
                               close_stdin: false)
       end
+      # The path should already be escaped
+      ensure_remote_command("rm #{script}")
     end
 
     def prepare_start
@@ -180,7 +181,10 @@ module Proxy::RemoteExecution::Ssh::Runners
       @output_path = File.join(File.dirname(@remote_script), 'output')
       @exit_code_path = File.join(File.dirname(@remote_script), 'exit_code')
       @pid_path = File.join(File.dirname(@remote_script), 'pid')
-      @remote_script_wrapper = upload_data("echo $$ > #{@pid_path}; exec \"$@\";", File.join(File.dirname(@remote_script), 'script-wrapper'), 555)
+      @remote_script_wrapper = upload_data(
+        "echo $$ > #{@pid_path}; exec \"$@\";",
+        File.join(File.dirname(@remote_script), 'script-wrapper'),
+        555)
     end
 
     # the script that initiates the execution
@@ -192,7 +196,11 @@ module Proxy::RemoteExecution::Ssh::Runners
         #{@remote_script_wrapper} #{@user_method.cli_command_prefix}#{su_method ? "'#{@remote_script} < /dev/null '" : "#{@remote_script} < /dev/null"}
         echo \\$?>#{@exit_code_path}
         EOF
-        exit $(cat #{@exit_code_path})
+        if [ -f #{@exit_code_path} ] && [ $(wc -l < #{@exit_code_path}) -gt 0 ]; then
+          exit $(cat #{@exit_code_path})
+        else
+          exit 1
+        fi
       SCRIPT
     end
 
@@ -394,5 +402,4 @@ module Proxy::RemoteExecution::Ssh::Runners
       end
     end
   end
-  # rubocop:enable Metrics/ClassLength
 end

data/lib/smart_proxy_remote_execution_ssh/version.rb

@@ -1,7 +1,7 @@
 module Proxy
   module RemoteExecution
     module Ssh
-      VERSION = '0.10.1'
+      VERSION = '0.10.3'
     end
   end
 end

data/lib/smart_proxy_remote_execution_ssh.rb

@@ -50,7 +50,10 @@ module Proxy::RemoteExecution
         raise 'mqtt_port has to be set when pull-mqtt mode is used' if Plugin.settings.mqtt_port.nil?
 
         if Plugin.settings.mqtt_tls.nil?
-          Plugin.settings.mqtt_tls = [[:foreman_ssl_cert, :ssl_certificate], [:foreman_ssl_key, :ssl_private_key], [:foreman_ssl_ca, :ssl_ca_file]].all? { |(client, server)| ::Proxy::SETTINGS[client] || ::Proxy::SETTINGS[server] }
+          Plugin.settings.mqtt_tls = [[:foreman_ssl_cert, :ssl_certificate], [:foreman_ssl_key, :ssl_private_key],
+                                      [:foreman_ssl_ca, :ssl_ca_file]].all? do |(client, server)|
+            ::Proxy::SETTINGS[client] || ::Proxy::SETTINGS[server]
+          end
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_remote_execution_ssh
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.3
 platform: ruby
 authors:
 - Ivan Nečas
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-18 00:00:00.000000000 Z
+date: 2023-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +192,7 @@ homepage: https://github.com/theforeman/smart_proxy_remote_execution_ssh
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -207,8 +207,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.20
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Ssh remote execution provider for Foreman Smart-Proxy
 test_files: []