smart_proxy_remote_execution_ssh 0.10.5 → 0.10.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c954cdfe053b445f2ca2d19ca1dbf6d2ad7415de960df82052cd88e397c58cdb
-  data.tar.gz: f13990b498a6703121f097d20514b6183ab4c78d7d8e7fa631c0a8dbdb96dd65
+  metadata.gz: 524c8e78e1750ce728c124861bfb6b011b93b270dc9937866c54031fe8403a16
+  data.tar.gz: 3a67985ff45e4d81b993bdba3b0f849ab4dd25588452ad97799f3b152c36ee26
 SHA512:
-  metadata.gz: 4395c6ae7c2b94d10b23d5fcc13606f99a72236e638bb65f012b6e4794fb6240ef157fb5141f5f8810e542554a61fdaf579830d1f0b395ca4ac61536af93f990
-  data.tar.gz: '08ef17875b92d53742b1482172e90ee825fc2657ee17237d04b8ead4019ad281a8d014b7b89cf74189542e9e9a08fddbd3d45bab9658de5c9369193bd8452eaa'
+  metadata.gz: fee698f670f8d5c7e350a05407e38be6ce7c48c492d03c1cdaccbe896fb49ea54227f672e2ae46ebc34cd142507b72b9f49ee6285b3e0a1b669398e9d37c2b1c
+  data.tar.gz: 8da52396e057f78ddaee30d67d9d8aff50306ec49d7c20b7ba5d506f806494ecc8868ff2233db9285d4e799d21202a5491108fd7a974c97de00fdf8a15821462

data/lib/smart_proxy_remote_execution_ssh/runners/script_runner.rb

@@ -99,6 +99,8 @@ module Proxy::RemoteExecution::Ssh::Runners
     EXPECTED_POWER_ACTION_MESSAGES = ['restart host', 'shutdown host'].freeze
     DEFAULT_REFRESH_INTERVAL = 1
 
+    UNSHARE_PREFIX = 'unshare --fork --kill-child'.freeze
+
     def initialize(options, user_method, suspended_action: nil)
       super suspended_action: suspended_action
       @host = options.fetch(:hostname)
@@ -116,6 +118,7 @@ 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:)
@@ -147,6 +150,7 @@ 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)}")
@@ -160,6 +164,16 @@ 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,
@@ -182,7 +196,7 @@ module Proxy::RemoteExecution::Ssh::Runners
       @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 \"$@\";",
+        "echo $$ > #{@pid_path}; exec #{@supports_unshare ? UNSHARE_PREFIX : ''} \"$@\";",
         File.join(File.dirname(@remote_script), 'script-wrapper'),
         555)
     end
@@ -247,6 +261,7 @@ module Proxy::RemoteExecution::Ssh::Runners
 
     def publish_data(data, type, pm = nil)
       pm ||= @process_manager
+      data = data.dup if data.frozen?
       super(data.force_encoding('UTF-8'), type) unless @user_method.filter_password?(data)
       @user_method.on_data(data, pm.stdin) if pm
     end

data/lib/smart_proxy_remote_execution_ssh/version.rb

@@ -1,7 +1,7 @@
 module Proxy
   module RemoteExecution
     module Ssh
-      VERSION = '0.10.5'
+      VERSION = '0.10.6'
     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.5
+  version: 0.10.6
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-30 00:00:00.000000000 Z
+date: 2024-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler