foreman_remote_execution_core 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ed4af0ca0cfa0732b3b1ab8614ac6b6429db9bd7
-  data.tar.gz: 9e810b7d7b4d91988e0a83d182dfb5d0fc2214dd
+SHA256:
+  metadata.gz: f58fc844cebc176f015343ed6c5ed47a97ffeac65356c8eb34009705b29322dd
+  data.tar.gz: 91b3890c6238578942389be52d1392a140deba33aa6261de65776788bca86fb7
 SHA512:
-  metadata.gz: d72dfad5a53957f25eeb547c62d0214c039e7c5e654ab18e198015f24158a5c65485b5b4b49417b4e2814a2bd082d300e2e4687a0469aa1b06a481f769268a09
-  data.tar.gz: 57d534ca297475f32ac4593db2590c7c747d74443d25600ec5d4c7b93647431275838652824d4d795a339a21f9377ea8c041c00cb712fc09ccdce6619786de15
+  metadata.gz: 86b4e7b8e098b493cda6214cfd5fa35ed471221c7ef8af9ba23a8966f7eca0236aea68eac9890d1333119f954e4b90b730fd2e1f73ad05c1b97f761e936bebad
+  data.tar.gz: cfb6aba18b777bb140e2535bd16c70a6c248ff7d4b0a44fcc9005da32c647321bcf3517d5f6fef2b2ae8377105d0209ddd7e65da0b04b6b332a138d4e297ca70

data/lib/foreman_remote_execution_core.rb

@@ -10,12 +10,43 @@ module ForemanRemoteExecutionCore
                     :kerberos_auth           => false,
                     :async_ssh               => false,
                     # When set to nil, makes REX use the runner's default interval
-                    :runner_refresh_interval => nil)
+                    :runner_refresh_interval => nil,
+                    :ssh_log_level           => :fatal)
+
+  SSH_LOG_LEVELS = %w(debug info warn error fatal).freeze
 
   def self.simulate?
     %w(yes true 1).include? ENV.fetch('REX_SIMULATE', '').downcase
   end
 
+  def self.validate_settings!
+    super
+    self.validate_ssh_log_level!
+    @settings[:ssh_log_level] = @settings[:ssh_log_level].to_sym
+  end
+
+  def self.validate_ssh_log_level!
+    wanted_level = @settings[:ssh_log_level].to_s
+    unless SSH_LOG_LEVELS.include? wanted_level
+      raise "Wrong value '#{@settings[:ssh_log_level]}' for ssh_log_level, must be one of #{SSH_LOG_LEVELS.join(', ')}"
+    end
+
+    current = if defined?(SmartProxyDynflowCore)
+                SmartProxyDynflowCore::SETTINGS.log_level.to_s.downcase
+              else
+                Rails.configuration.log_level.to_s
+              end
+
+    # regular log levels correspond to upcased ssh logger levels
+    ssh, regular = [wanted_level, current].map do |wanted|
+      SSH_LOG_LEVELS.each_with_index.find { |value, _index| value == wanted }.last
+    end
+
+    if ssh < regular
+      raise 'ssh_log_level cannot be more verbose than regular log level'
+    end
+  end
+
   def self.runner_class
     @runner_class ||= if simulate?
                         FakeScriptRunner
@@ -28,6 +59,7 @@ module ForemanRemoteExecutionCore
 
   if ForemanTasksCore.dynflow_present?
     require 'foreman_tasks_core/runner'
+    require 'foreman_remote_execution_core/log_filter'
     if simulate?
       # Load the fake implementation of the script runner if debug is enabled
       require 'foreman_remote_execution_core/fake_script_runner'

data/lib/foreman_remote_execution_core/fake_script_runner.rb

@@ -1,5 +1,6 @@
 module ForemanRemoteExecutionCore
   class FakeScriptRunner < ForemanTasksCore::Runner::Base
+    DEFAULT_REFRESH_INTERVAL = 1
 
     @data = []
 

data/lib/foreman_remote_execution_core/log_filter.rb

@@ -0,0 +1,13 @@
+module ForemanRemoteExecutionCore
+  class LogFilter < ::Logger
+    def initialize(base_logger)
+      @base_logger = base_logger
+    end
+
+    def add(severity, *args)
+      severity ||= ::Logger::UNKNOWN
+      return true if @base_logger.nil? || severity < @level
+      @base_logger.add(severity, *args)
+    end
+  end
+end

data/lib/foreman_remote_execution_core/script_runner.rb

@@ -12,6 +12,7 @@ module ForemanRemoteExecutionCore
 
     EXPECTED_POWER_ACTION_MESSAGES = ['restart host', 'shutdown host'].freeze
     DEFAULT_REFRESH_INTERVAL = 1
+    MAX_PROCESS_RETRIES = 4
 
     def initialize(options)
       super()
@@ -19,6 +20,8 @@ module ForemanRemoteExecutionCore
       @script = options.fetch(:script)
       @ssh_user = options.fetch(:ssh_user, 'root')
       @ssh_port = options.fetch(:ssh_port, 22)
+      @ssh_password = options.fetch(:secrets, {}).fetch(:ssh_password, nil)
+      @key_passphrase = options.fetch(:secrets, {}).fetch(:key_passphrase, nil)
       @effective_user = options.fetch(:effective_user, nil)
       @effective_user_method = options.fetch(:effective_user_method, 'sudo')
       @host_public_key = options.fetch(:host_public_key, nil)
@@ -108,7 +111,7 @@ module ForemanRemoteExecutionCore
 
     def with_disconnect_handling
       yield
-    rescue Net::SSH::Disconnect => e
+    rescue IOError, Net::SSH::Disconnect => e
       @session.shutdown!
       check_expecting_disconnect
       if @expecting_disconnect
@@ -139,6 +142,8 @@ module ForemanRemoteExecutionCore
       ssh_options = {}
       ssh_options[:port] = @ssh_port if @ssh_port
       ssh_options[:keys] = [@client_private_key_file] if @client_private_key_file
+      ssh_options[:password] = @ssh_password if @ssh_password
+      ssh_options[:passphrase] = @key_passphrase if @key_passphrase
       ssh_options[:user_known_hosts_file] = @known_hosts_file if @known_hosts_file
       ssh_options[:keys_only] = true
       # if the host public key is contained in the known_hosts_file,
@@ -146,6 +151,9 @@ module ForemanRemoteExecutionCore
       ssh_options[:paranoid] = true
       ssh_options[:auth_methods] = available_authentication_methods
       ssh_options[:user_known_hosts_file] = prepare_known_hosts if @host_public_key
+      ssh_options[:number_of_password_prompts] = 1
+      ssh_options[:verbose] = settings[:ssh_log_level]
+      ssh_options[:logger] = ForemanRemoteExecutionCore::LogFilter.new(SmartProxyDynflowCore::Log.instance)
       return ssh_options
     end
 
@@ -280,7 +288,7 @@ module ForemanRemoteExecutionCore
 
     def upload_file(local_path, remote_path)
       mode = File.stat(local_path).mode.to_s(8)[-3..-1]
-      @logger.debug('Uploading local file: #{local_path} as #{remote_path} with #{mode} permissions')
+      @logger.debug("Uploading local file: #{local_path} as #{remote_path} with #{mode} permissions")
       upload_data(File.read(local_path), remote_path, mode)
     end
 
@@ -322,6 +330,8 @@ module ForemanRemoteExecutionCore
           @logger.warn('Kerberos authentication requested but not available')
         end
       end
+      methods.unshift('password') if @ssh_password
+
       methods
     end
   end

data/lib/foreman_remote_execution_core/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecutionCore
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution_core
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-09 00:00:00.000000000 Z
+date: 2018-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks-core
@@ -38,8 +38,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: |2
-    Ssh remote execution provider code sharable between Foreman and Foreman-Proxy
+description: "  Ssh remote execution provider code sharable between Foreman and Foreman-Proxy\n"
 email:
 - inecas@redhat.com
 executables: []
@@ -51,6 +50,7 @@ files:
 - lib/foreman_remote_execution_core/actions.rb
 - lib/foreman_remote_execution_core/dispatcher.rb
 - lib/foreman_remote_execution_core/fake_script_runner.rb
+- lib/foreman_remote_execution_core/log_filter.rb
 - lib/foreman_remote_execution_core/polling_script_runner.rb
 - lib/foreman_remote_execution_core/script_runner.rb
 - lib/foreman_remote_execution_core/version.rb
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Foreman remote execution - core bits