foreman_remote_execution_core 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8c6efad663b97320d18f4e9d571f7f2b9664192
-  data.tar.gz: e7e0c57fcb0b404138e550c633890f394a227fbd
+  metadata.gz: a81b2a41e08c662ce352dd037d625bd42cb9d53a
+  data.tar.gz: a5294079e9132731210ebe670f2f7c1810639cdb
 SHA512:
-  metadata.gz: 83be3ce8b355070f9144aad526a570de85c5705a826eb75ebe060802b5f34b62df14cba1f5d98791d6823d04a4668ce32beaa647be46cd4897319c778d9f6b63
-  data.tar.gz: 90e397053171e0e3aab5e539e7b6d40fa71cf995812b95956fcf4156b44ee96f639ba83b6f3814ddd813e528cafac35c8a27bc46053f0701a9992758e6ca2a35
+  metadata.gz: 04e246d897664d62109be19680cb4c973dac71868385b228f1257de2d923a8523fc12d9cdbbb2c167de092f8703fcea26459d0363ac8f005344d40a1afe8b484
+  data.tar.gz: 8ab7a7eb9c9accc486c975896aaf70f3671e95ca1ab2f9509d56832c6985185e45a74c0b5a4fe7fef11aa4c9f30e97ffca62d995889e16b8d03967c157a871d5

data/lib/foreman_remote_execution_core/script_runner.rb

@@ -1,7 +1,15 @@
 require 'net/ssh'
 
+# rubocop:disable Lint/HandleExceptions
+begin
+  require 'net/ssh/krb'
+rescue LoadError; end
+# rubocop:enable Lint/HandleExceptions:
+
 module ForemanRemoteExecutionCore
   class ScriptRunner < ForemanTasksCore::Runner::Base
+    attr_reader :execution_timeout_interval
+
     EXPECTED_POWER_ACTION_MESSAGES = ['restart host', 'shutdown host'].freeze
 
     def initialize(options)
@@ -14,6 +22,7 @@ module ForemanRemoteExecutionCore
       @effective_user_method = options.fetch(:effective_user_method, 'sudo')
       @host_public_key = options.fetch(:host_public_key, nil)
       @verify_host = options.fetch(:verify_host, nil)
+      @execution_timeout_interval = options.fetch(:execution_timeout_interval, nil)
 
       @client_private_key_file = settings.fetch(:ssh_identity_key_file)
       @local_working_dir = options.fetch(:local_working_dir, settings.fetch(:local_working_dir))
@@ -61,6 +70,15 @@ module ForemanRemoteExecutionCore
       publish_exception('Unexpected error', e, false)
     end
 
+    def timeout
+      @logger.debug('job timed out')
+      super
+    end
+
+    def timeout_interval
+      execution_timeout_interval
+    end
+
     def with_retries
       tries = 0
       begin
@@ -93,6 +111,10 @@ module ForemanRemoteExecutionCore
       @session.close if @session && !@session.closed?
     end
 
+    def publish_data(data, type)
+      super(data.force_encoding('UTF-8'), type)
+    end
+
     private
 
     def session
@@ -111,7 +133,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] = available_authentication_methods
       ssh_options[:user_known_hosts_file] = prepare_known_hosts if @host_public_key
       return ssh_options
     end
@@ -279,5 +301,17 @@ module ForemanRemoteExecutionCore
         @expecting_disconnect = true
       end
     end
+
+    def available_authentication_methods
+      methods = %w(publickey) # Always use pubkey auth as fallback
+      if settings[:kerberos_auth]
+        if defined? Net::SSH::Kerberos
+          methods << 'gssapi-with-mic'
+        else
+          @logger.warn('Kerberos authentication requested but not available')
+        end
+      end
+      methods
+    end
   end
 end

data/lib/foreman_remote_execution_core/version.rb

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

data/lib/foreman_remote_execution_core.rb

@@ -6,7 +6,8 @@ module ForemanRemoteExecutionCore
                     :ssh_identity_key_file => '~/.ssh/id_rsa_foreman_proxy',
                     :ssh_user              => 'root',
                     :remote_working_dir    => '/var/tmp',
-                    :local_working_dir     => '/var/tmp')
+                    :local_working_dir     => '/var/tmp',
+                    :kerberos_auth         => false)
 
   def self.simulate?
     %w(yes true 1).include? ENV.fetch('REX_SIMULATE', '').downcase

metadata

@@ -1,45 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution_core
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2017-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-- !ruby/object:Gem::Dependency
-  name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
-  name: net-scp
+  name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="