smart_proxy_remote_execution_ssh 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db736b4bf0a21a18f335774778041f20480f18b886669d87c9d0f902e749eb14
-  data.tar.gz: 49741c279188b7371c212949d77cb8ebe488eccde6198018c41853bdad673f33
+  metadata.gz: 88b0285639f42712b4f588b01c4830b7155d971dc0677a4cf3a04e2557b742a0
+  data.tar.gz: a3b3af8bb1bf183a4156af74b758120f1039de80add807e1cea8713bcd6e982e
 SHA512:
-  metadata.gz: 92b94f0e609c6f5485f1519a6f853f74b75de8e1efec6f93bcf52519af8f585eb6a1189c547ce606434bdccf16764704d06c4d7bf0aa42b83a990a599585cce7
-  data.tar.gz: 4b0bc9999579dda06bcbdee9d0e6e422e67441e8fc82af6ea9064d8aec843a505a8a6505ba267bfdea514f8ba6ceb772ac06db5d4b0b2db27a1268a37033231f
+  metadata.gz: 12bfc09f6535367e6f090b0d0401b57e9395bd44b3c41603ec06279930bd1c1f48ef24d6a8088999aa323bf42901e9dd9b0460dfb634712b2cd4119374c377ee
+  data.tar.gz: 6715dbc41c631447a1e2817e4e8ab289230258a49b874f837d7e529bdb6e7f05ddae670389b2a2e3466a02598ee9238dfbb3ce13ea19c6e47a6fbf9624a88c41

data/lib/smart_proxy_remote_execution_ssh/runners/script_runner.rb

@@ -118,7 +118,6 @@ module Proxy::RemoteExecution::Ssh::Runners
       @first_execution = options.fetch(:first_execution, false)
       @user_method = user_method
       @options = options
-      @supports_unshare = false
     end
 
     def self.build(options, suspended_action:)
@@ -150,7 +149,6 @@ module Proxy::RemoteExecution::Ssh::Runners
       @connection = MultiplexedSSHConnection.new(@options.merge(:id => @id), logger: logger)
       @connection.establish!
       preflight_checks
-      detect_capabilities
       prepare_start
       script = initialization_script
       logger.debug("executing script:\n#{indent_multiline(script)}")
@@ -164,16 +162,6 @@ module Proxy::RemoteExecution::Ssh::Runners
       run_async(*args)
     end
 
-    def detect_capabilities
-      script = cp_script_to_remote("#!/bin/sh\nexec #{UNSHARE_PREFIX} true")
-      begin
-        ensure_remote_command(script)
-        @supports_unshare = true
-      rescue; end
-      # The path should already be escaped
-      ensure_remote_command("rm #{script}")
-    end
-
     def preflight_checks
       script = cp_script_to_remote("#!/bin/sh\nexec true")
       ensure_remote_command(script,
@@ -195,27 +183,32 @@ 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')
+      su_method = @user_method.instance_of?(SuUserMethod)
+      wrapper = <<~SCRIPT
+        if [ "$1" == "inner" ]; then
+          echo \$$ > #{@pid_path}
+          (
+            #{@user_method.cli_command_prefix}#{su_method ? "'exec #{@remote_script} < /dev/null '" : "#{@remote_script} < /dev/null"}
+            echo \$? >#{@exit_code_path}
+          ) | tee #{@output_path}
+        else
+          UNSHARE=''
+          if #{UNSHARE_PREFIX} true >/dev/null 2>/dev/null; then
+              UNSHARE='#{UNSHARE_PREFIX}'
+          fi
+          exec $UNSHARE "$0" inner
+        fi
+      SCRIPT
       @remote_script_wrapper = upload_data(
-        "echo $$ > #{@pid_path}; exec #{@supports_unshare ? UNSHARE_PREFIX : ''} \"$@\";",
+        wrapper,
         File.join(File.dirname(@remote_script), 'script-wrapper'),
         555)
     end
 
     # the script that initiates the execution
     def initialization_script
-      su_method = @user_method.instance_of?(SuUserMethod)
       # pipe the output to tee while capturing the exit code in a file
-      <<~SCRIPT
-        sh <<EOF | /usr/bin/tee #{@output_path}
-        #{@remote_script_wrapper} #{@user_method.cli_command_prefix}#{su_method ? "'#{@remote_script} < /dev/null '" : "#{@remote_script} < /dev/null"}
-        echo \\$?>#{@exit_code_path}
-        EOF
-        if [ -f #{@exit_code_path} ] && [ $(wc -l < #{@exit_code_path}) -gt 0 ]; then
-          exit $(cat #{@exit_code_path})
-        else
-          exit 1
-        fi
-      SCRIPT
+      @remote_script_wrapper
     end
 
     def refresh
@@ -227,7 +220,7 @@ module Proxy::RemoteExecution::Ssh::Runners
 
     def kill
       if @process_manager&.started?
-        run_sync("pkill -P $(cat #{@pid_path})")
+        run_sync("kill $(cat #{@pid_path})")
       else
         logger.debug('connection closed')
       end

data/lib/smart_proxy_remote_execution_ssh/version.rb

@@ -1,7 +1,7 @@
 module Proxy
   module RemoteExecution
     module Ssh
-      VERSION = '0.11.0'
+      VERSION = '0.11.1'
     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.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-10 00:00:00.000000000 Z
+date: 2024-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler