foreman_remote_execution_core 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3216a936b41179b58d8ae81a238d2fbdaff11e56
-  data.tar.gz: aec1f9700b5a9f7daa4fbe6259dc8e2d64943b30
+  metadata.gz: b8c6efad663b97320d18f4e9d571f7f2b9664192
+  data.tar.gz: e7e0c57fcb0b404138e550c633890f394a227fbd
 SHA512:
-  metadata.gz: 2eadacdd4acfd582061150991734a46ac53909874379c0cf7f4562089aa32342511875773c84134c97f2e2910ae9bd94aeb21c6726c0a7652dc93ccdb808a282
-  data.tar.gz: 6f6666aedd9474440e52a15f2927e5e279e439e75fb475e8bb9b747b921d83cb003a978b50d80596858845c06d581c51e68d59f1fc75697264a4e062cc8a8490
+  metadata.gz: 83be3ce8b355070f9144aad526a570de85c5705a826eb75ebe060802b5f34b62df14cba1f5d98791d6823d04a4668ce32beaa647be46cd4897319c778d9f6b63
+  data.tar.gz: 90e397053171e0e3aab5e539e7b6d40fa71cf995812b95956fcf4156b44ee96f639ba83b6f3814ddd813e528cafac35c8a27bc46053f0701a9992758e6ca2a35

data/lib/foreman_remote_execution_core/script_runner.rb

@@ -2,7 +2,7 @@ require 'net/ssh'
 
 module ForemanRemoteExecutionCore
   class ScriptRunner < ForemanTasksCore::Runner::Base
-    EXPECTED_POWER_ACTION_MESSAGES = ["restart host", "shutdown host"]
+    EXPECTED_POWER_ACTION_MESSAGES = ['restart host', 'shutdown host'].freeze
 
     def initialize(options)
       super()
@@ -26,16 +26,18 @@ module ForemanRemoteExecutionCore
       exit_code_path = File.join(File.dirname(remote_script), 'exit_code')
 
       # pipe the output to tee while capturing the exit code in a file
-      script = <<-SCRIPT
-          (#{su_prefix}#{remote_script} < /dev/null; echo $?>#{exit_code_path}) | /usr/bin/tee #{output_path}
-          exit $(< #{exit_code_path})
+      script = <<-SCRIPT.gsub(/^\s+\| /, '')
+      | sh <<WRAPPER
+      | (#{su_prefix}#{remote_script} < /dev/null; echo \\$?>#{exit_code_path}) | /usr/bin/tee #{output_path}
+      | exit \\$(cat #{exit_code_path})
+      | WRAPPER
       SCRIPT
 
       logger.debug("executing script:\n#{script.lines.map { |line| "  | #{line}" }.join}")
       run_async(script)
     rescue => e
       logger.error("error while initalizing command #{e.class} #{e.message}:\n #{e.backtrace.join("\n")}")
-      publish_exception("Error initializing command", e)
+      publish_exception('Error initializing command', e)
     end
 
     def refresh
@@ -53,10 +55,10 @@ module ForemanRemoteExecutionCore
       if @session
         run_sync("pkill -f #{remote_command_file('script')}")
       else
-        logger.debug("connection closed")
+        logger.debug('connection closed')
       end
     rescue => e
-      publish_exception("Unexpected error", e, false)
+      publish_exception('Unexpected error', e, false)
     end
 
     def with_retries
@@ -70,7 +72,7 @@ module ForemanRemoteExecutionCore
           logger.error('Retrying')
           retry
         else
-          publish_exception("Unexpected error", e)
+          publish_exception('Unexpected error', e)
         end
       end
     end
@@ -83,7 +85,7 @@ module ForemanRemoteExecutionCore
       if @expecting_disconnect
         publish_exit_status(0)
       else
-        publish_exception("Unexpected disconnect", e)
+        publish_exception('Unexpected disconnect', e)
       end
     end
 
@@ -109,7 +111,7 @@ module ForemanRemoteExecutionCore
       # if the host public key is contained in the known_hosts_file,
       # verify it, otherwise, if missing, import it and continue
       ssh_options[:paranoid] = true
-      ssh_options[:auth_methods] = ["publickey"]
+      ssh_options[:auth_methods] = ['publickey']
       ssh_options[:user_known_hosts_file] = prepare_known_hosts if @host_public_key
       return ssh_options
     end
@@ -122,16 +124,16 @@ module ForemanRemoteExecutionCore
     # available. The yielding doesn't happen automatically, but as
     # part of calling the `refresh` method.
     def run_async(command)
-      raise "Async command already in progress" if @started
+      raise 'Async command already in progress' if @started
       @started = false
       session.open_channel do |channel|
         channel.request_pty
         channel.on_data { |ch, data| publish_data(data, 'stdout') }
         channel.on_extended_data { |ch, type, data| publish_data(data, 'stderr') }
         # standard exit of the command
-        channel.on_request("exit-status") { |ch, data| publish_exit_status(data.read_long) }
+        channel.on_request('exit-status') { |ch, data| publish_exit_status(data.read_long) }
         # on signal: sending the signal value (such as 'TERM')
-        channel.on_request("exit-signal") do |ch, data|
+        channel.on_request('exit-signal') do |ch, data|
           publish_exit_status(data.read_string)
           ch.close
           # wait for the channel to finish so that we know at the end
@@ -140,7 +142,7 @@ module ForemanRemoteExecutionCore
         end
         channel.exec(command) do |ch, success|
           @started = true
-          raise("Error initializing command") unless success
+          raise('Error initializing command') unless success
         end
       end
       session.process(0) until @started
@@ -148,25 +150,25 @@ module ForemanRemoteExecutionCore
     end
 
     def run_sync(command, stdin = nil)
-      stdout = ""
-      stderr = ""
+      stdout = ''
+      stderr = ''
       exit_status = nil
       started = false
 
       channel = session.open_channel do |ch|
         ch.on_data { |_, data| stdout.concat(data) }
         ch.on_extended_data { |_, _, data| stderr.concat(data) }
-        ch.on_request("exit-status") { |_, data| exit_status = data.read_long }
+        ch.on_request('exit-status') { |_, data| exit_status = data.read_long }
         # Send data to stdin if we have some
         ch.send_data(stdin) unless stdin.nil?
         # on signal: sending the signal value (such as 'TERM')
-        ch.on_request("exit-signal") do |_, data|
+        ch.on_request('exit-signal') do |_, data|
           exit_status = data.read_string
           ch.close
           ch.wait
         end
         ch.exec command do |_, success|
-          raise "could not execute command" unless success
+          raise 'could not execute command' unless success
           started = true
         end
       end
@@ -231,7 +233,7 @@ module ForemanRemoteExecutionCore
       # We use tee here to pipe stdin coming from ssh to a file at $path, while silencing its output
       # This is used to write to $path with elevated permissions, solutions using cat and output redirection
       # would not work, because the redirection would happen in the non-elevated shell.
-      command = "#{su_prefix} tee '#{path}' >/dev/null && #{su_prefix} chmod '#{permissions}' '#{path}'"
+      command = "tee '#{path}' >/dev/null && chmod '#{permissions}' '#{path}'"
 
       @logger.debug("Sending data to #{path} on remote host:\n#{data}")
       status, _out, err = run_sync(command, data)

data/lib/foreman_remote_execution_core/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecutionCore
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution_core
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks-core
@@ -52,7 +52,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: "  Ssh remote execution provider code sharable between Foreman and Foreman-Proxy\n"
+description: |2
+    Ssh remote execution provider code sharable between Foreman and Foreman-Proxy
 email:
 - inecas@redhat.com
 executables: []
@@ -85,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Foreman remote execution - core bits