train-core 3.3.24 → 3.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b4cd9dbab0f4f3706d077a9c26185998bbdc4925ef03783b90c9244e268990d
-  data.tar.gz: a13777cd6b9e682fae479da36147ef17cbf01cf09c2d70f3377bf916e021be0f
+  metadata.gz: 54dee42a0ad37ef8b4308a184f5bd63f869565db241c1c1fa910626d6c9a323f
+  data.tar.gz: afbeb697f1d0613f9d86af612e5ce6745b27b4ac597221b5e07db0e11b9d90d8
 SHA512:
-  metadata.gz: 36d220f296af3ac7d239a38726c0ccf6764ff171ea73004ea700c637b05233132e79619ea05de4fedbc098493baef6ea1095126325fd988475cf4a0a05ccce66
-  data.tar.gz: 6f8b09680a850f138c217bbfc03ae18e44a117d08842d8ca00a7055931a39e95e3be3652a851a4904171f7a80e58776cf1ff2220affaa19833c495d28e10cbe7
+  metadata.gz: d2029c737655fc5f2eea92e290d73bbd0b6b7eac73ecc7e2e5526870e5318f6beceba8bc64c555ac451007cd1083870bba35985fa8353560a6040a5c6b997186
+  data.tar.gz: c57536c1bdddbde99d4955276d5fe14c20dbe84b7f109059bb8d8ee56a02f49f484811784aacf8384b1d6e5229f92f46f03fe005008677531eaef2abea55fe62

data/lib/train.rb

@@ -113,6 +113,9 @@ module Train
     # TODO: rewrite next line using compact! once we drop support for ruby 2.3
     creds = creds.delete_if { |_, value| value.nil? }
 
+    # merge train options in from the URI query string
+    creds.merge!(uri.query_values.map { |k, v| [k.to_sym, v] }.to_h) unless uri.query_values.nil?
+
     # return the updated config
     creds
   end

data/lib/train/platforms/detect/helpers/os_windows.rb

@@ -33,15 +33,20 @@ module Train::Platforms::Detect::Helpers
       command = @backend.run_command(
         "Get-WmiObject Win32_OperatingSystem | Select Caption,Version | ConvertTo-Json"
       )
-      return false if (command.exit_status != 0) || command.stdout.empty?
-
-      payload = JSON.parse(command.stdout)
-      @platform[:family] = "windows"
-      @platform[:release] = payload["Version"]
-      @platform[:name] = payload["Caption"]
-
-      read_wmic
-      true
+      # some targets (e.g. Cisco) may return 0 and print an error to stdout
+      return false if (command.exit_status != 0) || command.stdout.downcase !~ /window/
+
+      begin
+        payload = JSON.parse(command.stdout)
+        @platform[:family] = "windows"
+        @platform[:release] = payload["Version"]
+        @platform[:name] = payload["Caption"]
+
+        read_wmic
+        true
+      rescue
+        false
+      end
     end
 
     def local_windows?
@@ -126,7 +131,7 @@ module Train::Platforms::Detect::Helpers
       return if !file.exist? || file.size == 0
 
       json = JSON.parse(file.content)
-      json["node_uuid"] if json["node_uuid"]
+      json["node_uuid"]
     end
 
     def windows_uuid_from_wmic

data/lib/train/transports/ssh.rb

@@ -63,6 +63,7 @@ module Train::Transports
     option :bastion_port, default: 22
     option :non_interactive, default: false
     option :verify_host_key, default: false
+    option :forward_agent, default: false
 
     # Allow connecting with older algorithms
     option :append_all_supported_algorithms, default: true

data/lib/train/transports/ssh_connection.rb

@@ -29,8 +29,8 @@ class Train::Transports::SSH
   #
   # @author Fletcher Nichol <fnichol@nichol.ca>
   class Connection < BaseConnection # rubocop:disable Metrics/ClassLength
-    attr_reader :hostname
-    attr_reader :transport_options
+    attr_reader   :hostname
+    attr_accessor :transport_options
 
     def initialize(options)
       # Track IOS command retries to prevent infinite loop on IOError. This must
@@ -72,13 +72,18 @@ class Train::Transports::SSH
 
       args  = %w{ -o UserKnownHostsFile=/dev/null }
       args += %w{ -o StrictHostKeyChecking=no }
-      args += %w{ -o IdentitiesOnly=yes }        if options[:keys]
-      args += %w{ -o BatchMode=yes }             if options[:non_interactive]
+      args += %w{ -o BatchMode=yes } if options[:non_interactive]
       args += %W{ -o LogLevel=#{level} }
       args += %W{ -o ForwardAgent=#{fwd_agent} } if options.key?(:forward_agent)
-      Array(options[:keys]).each do |ssh_key|
-        args += %W{ -i #{ssh_key} }
+
+      keys = Array(options[:keys])
+      unless keys.empty?
+        args += %w{ -o IdentitiesOnly=yes }
+        keys.each do |ssh_key|
+          args += %W{ -i #{ssh_key} }
+        end
       end
+
       args
     end
 
@@ -242,6 +247,16 @@ class Train::Transports::SSH
 
       exit_status, stdout, stderr = execute_on_channel(cmd, opts, &data_handler)
 
+      # An interactive console might contain the STDERR in STDOUT
+      # concat both outputs for non-zero exit status. 
+      output = "#{stdout} #{stderr}".strip if exit_status != 0
+
+      # Abstract the su - USER authentication failure
+      # raise the Train::UserError and passes message & reason
+      if output && output.match?("su: Authentication failure")
+        raise Train::UserError.new(output, :bad_su_user_password)
+      end
+
       # Since `@session.loop` succeeded, reset the IOS command retry counter
       @ios_cmd_retries = 0
 
@@ -317,12 +332,12 @@ class Train::Transports::SSH
         channel.exec(cmd) do |_, success|
           abort "Couldn't execute command on SSH." unless success
           channel.on_data do |_, data|
-            yield(data) if block_given?
+            yield(data, channel) if block_given?
             stdout += data
           end
 
           channel.on_extended_data do |_, _type, data|
-            yield(data) if block_given?
+            yield(data, channel) if block_given?
             stderr += data
           end
 
@@ -341,7 +356,7 @@ class Train::Transports::SSH
       if timeout
         res = thr.join(timeout)
         unless res
-          logger.info("ssh command reached requested timeout (#{timeout}s)")
+          logger.debug("train ssh command '#{cmd}' reached requested timeout (#{timeout}s)")
           session.channels.each_value { |c| c.eof!; c.close }
           raise Train::CommandTimeoutReached.new "ssh command reached timeout (#{timeout}s)"
         end

data/lib/train/version.rb

@@ -2,5 +2,5 @@
 # Author:: Dominik Richter (<dominik.richter@gmail.com>)
 
 module Train
-  VERSION = "3.3.24".freeze
+  VERSION = "3.4.8".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: train-core
 version: !ruby/object:Gem::Version
-  version: 3.3.24
+  version: 3.4.8
 platform: ruby
 authors:
 - Chef InSpec Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-18 00:00:00.000000000 Z
+date: 2021-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -188,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Transport interface to talk to a selected set of backends.