train-core 3.2.27 → 3.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0294ba420fc7a8186d1e22a77ea60a4ad747d10d6e92606b76d1c78f7bd687cb'
-  data.tar.gz: ba6e6b7c0992ec69db612c7d935b89e5582e818e013d09474604eb496ba1edfc
+  metadata.gz: b6481551d7379b4a6cdee61568a1252e7feae2dc2d83def688417945eced8776
+  data.tar.gz: 3bec9acaea41dba70ed5c55cb7d6460d40e1c900002a172356419c80da222f7e
 SHA512:
-  metadata.gz: 0040ab59e434093b9d37e8fb275261de763085445735a39b183c9b41c8b9f7acac7e1a98aa7da56e49a95d56f72da07d75d5f5a12a61c8339c8c9a5faef21ba3
-  data.tar.gz: d7cd7b1bf445175ab96e3ee80f7de6557867b6cb9d8efc60526359d0a1ffecc5877c88ad79816fea34a5b429c1c9480bd26bb97e23c2612c4e3e536b19b4b7a7
+  metadata.gz: '09b0f40e16fc0533bb474a460d3526fd767cacd2e2c18e35a6f9aa825e953adc7de241116d12a832c179c6e7383afbb7357ecf31bdeb75347854083fee328caa'
+  data.tar.gz: c1bcbb41f3c7e3e832f1adf70b5f02634906e6f40d8ed989ff7aafb56b2e5008ba4cab5ce483dc39badaf8142e8e685a7f262c1f154d28c078ce0d899d9561fc

data/lib/train/extras/command_wrapper.rb

@@ -72,14 +72,14 @@ module Train::Extras
       rawerr = "#{res.stdout} #{res.stderr}".strip
 
       case rawerr
-      when "Sorry, try again"
+      when /Sorry, try again/
         ["Wrong sudo password.", :bad_sudo_password]
-      when "sudo: no tty present and no askpass program specified"
+      when /sudo: no tty present and no askpass program specified/
         ["Sudo requires a password, please configure it.", :sudo_password_required]
-      when "sudo: command not found"
+      when /sudo: command not found/
         ["Can't find sudo command. Please either install and "\
           "configure it on the target or deactivate sudo.", :sudo_command_not_found]
-      when "sudo: sorry, you must have a tty to run sudo"
+      when /sudo: sorry, you must have a tty to run sudo/
         ["Sudo requires a TTY. Please see the README on how to configure "\
           "sudo to allow for non-interactive usage.", :sudo_no_tty]
       else

data/lib/train/file/remote/unix.rb

@@ -22,8 +22,14 @@ module Train
         def exist?
           @exist ||= begin
             f = @follow_symlink ? "" : " || test -L #{@spath}"
-            @backend.run_command("test -e #{@spath}" + f)
-              .exit_status == 0
+            if @backend.platform.solaris?
+              # Solaris does not support `-e` flag in default `test`,
+              # so we specify by running /usr/bin/test:
+              # https://github.com/inspec/train/issues/587
+              @backend.run_command("/usr/bin/test -e #{@spath}" + f)
+            else
+              @backend.run_command("test -e #{@spath}" + f)
+            end.exit_status == 0
           end
         end
 

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

@@ -34,16 +34,24 @@ module Train::Platforms::Detect::Helpers
     end
 
     def command_output(cmd)
-      res = @backend.run_command(cmd).stdout
+      res = @backend.run_command(cmd)
+      stdout = res.stdout
+      stderr = res.stderr
       # When you try to execute command using ssh connction as root user and you have provided ssh user identity file
       # it gives standard output to login as authorised user other than root. To show this standard ouput as an error
       # to user we are matching the string of stdout and raising the error here so that user gets exact information.
-      if @backend.class.to_s == "Train::Transports::SSH::Connection" && res =~ /Please login as the user/
-        raise Train::UserError, "SSH failed: #{res}"
+      if @backend.class.to_s == "Train::Transports::SSH::Connection"
+        if stdout =~ /Please login as the user/
+          raise Train::UserError, "SSH failed: #{stdout}"
+        end
+
+        if stderr =~ /WARNING: Your password has expired/
+          raise Train::UserError, "SSH failed: #{stderr}"
+        end
       end
 
-      res.strip! unless res.nil?
-      res
+      stdout.strip! unless stdout.nil?
+      stdout
     end
 
     def unix_uname_s

data/lib/train/platforms/detect/specifications/os.rb

@@ -357,7 +357,7 @@ module Train::Platforms::Detect::Specifications
       declare_instance("mac_os_x", "macOS X", "darwin") do
         cmd = unix_file_contents("/System/Library/CoreServices/SystemVersion.plist")
         @platform[:uuid_command] = "system_profiler SPHardwareDataType | awk '/UUID/ { print $3; }'"
-        cmd =~ /Mac OS X/i
+        cmd =~ /Mac OS X|macOS/i
       end
 
       declare_instance("darwin", "Darwin", "darwin") do
@@ -369,6 +369,7 @@ module Train::Platforms::Detect::Specifications
       declare_bsd("freebsd", "Freebsd", "bsd", /freebsd/i)
       declare_bsd("openbsd", "Openbsd", "bsd", /openbsd/i)
       declare_bsd("netbsd", "Netbsd", "bsd", /netbsd/i)
+      declare_bsd("dragonflybsd", "Dragonflybsd", "bsd", /dragonfly/i)
     end
 
     def self.load_other

data/lib/train/transports/cisco_ios_connection.rb

@@ -16,6 +16,9 @@ class Train::Transports::SSH
       # Use all options left that are not `nil` for `Net::SSH.start` later
       @ssh_options = options.reject { |_key, value| value.nil? }
 
+      # Allow older algorithms
+      @ssh_options[:append_all_supported_algorithms] = true
+
       @prompt = /^\S+[>#]\r\n.*$/
     end
 

data/lib/train/transports/ssh.rb

@@ -65,6 +65,9 @@ module Train::Transports
     option :non_interactive, default: false
     option :verify_host_key, default: false
 
+    # Allow connecting with older algorithms
+    option :append_all_supported_algorithms, default: true
+
     option :compression_level do |opts|
       # on nil or false: set compression level to 0
       opts[:compression] ? 6 : 0
@@ -76,7 +79,7 @@ module Train::Transports
       validate_options(opts)
       conn_opts = connection_options(opts)
 
-      if defined?(@connection) && @connection_options == conn_opts
+      if defined?(@connection) && reusable_connection?(conn_opts)
         reuse_connection(&block)
       else
         create_new_connection(conn_opts, &block)
@@ -85,6 +88,13 @@ module Train::Transports
 
     private
 
+    def reusable_connection?(conn_opts)
+      return false unless @connection_options
+
+      # Do requested options match their current settings
+      @connection_options.all? { |k, v| conn_opts[k] == v }
+    end
+
     def validate_options(options)
       super(options)
 
@@ -167,6 +177,7 @@ module Train::Transports
         bastion_user: opts[:bastion_user],
         bastion_port: opts[:bastion_port],
         non_interactive: opts[:non_interactive],
+        append_all_supported_algorithms: opts[:append_all_supported_algorithms],
         transport_options: opts,
       }
       # disable host key verification. The hash key and value to use

data/lib/train/transports/ssh_connection.rb

@@ -54,7 +54,7 @@ class Train::Transports::SSH
       @bastion_user           = @options.delete(:bastion_user)
       @bastion_port           = @options.delete(:bastion_port)
 
-      @cmd_wrapper            = CommandWrapper.load(self, @transport_options)
+      @cmd_wrapper = CommandWrapper.load(self, @transport_options)
     end
 
     # (see Base::Connection#close)

data/lib/train/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: train-core
 version: !ruby/object:Gem::Version
-  version: 3.2.27
+  version: 3.3.6
 platform: ruby
 authors:
 - Chef InSpec Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-08 00:00:00.000000000 Z
+date: 2020-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.13.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -73,7 +87,7 @@ dependencies:
         version: '1.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -83,7 +97,7 @@ dependencies:
         version: '1.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -93,7 +107,7 @@ dependencies:
         version: '2.9'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -103,7 +117,7 @@ dependencies:
         version: '2.9'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 description: A minimal Train with a backends for ssh and winrm.
 email:
 - inspec@chef.io