smart_proxy_remote_execution_ssh 0.5.0 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2f91ec259ca105bcc18a5cecf4342019f4023d44cbff5695998b5e57c25e325
-  data.tar.gz: 51ccf299324d4adf10c07475dca2749d885c258913c8d9e7593d8b8149e6d18d
+  metadata.gz: abf6517f6a98386e246650454c7deb049b7583c7653040eb63bbdf8e3cc27f0a
+  data.tar.gz: 12b0aa0d067e45c73ee65286f69d1556f7ae8b1c47624845e1e0a7e96c341e95
 SHA512:
-  metadata.gz: 74313e91e51ff5d58fce0bc880131b12984a750110a2d76c88875a6b824eec40a2ba9d7336dfda34df7c11d465ded62c14d4d33ba10cf4bed1b2e0309aff9a2b
-  data.tar.gz: 92f85e971f10d9e45418e75d0325f3e548e65954160be9f86cb154adde6bc3a512b4e3a5429d162291704b49a50a5570fcdeb4b129f735b8f8f737938a0194d0
+  metadata.gz: f873d27dc9b5ba0b9c10d7d227058618d901a48643ba31e491e1530b34356aa88ac8a197e9731d83a2a535ffa7577ba674578af8b90de3d02f7537d6359063d5
+  data.tar.gz: d72dfc490d0f71a076885eeabf435a89bca3658ce31a465666725a19e1d0f3c682d51f899922a2b6dbfdbfe8ee8d880fc0b0d0a13ac2536c5ce8f276f64b059b

data/lib/smart_proxy_remote_execution_ssh/cockpit.rb

@@ -164,6 +164,8 @@ module Proxy::RemoteExecution
         out_read, out_write = IO.pipe
         err_read, err_write = IO.pipe
 
+        # Force the script runner to initialize its logger
+        script_runner.logger
         pid = spawn(*script_runner.send(:get_args, command), :in => in_read, :out => out_write, :err => err_write)
         [in_read, out_write, err_write].each(&:close)
 
@@ -176,7 +178,7 @@ module Proxy::RemoteExecution
         inner_system_ssh_loop out_buf, err_buf, in_buf, pid
       end
 
-      def inner_system_ssh_loop2(out_buf, err_buf, in_buf, pid)
+      def inner_system_ssh_loop(out_buf, err_buf, in_buf, pid)
         err_buf_raw = ''
         readers = [buf_socket, out_buf, err_buf]
         loop do
@@ -185,6 +187,9 @@ module Proxy::RemoteExecution
           (ready_readers || []).each { |reader| reader.close if reader.fill.zero? }
 
           proxy_data(out_buf, in_buf)
+          if buf_socket.closed?
+            script_runner.close_session
+          end
 
           if out_buf.closed?
             code = Process.wait2(pid).last.exitstatus
@@ -202,7 +207,7 @@ module Proxy::RemoteExecution
       rescue # rubocop:disable Style/RescueStandardError
         send_error(400, err_buf_raw) unless @started
       ensure
-        [out_buff, err_buf, in_buf].each(&:close)
+        [out_buf, err_buf, in_buf].each(&:close)
       end
 
       def proxy_data(out_buf, in_buf)

data/lib/smart_proxy_remote_execution_ssh/plugin.rb

@@ -14,7 +14,7 @@ module Proxy::RemoteExecution::Ssh
                      :kerberos_auth           => false,
                      # When set to nil, makes REX use the runner's default interval
                      # :runner_refresh_interval => nil,
-                     :ssh_log_level           => :fatal,
+                     :ssh_log_level           => :error,
                      :cleanup_working_dirs    => true,
                      # :mqtt_broker             => nil,
                      # :mqtt_port               => nil,

data/lib/smart_proxy_remote_execution_ssh/runners/polling_script_runner.rb

@@ -40,7 +40,8 @@ module Proxy::RemoteExecution::Ssh::Runners
       control_script_finish = "#{@control_script_path} init-script-finish"
       <<-SCRIPT.gsub(/^ +\| /, '')
       | export CONTROL_SCRIPT="#{@control_script_path}"
-      | sh -c '#{main_script}; #{control_script_finish}' #{close_fds} &
+      | #{"chown #{@user_method.effective_user} '#{@base_dir}'" if @user_method.cli_command_prefix}
+      | #{@user_method.cli_command_prefix} sh -c '#{main_script}; #{control_script_finish}' #{close_fds} &
       | echo $! > '#{@base_dir}/pid'
       SCRIPT
     end

data/lib/smart_proxy_remote_execution_ssh/runners/script_runner.rb

@@ -201,8 +201,10 @@ module Proxy::RemoteExecution::Ssh::Runners
       raise 'Control socket file does not exist' unless File.exist?(local_command_file("socket"))
       @logger.debug("Sending exit request for session #{@ssh_user}@#{@host}")
       args = ['/usr/bin/ssh', @host, "-o", "User=#{@ssh_user}", "-o", "ControlPath=#{local_command_file("socket")}", "-O", "exit"].flatten
-      *, err = session(args, in_stream: false, out_stream: false)
-      read_output_debug(err)
+      pid, *, err = session(args, in_stream: false, out_stream: false)
+      result = read_output_debug(err)
+      Process.wait(pid)
+      result
     end
 
     def close

data/lib/smart_proxy_remote_execution_ssh/version.rb

@@ -1,7 +1,7 @@
 module Proxy
   module RemoteExecution
     module Ssh
-      VERSION = '0.5.0'
+      VERSION = '0.5.3'
     end
   end
 end

data/lib/smart_proxy_remote_execution_ssh.rb

@@ -47,7 +47,7 @@ module Proxy::RemoteExecution
           when :ssh
             Plugin.logger.warn('Deprecated option async_ssh used together with ssh mode, switching mode to ssh-async.')
             Plugin.settings.mode = :'ssh-async'
-          when :'async-ssh'
+          when :'ssh-async'
             # This is a noop
           else
             Plugin.logger.warn('Deprecated option async_ssh used together with incompatible mode, ignoring.')

data/settings.d/remote_execution_ssh.yml.example

@@ -16,7 +16,7 @@
 # Defines the verbosity of logging coming from ssh command
 # one of :debug, :info, :error, :fatal
 # must be lower than general log level
-# :ssh_log_level: fatal
+# :ssh_log_level: error
 
 # Remove working directories on job completion
 # :cleanup_working_dirs: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_remote_execution_ssh
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.3
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-16 00:00:00.000000000 Z
+date: 2022-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -203,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Ssh remote execution provider for Foreman Smart-Proxy